ignore prompt if it is empty in addition to NULL

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index d747629..76f0c54 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,171 +1,177 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */
+#include <locale.h>
+#include <stdarg.h>

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

+#include <stdlib.h>

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

+#include <X11/Xlib.h>
+#include "draw.h"
+
+#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);

 
 

-#include "dmenu.h"
-
-static void
-drawborder(Display *dpy, Brush *b)
-{
-       XPoint points[5];
-       XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, b->gc, b->border);
-       points[0].x = b->x;
-       points[0].y = b->y;
-       points[1].x = b->w - 1;
-       points[1].y = 0;
-       points[2].x = 0;
-       points[2].y = b->h - 1;
-       points[3].x = -(b->w - 1);
-       points[3].y = 0;
-       points[4].x = 0;
-       points[4].y = -(b->h - 1);
-       XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
+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
 }
 
 void

-draw(Display *dpy, Brush *b, Bool border, const char *text)
-{
-       unsigned int x, y, w, h, len;
-       static char buf[256];
-       XGCValues gcv;
-       XRectangle r = { b->x, b->y, b->w, b->h };
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+       char buf[BUFSIZ];
+       size_t mn, n = strlen(text);

 
 

-       XSetForeground(dpy, b->gc, b->bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
+       /* 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);
+}

 
 

-       w = 0;
-       if(border)
-               drawborder(dpy, b);
+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;

 
 

-       if(!text)
-               return;
+       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);
+       }
+}

 
 

-       len = strlen(text);
-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
+void
+eprintf(const char *fmt, ...) {
+       va_list ap;

 
 

-       h = b->font.ascent + b->font.descent;
-       y = b->y + (b->h / 2) - (h / 2) + b->font.ascent;
-       x = b->x + (h / 2);
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);

 
 

-       /* shorten text if necessary */
-       while(len && (w = textnw(&b->font, buf, len)) > b->w - h)
-               buf[--len] = 0;
-
-       if(w > b->w)
-               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,
-                               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);
+       if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);

        }
        }

+       exit(EXIT_FAILURE);
+}
+
+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);

 }
 
 }
 

-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
-{
+unsigned long
+getcolor(DC *dc, const char *colstr) {
+       Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));

        XColor color;
        XColor color;

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

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

-void
-loadcolors(Display *dpy, int screen, Brush *b,
-               const char *bg, const char *fg, const char *border)
-{
-       Colormap cmap = DefaultColormap(dpy, screen);
-       b->bg = xloadcolors(dpy, cmap, bg);
-       b->fg = xloadcolors(dpy, cmap, fg);
-       b->border = xloadcolors(dpy, cmap, border);
+DC *
+initdc(void) {
+       DC *dc;
+
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("no locale support\n", stderr);
+       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;

 }
 
 }
 

-unsigned int
-textnw(Fnt *font, char *text, unsigned int len)
-{
-       XRectangle r;
-       if(font->set) {
-               XmbTextExtents(font->set, text, len, NULL, &r);
-               return r.width;
+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(font->xfont, text, len);
+       dc->font.height = dc->font.ascent + dc->font.descent;

 }
 
 }
 

-unsigned int
-textw(Fnt *font, char *text)
-{
-       return textnw(font, text, strlen(text));
+Bool
+loadfont(DC *dc, const char *fontstr) {
+       char *def, **missing, **names;
+       int i, n;
+       XFontStruct **xfonts;
+
+       if(!*fontstr)
+               return False;
+       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+               n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
+               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);
+               }
+       }
+       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+               dc->font.ascent  = dc->font.xfont->ascent;
+               dc->font.descent = dc->font.xfont->descent;
+               dc->font.width   = dc->font.xfont->max_bounds.width;
+       }
+       if(missing)
+               XFreeStringList(missing);
+       return dc->font.set || dc->font.xfont;

 }
 
 }
 

-unsigned int
-texth(Fnt *font)
-{
-       return font->height + 4;
+void
+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
 }
 
 void

-loadfont(Display *dpy, Fnt *font, const char *fontstr)
-{
-       char **missing, *def;
-       int n;
-
-       missing = NULL;
-       def = "?";
-       setlocale(LC_ALL, "");
-       if(font->set)
-               XFreeFontSet(dpy, font->set);
-       font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       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(font->set) {
-               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;
-                       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)
-                       eprint("error, cannot load 'fixed' font\n");
-               font->ascent = font->xfont->ascent;
-               font->descent = font->xfont->descent;
+resizedc(DC *dc, unsigned int w, unsigned int h) {
+       if(dc->canvas)
+               XFreePixmap(dc->dpy, dc->canvas);
+
+       dc->w = w;
+       dc->h = h;
+       dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+                                  DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
+}
+
+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;

        }
        }

-       font->height = font->ascent + font->descent;
+       return XTextWidth(dc->font.xfont, text, len);
+}
+
+int
+textw(DC *dc, const char *text) {
+       return textnw(dc, text, strlen(text)) + dc->font.height;

 }
 }