[hackers] [dwm] new colorscheme (16-bit compliant)

changeset: 989:5f7018237edb
tag: tip
user: Anselm R. Garbe <garbeam_AT_gmail.com>
date: Sat Sep 15 20:39:31 2007 +0200
summary: new colorscheme (16-bit compliant)

diff -r aea51354bbe6 -r 5f7018237edb bar.c
--- a/bar.c Sat Sep 15 13:16:54 2007 +0200
+++ b/bar.c Sat Sep 15 20:39:31 2007 +0200
@@ -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;
@@ -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);
@@ -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 -r aea51354bbe6 -r 5f7018237edb config.h
--- a/config.h Sat Sep 15 13:16:54 2007 +0200
+++ b/config.h Sat Sep 15 20:39:31 2007 +0200
@@ -4,19 +4,11 @@
 #define BARPOS BarTop /* BarBot, BarOff */
 #define BORDERPX 1
 #define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
-#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 -r aea51354bbe6 -r 5f7018237edb dwm.h
--- a/dwm.h Sat Sep 15 13:16:54 2007 +0200
+++ b/dwm.h Sat Sep 15 20:39:31 2007 +0200
@@ -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 -r aea51354bbe6 -r 5f7018237edb main.c
--- a/main.c Sat Sep 15 13:16:54 2007 +0200
+++ b/main.c Sat Sep 15 20:39:31 2007 +0200
@@ -148,6 +148,7 @@ setup(void) {
         sx = sy = 0;
         sw = DisplayWidth(dpy, screen);
         sh = DisplayHeight(dpy, screen);
+ initstyle();
         initlayouts();
         initbar();
         /* multihead support */
Received on Sat Sep 15 2007 - 20:41:57 UTC