applied Markus' decouple color-scheme patch

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 9585683..3d6cc28 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -55,11 +55,12 @@
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)

-#define TEXTW(X)                (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
+#define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
+#define ColBorder               2

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */

-enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
+enum { SchemeNorm, SchemeSel }; /* color schemes */

 enum { NetSupported, NetWMName, NetWMState,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
 enum { NetSupported, NetWMName, NetWMState,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */


@@ -240,6 +241,7 @@ static char stext[256];
 static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */

+static int lrpad;            /* sum of left and right padding for text */

 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {


@@ -261,7 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 static Atom wmatom[WMLast], netatom[NetLast];
 static int running = 1;
 static Cur *cursor[CurLast];
 static Atom wmatom[WMLast], netatom[NetLast];
 static int running = 1;
 static Cur *cursor[CurLast];

-static ClrScheme scheme[SchemeLast];
+static Scm *scheme;

 static Display *dpy;
 static Drw *drw;
 static Monitor *mons, *selmon;
 static Display *dpy;
 static Drw *drw;
 static Monitor *mons, *selmon;


@@ -481,11 +483,8 @@ cleanup(void)
                cleanupmon(mons);
        for (i = 0; i < CurLast; i++)
                drw_cur_free(drw, cursor[i]);
                cleanupmon(mons);
        for (i = 0; i < CurLast; i++)
                drw_cur_free(drw, cursor[i]);

-       for (i = 0; i < SchemeLast; i++) {
-               drw_clr_free(scheme[i].border);
-               drw_clr_free(scheme[i].bg);
-               drw_clr_free(scheme[i].fg);
-       }
+       for (i = 0; i < LENGTH(colors); i++)
+               free(scheme[i]);

        drw_free(drw);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        drw_free(drw);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);


@@ -709,11 +708,18 @@ dirtomon(int dir)
 void
 drawbar(Monitor *m)
 {
 void
 drawbar(Monitor *m)
 {

-       int x, xx, w, dx;
+       int x, w, sw = 0;
+       int boxs = drw->fonts->h / 9;
+       int boxw = drw->fonts->h / 6 + 2;

        unsigned int i, occ = 0, urg = 0;
        Client *c;
 
        unsigned int i, occ = 0, urg = 0;
        Client *c;
 

-       dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
+       /* draw status first so it can be overdrawn by tags later */
+       if (m == selmon) { /* status is only drawn on selected monitor */
+               drw_setscheme(drw, scheme[SchemeNorm]);
+               sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+               drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
+       }

 
        for (c = m->clients; c; c = c->next) {
                occ |= c->tags;
 
        for (c = m->clients; c; c = c->next) {
                occ |= c->tags;


@@ -723,36 +729,27 @@ drawbar(Monitor *m)
        x = 0;
        for (i = 0; i < LENGTH(tags); i++) {
                w = TEXTW(tags[i]);
        x = 0;
        for (i = 0; i < LENGTH(tags); i++) {
                w = TEXTW(tags[i]);

-               drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
-               drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
-               drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-                          occ & 1 << i, urg & 1 << i);
+               drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+               drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+               if (occ & 1 << i)
+                       drw_rect(drw, x + boxs, boxs, boxw, boxw,
+                                m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+                                urg & 1 << i);

                x += w;
        }
        w = blw = TEXTW(m->ltsymbol);
                x += w;
        }
        w = blw = TEXTW(m->ltsymbol);

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
-       x += w;
-       xx = x;
-       if (m == selmon) { /* status is only drawn on selected monitor */
-               w = TEXTW(stext);
-               x = m->ww - w;
-               if (x < xx) {
-                       x = xx;
-                       w = m->ww - xx;
-               }
-               drw_text(drw, x, 0, w, bh, stext, 0);
-       } else
-               x = m->ww;
-       if ((w = x - xx) > bh) {
-               x = xx;
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+       if ((w = m->ww - sw - x) > bh) {

                if (m->sel) {
                if (m->sel) {

-                       drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, m->sel->name, 0);
-                       drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
+                       drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+                       if (m->sel->isfloating)
+                               drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);

                } else {
                } else {

-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_rect(drw, x, 0, w, bh, 1, 0, 1);
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_rect(drw, x, 0, w, bh, 1, 1);

                }
        }
        drw_map(drw, m->barwin, 0, 0, m->ww, bh);
                }
        }
        drw_map(drw, m->barwin, 0, 0, m->ww, bh);


@@ -812,7 +809,7 @@ focus(Client *c)
                detachstack(c);
                attachstack(c);
                grabbuttons(c, 1);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, 1);

-               XSetWindowBorder(dpy, c->win, scheme[SchemeSel].border->pix);
+               XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);

                setfocus(c);
        } else {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                setfocus(c);
        } else {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);


@@ -1071,7 +1068,7 @@ manage(Window w, XWindowAttributes *wa)
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

-       XSetWindowBorder(dpy, w, scheme[SchemeNorm].border->pix);
+       XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);

        configure(c); /* propagates border_width, if size doesn't change */
        updatewindowtype(c);
        updatesizehints(c);
        configure(c); /* propagates border_width, if size doesn't change */
        updatewindowtype(c);
        updatesizehints(c);


@@ -1552,6 +1549,7 @@ setmfact(const Arg *arg)
 void
 setup(void)
 {
 void
 setup(void)
 {

+       int i;

        XSetWindowAttributes wa;
 
        /* clean up any zombies immediately */
        XSetWindowAttributes wa;
 
        /* clean up any zombies immediately */


@@ -1563,10 +1561,10 @@ setup(void)
        sh = DisplayHeight(dpy, screen);
        root = RootWindow(dpy, screen);
        drw = drw_create(dpy, screen, root, sw, sh);
        sh = DisplayHeight(dpy, screen);
        root = RootWindow(dpy, screen);
        drw = drw_create(dpy, screen, root, sw, sh);

-       drw_load_fonts(drw, fonts, LENGTH(fonts));
-       if (!drw->fontcount)
-               die("no fonts could be loaded.\n");
-       bh = drw->fonts[0]->h + 2;
+       if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+               die("no fonts could be loaded.");
+       lrpad = drw->fonts->h;
+       bh = drw->fonts->h + 2;

        updategeom();
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        updategeom();
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);


@@ -1586,12 +1584,9 @@ setup(void)
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
        /* init appearance */
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
        cursor[CurMove] = drw_cur_create(drw, XC_fleur);
        /* init appearance */

-       scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor);
-       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-       scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
-       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
+       scheme = ecalloc(LENGTH(colors), sizeof(Scm));
+       for (i = 0; i < LENGTH(colors); i++)
+               scheme[i] = drw_scm_create(drw, colors[i], 3);

        /* init bars */
        updatebars();
        updatestatus();
        /* init bars */
        updatebars();
        updatestatus();


@@ -1751,7 +1746,7 @@ unfocus(Client *c, int setfocus)
        if (!c)
                return;
        grabbuttons(c, 0);
        if (!c)
                return;
        grabbuttons(c, 0);

-       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->pix);
+       XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);

        if (setfocus) {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
        if (setfocus) {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);


@@ -2108,7 +2103,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee)
 int
 xerrorstart(Display *dpy, XErrorEvent *ee)
 {
 int
 xerrorstart(Display *dpy, XErrorEvent *ee)
 {

-       die("dwm: another window manager is already running\n");
+       die("dwm: another window manager is already running");

        return -1;
 }
 
        return -1;
 }
 


@@ -2130,13 +2125,13 @@ int
 main(int argc, char *argv[])
 {
        if (argc == 2 && !strcmp("-v", argv[1]))
 main(int argc, char *argv[])
 {
        if (argc == 2 && !strcmp("-v", argv[1]))

-               die("dwm-"VERSION "\n");
+               die("dwm-"VERSION);

        else if (argc != 1)
        else if (argc != 1)

-               die("usage: dwm [-v]\n");
+               die("usage: dwm [-v]");

        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))

-               die("dwm: cannot open display\n");
+               die("dwm: cannot open display");

        checkotherwm();
        setup();
        scan();
        checkotherwm();
        setup();
        scan();