fix possible overflow

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 80a5074..351a43d 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -7,33 +7,32 @@
 #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 DEFFONT    "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 };
+       XRectangle r;
+
+       r.x = dc->x + x;
+       r.y = dc->y + y;
+       r.width  = fill ? w : w-1;
+       r.height = fill ? h : h-1;

 
 

-       if(!fill) {
-               r.width -= 1;
-               r.height -= 1;
-       }

        XSetForeground(dc->dpy, dc->gc, color);
        (fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
 }
 
        XSetForeground(dc->dpy, dc->gc, color);
        (fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 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 +45,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 +61,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[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);
+       }

        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 


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

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

        if(!(dc = calloc(1, sizeof *dc)))
        if(!(dc = calloc(1, sizeof *dc)))

-               eprintf("cannot malloc %u bytes\n", sizeof *dc);
+               eprintf("cannot malloc %u bytes:", sizeof *dc);

        if(!(dc->dpy = XOpenDisplay(NULL)))
                eprintf("cannot open display\n");
 
        if(!(dc->dpy = XOpenDisplay(NULL)))
                eprintf("cannot open display\n");
 


@@ -114,7 +115,7 @@ void
 initfont(DC *dc, const char *fontstr) {
        if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
                if(fontstr != NULL)
 initfont(DC *dc, const char *fontstr) {
        if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
                if(fontstr != NULL)

-                       weprintf("cannot load font '%s'\n", fontstr);
+                       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, DEFFONT))
                        eprintf("cannot load font '%s'\n", DEFFONT);
        }


@@ -156,12 +157,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->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;

 }
 
 int
 }
 
 int


@@ -179,13 +179,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: ", progname);
-       va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
-       va_end(ap);
-}