accepted vi'is exit approach ^[ (suggested by Arkaduisz)

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 28c658c..76f0c54 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -7,33 +7,28 @@
 #include <X11/Xlib.h>
 #include "draw.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 DEFFONT     "fixed"
+#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) {
 
 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];
-       size_t n, mn;
+       char buf[BUFSIZ];
+       size_t mn, n = strlen(text);

 
        /* shorten text if necessary */
 
        /* shorten text if necessary */

-       n = strlen(text);
-       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);


@@ -46,10 +41,8 @@ drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
 
 void
 drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
 
 void
 drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {

-       int x, y;
-
-       x = dc->x + dc->font.height/2;
-       y = dc->y + dc->font.ascent+1;
+       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)
 
        XSetForeground(dc->dpy, dc->gc, FG(dc, col));
        if(dc->font.set)


@@ -64,10 +57,14 @@ void
 eprintf(const char *fmt, ...) {
        va_list ap;
 
 eprintf(const char *fmt, ...) {
        va_list ap;
 

-       fprintf(stderr, "%s: ", progname);

        va_start(ap, fmt);
        vfprintf(stderr, fmt, ap);
        va_end(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);
 }
 
        exit(EXIT_FAILURE);
 }
 


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

-               weprintf("no locale support\n");
-       if(!(dc = malloc(sizeof *dc)))
-               eprintf("cannot malloc %u bytes\n", sizeof *dc);
+               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);
        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);

-       dc->font.xfont = NULL;
-       dc->font.set = NULL;
-       dc->canvas = None;

        return dc;
 }
 
 void
 initfont(DC *dc, const char *fontstr) {
        return dc;
 }
 
 void
 initfont(DC *dc, const char *fontstr) {

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

                if(fontstr != NULL)
                if(fontstr != NULL)

-                       weprintf("cannot load font '%s'\n", fontstr);
-               if(fontstr == NULL || !loadfont(dc, DEFFONT))
-                       eprintf("cannot load font '%s'\n", DEFFONT);
+                       fprintf(stderr, "cannot load font '%s'\n", fontstr);
+               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;
+       char *def, **missing, **names;

        int i, n;
        int i, n;

+       XFontStruct **xfonts;

 
        if(!*fontstr)
                return False;
        if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
 
        if(!*fontstr)
                return False;
        if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {

-               char **names;
-               XFontStruct **xfonts;
-

                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);
+               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.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))) {
                }
        }
        else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {

-               dc->font.ascent = dc->font.xfont->ascent;
+               dc->font.ascent  = dc->font.xfont->ascent;

                dc->font.descent = dc->font.xfont->descent;
                dc->font.descent = dc->font.xfont->descent;

+               dc->font.width   = dc->font.xfont->max_bounds.width;

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

-       return (dc->font.set || dc->font.xfont);
+       return dc->font.set || dc->font.xfont;

 }
 
 void
 }
 
 void


@@ -159,12 +153,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


@@ -182,13 +175,3 @@ int
 textw(DC *dc, const char *text) {
        return textnw(dc, text, strlen(text)) + dc->font.height;
 }
 textw(DC *dc, const char *text) {
        return textnw(dc, text, strlen(text)) + dc->font.height;
 }

-
-void
-weprintf(const char *fmt, ...) {
-       va_list ap;
-
-       fprintf(stderr, "%s: warning: ", progname);
-       va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
-       va_end(ap);
-}