-/* todo
- old way of doing alarm
-*/
-
/*
* 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
*
#define TIMEOUT_ONERROR 3333 /* milliseconds */
static const char program_name[]= "xacpi-simple";
-static int debug;
+static int debug=-1, alarmlevel;
/*---------- general utility stuff and declarations ----------*/
typedef struct fileinfo fileinfo;
typedef int parser(const fileinfo*);
-static parser parse_uevent, parse_separate;
+static parser parse_uevent;
struct fileinfo {
const char *filename;
#define TYPE_BOTH 100 /* Except this is a magic invalid value. */
#define SEPARATE_QUANTITY_FIELDS(_) \
- _(alarm, BATTERY, "alarm", "0", "1")
+ /* See commit ec6f5f0be800bc5f2a27046833dba04e0c67ffac for
+ the code needed to use this */
#define ALL_DIRECT_VARS(_) \
#define ALL_PLAIN_ACCUMULATE_FIELDS(_) \
UEVENT_ESSENTIAL_QUANTITY_FIELDS(_) \
- UEVENT_ENUM_FIELDS(_) \
SEPARATE_QUANTITY_FIELDS(_)
#define ALL_ACCUMULATE_FIELDS(_) \
return 0;
}
-static int parse_separate(const fileinfo *cfile) {
- batlinevalue = batlinebuf;
- return parse_value(cfile, cfile->extra);
-}
-
static int parse_uevent(const fileinfo *cfile) {
char *equals= strchr(batlinebuf,'=');
if (!equals)
/* These next three variables are the results of the charging state */
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 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_mask= 0;
+ alarmed = 0;
+
+ if (debug) printf("\n");
#define Q_ZERO(f,t,...) \
total_##f= 0;
}
- closedir(di);
+ if (di) closedir(di);
- printf("TOTAL:\n");
+ 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 ((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_design_capacity < 0.5)
total_design_capacity= 1.0;
if (total_design_capacity < total_last_full_capacity)
total_design_capacity= total_last_full_capacity;
- alarm_level= total_alarm && (charging_mask & 1u << CHGST_DISCHARGING);
-
nondegraded_norm= total_last_full_capacity / total_design_capacity;
fill_norm= total_remaining_capacity / total_design_capacity;
ratepersec_norm= total_present_rate
/*---------- 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)
static XrmDatabase xrm;
static Display *disp;
static int screen;
+static const char *parentwindow;
static const char defaultresources[]=
#define GC(g)
#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 },
+ { S("-into"), S("*parentWindow"), XrmoptionSepArg },
+ { S("-icon"), S("*icon"), XrmoptionIsArg },
+ { S("-withdrawn"), S("*withdrawn"), XrmoptionIsArg },
#define GC(g)
#define C(c,u) \
{ S("-" #u "Color"), S("*" #u "Color"), XrmoptionSepArg }, \
return val.addr;
}
+static int getresource_bool(const char *want, int def, int *cache) {
+ /* *cache should be initialised to -1 and will be set to !!value
+ * alternatively cache==0 is allowed */
+
+ if (cache && *cache >= 0) return *cache;
+
+ const char *str= getresource(want);
+ int result = def;
+ if (str && str[0]) {
+ char *ep;
+ long l= strtol(str,&ep,0);
+ if (!*ep) {
+ result = l > 0;
+ } else {
+ switch (str[0]) {
+ case 't': case 'T': case 'y': case 'Y': result= 1; break;
+ case 'f': case 'F': case 'n': case 'N': result= 0; break;
+ case '-': /* option name from XrmoptionIsArg */ result= 1; break;
+ }
+ }
+ }
+
+ if (cache) *cache= result;
+ return result;
+}
+
static void more_resources(const char *str, const char *why) {
XrmDatabase more;
if (argc>1) badusage();
- debug= !!getresource("debug");
+ getresource_bool("debug",0,&debug);
+
+ const char *alarmlevel_string= getresource("alarmLevel");
+ alarmlevel = alarmlevel_string ? atoi(alarmlevel_string) : 300;
+
+ parentwindow = getresource("parentWindow");
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
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, 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 :
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);
}
&width, &height,
&gravity);
- win= XCreateSimpleWindow(disp,DefaultRootWindow(disp),
+ unsigned long parentwindowid;
+ if (parentwindow)
+ parentwindowid = strtoul(parentwindow,0,0);
+ else
+ parentwindowid = DefaultRootWindow(disp);
+
+ win= XCreateSimpleWindow(disp,parentwindowid,
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;
wm_hints->flags= InputHint;
wm_hints->input= False;
+ wm_hints->initial_state= (getresource("withdrawn") ? WithdrawnState :
+ getresource("icon") ? IconicState
+ : NormalState);
class_hint->res_name= program_name_silly;
class_hint->res_class= program_name_silly;
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) {