new colorscheme (16-bit compliant)

diff --git a/bar.c b/bar.c
index 9e3c386..91689cf 100644 (file)
--- a/bar.c
+++ b/bar.c
@@ -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)
                        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;
                        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
 }
 
 void

-initbar(void) {
-       XSetWindowAttributes wa;
-
+initstyle(void) {

        dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = initcolor(NORMBGCOLOR);
        dc.norm[ColFG] = initcolor(NORMFGCOLOR);
        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;
        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;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask | ExposureMask;

diff --git a/config.h b/config.h
index cf24e67..f946407 100644 (file)
--- a/config.h
+++ b/config.h
@@ -4,19 +4,11 @@
 #define BARPOS                 BarTop /* BarBot, BarOff */
 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
 #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 NORMBGCOLOR            "#000"

-#define NORMFGCOLOR            "#ddd"
-#define SELBORDERCOLOR         "#09f"
-#else
-#define NORMBORDERCOLOR                "#666"
-#define NORMBGCOLOR            "#eee"
-#define NORMFGCOLOR            "#222"
+#define NORMFGCOLOR            "#ccc"

 #define SELBORDERCOLOR         "#f00"
 #define SELBORDERCOLOR         "#f00"

-#endif
-#define SELBGCOLOR             "#369"
+#define SELBGCOLOR             "#00f"

 #define SELFGCOLOR             "#fff"
 
 /* tagging */
 #define SELFGCOLOR             "#fff"
 
 /* tagging */

diff --git a/dwm.h b/dwm.h
index 6ab6bc3..8c9a141 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -91,6 +91,7 @@ extern Window root, barwin;
 /* bar.c */
 void drawbar(void);                    /* draw the bar */
 void initbar(void);                    /* initializes the bar */
 /* 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 */
 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
index de38cbc..1e1ad4c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -148,6 +148,7 @@ setup(void) {
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

+       initstyle();

        initlayouts();
        initbar();
        /* multihead support */
        initlayouts();
        initbar();
        /* multihead support */