prepared 0.3

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 9743ec1..de4bdb0 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <X11/Xlocale.h>
 
-/* static functions */
+/* static */
 
 static void
 drawborder(void)
@@ -29,51 +29,18 @@ drawborder(void)
        XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 }
 
-/* extern functions */
-
-void
-drawall()
-{
-       Client *c;
-
-       for(c = clients; c; c = getnext(c->next))
-               drawtitle(c);
-       drawstatus();
-}
-
-void
-drawstatus()
+static unsigned int
+textnw(char *text, unsigned int len)
 {
-       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);
-       }
-       if(sel) {
-               dc.x += dc.w;
-               dc.w = textw(sel->name);
-               drawtext(sel->name, istile, True);
+       XRectangle r;
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);
+               return r.width;
        }
-       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);
-       XFlush(dpy);
+       return XTextWidth(dc.font.xfont, text, len);
 }
 
-void
+static void
 drawtext(const char *text, Bool invert, Bool border)
 {
        int x, y, w, h;
@@ -123,6 +90,50 @@ drawtext(const char *text, Bool invert, Bool border)
        }
 }
 
+/* extern */
+
+void
+drawall()
+{
+       Client *c;
+
+       for(c = clients; c; c = getnext(c->next, tsel))
+               drawtitle(c);
+       drawstatus();
+}
+
+void
+drawstatus()
+{
+       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);
+       }
+       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);
+}
+
 void
 drawtitle(Client *c)
 {
@@ -152,9 +163,8 @@ drawtitle(Client *c)
        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);
-       XFlush(dpy);
+       XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XSync(dpy, False);
 }
 
 unsigned long
@@ -219,17 +229,6 @@ setfont(const char *fontstr)
 }
 
 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);
-}
-
-unsigned int
 textw(char *text)
 {
        return textnw(text, strlen(text)) + dc.font.height;