new stuff

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 9743ec1..64b11af 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -3,96 +3,41 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 

-/* static functions */
-
-static void
-drawborder(void)
-{
-       XPoint points[5];
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, dc.gc, dc.border);
-       points[0].x = dc.x;
-       points[0].y = dc.y;
-       points[1].x = dc.w - 1;
-       points[1].y = 0;
-       points[2].x = 0;
-       points[2].y = dc.h - 1;
-       points[3].x = -(dc.w - 1);
-       points[3].y = 0;
-       points[4].x = 0;
-       points[4].y = -(dc.h - 1);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
-/* extern functions */
+/* static */

 
 

-void
-drawall()
+static unsigned int
+textnw(const char *text, unsigned int len)

 {
 {

-       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);
+       XRectangle r;

 
 

-       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);
+       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
-drawtext(const char *text, Bool invert, Bool border)
+static void
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight)

 {
        int x, y, w, h;
 {
        int x, y, w, h;

-       unsigned int len;

        static char buf[256];
        static char buf[256];

+       unsigned int len, olen;

        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, col[ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 

-       w = 0;
-       if(border)
-               drawborder();
-

        if(!text)
                return;
 
        if(!text)
                return;
 

-       len = strlen(text);
+       w = 0;
+       olen = len = strlen(text);

        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);


@@ -105,63 +50,111 @@ drawtext(const char *text, Bool invert, Bool border)
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
        /* 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 */
 
        if(w > dc.w)
                return; /* too long */

-
-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
+       gcv.foreground = col[ColFG];

        if(dc.font.set) {
        if(dc.font.set) {

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-                               x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);

        }
        else {
                gcv.font = dc.font.xfont->fid;
        }
        else {
                gcv.font = dc.font.xfont->fid;

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+       }
+       if(highlight) {
+               r.x = dc.x + 2;
+               r.y = dc.y + 2;
+               r.width = r.height = 3;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       }
+}
+
+/* extern */
+
+void
+drawall()
+{
+       Client *c;
+
+       for(c = clients; c; c = getnext(c->next))
+               drawtitle(c);
+       drawstatus();
+}
+
+void
+drawstatus()
+{
+       int i, x;
+
+       dc.x = dc.y = 0;
+       dc.w = bw;
+
+       drawtext(NULL, dc.status, False);
+       for(i = 0; i < ntags; i++) {
+               dc.w = textw(tags[i]);
+               if(seltag[i])
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+               else
+                       drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+               dc.x += dc.w;
+       }
+
+       dc.w = bmw;
+       drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+
+       x = dc.x + dc.w;
+       dc.w = textw(stext);
+       dc.x = bx + bw - dc.w;
+       if(dc.x < x) {
+               dc.x = x;
+               dc.w = bw - x;
+       }
+       drawtext(stext, dc.status, False);
+
+       if(sel && ((dc.w = dc.x - x) > bh)) {
+               dc.x = x;
+               drawtext(sel->name, dc.sel, False);

        }
        }

+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XSync(dpy, False);

 }
 
 void
 drawtitle(Client *c)
 {
        int i;
 }
 
 void
 drawtitle(Client *c)
 {
        int i;

-       Bool istile = arrange == dotile;

 
 

-       if(c == sel) {
+       if(c == sel && issel) {

                drawstatus();
                drawstatus();

-               XUnmapWindow(dpy, c->title);
-               XSetWindowBorder(dpy, c->win, dc.fg);
+               XUnmapWindow(dpy, c->twin);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);

                return;
        }
 
                return;
        }
 

-       XSetWindowBorder(dpy, c->win, dc.bg);
-       XMapWindow(dpy, c->title);
-
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+       XMapWindow(dpy, c->twin);

        dc.x = dc.y = 0;
        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);
-       XFlush(dpy);
+       dc.w = c->tw;
+       drawtext(c->name, dc.norm, False);
+       XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XSync(dpy, False);

 }
 
 unsigned long
 getcolor(const char *colstr)
 {
 }
 
 unsigned long
 getcolor(const char *colstr)
 {

-       XColor color;

        Colormap cmap = DefaultColormap(dpy, screen);
        Colormap cmap = DefaultColormap(dpy, screen);

+       XColor color;

 
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
        return color.pixel;
 
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
        return color.pixel;


@@ -219,18 +212,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 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;
 }
 {
        return textnw(text, strlen(text)) + dc.font.height;
 }