removed hardcoded 'fixed' fallback, useless and misleading

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 0459392..ea02c4d 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,11 +1,9 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -32,21 +30,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;
@@ -58,10 +52,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);
@@ -78,34 +70,28 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color = {0};
+       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
 setfont(const char *fontstr) {
-       char **missing, *def;
+       char *def, **missing;
        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(missing) {
+       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);
@@ -121,10 +107,7 @@ setfont(const char *fontstr) {
                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)
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
                        eprint("error, cannot init 'fixed' font\n");
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;