diff options
| author | Connor Lane Smith <cls@lubutu.com> | 2011-05-15 02:37:49 +0100 |
|---|---|---|
| committer | Connor Lane Smith <cls@lubutu.com> | 2011-05-15 02:37:49 +0100 |
| commit | 1654d6cd6269bc784ee99045edd89e4bda24149f (patch) | |
| tree | 9d440b1133201d2083e99213412f92d094adc516 /draw.c | |
| parent | 6cc0b0dc086feaf944b166d0b459ac407192ea5e (diff) | |
| download | dmenu-1654d6cd6269bc784ee99045edd89e4bda24149f.tar.gz dmenu-1654d6cd6269bc784ee99045edd89e4bda24149f.tar.bz2 dmenu-1654d6cd6269bc784ee99045edd89e4bda24149f.zip | |
cleanup
Diffstat (limited to 'draw.c')
| -rw-r--r-- | draw.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -25,14 +25,13 @@ drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsign (fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1); } - 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 */ - 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); @@ -157,12 +156,11 @@ void 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->invert = False; } int |