fixed the bug mentioned by Sander

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 6a7fea9..de4bdb0 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -2,78 +2,13 @@
  * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
 #include <stdio.h>
 #include <string.h>
-
 #include <X11/Xlocale.h>
 
-#include "dwm.h"
-
-void
-drawstatus()
-{
-       int i;
-
-       dc.x = dc.y = 0;
-       dc.w = bw;
-       drawtext(NULL, False, False);
-
-       if(arrange == floating) {
-               dc.w = textw("~");
-               drawtext("~", False, False);
-       }
-       else
-               dc.w = 0;
-       for(i = 0; i < TLast; i++) {
-               dc.x += dc.w;
-               dc.w = textw(tags[i]);
-               drawtext(tags[i], i == tsel, True);
-       }
-       if(sel) {
-               dc.x += dc.w;
-               dc.w = textw(sel->name);
-               drawtext(sel->name, True, True);
-       }
-       dc.w = textw(stext);
-       dc.x = bx + bw - dc.w;
-       drawtext(stext, False, False);
-
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
-       XFlush(dpy);
-}
-
-void
-drawtitle(Client *c)
-{
-       int i;
-       if(c == sel) {
-               drawstatus();
-               XUnmapWindow(dpy, c->title);
-               XSetWindowBorder(dpy, c->win, dc.fg);
-               return;
-       }
-
-       XSetWindowBorder(dpy, c->win, dc.bg);
-       XMapWindow(dpy, c->title);
-
-       dc.x = dc.y = 0;
-
-       dc.w = 0;
-       for(i = 0; i < TLast; i++) {
-               if(c->tags[i]) {
-                       dc.x += dc.w;
-                       dc.w = textw(c->tags[i]);
-                       drawtext(c->tags[i], False, True);
-               }
-       }
-       dc.x += dc.w;
-       dc.w = textw(c->name);
-       drawtext(c->name, False, True);
-       XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-                       0, 0, c->tw, c->th, 0, 0);
-       XFlush(dpy);
-}
+/* static */
 
 static void
 drawborder(void)
@@ -94,7 +29,18 @@ drawborder(void)
        XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 }
 
-void
+static unsigned int
+textnw(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
 drawtext(const char *text, Bool invert, Bool border)
 {
        int x, y, w, h;
@@ -144,31 +90,91 @@ drawtext(const char *text, Bool invert, Bool border)
        }
 }
 
-unsigned long
-getcolor(const char *colstr)
+/* extern */
+
+void
+drawall()
 {
-       XColor color;
-       Colormap cmap = DefaultColormap(dpy, screen);
+       Client *c;
 
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-       return color.pixel;
+       for(c = clients; c; c = getnext(c->next, tsel))
+               drawtitle(c);
+       drawstatus();
 }
 
-unsigned int
-textnw(char *text, unsigned int len)
+void
+drawstatus()
 {
-       XRectangle r;
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
+       int i;
+       Bool istile = arrange == dotile;
+
+       dc.x = dc.y = 0;
+       dc.w = bw;
+       drawtext(NULL, !istile, False);
+
+       dc.w = 0;
+       for(i = 0; i < TLast; i++) {
+               dc.x += dc.w;
+               dc.w = textw(tags[i]);
+               if(istile)
+                       drawtext(tags[i], (i == tsel), True);
+               else
+                       drawtext(tags[i], (i != tsel), True);
        }
-       return XTextWidth(dc.font.xfont, text, len);
+       if(sel) {
+               dc.x += dc.w;
+               dc.w = textw(sel->name);
+               drawtext(sel->name, istile, True);
+       }
+       dc.w = textw(stext);
+       dc.x = bx + bw - dc.w;
+       drawtext(stext, !istile, False);
+
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XSync(dpy, False);
 }
 
-unsigned int
-textw(char *text)
+void
+drawtitle(Client *c)
 {
-       return textnw(text, strlen(text)) + dc.font.height;
+       int i;
+       Bool istile = arrange == dotile;
+
+       if(c == sel) {
+               drawstatus();
+               XUnmapWindow(dpy, c->title);
+               XSetWindowBorder(dpy, c->win, dc.fg);
+               return;
+       }
+
+       XSetWindowBorder(dpy, c->win, dc.bg);
+       XMapWindow(dpy, c->title);
+
+       dc.x = dc.y = 0;
+
+       dc.w = 0;
+       for(i = 0; i < TLast; i++) {
+               if(c->tags[i]) {
+                       dc.x += dc.w;
+                       dc.w = textw(c->tags[i]);
+                       drawtext(c->tags[i], !istile, True);
+               }
+       }
+       dc.x += dc.w;
+       dc.w = textw(c->name);
+       drawtext(c->name, !istile, True);
+       XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XSync(dpy, False);
+}
+
+unsigned long
+getcolor(const char *colstr)
+{
+       XColor color;
+       Colormap cmap = DefaultColormap(dpy, screen);
+
+       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       return color.pixel;
 }
 
 void
@@ -215,9 +221,15 @@ setfont(const char *fontstr)
                if (!dc.font.xfont)
                        dc.font.xfont = XLoadQueryFont(dpy, "fixed");
                if (!dc.font.xfont)
-                       error("error, cannot init 'fixed' font\n");
+                       eprint("error, cannot init 'fixed' font\n");
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
+
+unsigned int
+textw(char *text)
+{
+       return textnw(text, strlen(text)) + dc.font.height;
+}