togglefloat should only work in dotile mode (thanks to Sander for this hint)

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 4ebda12..671062c 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,44 +30,26 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, Bool invert, Bool underline)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        XGCValues gcv;
        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 };
 
        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);

-       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);
-       XSetForeground(dpy, dc.gc, dc.border);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-

        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;


@@ -71,34 +61,36 @@ drawtext(const char *text, Bool invert, Bool underline)
                if(len > 3)
                        buf[len - 3] = '.';
        }
                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);
+               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;
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        }
        else {
                gcv.font = dc.font.xfont->fid;

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);

                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }

-       if(underline) {
-               points[0].x = dc.x + (h / 2) - 1;
-               points[0].y = dc.y + dc.h - 3;
-               points[1].x = dc.w - h + 2;
-               points[1].y = 0;
-               XDrawLines(dpy, dc.drawable, dc.gc, points, 2, CoordModePrevious);
+       if(ldot) {
+               r.x = dc.x + 2;
+               r.y = dc.y + 2;
+               r.width = r.height = (h + 2) / 4;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       }
+       if(rdot) {
+               r.width = r.height = (h + 2) / 4;
+               r.x = dc.x + dc.w - r.width - 2;
+               r.y = dc.y + dc.h - r.height - 2;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
 }
 
 /* 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))


@@ -107,76 +99,65 @@ drawall()
 }
 
 void
 }
 
 void

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

        int i, x;
        int i, x;

-       Bool istile = arrange == dotile;

 
        dc.x = dc.y = 0;
 
        dc.x = dc.y = 0;

-       dc.w = bw;
-       drawtext(NULL, !istile, False);
-
-       dc.w = 0;

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

-               dc.x += dc.w;

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

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

                else
                else

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

        }
        }

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

        x = dc.x + dc.w;
        dc.w = textw(stext);
        x = dc.x + dc.w;
        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, !istile, 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, istile, 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;
-       Bool istile = arrange == dotile;
-
+drawtitle(Client *c) {

        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);

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

                return;
        }
                return;
        }

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

        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;

-       drawtext(c->name, !istile, 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;
 


@@ -198,7 +179,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);


@@ -226,7 +206,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;
 }