added draw.h, draw.c

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index eaad7fc..341a26f 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,134 +1,176 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include "dwm.h"
+#include <locale.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>

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

+#include <X11/Xlib.h>
+#include "draw.h"

 
 

-/* static */
-
-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
-       int x;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       gcv.foreground = col[ColFG];
-       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-       x = (dc.font.ascent + dc.font.descent + 2) / 4;
-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filled) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+#define MAX(a, b)  ((a) > (b) ? (a) : (b))
+#define MIN(a, b)  ((a) < (b) ? (a) : (b))
+#define DEFAULTFN  "fixed"
+
+static Bool loadfont(DC *dc, const char *fontstr);
+
+void
+drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
+       XSetForeground(dc->dpy, dc->gc, color);
+       if(fill)
+               XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
+       else
+               XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
+}
+
+void
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+       char buf[BUFSIZ];
+       size_t mn, n = strlen(text);
+
+       /* shorten text if necessary */
+       for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
+               if(mn == 0)
+                       return;
+       memcpy(buf, text, mn);
+       if(mn < n)
+               for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
+
+       drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
+       drawtextn(dc, buf, mn, col);
+}
+
+void
+drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
+       int x = dc->x + dc->font.height/2;
+       int y = dc->y + dc->font.ascent+1;
+
+       XSetForeground(dc->dpy, dc->gc, FG(dc, col));
+       if(dc->font.set)
+               XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
+       else {
+               XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+               XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);

        }
        }

-       else if(empty) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+}
+
+void
+eprintf(const char *fmt, ...) {
+       va_list ap;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+
+       if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);

        }
        }

+       exit(EXIT_FAILURE);

 }
 
 }
 

-static Bool
-isoccupied(unsigned int t) {
-       Client *c;
+void
+freedc(DC *dc) {
+       if(dc->font.set)
+               XFreeFontSet(dc->dpy, dc->font.set);
+       if(dc->font.xfont)
+               XFreeFont(dc->dpy, dc->font.xfont);
+       if(dc->canvas)
+               XFreePixmap(dc->dpy, dc->canvas);
+       XFreeGC(dc->dpy, dc->gc);
+       XCloseDisplay(dc->dpy);
+       free(dc);
+}
+
+unsigned long
+getcolor(DC *dc, const char *colstr) {
+       Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
+       XColor color;

 
 

-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
+       if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
+               eprintf("cannot allocate color '%s'\n", colstr);
+       return color.pixel;

 }
 
 }
 

-static unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
+DC *
+initdc(void) {
+       DC *dc;

 
 

-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "no locale support\n");
+       if(!(dc = calloc(1, sizeof *dc)))
+               eprintf("cannot malloc %u bytes:", sizeof *dc);
+       if(!(dc->dpy = XOpenDisplay(NULL)))
+               eprintf("cannot open display\n");
+
+       dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
+       XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
+       return dc;
+}
+
+void
+initfont(DC *dc, const char *fontstr) {
+       if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
+               if(fontstr != NULL)
+                       fprintf(stderr, "cannot load font '%s'\n", fontstr);
+               if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+                       eprintf("cannot load font '%s'\n", DEFAULTFN);

        }
        }

-       return XTextWidth(dc.font.xfont, text, len);
+       dc->font.height = dc->font.ascent + dc->font.descent;

 }
 
 }
 

-/* extern */
+Bool
+loadfont(DC *dc, const char *fontstr) {
+       char *def, **missing, **names;
+       int i, n = 1;
+       XFontStruct **xfonts;

 
 

-void
-drawbar(void) {
-       int i, x;
-
-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
-               dc.w = textw(tags[i]);
-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
-               }
-               else {
-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
-               }
-               dc.x += dc.w;
+       if(!*fontstr)
+               return False;
+       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+               n = XFontsOfFontSet(dc->font.set, &xfonts, &names);

        }
        }

-       dc.w = blw;
-       drawtext(getsymbol(), dc.norm);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = sw - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = sw - x;
+       else {
+               dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr);
+               xfonts = &dc->font.xfont;

        }
        }

-       drawtext(stext, dc.norm);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               if(sel) {
-                       drawtext(sel->name, dc.sel);
-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
-               }
-               else
-                       drawtext(NULL, dc.norm);
+       for(i = 0; i < n; i++) {
+               dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
+               dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+               dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);

        }
        }

-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-       XSync(dpy, False);
+       if(missing)
+               XFreeStringList(missing);
+       return (dc->font.set || dc->font.xfont);

 }
 
 void
 }
 
 void

-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
-               return;
-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       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);
-       /* 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] = '.';
+mapdc(DC *dc, Window win, unsigned int w, unsigned int h) {
+       XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
+}
+
+void
+resizedc(DC *dc, unsigned int w, unsigned int h) {
+       if(dc->canvas)
+               XFreePixmap(dc->dpy, dc->canvas);
+
+       dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+                                  DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
+       dc->w = w;
+       dc->h = h;
+}
+
+int
+textnw(DC *dc, const char *text, size_t len) {
+       if(dc->font.set) {
+               XRectangle r;
+
+               XmbTextExtents(dc->font.set, text, len, NULL, &r);
+               return r.width;

        }
        }

-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       else
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+       return XTextWidth(dc->font.xfont, text, len);

 }
 
 }
 

-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
+int
+textw(DC *dc, const char *text) {
+       return textnw(dc, text, strlen(text)) + dc->font.height;

 }
 }