stupid me, one needs to set c->{x,y,w,h} in configurerequest obviously ;)

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 2ccaf6a..0e02d6c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,17 +1,24 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>

-#include <X11/Xlocale.h>

 
 /* 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,45 +29,26 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, Bool invert)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {

        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);

-       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);
-

        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;


@@ -72,117 +60,80 @@ drawtext(const char *text, Bool invert)
                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);
-               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);
+       }
+       x = (h + 2) / 4;
+       r.x = dc.x + 1;
+       r.y = dc.y + 1;
+       if(filledsquare) {
+               r.width = r.height = x + 1;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       }
+       else if(emptysquare) {
+               r.width = r.height = x;
+               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);

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

-drawall()
-{
-       Client *c;
-
-       for(c = clients; c; c = getnext(c->next))
-               drawtitle(c);
-       drawstatus();
-}
-
-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);
-
-       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]);
+               if(seltag[i])
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));

                else
                else

-                       drawtext(tags[i], !seltag[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.norm, 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;
-       drawtext(stext, !istile);
-       if(sel && ((dc.w = dc.x - x) >= bh)) {
+       dc.x = sw - dc.w;
+       if(dc.x < x) {

                dc.x = x;
                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 && issel) {
-               drawstatus();
-               XUnmapWindow(dpy, c->title);
-               XSetWindowBorder(dpy, c->win, dc.fg);
-               return;
+               dc.w = sw - x;

        }
        }

-
-       XSetWindowBorder(dpy, c->win, dc.bg);
-       XMapWindow(dpy, c->title);
-
-       dc.y = dc.w = 0;
-       dc.x = c->tw;
-       for(i = 0; i < ntags; i++) {
-               if(c->tags[i]) {
-                       dc.w = textw(tags[i]);
-                       dc.x -= dc.w;
-                       drawtext(tags[i], !istile);
-               }
+       drawtext(stext, dc.norm, False, False);
+       if((dc.w = dc.x - x) > bh) {
+               dc.x = x;
+               drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);

        }
        }

-       dc.w = dc.x;
-       dc.x = 0;
-       drawtext(c->name, !istile);
-       XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);

        XSync(dpy, False);
 }
 
 unsigned long
        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)
-{
-       char **missing, *def;
+setfont(const char *fontstr) {
+       char *def, **missing;

        int i, n;
 
        missing = NULL;
        int i, n;
 
        missing = NULL;

-       setlocale(LC_ALL, "");

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);


@@ -190,16 +141,11 @@ setfont(const char *fontstr)
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);

-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }

        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
        }
        if(dc.font.set) {
                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);


@@ -215,11 +161,8 @@ setfont(const char *fontstr)
                if(dc.font.xfont)
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(dc.font.xfont)
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;

-               dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-               if (!dc.font.xfont)
-                       dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-               if (!dc.font.xfont)
-                       eprint("error, cannot init 'fixed' font\n");
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+                       eprint("error, cannot load font: '%s'\n", fontstr);

                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }


@@ -227,7 +170,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;
 }