efficiency tweaks

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index f9b8957..d0beee8 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,30 +9,26 @@
 
 #define MAX(a, b)  ((a) > (b) ? (a) : (b))
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 
 #define MAX(a, b)  ((a) > (b) ? (a) : (b))
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))

-#define DEFFONT    "fixed"
+#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) {
 
 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) {

-       XRectangle r = { dc->x + x, dc->y + y, w, h };
-
-       if(!fill) {
-               r.width -= 1;
-               r.height -= 1;
-       }

        XSetForeground(dc->dpy, dc->gc, color);
        XSetForeground(dc->dpy, dc->gc, color);

-       (fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
+       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]) {
 void
 drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {

-       char buf[256];
+       char buf[BUFSIZ];

        size_t mn, n = strlen(text);
 
        /* shorten text if necessary */
        size_t mn, n = strlen(text);
 
        /* shorten text if necessary */

-       for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) > dc->w - dc->font.height/2; mn--)
+       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 == 0)
                        return;
        memcpy(buf, text, mn);


@@ -65,7 +61,7 @@ eprintf(const char *fmt, ...) {
        vfprintf(stderr, fmt, ap);
        va_end(ap);
 
        vfprintf(stderr, fmt, ap);
        va_end(ap);
 

-       if(fmt[strlen(fmt)-1] == ':') {
+       if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {

                fputc(' ', stderr);
                perror(NULL);
        }
                fputc(' ', stderr);
                perror(NULL);
        }


@@ -100,7 +96,7 @@ initdc(void) {
        DC *dc;
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
        DC *dc;
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())

-               fprintf(stderr, "no locale support\n");
+               fputs("no locale support\n", stderr);

        if(!(dc = calloc(1, sizeof *dc)))
                eprintf("cannot malloc %u bytes:", sizeof *dc);
        if(!(dc->dpy = XOpenDisplay(NULL)))
        if(!(dc = calloc(1, sizeof *dc)))
                eprintf("cannot malloc %u bytes:", sizeof *dc);
        if(!(dc->dpy = XOpenDisplay(NULL)))


@@ -113,35 +109,34 @@ initdc(void) {
 
 void
 initfont(DC *dc, const char *fontstr) {
 
 void
 initfont(DC *dc, const char *fontstr) {

-       if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
+       if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {

                if(fontstr != NULL)
                        fprintf(stderr, "cannot load font '%s'\n", fontstr);
                if(fontstr != NULL)
                        fprintf(stderr, "cannot load font '%s'\n", fontstr);

-               if(fontstr == NULL || !loadfont(dc, DEFFONT))
-                       eprintf("cannot load font '%s'\n", DEFFONT);
+               if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+                       eprintf("cannot load font '%s'\n", DEFAULTFN);

        }
        dc->font.height = dc->font.ascent + dc->font.descent;
 }
 
 Bool
 loadfont(DC *dc, const char *fontstr) {
        }
        dc->font.height = dc->font.ascent + dc->font.descent;
 }
 
 Bool
 loadfont(DC *dc, const char *fontstr) {

-       char *def, **missing;
-       int i, n;
+       char *def, **missing, **names;
+       int i, n = 1;
+       XFontStruct **xfonts;

 
        if(!*fontstr)
                return False;
 
        if(!*fontstr)
                return False;

-       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-               char **names;
-               XFontStruct **xfonts;
-
+       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def)))

                n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
                n = XFontsOfFontSet(dc->font.set, &xfonts, &names);

-               for(i = dc->font.ascent = dc->font.descent = 0; i < n; i++) {
-                       dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
-                       dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-               }
-       }
-       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
-               dc->font.ascent = dc->font.xfont->ascent;
-               dc->font.descent = dc->font.xfont->descent;
+       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr)))
+               xfonts = &dc->font.xfont;
+       else
+               n = 0;
+
+       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);

        }
        if(missing)
                XFreeStringList(missing);
        }
        if(missing)
                XFreeStringList(missing);


@@ -157,12 +152,11 @@ void
 resizedc(DC *dc, unsigned int w, unsigned int h) {
        if(dc->canvas)
                XFreePixmap(dc->dpy, dc->canvas);
 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->x = dc->y = 0;
+

        dc->w = w;
        dc->h = h;
        dc->w = w;
        dc->h = h;

-       dc->invert = False;
+       dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+                                  DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));

 }
 
 int
 }
 
 int