tnew colorscheme (16-bit compliant) - dwm - [fork] customized build of dwm, the… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 2091200c957783deed032380d56c4199a23c6b81 | |
parent 7e476fb86ba254e6fe3a916ed7b5298e432a469c | |
Author: Anselm R. Garbe <[email protected]> | |
Date: Sat, 15 Sep 2007 20:39:31 +0200 | |
new colorscheme (16-bit compliant) | |
Diffstat: | |
M bar.c | 13 +++++++++---- | |
M config.h | 14 +++----------- | |
M dwm.h | 1 + | |
M main.c | 1 + | |
4 files changed, 14 insertions(+), 15 deletions(-) | |
--- | |
diff --git a/bar.c b/bar.c | |
t@@ -69,7 +69,8 @@ initfont(const char *fontstr) { | |
if(dc.font.xfont) | |
XFreeFont(dpy, dc.font.xfont); | |
dc.font.xfont = NULL; | |
- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) | |
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) | |
+ || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) | |
eprint("error, cannot load font: '%s'\n", fontstr); | |
dc.font.ascent = dc.font.xfont->ascent; | |
dc.font.descent = dc.font.xfont->descent; | |
t@@ -186,9 +187,7 @@ drawbar(void) { | |
} | |
void | |
-initbar(void) { | |
- XSetWindowAttributes wa; | |
- | |
+initstyle(void) { | |
dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR); | |
dc.norm[ColBG] = initcolor(NORMBGCOLOR); | |
dc.norm[ColFG] = initcolor(NORMFGCOLOR); | |
t@@ -197,6 +196,12 @@ initbar(void) { | |
dc.sel[ColFG] = initcolor(SELFGCOLOR); | |
initfont(FONT); | |
dc.h = bh = dc.font.height + 2; | |
+} | |
+ | |
+void | |
+initbar(void) { | |
+ XSetWindowAttributes wa; | |
+ | |
wa.override_redirect = 1; | |
wa.background_pixmap = ParentRelative; | |
wa.event_mask = ButtonPressMask | ExposureMask; | |
diff --git a/config.h b/config.h | |
t@@ -4,19 +4,11 @@ | |
#define BARPOS BarTop /* BarBot, BarOff */ | |
#define BORDERPX 1 | |
#define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso… | |
-#define DARK /* LIGHT */ | |
-#ifdef DARK | |
-#define NORMBORDERCOLOR "#222" | |
+#define NORMBORDERCOLOR "#333" | |
#define NORMBGCOLOR "#000" | |
-#define NORMFGCOLOR "#ddd" | |
-#define SELBORDERCOLOR "#09f" | |
-#else | |
-#define NORMBORDERCOLOR "#666" | |
-#define NORMBGCOLOR "#eee" | |
-#define NORMFGCOLOR "#222" | |
+#define NORMFGCOLOR "#ccc" | |
#define SELBORDERCOLOR "#f00" | |
-#endif | |
-#define SELBGCOLOR "#369" | |
+#define SELBGCOLOR "#00f" | |
#define SELFGCOLOR "#fff" | |
/* tagging */ | |
diff --git a/dwm.h b/dwm.h | |
t@@ -91,6 +91,7 @@ extern Window root, barwin; | |
/* bar.c */ | |
void drawbar(void); /* draw the bar */ | |
void initbar(void); /* initializes the bar */ | |
+void initstyle(void); /* initializes colors and font */ | |
unsigned int textw(const char *text); /* return the width of text in px… | |
void togglebar(const char *arg); /* shows/hides the bar */ | |
void updatebarpos(void); /* updates the bar position */ | |
diff --git a/main.c b/main.c | |
t@@ -148,6 +148,7 @@ setup(void) { | |
sx = sy = 0; | |
sw = DisplayWidth(dpy, screen); | |
sh = DisplayHeight(dpy, screen); | |
+ initstyle(); | |
initlayouts(); | |
initbar(); | |
/* multihead support */ |