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
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_lightgrey : 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 :
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);
}
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;