small changes to dwm.1, rearranged order within main event loop

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 9743ec1..0ded26b 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -3,17 +3,36 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 
-/* static functions */
+/* 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
-drawborder(void)
+drawtext(const char *text, Bool invert)
 {
+       int x, y, w, h;
+       static char buf[256];
+       unsigned int len, olen;
+       XGCValues gcv;
        XPoint points[5];
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        XSetForeground(dpy, dc.gc, dc.border);
        points[0].x = dc.x;
@@ -27,72 +46,12 @@ drawborder(void)
        points[4].x = 0;
        points[4].y = -(dc.h - 1);
        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()
-{
-       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);
-       XFlush(dpy);
-}
-
-void
-drawtext(const char *text, Bool invert, Bool border)
-{
-       int x, y, w, h;
-       unsigned int len;
-       static char buf[256];
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
-       w = 0;
-       if(border)
-               drawborder();
 
        if(!text)
                return;
 
-       len = strlen(text);
+       w = 0;
+       olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
@@ -105,6 +64,14 @@ drawtext(const char *text, Bool invert, Bool border)
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }
 
        if(w > dc.w)
                return; /* too long */
@@ -123,13 +90,56 @@ drawtext(const char *text, Bool invert, Bool border)
        }
 }
 
+/* extern */
+
+void
+drawall()
+{
+       Client *c;
+
+       for(c = clients; c; c = getnext(c->next))
+               drawtitle(c);
+       drawstatus();
+}
+
+void
+drawstatus()
+{
+       int i, x;
+       Bool istile = arrange == dotile;
+
+       dc.x = dc.y = 0;
+       dc.w = bw;
+       drawtext(NULL, !istile);
+
+       dc.w = 0;
+       for(i = 0; i < ntags; i++) {
+               dc.x += dc.w;
+               dc.w = textw(tags[i]);
+               if(istile)
+                       drawtext(tags[i], seltag[i]);
+               else
+                       drawtext(tags[i], !seltag[i]);
+       }
+       x = dc.x + dc.w;
+       dc.w = textw(stext);
+       dc.x = bx + bw - dc.w;
+       drawtext(stext, !istile);
+       if(sel && ((dc.w = dc.x - x) >= bh)) {
+               dc.x = x;
+               drawtext(sel->name, istile);
+       }
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XSync(dpy, False);
+}
+
 void
 drawtitle(Client *c)
 {
        int i;
        Bool istile = arrange == dotile;
 
-       if(c == sel) {
+       if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);
@@ -142,26 +152,25 @@ drawtitle(Client *c)
        dc.x = dc.y = 0;
 
        dc.w = 0;
-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {
                if(c->tags[i]) {
                        dc.x += dc.w;
-                       dc.w = textw(c->tags[i]);
-                       drawtext(c->tags[i], !istile, True);
+                       dc.w = textw(tags[i]);
+                       drawtext(tags[i], !istile);
                }
        }
        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);
+       dc.w = c->tw - dc.x;
+       drawtext(c->name, !istile);
+       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);
+       XColor color;
 
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
        return color.pixel;
@@ -219,18 +228,7 @@ 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)
+textw(const char *text)
 {
        return textnw(text, strlen(text)) + dc.font.height;
 }