dood

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 9204ee8..0237b40 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -9,9 +8,18 @@
 
 /* static */
 
 
 /* static */
 

-static unsigned int
-textnw(const char *text, unsigned int len)
+static Bool
+isoccupied(unsigned int t)

 {
 {

+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->tags[t])
+                       return True;
+       return False;
+}
+
+static unsigned int
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -22,8 +30,7 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborder) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;


@@ -32,21 +39,17 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

-

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

-

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

-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;

        memcpy(buf, text, len);
        buf[len] = 0;
        memcpy(buf, text, len);
        buf[len] = 0;

-

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);

-

        /* 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;


@@ -58,7 +61,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
                if(len > 3)
                        buf[len - 3] = '.';
        }
                if(len > 3)
                        buf[len - 3] = '.';
        }

-

        if(w > dc.w)
                return; /* too long */
        gcv.foreground = col[ColFG];
        if(w > dc.w)
                return; /* too long */
        gcv.foreground = col[ColFG];


@@ -71,19 +73,20 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
                XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(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);
+       if(vborder) {
+               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1);
+               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1);
+       }
+       if(hborder) {
+               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1);
+               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2);

        }
 }
 
 /* extern */
 
 void
        }
 }
 
 /* extern */
 
 void

-drawall()
-{
+drawall(void) {

        Client *c;
 
        for(c = clients; c; c = getnext(c->next))
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))


@@ -92,74 +95,65 @@ drawall()
 }
 
 void
 }
 
 void

-drawstatus()
-{
+drawstatus(void) {

        int i, x;
 
        dc.x = dc.y = 0;
        int i, x;
 
        dc.x = dc.y = 0;

-       dc.w = bw;
-
-       drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
-       dc.w = modew;

        for(i = 0; i < ntags; i++) {
        for(i = 0; i < ntags; i++) {

-               dc.x += dc.w;

                dc.w = textw(tags[i]);
                if(seltag[i])
                dc.w = textw(tags[i]);
                if(seltag[i])

-                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));

                else
                else

-                       drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+                       drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
+               dc.x += dc.w;

        }
        }

-       x = dc.x + dc.w + 2;
+       dc.w = bmw;
+       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
+       x = dc.x + dc.w;

        dc.w = textw(stext);
        dc.w = textw(stext);

-       dc.x = bx + bw - dc.w;
+       dc.x = bw - dc.w;

        if(dc.x < x) {
                dc.x = x;
                dc.w = bw - x;
        }
        if(dc.x < x) {
                dc.x = x;
                dc.w = bw - x;
        }

-       drawtext(stext, dc.status, False);
-
-       if(sel && ((dc.w = dc.x - x) > bh)) {
+       drawtext(stext, dc.status, False, False);
+       if((dc.w = dc.x - x) > bh) {

                dc.x = x;
                dc.x = x;

-               drawtext(sel->name, dc.sel, False);
+               drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);

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

-drawtitle(Client *c)
-{
-       int i;
-
+drawtitle(Client *c) {

        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
                XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
                return;
        }
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
                XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
                return;
        }

-

        XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
        XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;

-       drawtext(c->name, dc.norm, False);
+       drawtext(c->name, dc.norm, False,False);

        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }
 
 unsigned long
        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)
-{
+getcolor(const char *colstr) {

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

-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);

        return color.pixel;
 }
 
 void
        return color.pixel;
 }
 
 void

-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {

        char **missing, *def;
        int i, n;
 
        char **missing, *def;
        int i, n;
 


@@ -181,7 +175,6 @@ setfont(const char *fontstr)
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-

                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);


@@ -209,7 +202,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(const char *text)
-{
+textw(const char *text) {

        return textnw(text, strlen(text)) + dc.font.height;
 }
        return textnw(text, strlen(text)) + dc.font.height;
 }