X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2Fxacpi-simple.c;h=cd2a1c7f37f34a8633b211aae674eea68485991a;hp=50b7965bee5dfdcc016fde3dfdb63187b21205ef;hb=d537b0b5f235d49af42e4718786a8ffb170a0c53;hpb=4418c73485144d32c1cd72e2e553e498b30f53a5 diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c index 50b7965..cd2a1c7 100644 --- a/cprogs/xacpi-simple.c +++ b/cprogs/xacpi-simple.c @@ -10,10 +10,29 @@ * green | red | dimgrey charging - low * cyan | red | dimgrey charged - low [1] * grey | red | dimgrey charging&discharching, low [1] - * ... darkmagenta ... no batteries present + * ... darkgreen ... no batteries present + * ... yellow ... error * * [1] battery must be quite badly degraded */ +/* + * Copyright (C) 2004 Ian Jackson + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 3, + * or (at your option) any later version. + * + * This is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, consult the Free Software + * Foundation's website at www.fsf.org, or the GNU Project website at + * www.gnu.org. + */ #include #include @@ -23,17 +42,23 @@ #include #include #include +#include #include #include #include #include +#include +#include #define TOP 60 #define BOTTOM 3600 -#define TIMEOUT 5000 /* milliseconds */ +#define TIMEOUT 5000 /* milliseconds */ +#define TIMEOUT_ONERROR 3333 /* milliseconds */ + +static const char program_name[]= "xacpi-simple"; /*---------- general utility stuff and declarations ----------*/ @@ -43,53 +68,66 @@ static void fail(const char *m) { } static void badusage(void) { fail("bad usage"); } -#define CHGST_DISCHARGING 0 /* Reflects order in E(state,charging_state) */ -#define CHGST_CHARGING 1 /* in fields table. Also, much code assumes */ -#define CHGST_CHARGED 2 /* exactly these three possible states. */ +typedef struct fileinfo fileinfo; +struct fileinfo { + const char *filename; + void (*parse)(const fileinfo*); + const void *extra; +}; -/*---------- structure of and results from /proc/acpi/battery/... ----------*/ +/*---------- 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 */ typedef struct batinfo_field { - const char *file; const char *label; - unsigned long *valuep; - const char *unit; + uint64_t *valuep; const char *enumarray[10]; } batinfo_field; -#define QUANTITY_FIELDS \ - QF(info, design_capacity, "mWh") \ - QF(info, last_full_capacity, "mWh") \ - QF(state, present_rate, "mW") \ - QF(state, remaining_capacity, "mWh") \ - QF(alarm, alarm, "mWh") - -#define QF(f,l,u) static unsigned long thisbat_##f##_##l; - QUANTITY_FIELDS -#undef QF - -static unsigned long thisbat_info_present, thisbat_state_present; -static unsigned long thisbat_state_charging_state; +#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 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 ALL_FIELDS(i) \ + UEVENT_QUANTITY_FIELDS(i) \ + UEVENT_ENUM_FIELDS(i) \ + i(thisbat_alarm) + +#define F_VAR(f,...) static uint64_t thisbat_##f; + ALL_FIELDS(F_VAR) + +static const batinfo_field uevent_fields[]= { + UEVENT_QUANTITY_FIELDS(Q_FLD) + UEVENT_ENUM_FIELDS(E_FLD) + { 0 } +}; #define VAL_NOTFOUND (~0UL) -static const batinfo_field fields[]= { -#define E(f,l) #f, #l, &thisbat_##f##_##l, 0 -#define QF(f,l,u) { #f, #l, &thisbat_##f##_##l, u }, - { E(info, present), { "no", "yes" } }, - { E(state,present), { "no", "yes" } }, - { E(state,charging_state), { "discharging", "charging", "charged" } }, - QUANTITY_FIELDS /* take care re charging_state values order - */ - { 0 } /* if you must change it, search for CHGST_... */ -#undef E -#undef QF +static const fileinfo files[]= { + { "uevent", parse_fields, uevent_fields }, + { "alarm", parse_boolean, &thisbat_alarm }, + { 0 } }; -static const char *files[]= { "info", "state", "alarm" }; - /*---------- parsing of one battery in /proc/acpi/battery/... ----------*/ /* variables private to the parser and its error handlers */ @@ -119,8 +157,8 @@ static int batfaile(const char *syscall, const char *target) { static void chdir_base(void) { int r; - r= chdir("/proc/acpi/battery"); - if (r) batfaile("chdir","/proc/acpi/battery"); + r= chdir("/sys/class/power_supply"); + if (r) batfaile("chdir","/sys/class/power_supply"); } static void tidybattery(void) { @@ -128,21 +166,55 @@ static void tidybattery(void) { 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; + + found: + if (!field->enumarray[0]) { + + *field->valuep= strtoull(equals,&ep,10); + if (*ep) + batfailf("value number syntax incorrect"); + + } else { + + for (*field->valuep=0, enumsearch=field->enumarray; + *enumsearch && strcmp(*enumsearch,equals); + (*field->valuep)++, enumsearch++); + if (!*enumsearch) + batfailf("unknown enum value"); + + } +} + static int readbattery(void) { /* 0=>ok, -1=>couldn't */ const batinfo_field *field; - const char *const *cfilename, *const *enumsearch; + const fileinfo *cfile; + const char *const *enumsearch; char *colon, *ep, *sr, *p; int r, l, missing; 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; - for (cfilename=files; - (batfilename= *cfilename); - cfilename++) { + for (cfile=files; + (batfilename= cfile->filename); + cfile++++) { batfile= fopen(batfilename,"r"); if (!batfile) return batfaile("open",batfilename); @@ -157,64 +229,35 @@ static int readbattery(void) { /* 0=>ok, -1=>couldn't */ if (batlinebuf[l-1] != '\n') return batfailf("line too long"); batlinebuf[l-1]= 0; - colon= strchr(batlinebuf,':'); - if (!colon) - return batfailf("line without a colon"); - *colon= 0; - - for (p=batlinebuf; pfile; field++) { - if (!strcmp(field->file,batfilename) && - !strcmp(field->label,batlinebuf)) - goto label_interesting; - } - continue; - - label_interesting: - for (batlinevalue= colon+1; - *batlinevalue && isspace((unsigned char)*batlinevalue); - batlinevalue++); - - if (field->unit) { - - *field->valuep= strtoul(batlinevalue,&ep,10); - if (ep==batlinevalue || *ep!=' ') - batfailf("value number syntax incorrect"); - if (strcmp(ep+1,field->unit)) batfailf("incorrect unit"); - } else { - - for (*field->valuep=0, enumsearch=field->enumarray; - *enumsearch && strcmp(*enumsearch,batlinevalue); - (*field->valuep)++, enumsearch++); - if (!*enumsearch) - batfailf("unknown enum value"); - - } + cfile->parse(cfile, batlinebuf); } 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; + } + r= chdir(".."); if (r) return batfaile("chdir",".."); batdirname= 0; - 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; - return 0; } @@ -250,12 +293,10 @@ static void acquiredata(void) { r= readbattery(); tidybattery(); - if (r) continue; + if (r) { charging_state_mask |= CHGST_ERROR; continue; } - if (!thisbat_info_present || !thisbat_state_present) { - printf("battery/%s not present\n",de->d_name); + if (!thisbat_info_present || !thisbat_state_present) continue; - } charging_state_mask |= 1u << thisbat_state_charging_state; @@ -293,27 +334,103 @@ static void initacquire(void) { chdir_base(); } -/*---------- display ----------*/ +/*---------- argument parsing ----------*/ #define COLOURS \ - C(dimgrey) \ - C(blue) \ - C(black) \ - C(red) \ - C(green) \ - C(cyan) \ - C(grey) \ - C(darkmagenta) \ - C(white) \ + 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) \ GC(remain) \ GC(white) \ GC(empty) +static XrmDatabase xrm; static Display *disp; +static int screen; + +static const char defaultresources[]= +#define GC(g) +#define C(c,u) \ + "*" #u "Color: " #c "\n" + COLOURS +#undef GC +#undef C + ; + +#define S(s) ((char*)(s)) +static const XrmOptionDescRec optiontable[]= { + { S("-display"), S("*display"), XrmoptionSepArg }, + { S("-geometry"), S("*geometry"), XrmoptionSepArg }, +#define GC(g) +#define C(c,u) \ + { S("-" #u "Color"), S("*" #u "Color"), XrmoptionSepArg }, \ + { S("-" #u "Colour"), S("*" #u "Color"), XrmoptionSepArg }, + COLOURS +#undef GC +#undef C +}; + +static const char *getresource(const char *want) { + char name_buf[256], class_buf[256]; + XrmValue val; + char *rep_type_dummy; + int r; + + assert(strlen(want) < 128); + sprintf(name_buf,"xacpi-simple.%s",want); + sprintf(class_buf,"Xacpi-Simple.%s",want); + + r= XrmGetResource(xrm, name_buf,class_buf, &rep_type_dummy, &val); + if (!r) return 0; + + return val.addr; +} + +static void more_resources(const char *str, const char *why) { + XrmDatabase more; + + if (!str) return; + + more= XrmGetStringDatabase((char*)str); + if (!more) fail(why); + XrmCombineDatabase(more,&xrm,0); +} + +static void parseargs(int argc, char **argv) { + Screen *screenscreen; + + XrmInitialize(); + + XrmParseCommand(&xrm, (XrmOptionDescRec*)optiontable, + sizeof(optiontable)/sizeof(*optiontable), + program_name, &argc, argv); + + if (argc>1) badusage(); + + disp= XOpenDisplay(getresource("display")); + if (!disp) fail("could not open display"); + + screen= DefaultScreen(disp); + + screenscreen= ScreenOfDisplay(disp,screen); + if (!screenscreen) fail("screenofdisplay"); + more_resources(XScreenResourceString(screenscreen), "screen resources"); + more_resources(XResourceManagerString(disp), "display resources"); + more_resources(defaultresources, "default resources"); +} + +/*---------- display ----------*/ + static Window win; static int width, height; static Colormap cmap; -static int screen; static unsigned long lastbackground; typedef struct { @@ -321,7 +438,7 @@ typedef struct { unsigned long lastfg; } Gcstate; -#define C(c) static unsigned long pix_##c; +#define C(c,u) static unsigned long pix_##c; #define GC(g) static Gcstate gc_##g; COLOURS #undef C @@ -341,7 +458,7 @@ static void setbackground(unsigned long newbg) { if (newbg == lastbackground) return; r= XSetWindowBackground(disp,win,newbg); - if (r) failr("XSetWindowBackground",r); + if (!r) fail("XSetWindowBackground"); lastbackground= newbg; } @@ -357,15 +474,20 @@ static void setforeground(Gcstate *g, unsigned long px) { if (!r) fail("XChangeGC"); } +static void show_solid(unsigned long px) { + setbackground(px); + XClearWindow(disp,win); +} + static void show(void) { double elap, then; int i, leftmost_lit, leftmost_nondeg, beyond, first_beyond; - if (!charging_state_mask) { - setbackground(pix_darkmagenta); - XClearWindow(disp,win); - return; - } + if (!charging_state_mask) + return show_solid(pix_darkgreen); + + if (charging_state_mask & CHGST_ERROR) + return show_solid(pix_yellow); setbackground(pix_dimgrey); XClearWindow(disp,win); @@ -418,9 +540,13 @@ static void initgc(Gcstate *gc_r) { gc_r->gc= XCreateGC(disp,win, GCFunction|GCLineWidth|GCForeground, &gcv); } -static void colour(unsigned long *pix_r, const char *name) { +static void colour(unsigned long *pix_r, const char *whichcolour) { XColor xc; + const char *name; Status st; + + name= getresource(whichcolour); + if (!name) fail("get colour resource"); st= XAllocNamedColor(disp,cmap,name,&xc,&xc); if (!st) fail(name); @@ -428,16 +554,37 @@ static void colour(unsigned long *pix_r, const char *name) { *pix_r= xc.pixel; } -static void initgraphics(void) { - int r; +static void initgraphics(int argc, char **argv) { + int xwmgr, r; + const char *geom_string; + XSizeHints *normal_hints; + XWMHints *wm_hints; + XClassHint *class_hint; + int pos_x, pos_y, gravity; + char *program_name_silly; - disp= XOpenDisplay(0); if (!disp) fail("could not open display"); + program_name_silly= (char*)program_name; - screen= DefaultScreen(disp); - win= XCreateSimpleWindow(disp,DefaultRootWindow(disp),0,0,100,20,0,0,0); + normal_hints= XAllocSizeHints(); + wm_hints= XAllocWMHints(); + class_hint= XAllocClassHint(); + + if (!normal_hints || !wm_hints || !class_hint) + fail("could not alloc hint(s)"); + + geom_string= getresource("geometry"); + + xwmgr= XWMGeometry(disp,screen, geom_string,"128x32", 0, + normal_hints, + &pos_x, &pos_y, + &width, &height, + &gravity); + + win= XCreateSimpleWindow(disp,DefaultRootWindow(disp), + pos_x,pos_y,width,height,0,0,0); cmap= DefaultColormap(disp,screen); -#define C(c) colour(&pix_##c, #c); +#define C(c,u) colour(&pix_##c, #u "Color"); #define GC(g) initgc(&gc_##g); COLOURS #undef C @@ -447,6 +594,24 @@ static void initgraphics(void) { if (!r) fail("init set background"); lastbackground= pix_dimgrey; + normal_hints->flags= PWinGravity; + normal_hints->win_gravity= gravity; + normal_hints->x= pos_x; + normal_hints->y= pos_y; + normal_hints->width= width; + normal_hints->height= height; + if ((xwmgr & XValue) || (xwmgr & YValue)) + normal_hints->flags |= USPosition; + + wm_hints->flags= InputHint; + wm_hints->input= False; + + class_hint->res_name= program_name_silly; + class_hint->res_class= program_name_silly; + + XmbSetWMProperties(disp,win, program_name,program_name, + argv,argc, normal_hints, wm_hints, class_hint); + XSelectInput(disp,win, ExposureMask|StructureNotifyMask); XMapWindow(disp,win); } @@ -466,16 +631,19 @@ static void newgeometry(void) { static void eventloop(void) { XEvent ev; struct pollfd pfd; - int r; + int r, timeout; newgeometry(); refresh(); for (;;) { + XFlush(disp); + pfd.fd= ConnectionNumber(disp); pfd.events= POLLIN|POLLERR; - r= poll(&pfd,1,TIMEOUT); + timeout= !(charging_state_mask & CHGST_ERROR) ? TIMEOUT : TIMEOUT_ONERROR; + r= poll(&pfd,1,timeout); if (r==-1 && errno!=EINTR) failr("poll",errno); while (XPending(disp)) { @@ -486,18 +654,14 @@ static void eventloop(void) { height= ce->height; } } - refresh(); - XFlush(disp); } } -int main(int argc, const char *const *argv) { - if (!argv[0] || argv[1]) - badusage(); - +int main(int argc, char **argv) { + parseargs(argc,argv); initacquire(); - initgraphics(); + initgraphics(argc,argv); eventloop(); return 0; }