yet another fix of copyright compactisition

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 25b08c6..ce24354 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,22 +1,11 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <string.h>
 
 /* static */
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
-
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
-}
-
 static void
 drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
        int x;
@@ -48,6 +37,17 @@ isoccupied(unsigned int t) {
        return False;
 }
 
+static unsigned int
+textnw(const char *text, unsigned int len) {
+       XRectangle r;
+
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);
+               return r.width;
+       }
+       return XTextWidth(dc.font.xfont, text, len);
+}
+
 /* extern */
 
 void
@@ -79,7 +79,12 @@ drawstatus(void) {
        drawtext(stext, dc.norm);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
-               drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm);
+               if(sel) {
+                       drawtext(sel->name, dc.sel);
+                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
+               }
+               else
+                       drawtext(NULL, dc.norm);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
        XSync(dpy, False);
@@ -90,7 +95,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
-       XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
@@ -119,16 +123,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
        }
        if(w > dc.w)
                return; /* too long */
-       gcv.foreground = col[ColFG];
-       if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+       XSetForeground(dpy, dc.gc, col[ColFG]);
+       if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       }
-       else {
-               gcv.font = dc.font.xfont->fid;
-               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+       else
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-       }
 }
 
 unsigned int