made Fnt an anonymous struct

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index d0f21cd..145df16 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,31 +1,14 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
-#include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
-
-/* static */
-
-static unsigned int
-textnw(const 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);
-}
 
 /* extern */
 
 void
-drawtext(const char *text, unsigned long col[ColLast])
-{
+drawtext(const char *text, unsigned long col[ColLast]) {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
@@ -34,21 +17,17 @@ drawtext(const char *text, unsigned long col[ColLast])
 
        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;
+       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;
@@ -60,10 +39,8 @@ drawtext(const char *text, unsigned long col[ColLast])
                if(len > 3)
                        buf[len - 3] = '.';
        }
-
        if(w > dc.w)
                return; /* too long */
-
        gcv.foreground = col[ColFG];
        if(dc.font.set) {
                XChangeGC(dpy, dc.gc, GCForeground, &gcv);
@@ -77,67 +54,18 @@ drawtext(const char *text, unsigned long col[ColLast])
        }
 }
 
-unsigned long
-getcolor(const char *colstr)
-{
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
-
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-       return color.pixel;
+unsigned int
+textw(const char *text) {
+       return textnw(text, strlen(text)) + dc.font.height;
 }
 
-void
-setfont(const char *fontstr)
-{
-       char **missing, *def;
-       int i, n;
+unsigned int
+textnw(const char *text, unsigned int len) {
+       XRectangle r;
 
-       missing = NULL;
-       setlocale(LC_ALL, "");
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       if(missing) {
-               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;
-
-               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 {
-               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;
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);
+               return r.width;
        }
-       dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
-unsigned int
-textw(const char *text)
-{
-       return textnw(text, strlen(text)) + dc.font.height;
+       return XTextWidth(dc.font.xfont, text, len);
 }