Added tag 3.7 for changeset baee494346e5

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 25b08c6..e0a93fe 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -6,17 +6,6 @@
 
 /* static */
 
 
 /* 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;
 static void
 drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
        int x;


@@ -48,6 +37,17 @@ isoccupied(unsigned int t) {
        return False;
 }
 
        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
 /* extern */
 
 void


@@ -79,7 +79,12 @@ drawstatus(void) {
        drawtext(stext, dc.norm);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        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);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
        XSync(dpy, False);