fix an uninit'd variable

[chiark-utils.git] / cprogs / xacpi-simple.c

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index 52e02a2e269e2829c4d8c5dc0cb221f98df019b7..f2ba491d93adbc41d8773eedf77b4564f90ece13 100644 (file)
--- a/cprogs/xacpi-simple.c
+++ b/cprogs/xacpi-simple.c
@@ -1,16 +1,16 @@
 /*
  * display outputs, per line:
  *
- *   Remaining:        | Empty:        | Degraded:
- *     blue    |  black        |  dimgrey      discharging
- *     green   |  black        |  dimgrey      charging
- *     cyan    |  black        |  dimgrey      charged
- *     grey    |  black        |  dimgrey      charging&discharching!
- *     darkcyan        |  black        |  dimgrey      none of the above
- *     blue    |  red          |  dimgrey      discharging - low!
- *     green   |  red          |  dimgrey      charging - low
- *     cyan    |  red          |  dimgrey      charged - low [1]
- *     grey    |  red          |  dimgrey      charging&discharching, low [1]
+ *   Remaining:         | Empty:       | Degraded:
+ *     blue     |  black       |  dimgrey      discharging
+ *     green    |  black       |  dimgrey      charging
+ *     cyan     |  black       |  dimgrey      charged
+ *     grey     |  black       |  dimgrey      charging&discharching!
+ *     lightgrey |  black      |  dimgrey      none of the above
+ *     blue     |  red         |  dimgrey      discharging - low!
+ *     green    |  red         |  dimgrey      charging - low
+ *     cyan     |  red         |  dimgrey      charged - low [1]
+ *     grey     |  red         |  dimgrey      charging&discharching, low [1]
  *       ...  darkgreen  ...                   no batteries present
  *       ...  yellow  ...                      error
  *
@@ -357,7 +357,7 @@ static double total_##f;
   ALL_ACCUMULATE_FIELDS(Q_VAR)
 
 static void acquiredata(void) {
-  DIR *di;
+  DIR *di = 0;
   struct dirent *de;
   int r;
   
@@ -427,7 +427,7 @@ ALL_PLAIN_ACCUMULATE_FIELDS(Q_ACCUMULATE_PLAIN)
 
       
   }
-  closedir(di);
+  if (di) closedir(di);
 
   if (debug) {
     printf("TOTAL:\n");
@@ -467,17 +467,17 @@ static void initacquire(void) {
 /*---------- argument parsing ----------*/
 
 #define COLOURS                                        \
-  C(blue,      discharging)                    \
-  C(green,     charging)                       \
-  C(cyan,      charged)                                \
-  C(darkcyan,  notcharging)                    \
-  C(grey,      confusing)                      \
-  C(black,     normal)                         \
-  C(red,       low)                            \
-  C(dimgrey,   degraded)                       \
-  C(darkgreen, absent)                         \
-  C(yellow,    error)                          \
-  C(white,     equilibrium)                    \
+  C(blue,           discharging)               \
+  C(green,         charging)                   \
+  C(cyan,           charged)                   \
+  C(lightgrey,      notcharging)               \
+  C(grey,           confusing)                 \
+  C(black,          normal)                    \
+  C(red,            low)                       \
+  C(dimgrey,        degraded)                  \
+  C(darkgreen,      absent)                    \
+  C(yellow,         error)                     \
+  C(white,          equilibrium)               \
   GC(remain)                                   \
   GC(white)                                    \
   GC(empty)
@@ -576,7 +576,7 @@ typedef struct {
   unsigned long lastfg;
 } Gcstate;
 
-#define C(c,u) static unsigned long pix_##c;
+#define C(c,u) static unsigned long pix_##u;
 #define GC(g) static Gcstate gc_##g;
   COLOURS
 #undef C
@@ -622,23 +622,23 @@ static void show(void) {
   int i, leftmost_lit, leftmost_nondeg, beyond, first_beyond;
 
   if (!charging_mask)
-    return show_solid(pix_darkgreen);
+    return show_solid(pix_absent);
 
   if (charging_mask & (1u << CHGST_ERROR))
-    return show_solid(pix_yellow);
+    return show_solid(pix_error);
 
-  setbackground(pix_dimgrey);
+  setbackground(pix_degraded);
   XClearWindow(disp,win);
   
   setforeground(&gc_remain,
                !(charging_mask & CHGMASK_CHG_DIS) ?
                (~charging_mask & (1u << CHGST_CHARGED) ?
-                pix_darkcyan : pix_cyan) :
-               !(~charging_mask & CHGMASK_CHG_DIS) ? pix_grey :
+                pix_notcharging : pix_charged) :
+               !(~charging_mask & CHGMASK_CHG_DIS) ? pix_confusing :
                charging_mask & (1u<<CHGST_CHARGING)
-               ? pix_green : pix_blue);
+               ? pix_charging : pix_discharging);
                
-  setforeground(&gc_empty, alarmed ? pix_red : pix_black);
+  setforeground(&gc_empty, alarmed ? pix_low : pix_normal);
 
   for (i=0, first_beyond=1; i<height; i++) {
     elap= !i ? 0 :
@@ -676,7 +676,7 @@ static void initgc(Gcstate *gc_r) {
   memset(&gcv,0,sizeof(gcv));
   gcv.function= GXcopy;
   gcv.line_width= 1;
-  gc_r->lastfg= gcv.foreground= pix_white;
+  gc_r->lastfg= gcv.foreground= pix_equilibrium;
   gc_r->gc= XCreateGC(disp,win, GCFunction|GCLineWidth|GCForeground, &gcv);
 }
 
@@ -724,15 +724,15 @@ static void initgraphics(int argc, char **argv) {
                           pos_x,pos_y,width,height,0,0,0);
   cmap= DefaultColormap(disp,screen);
   
-#define C(c,u) colour(&pix_##c, #u "Color");
+#define C(c,u) colour(&pix_##u, #u "Color");
 #define GC(g) initgc(&gc_##g);
   COLOURS
 #undef C
 #undef GC
 
-  r= XSetWindowBackground(disp,win,pix_dimgrey);
+  r= XSetWindowBackground(disp,win,pix_degraded);
   if (!r) fail("init set background");
-  lastbackground= pix_dimgrey;
+  lastbackground= pix_degraded;
 
   normal_hints->flags= PWinGravity;
   normal_hints->win_gravity= gravity;
@@ -763,15 +763,9 @@ static void refresh(void) {
 
 static void newgeometry(void) {
   int dummy;
-  unsigned int udummy, gotwidth, gotheight;
   Window dummyw;
   
-  XGetGeometry(disp,win, &dummyw,&dummy,&dummy, &gotwidth,&gotheight,
-              &udummy,&udummy);
-  assert(gotwidth < INT_MAX);
-  assert(gotheight < INT_MAX);
-  width = gotwidth;
-  height = gotheight;
+  XGetGeometry(disp,win, &dummyw,&dummy,&dummy, &width,&height, &dummy,&dummy);
 }
 
 static void eventloop(void) {