xbattmon

simple battery monitor for X
git clone git://git.2f30.org/xbattmon.git
Log | Files | Refs | README | LICENSE

commit c2ee764a27a5dad363abd55a8f821fcdf0aead51
parent 717451927241d6b6249c9f2caf25cfcffe9865d6
Author: sin <sin@2f30.org>
Date:   Sat Nov  1 11:21:16 +0000

Add poll interval flag

Diffstat:
arg.h | 63+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
xbattmon.c | 29++++++++++++++++++++++++++++-
2 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/arg.h b/arg.h @@ -0,0 +1,63 @@ +/* + * Copy me if you can. + * by 20h + */ + +#ifndef ARG_H__ +#define ARG_H__ + +extern char *argv0; + +/* use main(int argc, char *argv[]) */ +#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ + argv[0] && argv[0][1]\ + && argv[0][0] == '-';\ + argc--, argv++) {\ + char argc_;\ + char **argv_;\ + int brk_;\ + if (argv[0][1] == '-' && argv[0][2] == '\0') {\ + argv++;\ + argc--;\ + break;\ + }\ + for (brk_ = 0, argv[0]++, argv_ = argv;\ + argv[0][0] && !brk_;\ + argv[0]++) {\ + if (argv_ != argv)\ + break;\ + argc_ = argv[0][0];\ + switch (argc_) + +/* Handles obsolete -NUM syntax */ +#define ARGNUM case '0':\ + case '1':\ + case '2':\ + case '3':\ + case '4':\ + case '5':\ + case '6':\ + case '7':\ + case '8':\ + case '9' + +#define ARGEND }\ + } + +#define ARGC() argc_ + +#define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base))) + +#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ + ((x), abort(), (char *)0) :\ + (brk_ = 1, (argv[0][1] != '\0')?\ + (&argv[0][1]) :\ + (argc--, argv++, argv[0]))) + +#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ + (char *)0 :\ + (brk_ = 1, (argv[0][1] != '\0')?\ + (&argv[0][1]) :\ + (argc--, argv++, argv[0]))) + +#endif diff --git a/xbattmon.c b/xbattmon.c @@ -20,12 +20,16 @@ #include <err.h> #include <errno.h> #include <fcntl.h> +#include <limits.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <machine/apmvar.h> #include <X11/Xlib.h> +#include "arg.h" + #define LEN(x) (sizeof(x) / sizeof(*(x))) enum { @@ -40,6 +44,7 @@ enum { COLOR_BATT_LEFT2DRAIN }; +char *argv0; Display *dpy; Window winbar; GC gcbar; @@ -201,9 +206,31 @@ again: } } +void +usage(void) +{ + fprintf(stderr, "usage: %s [-i interval]\n", argv0); + fprintf(stderr, " -i\tbattery poll interval\n"); + exit(1); +} + int -main(void) +main(int argc, char *argv[]) { + char *arg; + const char *errstr; + + ARGBEGIN { + case 'i': + arg = EARGF(usage()); + pollinterval = strtonum(arg, 0, INT_MAX, &errstr); + if (errstr) + errx(1, "%s: %s", arg, errstr); + break; + default: + usage(); + } ARGEND; + setup(); recalc(); redraw();