xbattmon

commit 2be0979f54f271fadc6c08c0174be2c2d50ffcb6
parent b8fc48f8a9db0b0e8d4c3af65cd11224bcdc4869
Author: sin <sin@2f30.org>
Date:   Fri, 31 Oct 2014 16:33:20 +0000

Add config.def.h

Diffstat:
M
Makefile
 | 
23
++++++++++++++++++++++-
A
config.def.h
 | 
14
++++++++++++++
M
xbattmon.c
 | 
29
++++++++---------------------

3 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,8 +1,29 @@
+PREFIX = /usr/local
+
 CFLAGS = -I/usr/X11R6/include
 LDLIBS = -L/usr/X11R6/lib -lX11
+
+OBJ = xbattmon.o
 BIN = xbattmon
 
 all: $(BIN)
 
+$(BIN): $(OBJ)
+	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LDLIBS)
+
+xbattmon.o: config.h
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
+
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
+
 clean:
-	rm -f $(BIN)
+	rm -f $(BIN) $(OBJ)
+
+.SUFFIXES: .def.h
+
+.def.h.h:
+	cp $< $@
diff --git a/config.def.h b/config.def.h
@@ -0,0 +1,14 @@
+struct {
+	char *name;
+	unsigned long pixel;
+} colmap[] = {
+	[COLOR_BATT_CHARGED]     = { "green", 0 },
+	[COLOR_BATT_LEFT2CHARGE] = { "grey",  0 },
+	[COLOR_BATT_DRAINED]     = { "red",   0 },
+	[COLOR_BATT_LEFT2DRAIN]  = { "blue",  0 }
+};
+
+unsigned int thickness = 4;	/* 4 pixels by default */
+time_t pollinterval = 5;	/* poll battery state every 5 seconds */
+int bottom = 1;			/* set to 0 if you want the bar to be at the top */
+int maxcap = 100;		/* maximum battery capacity */
diff --git a/xbattmon.c b/xbattmon.c
@@ -29,8 +29,8 @@
 #define LEN(x) (sizeof(x) / sizeof(*(x)))
 
 enum {
-	BATT_CHARGING,
-	BATT_DRAINING
+	AC_ON,
+	AC_OFF
 };
 
 enum {
@@ -40,16 +40,6 @@ enum {
 	COLOR_BATT_LEFT2DRAIN
 };
 
-struct {
-	char *name;
-	unsigned long pixel;
-} colmap[] = {
-	[COLOR_BATT_CHARGED]     = { "green", 0 },
-	[COLOR_BATT_LEFT2CHARGE] = { "grey",  0 },
-	[COLOR_BATT_DRAINED]     = { "red",   0 },
-	[COLOR_BATT_LEFT2DRAIN]  = { "blue",  0 }
-};
-
 Display *dpy;
 Window winbar;
 GC gcbar;
@@ -57,13 +47,10 @@ int barx;
 int bary;
 unsigned int barwidth;
 unsigned int barheight;
-int state;			/* BATT_CHARGING or BATT_DRAINING */
+int state;			/* AC_ON or AC_OFF */
 int howmuch;			/* 0 if completely discharged or 100 if completely charged */
 
-unsigned int thickness = 4;	/* 4 pixels by default */
-time_t pollinterval = 5;	/* poll battery state every 5 seconds */
-int bottom = 1;			/* set to 0 if you want the bar to be at the top */
-int maxcap = 100;		/* maximum battery capacity */
+#include "config.h"
 
 void
 setup(void)
@@ -123,13 +110,13 @@ redraw(void)
 
 	pos = barwidth * howmuch / maxcap;
 	switch (state) {
-	case BATT_CHARGING:
+	case AC_ON:
 		XSetForeground(dpy, gcbar, colmap[COLOR_BATT_CHARGED].pixel);
 		XFillRectangle(dpy, winbar, gcbar, 0, 0, pos, thickness);
 		XSetForeground(dpy, gcbar, colmap[COLOR_BATT_LEFT2CHARGE].pixel);
 		XFillRectangle(dpy, winbar, gcbar, pos, 0, barwidth, thickness);
 		break;
-	case BATT_DRAINING:
+	case AC_OFF:
 		XSetForeground(dpy, gcbar, colmap[COLOR_BATT_LEFT2DRAIN].pixel);
 		XFillRectangle(dpy, winbar, gcbar, 0, 0, pos, thickness);
 		XSetForeground(dpy, gcbar, colmap[COLOR_BATT_DRAINED].pixel);
@@ -161,9 +148,9 @@ update(void)
 		howmuch = maxcap;
 
 	if (info.ac_state == APM_AC_ON)
-		state = BATT_CHARGING;
+		state = AC_ON;
 	else
-		state = BATT_DRAINING;
+		state = AC_OFF;
 
 	fflush(stdout);
 }