From bb06e8019963bd65fef170dae2c66423e6834306 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 1 Jan 2008 16:23:28 +0100
Subject: [PATCH] simplify some stuff, cosmetic

---
 config.c              |  6 ++--
 widgets/progressbar.c | 78 +++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/config.c b/config.c
index 6915550d1..633dba14e 100644
--- a/config.c
+++ b/config.c
@@ -535,7 +535,7 @@ config_parse(const char *confpatharg)
         CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
         CFG_END()
     };
-    static cfg_opt_t bar_opts[] =
+    static cfg_opt_t widget_progressbar_bar_opts[] =
     {
         CFG_STR((char *) "fg", (char *) NULL, CFGF_NONE),
         CFG_STR((char *) "bg", (char *) NULL, CFGF_NONE),
@@ -544,8 +544,8 @@ config_parse(const char *confpatharg)
     static cfg_opt_t widget_progressbar_opts[] =
     {
         CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
-        CFG_SEC((char *) "bar", bar_opts, CFGF_MULTI),
-        CFG_INT((char *) "width", 102, CFGF_NONE),
+        CFG_SEC((char *) "bar", widget_progressbar_bar_opts, CFGF_MULTI),
+        CFG_INT((char *) "width", 100, CFGF_NONE),
         CFG_INT((char *) "gap", 2, CFGF_NONE),
         CFG_INT((char *) "lpadding", 3, CFGF_NONE),
         CFG_FLOAT((char *) "height", 0.67, CFGF_NONE),
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 20c1bda95..5c54efdfb 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -30,15 +30,24 @@ extern AwesomeConf globalconf;
 
 typedef struct
 {
-    int *percent;   /* 0-100 */
-    int width;      /* width of the bars */
-    int lpadding;   /* padding on the left of the bars */
-    int gap;        /* pixels between bars */
-    int bars;       /* number of bars */
-    float height;   /* height 0-1 (where 1 = height of statusbar */
+    /** Percent 0 to 100 */
+    int *percent;
+    /** Width of the bars */
+    int width;
+    /** Left padding */
+    int lpadding;
+    /** Pixel between bars */
+    int gap;
+    /** Number of bars */
+    int bars;
+    /** Height 0-1, where 1 is height of statusbar */
+    float height;
+    /** Foreground color */
     XColor *fg;
+    /** Background color */
     XColor *bg;
-    XColor *bcolor; /* border color */
+    /** Border color */
+    XColor *bcolor;
 } Data;
 
 static int
@@ -58,9 +67,9 @@ progressbar_draw(Widget *widget, DrawCtx *ctx, int offset,
     width = d->width - d->lpadding;
 
     widget->location = widget_calculate_offset(widget->statusbar->width,
-            d->width,
-            offset,
-            widget->alignment);
+                                               d->width,
+                                               offset,
+                                               widget->alignment);
 
     left_offset = widget->location + d->lpadding;
 
@@ -69,21 +78,21 @@ progressbar_draw(Widget *widget, DrawCtx *ctx, int offset,
         pwidth = (int) d->percent[i] ? ((width - 2) * d->percent[i]) / 100 : 0;
 
         draw_rectangle(ctx,
-                left_offset, margin_top,
-                width, pb_height,
-                False, d->bcolor[i]);
+                       left_offset, margin_top,
+                       width, pb_height,
+                       False, d->bcolor[i]);
 
         if(pwidth > 0)
             draw_rectangle(ctx,
-                    left_offset + 1, margin_top + 1,
-                    pwidth, pb_height - 2,
-                    True, d->fg[i]);
+                           left_offset + 1, margin_top + 1,
+                           pwidth, pb_height - 2,
+                           True, d->fg[i]);
 
         if(width - 2 - pwidth > 0) /* not filled area */
             draw_rectangle(ctx,
-                    left_offset + 1 + pwidth, margin_top + 1,
-                    width - 2 - pwidth, pb_height - 2,
-                    True, d->bg[i]);
+                           left_offset + 1 + pwidth, margin_top + 1,
+                           width - 2 - pwidth, pb_height - 2,
+                           True, d->bg[i]);
 
         margin_top += (pb_height + d->gap);
     }
@@ -96,24 +105,17 @@ static void
 progressbar_tell(Widget *widget, char *command)
 {
     Data *d = widget->data;
-    int i, percent;
+    int i = 0, percent;
     char * tok;
 
-    if(!command)
+    if(!command || !d->bars)
         return;
 
-    if(!d->bars)
-        return;
-
-    i = 0;
-    for (tok = strtok(command, ", "); tok != NULL; tok = strtok(NULL, ", "))
+    for (tok = strtok(command, ", "); tok && i < d->bars; tok = strtok(NULL, ", "), i++)
     {
         percent = atoi(tok);
         if(percent <= 100 && percent >= 0)
             d->percent[i] = percent;
-        if (i > d->bars )
-            break;
-        i++;
     }
 }
 
@@ -123,7 +125,7 @@ progressbar_new(Statusbar *statusbar, cfg_t *config)
     Widget *w;
     Data *d;
     char *color;
-    int i, bars; 
+    int i; 
     cfg_t *cfg;
 
 
@@ -134,20 +136,18 @@ progressbar_new(Statusbar *statusbar, cfg_t *config)
     d = w->data = p_new(Data, 1);
     d->width = cfg_getint(config, "width");
 
-    bars = cfg_size(config, "bar");
-    if (!(bars))
+    if(!(d->bars = cfg_size(config, "bar")))
     {
-        d->bars = 0;
         warn("A progressbar-widget needs a: bar {} in the .awesomerc\n");
         return w;
     }
-    d->bars = bars;
-    d->bg = p_new(XColor, bars);
-    d->fg = p_new(XColor, bars);
-    d->bcolor = p_new(XColor, bars);
-    d->percent = p_new(int, bars);
 
-    for(i = 0; i < bars; i++)
+    d->bg = p_new(XColor, d->bars);
+    d->fg = p_new(XColor, d->bars);
+    d->bcolor = p_new(XColor, d->bars);
+    d->percent = p_new(int, d->bars);
+
+    for(i = 0; i < d->bars; i++)
     {
         cfg = cfg_getnsec(config, "bar", i);