implemented new color scheme accordingly to Sanders proposal

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index e4b2b88..19604f3 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,10 +1,9 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>

-#include <X11/Xlocale.h>

 
 /* static */
 
 
 /* static */
 


@@ -103,7 +102,7 @@ drawall(void) {
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))

-               drawtitle(c);
+               drawclient(c);

        drawstatus();
 }
 
        drawstatus();
 }
 


@@ -121,7 +120,7 @@ drawstatus(void) {
                dc.x += dc.w;
        }
        dc.w = bmw;
                dc.x += dc.w;
        }
        dc.w = bmw;

-       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
+       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);

        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;


@@ -129,7 +128,7 @@ drawstatus(void) {
                dc.x = x;
                dc.w = bw - x;
        }
                dc.x = x;
                dc.w = bw - x;
        }

-       drawtext(stext, dc.status, False, False);
+       drawtext(stext, dc.norm, False, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);


@@ -139,19 +138,13 @@ drawstatus(void) {
 }
 
 void
 }
 
 void

-drawtitle(Client *c) {
+drawclient(Client *c) {

        if(c == sel && issel) {
                drawstatus();
        if(c == sel && issel) {
                drawstatus();

-               XUnmapWindow(dpy, c->twin);
-               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);

                return;
        }
                return;
        }

-       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
-       XMapWindow(dpy, c->twin);
-       dc.x = dc.y = 0;
-       dc.w = c->tw;
-       drawtext(c->name, dc.norm, False,False);
-       XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 


@@ -167,16 +160,13 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
 
 void
 setfont(const char *fontstr) {

-       char *def, *lc, **missing;
+       char *def, **missing;

        int i, n;
 
        int i, n;
 

-       lc = setlocale(LC_CTYPE, NULL);
-       setlocale(LC_CTYPE, "UTF-8");

        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);

-       setlocale(LC_CTYPE, lc);

        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);


@@ -201,11 +191,8 @@ setfont(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;

-               dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-               if (!dc.font.xfont)
-                       dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-               if (!dc.font.xfont)
-                       eprint("error, cannot init 'fixed' font\n");
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+                       eprint("error, cannot load font: '%s'\n", fontstr);

                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }