applied Jukkas prev/next patch with XK_{h,l}

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index a3c526e..4f8594c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -2,44 +2,61 @@
  * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */

+#include "dwm.h"

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

+#include <X11/Xlocale.h>

 
 

-#include "draw.h"
-#include "util.h"
+/* static */

 
 static void
 
 static void

-drawborder(Display *dpy, Brush *b)
+drawborder(void)

 {
        XPoint points[5];
 {
        XPoint points[5];

-       XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, b->gc, b->border);
-       points[0].x = b->rect.x;
-       points[0].y = b->rect.y;
-       points[1].x = b->rect.width - 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[1].y = 0;
        points[2].x = 0;

-       points[2].y = b->rect.height - 1;
-       points[3].x = -(b->rect.width - 1);
+       points[2].y = dc.h - 1;
+       points[3].x = -(dc.w - 1);

        points[3].y = 0;
        points[4].x = 0;
        points[3].y = 0;
        points[4].x = 0;

-       points[4].y = -(b->rect.height - 1);
-       XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
+       points[4].y = -(dc.h - 1);
+       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);

 }
 
 }
 

-void
-draw(Display *dpy, Brush *b, Bool border, const char *text)
+static 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);
+}
+
+static void
+drawtext(const char *text, Bool invert, Bool border)

 {
 {

-       unsigned int x, y, w, h, len;
+       int x, y, w, h;

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

+       unsigned int len;

        XGCValues gcv;
        XGCValues gcv;

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

 
 

-       XSetForeground(dpy, b->gc, b->bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
+       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

 
 

+       w = 0;

        if(border)
        if(border)

-               drawborder(dpy, b);
+               drawborder();

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


@@ -50,121 +67,170 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
        memcpy(buf, text, len);
        buf[len] = 0;
 
        memcpy(buf, text, len);
        buf[len] = 0;
 

-       h = b->font.ascent + b->font.descent;
-       y = b->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent;
-       x = b->rect.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 */
 
        /* shorten text if necessary */

-       while(len && (w = textwidth_l(&b->font, buf, len)) > b->rect.width - h)
+       while(len && (w = textnw(buf, len)) > dc.w - h)

                buf[--len] = 0;
 
                buf[--len] = 0;
 

-       if(w > b->rect.width)
+       if(w > dc.w)

                return; /* too long */
 
                return; /* too long */
 

-       gcv.foreground = b->fg;
-       gcv.background = b->bg;
-       if(b->font.set) {
-               XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc,
+       gcv.foreground = invert ? dc.bg : dc.fg;
+       gcv.background = invert ? dc.fg : dc.bg;
+       if(dc.font.set) {
+               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,

                                x, y, buf, len);
        }
        else {
                                x, y, buf, len);
        }
        else {

-               gcv.font = b->font.xfont->fid;
-               XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
+               gcv.font = dc.font.xfont->fid;
+               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);

        }
 }
 
        }
 }
 

-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
+/* extern */
+
+void
+drawall()

 {
 {

-       XColor color;
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-       return color.pixel;
+       Client *c;
+
+       for(c = clients; c; c = getnext(c->next))
+               drawtitle(c);
+       drawstatus();

 }
 
 void
 }
 
 void

-loadcolors(Display *dpy, int screen, Brush *b,
-               const char *bg, const char *fg, const char *border)
+drawstatus()

 {
 {

-       Colormap cmap = DefaultColormap(dpy, screen);
-       b->bg = xloadcolors(dpy, cmap, bg);
-       b->fg = xloadcolors(dpy, cmap, fg);
-       b->border = xloadcolors(dpy, cmap, border);
+       int i, x;
+       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);
+       }
+       x = dc.x + dc.w;
+       dc.w = textw(stext);
+       dc.x = bx + bw - dc.w;
+       drawtext(stext, !istile, False);
+       if(sel && ((dc.w = dc.x - x) >= bh)) {
+               dc.x = x;
+               drawtext(sel->name, istile, True);
+       }
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XSync(dpy, False);

 }
 
 }
 

-unsigned int
-textwidth_l(Fnt *font, char *text, unsigned int len)
+void
+drawtitle(Client *c)

 {
 {

-       if(font->set) {
-               XRectangle r;
-               XmbTextExtents(font->set, text, len, 0, &r);
-               return r.width;
+       int i;
+       Bool istile = arrange == dotile;
+
+       if(c == sel) {
+               drawstatus();
+               XUnmapWindow(dpy, c->title);
+               XSetWindowBorder(dpy, c->win, dc.fg);
+               return;

        }
        }

-       return XTextWidth(font->xfont, text, len);
+
+       XSetWindowBorder(dpy, c->win, dc.bg);
+       XMapWindow(dpy, c->title);
+
+       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);
+       XSync(dpy, False);

 }
 
 }
 

-unsigned int
-textwidth(Fnt *font, char *text)
+unsigned long
+getcolor(const char *colstr)

 {
 {

-       return textwidth_l(font, text, strlen(text));
+       Colormap cmap = DefaultColormap(dpy, screen);
+       XColor color;
+
+       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       return color.pixel;

 }
 
 void
 }
 
 void

-loadfont(Display *dpy, Fnt *font, const char *fontstr)
+setfont(const char *fontstr)

 {
        char **missing, *def;
 {
        char **missing, *def;

-       int n;
+       int i, n;

 
        missing = NULL;
 
        missing = NULL;

-       def = "?";

        setlocale(LC_ALL, "");
        setlocale(LC_ALL, "");

-       if(font->set)
-               XFreeFontSet(dpy, font->set);
-       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);

        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
        if(missing) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);

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

                }
        }
                }
        }

-       if(font->set) {
+       if(dc.font.set) {

                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-               unsigned int i;
-
-               font->ascent = font->descent = 0;
-               font_extents = XExtentsOfFontSet(font->set);
-               n = XFontsOfFontSet(font->set, &xfonts, &font_names);
-               for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) {
-                       if(font->ascent < (*xfonts)->ascent)
-                               font->ascent = (*xfonts)->ascent;
-                       if(font->descent < (*xfonts)->descent)
-                               font->descent = (*xfonts)->descent;
+
+               dc.font.ascent = dc.font.descent = 0;
+               font_extents = XExtentsOfFontSet(dc.font.set);
+               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+                       if(dc.font.ascent < (*xfonts)->ascent)
+                               dc.font.ascent = (*xfonts)->ascent;
+                       if(dc.font.descent < (*xfonts)->descent)
+                               dc.font.descent = (*xfonts)->descent;

                        xfonts++;
                }
        }
        else {
                        xfonts++;
                }
        }
        else {

-               if(font->xfont)
-                       XFreeFont(dpy, font->xfont);
-               font->xfont = NULL;
-               font->xfont = XLoadQueryFont(dpy, fontstr);
-               if (!font->xfont)
-                       font->xfont = XLoadQueryFont(dpy, "fixed");
-               if (!font->xfont)
-                       error("error, cannot load 'fixed' font\n");
-               font->ascent = font->xfont->ascent;
-               font->descent = font->xfont->descent;
+               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");
+               dc.font.ascent = dc.font.xfont->ascent;
+               dc.font.descent = dc.font.xfont->descent;

        }
        }

-       font->height = font->ascent + font->descent;
+       dc.font.height = dc.font.ascent + dc.font.descent;

 }
 
 unsigned int
 }
 
 unsigned int

-labelheight(Fnt *font)
+textw(char *text)

 {
 {

-       return font->height + 4;
+       return textnw(text, strlen(text)) + dc.font.height;

 }
 }