/*
* display outputs, per line:
*
- * Remaining: | Empty: | Degraded:
- * blue | black | dimgrey discharging
- * green | black | dimgrey charging
- * cyan | black | dimgrey charged
- * grey | black | dimgrey charging&discharching!
- * 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
*
#include <unistd.h>
#include <ctype.h>
#include <stdint.h>
+#include <limits.h>
+#include <inttypes.h>
#include <sys/poll.h>
#include <sys/types.h>
#define TIMEOUT_ONERROR 3333 /* milliseconds */
static const char program_name[]= "xacpi-simple";
+static int debug, alarmlevel;
/*---------- general utility stuff and declarations ----------*/
}
static void badusage(void) { fail("bad usage"); }
+typedef uint64_t value;
+#define VAL_NOTFOUND (~(value)0)
+
typedef struct fileinfo fileinfo;
+typedef int parser(const fileinfo*);
+
+static parser parse_uevent;
+
struct fileinfo {
const char *filename;
- void (*parse)(const fileinfo*);
+ parser *parse;
const void *extra;
};
/*---------- structure of and results from /sys/class/power/... ----------*/
-/* variables thisbat_... are the results from readbattery();
- * if readbattery() succeeds they are all valid and not VAL_NOTFOUND
+/* variables this_... are the results from readbattery();
+ * if readbattery() succeeds the appropriate ones are all valid
+ * and not VAL_NOTFOUND
*/
typedef struct batinfo_field {
const char *label;
- uint64_t *valuep;
+ value *valuep;
const char *enumarray[10];
} batinfo_field;
-#define UEVENT_QUANTITY_FIELDS(q) \
- q(design_capacity, CHARGE_FULL_DESIGN ) /* uAh */ \
- q(last_full_capacity, CHARGE_FULL ) /* uAh */ \
- q(present_rate, CURRENT_NOW ) /* uA */ \
- q(remaining_capacity, CHARGE_NOW ) /* uAh */ \
- q(present, PRESENT ) /* boolean */ \
- q(online, ONLINE ) /* boolean */
-
-#define UEVENT_ENUM_FIELDS(e) \
- e(type, TYPE, "Battery", "Mains" ) \
- e(state, STATUS, "Discharging", "Charging", "Charged" )
-
-#define CHGST_DISCHARGING 0 /* Reflects order in e(state,...) above */
-#define CHGST_CHARGING 1 /* Also, much code assumes exadtly */
-#define CHGST_CHARGED 2 /* these three possible states. */
+#define BAT_QTYS(_, _ec, EC_, PC_) \
+ _(design_capacity##_ec, BATTERY, EC_##FULL_DESIGN ) \
+ _(last_full_capacity##_ec, BATTERY, EC_##FULL ) \
+ _(remaining_capacity##_ec, BATTERY, EC_##NOW ) \
+ _(present_rate##_ec, BATTERY, PC_##NOW )
+ /* ENERGY [mWh]; POWER [mW]; CHARGE [uAh]; CURRENT [uA] */
+
+#define UEVENT_ESSENTIAL_QUANTITY_FIELDS(_) \
+ _(present, BATTERY, PRESENT /* bool */ ) \
+ _(online, MAINS, ONLINE /* bool */ )
+
+#define UEVENT_FUNKY_QUANTITY_FIELDS(_) \
+ BAT_QTYS(_,_energy,ENERGY_,POWER_) \
+ BAT_QTYS(_,_charge,CHARGE_,CURRENT_)
+
+#define UEVENT_OPTIONAL_QUANTITY_FIELDS(_) \
+ _(voltage, BATTERY, VOLTAGE_NOW /* uV */ )
+
+#define UEVENT_ENUM_FIELDS(_) \
+ _(state, BATTERY, STATUS, "Discharging","Charging","Full","Unknown" ) \
+ _(type, BOTH, TYPE, "Mains", "Battery" )
+
+#define CHGST_DISCHARGING 0 /* Reflects order in _(state,...) above */
+#define CHGST_CHARGING 1 /* Also, much code assumes exactly */
+#define CHGST_CHARGED 2 /* these three possible states. */
+#define CHGST_UNKNOWN 3 /* these three possible states. */
#define CHGST_ERROR 8 /* Except that this one is an extra bit. */
-#define Q_FLD(f,l) { "POWER_SUPPLY_" #l, &thisbat_##f },
-#define E_FLD(f,l,vl...) { "POWER_SUPPLY_" #l, &thisbat_##f, { vl } },
+#define TYPE_MAINS 0 /* Reflects order in _(type,...) above */
+#define TYPE_BATTERY 1 /* Also, much code assumes exactly these two */
+#define TYPE_BOTH 100 /* Except this is a magic invalid value. */
+
+#define SEPARATE_QUANTITY_FIELDS(_) \
+ /* See commit ec6f5f0be800bc5f2a27046833dba04e0c67ffac for
+ the code needed to use this */
+
+
+#define ALL_DIRECT_VARS(_) \
+ UEVENT_ESSENTIAL_QUANTITY_FIELDS(_) \
+ UEVENT_FUNKY_QUANTITY_FIELDS(_) \
+ UEVENT_OPTIONAL_QUANTITY_FIELDS(_) \
+ UEVENT_ENUM_FIELDS(_) \
+ SEPARATE_QUANTITY_FIELDS(_)
+
+#define ALL_VARS(_) \
+ ALL_DIRECT_VARS(_) \
+ BAT_QTYS(_,,,)
+
+#define ALL_NEEDED_FIELDS(_) \
+ UEVENT_ESSENTIAL_QUANTITY_FIELDS(_) \
+ UEVENT_ENUM_FIELDS(_) \
+ SEPARATE_QUANTITY_FIELDS(_)
+
+#define ALL_PLAIN_ACCUMULATE_FIELDS(_) \
+ UEVENT_ESSENTIAL_QUANTITY_FIELDS(_) \
+ SEPARATE_QUANTITY_FIELDS(_)
+
+#define ALL_ACCUMULATE_FIELDS(_) \
+ ALL_PLAIN_ACCUMULATE_FIELDS(_) \
+ BAT_QTYS(_,,,)
+
-#define ALL_FIELDS(i) \
- UEVENT_QUANTITY_FIELDS(i) \
- UEVENT_ENUM_FIELDS(i) \
- i(thisbat_alarm)
+#define F_VAR(f,...) \
+static value this_##f;
+ALL_VARS(F_VAR)
-#define F_VAR(f,...) static uint64_t thisbat_##f;
- ALL_FIELDS(F_VAR)
+#define Q_FLD(f,t,l) { "POWER_SUPPLY_" #l, &this_##f },
+#define E_FLD(f,t,l,vl...) { "POWER_SUPPLY_" #l, &this_##f, { vl } },
static const batinfo_field uevent_fields[]= {
- UEVENT_QUANTITY_FIELDS(Q_FLD)
+ UEVENT_ESSENTIAL_QUANTITY_FIELDS(Q_FLD)
+ UEVENT_FUNKY_QUANTITY_FIELDS(Q_FLD)
+ UEVENT_OPTIONAL_QUANTITY_FIELDS(Q_FLD)
UEVENT_ENUM_FIELDS(E_FLD)
{ 0 }
};
-#define VAL_NOTFOUND (~0UL)
+#define S_FLD(f,t,fn,vl...) \
+static const batinfo_field bif_##f = { 0, &this_##f, { vl } };
+ SEPARATE_QUANTITY_FIELDS(S_FLD)
+
+#define S_FILE(f,t,fn,vl...) { fn, parse_separate, &bif_##f },
static const fileinfo files[]= {
- { "uevent", parse_fields, uevent_fields },
- { "alarm", parse_boolean, &thisbat_alarm },
+ { "uevent", parse_uevent, uevent_fields },
+ SEPARATE_QUANTITY_FIELDS(S_FILE)
{ 0 }
};
-/*---------- parsing of one battery in /proc/acpi/battery/... ----------*/
+/*---------- parsing of one thingx in /sys/class/power/... ----------*/
/* variables private to the parser and its error handlers */
static char batlinebuf[1000];
static int batfailf(const char *why) {
if (batlinevalue) {
- fprintf(stderr,"battery/%s/%s: %s value `%s': %s\n",
+ fprintf(stderr,"%s/%s: %s value `%s': %s\n",
batdirname,batfilename, batlinebuf,batlinevalue,why);
} else {
- fprintf(stderr,"battery/%s/%s: %s: `%s'\n",
+ fprintf(stderr,"%s/%s: %s: `%s'\n",
batdirname,batfilename, why, batlinebuf);
}
return -1;
}
+static int batfailc(const char *why) {
+ fprintf(stderr,"%s/%s: %s\n",
+ batdirname,batfilename, why);
+ return -1;
+}
+
static int batfaile(const char *syscall, const char *target) {
- fprintf(stderr,"battery/%s: failed to %s %s: %s\n",
+ fprintf(stderr,"%s: failed to %s %s: %s\n",
batdirname ? batdirname : "*", syscall, target, strerror(errno));
return -1;
}
-static void chdir_base(void) {
+static int chdir_base(void) {
int r;
r= chdir("/sys/class/power_supply");
- if (r) batfaile("chdir","/sys/class/power_supply");
+ if (r) return batfaile("chdir","/sys/class/power_supply");
+
+ return 0;
}
static void tidybattery(void) {
if (batfile) { fclose(batfile); batfile=0; }
- if (batdirname) { chdir_base(); batdirname=0; }
}
-static void parse_fields(const fileinfo *cfile, char *batlinebuf) {
- equals= strchr(batlinebuf,'=');
- if (!equals)
- return batfailf("line without a equals");
- *equals++= 0;
-
- for (field=fields; field->file; field++) {
- if (!strcmp(field->label,batlinebuf))
- goto found;
- }
- return;
+static int parse_value(const fileinfo *cfile, const batinfo_field *field) {
+ if (*field->valuep != VAL_NOTFOUND)
+ return batfailf("value specified multiple times");
- found:
if (!field->enumarray[0]) {
- *field->valuep= strtoull(equals,&ep,10);
+ char *ep;
+ *field->valuep= strtoull(batlinevalue,&ep,10);
if (*ep)
batfailf("value number syntax incorrect");
} else {
+ const char *const *enumsearch;
for (*field->valuep=0, enumsearch=field->enumarray;
- *enumsearch && strcmp(*enumsearch,equals);
+ *enumsearch && strcmp(*enumsearch,batlinevalue);
(*field->valuep)++, enumsearch++);
if (!*enumsearch)
batfailf("unknown enum value");
}
+ return 0;
}
-static int readbattery(void) { /* 0=>ok, -1=>couldn't */
+static int parse_uevent(const fileinfo *cfile) {
+ char *equals= strchr(batlinebuf,'=');
+ if (!equals)
+ return batfailf("line without a equals");
+ *equals= 0;
+ batlinevalue = equals+1;
+
const batinfo_field *field;
+ for (field=cfile->extra; field->label; field++) {
+ if (!strcmp(field->label,batlinebuf))
+ goto found;
+ }
+ return 0;
+
+ found:
+ return parse_value(cfile, field);
+}
+
+static int readbattery(void) { /* 0=>ok, -1=>couldn't */
+
const fileinfo *cfile;
- const char *const *enumsearch;
- char *colon, *ep, *sr, *p;
- int r, l, missing;
+ char *sr;
+ int r, l;
+ r= chdir_base();
+ if (r) return r;
+
r= chdir(batdirname);
if (r) return batfaile("chdir",batdirname);
-#define V_NOTFOUND(f,...) thisbat_##f = VAL_NOTFOUND;
- ALL_FIELDS(V_NOTFOUND)
-
- for (field=fields; field->file; field++)
- *field->valuep= VAL_NOTFOUND;
+#define V_NOTFOUND(f,...) \
+ this_##f = VAL_NOTFOUND;
+ALL_VARS(V_NOTFOUND)
for (cfile=files;
(batfilename= cfile->filename);
- cfile++++) {
+ cfile++) {
batfile= fopen(batfilename,"r");
- if (!batfile) return batfaile("open",batfilename);
+ if (!batfile) {
+ if (errno == ENOENT) continue;
+ return batfaile("open",batfilename);
+ }
for (;;) {
batlinevalue= 0;
return batfailf("line too long");
batlinebuf[l-1]= 0;
- cfile->parse(cfile, batlinebuf);
+ if (cfile->parse(cfile))
+ return -1;
}
fclose(batfile);
batfile= 0;
}
- if (!(thisbat_alarm_present==0 ||
- thisbat_state_present==0 || thisbat_info_present==0)) {
- if (thisbat_alarm_present == VAL_NOTFOUND)
- thisbat_alarm_present= 1;
-
- for (field=fields, missing=0;
- field->file;
- field++) {
- if (*field->valuep == VAL_NOTFOUND) {
- fprintf(stderr,"battery/%s/%s: %s: not found\n",
- batdirname, field->file,field->label);
- missing++;
- }
- }
- if (missing) return -1;
+ if (debug) {
+ printf("%s:\n",batdirname);
+#define V_PRINT(f,...) \
+ printf(" %-30s = %20"PRId64"\n", #f, (int64_t)this_##f);
+ALL_DIRECT_VARS(V_PRINT)
+ }
+
+ int needsfields_MAINS = this_type == TYPE_MAINS;
+ int needsfields_BATTERY = this_type == TYPE_BATTERY;
+ int needsfields_BOTH = 1;
+
+ int missing = 0;
+
+#define V_NEEDED(f,t,...) \
+ if (needsfields_##t && this_##f == VAL_NOTFOUND) { \
+ fprintf(stderr,"%s: %s: not found\n", \
+ batdirname, #f); \
+ missing++; \
}
+ALL_NEEDED_FIELDS(V_NEEDED)
- r= chdir("..");
- if (r) return batfaile("chdir","..");
- batdirname= 0;
+ if (missing) return -1;
return 0;
}
/*---------- data collection and analysis ----------*/
/* These next three variables are the results of the charging state */
-static unsigned charging_state_mask; /* 1u<<CHGST_* | ... */
+static unsigned charging_mask; /* 1u<<CHGST_* | ... */
static double nondegraded_norm, fill_norm, ratepersec_norm;
-static int alarm_level; /* 0=ok, 1=low */
+static int alarmed;
-#define QF(f,l,u) \
- static double total_##f##_##l;
- QUANTITY_FIELDS
-#undef QF
+#define Q_VAR(f,t,...) \
+static double total_##f;
+ ALL_ACCUMULATE_FIELDS(Q_VAR)
static void acquiredata(void) {
- DIR *di;
+ DIR *di = 0;
struct dirent *de;
int r;
- charging_state_mask= 0;
+ charging_mask= 0;
+ alarmed = 0;
+
+ if (debug) printf("\n");
+
+#define Q_ZERO(f,t,...) \
+ total_##f= 0;
+ALL_ACCUMULATE_FIELDS(Q_ZERO)
-#define QF(f,l,u) \
- total_##f##_##l= 0;
- QUANTITY_FIELDS
-#undef QF
+ r = chdir_base();
+ if (r) goto bad;
- di= opendir("."); if (!di) batfaile("opendir","battery");
+ di= opendir("."); if (!di) { batfaile("opendir","battery"); goto bad; }
while ((de= readdir(di))) {
if (de->d_name[0]==0 || de->d_name[0]=='.') continue;
r= readbattery();
tidybattery();
- if (r) { charging_state_mask |= CHGST_ERROR; continue; }
+ if (r) {
+ bad:
+ charging_mask |= (1u << CHGST_ERROR);
+ break;
+ }
- if (!thisbat_info_present || !thisbat_state_present)
- continue;
+ if (this_type == TYPE_BATTERY) {
+ if (!this_present)
+ continue;
+
+ charging_mask |= 1u << this_state;
+
+#define QTY_SUPPLIED(f,...) this_##f != VAL_NOTFOUND &&
+#define QTY_USE_ENERGY(f,...) this_##f = this_##f##_energy;
+#define QTY_USE_CHARGE(f,...) this_##f = this_##f##_charge;
+
+ double funky_multiplier;
+ if (BAT_QTYS(QTY_SUPPLIED,_energy,,) 1) {
+ if (debug) printf(" using energy\n");
+ BAT_QTYS(QTY_USE_ENERGY,,,);
+ funky_multiplier = 1.0;
+ } else if (BAT_QTYS(QTY_SUPPLIED,_charge,,)
+ this_voltage != VAL_NOTFOUND) {
+ if (debug) printf(" using charge\n");
+ BAT_QTYS(QTY_USE_CHARGE,,,);
+ funky_multiplier = this_voltage * 1e-6;
+ } else {
+ batfailc("neither complete set of energy nor charge");
+ continue;
+ }
+ if (this_state == CHGST_DISCHARGING)
+ /* negate it */
+ total_present_rate -= 2.0 * this_present_rate * funky_multiplier;
- charging_state_mask |= 1u << thisbat_state_charging_state;
+#define Q_ACCUMULATE_FUNKY(f,...) \
+ total_##f += this_##f * funky_multiplier;
+BAT_QTYS(Q_ACCUMULATE_FUNKY,,,)
+ }
-#define QF(f,l,u) \
- total_##f##_##l += thisbat_##f##_##l;
- QUANTITY_FIELDS
-#undef QF
+#define Q_ACCUMULATE_PLAIN(f,t,...) \
+ if (this_type == TYPE_##t) \
+ total_##f += this_##f;
+ALL_PLAIN_ACCUMULATE_FIELDS(Q_ACCUMULATE_PLAIN)
- if (thisbat_state_charging_state == CHGST_DISCHARGING)
- /* negate it */
- total_state_present_rate -= 2.0 * thisbat_state_present_rate;
}
- closedir(di);
+ if (di) closedir(di);
+
+ if (debug) {
+ printf("TOTAL:\n");
+ printf(" %-30s = %#20x\n", "mask", charging_mask);
+#define T_PRINT(f,...) \
+ printf(" %-30s = %20.6f\n", #f, total_##f);
+BAT_QTYS(T_PRINT,,,)
+ALL_PLAIN_ACCUMULATE_FIELDS(T_PRINT)
+ }
- if (total_info_design_capacity < 0.5)
- total_info_design_capacity= 1.0;
+ if ((charging_mask & (1u<<CHGST_DISCHARGING)) &&
+ !total_online/*mains*/) {
+ double time_remaining =
+ -total_remaining_capacity * 3600.0 / total_present_rate;
+ if (debug) printf(" %-30s = %20.6f\n", "time remaining", time_remaining);
+ if (time_remaining < alarmlevel)
+ alarmed = 1;
+ }
- if (total_info_last_full_capacity < total_state_remaining_capacity)
- total_info_last_full_capacity= total_state_remaining_capacity;
- if (total_info_design_capacity < total_info_last_full_capacity)
- total_info_design_capacity= total_info_last_full_capacity;
+ if (total_design_capacity < 0.5)
+ total_design_capacity= 1.0;
- alarm_level=
- (total_state_remaining_capacity < total_alarm_alarm &&
- !(charging_state_mask & 1u << CHGST_CHARGING));
+ if (total_last_full_capacity < total_remaining_capacity)
+ total_last_full_capacity= total_remaining_capacity;
+ if (total_design_capacity < total_last_full_capacity)
+ total_design_capacity= total_last_full_capacity;
- nondegraded_norm= total_info_last_full_capacity / total_info_design_capacity;
- fill_norm= total_state_remaining_capacity / total_info_design_capacity;
- ratepersec_norm= total_state_present_rate
- / (3600.0 * total_info_design_capacity);
+ nondegraded_norm= total_last_full_capacity / total_design_capacity;
+ fill_norm= total_remaining_capacity / total_design_capacity;
+ ratepersec_norm= total_present_rate
+ / (3600.0 * total_design_capacity);
}
static void initacquire(void) {
- chdir_base();
}
/*---------- argument parsing ----------*/
#define COLOURS \
- C(blue, discharging) \
- C(green, charging) \
- C(cyan, charged) \
- 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)
#define S(s) ((char*)(s))
static const XrmOptionDescRec optiontable[]= {
+ { S("-debug"), S("*debug"), XrmoptionIsArg },
+ { S("-warningTime"), S("*warningTime"), XrmoptionSepArg },
{ S("-display"), S("*display"), XrmoptionSepArg },
{ S("-geometry"), S("*geometry"), XrmoptionSepArg },
#define GC(g)
if (argc>1) badusage();
+ debug= !!getresource("debug");
+
+ const char *alarmlevel_string= getresource("alarmLevel");
+ alarmlevel = alarmlevel_string ? atoi(alarmlevel_string) : 300;
+
disp= XOpenDisplay(getresource("display"));
if (!disp) fail("could not open display");
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
static void refresh(void);
-#define CHGMASK_CHG_DIS (1u<<CHGST_CHARGING | 1u<<CHGST_DISCHARGING)
+#define CHGMASK_CHG_DIS ((1u<<CHGST_CHARGING) | (1u<<CHGST_DISCHARGING))
static void failr(const char *m, int r) {
fprintf(stderr,"error: %s (code %d)\n", m, r);
double elap, then;
int i, leftmost_lit, leftmost_nondeg, beyond, first_beyond;
- if (!charging_state_mask)
- return show_solid(pix_darkgreen);
+ if (!charging_mask)
+ return show_solid(pix_absent);
- if (charging_state_mask & CHGST_ERROR)
- return show_solid(pix_yellow);
+ if (charging_mask & (1u << CHGST_ERROR))
+ return show_solid(pix_error);
- setbackground(pix_dimgrey);
+ setbackground(pix_degraded);
XClearWindow(disp,win);
setforeground(&gc_remain,
- !(charging_state_mask & CHGMASK_CHG_DIS) ? pix_cyan :
- !(~charging_state_mask & CHGMASK_CHG_DIS) ? pix_grey :
- charging_state_mask & (1u<<CHGST_CHARGING)
- ? pix_green : pix_blue);
+ !(charging_mask & CHGMASK_CHG_DIS) ?
+ (~charging_mask & (1u << CHGST_CHARGED) ?
+ pix_notcharging : pix_charged) :
+ !(~charging_mask & CHGMASK_CHG_DIS) ? pix_confusing :
+ charging_mask & (1u<<CHGST_CHARGING)
+ ? pix_charging : pix_discharging);
- setforeground(&gc_empty, alarm_level ? pix_red : pix_black);
+ setforeground(&gc_empty, alarmed ? pix_low : pix_normal);
for (i=0, first_beyond=1; i<height; i++) {
elap= !i ? 0 :
then= fill_norm + ratepersec_norm * elap;
beyond=
- ((charging_state_mask & (1u<<CHGST_DISCHARGING) && then <= 0.0) ||
- (charging_state_mask & (1u<<CHGST_CHARGING) && then>=nondegraded_norm));
+ ((charging_mask & (1u<<CHGST_DISCHARGING) && then <= 0.0) ||
+ (charging_mask & (1u<<CHGST_CHARGING) && then>=nondegraded_norm));
if (then <= 0.0) then= 0.0;
else if (then >= nondegraded_norm) then= nondegraded_norm;
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;
pfd.fd= ConnectionNumber(disp);
pfd.events= POLLIN|POLLERR;
- timeout= !(charging_state_mask & CHGST_ERROR) ? TIMEOUT : TIMEOUT_ONERROR;
+ timeout= !(charging_mask & (1u << CHGST_ERROR)) ? TIMEOUT : TIMEOUT_ONERROR;
r= poll(&pfd,1,timeout);
if (r==-1 && errno!=EINTR) failr("poll",errno);
~ian / chiark-utils.git / blobdiff