diff options
author | Markus Teich <markus.teich@stusta.mhn.de> | 2015-04-12 22:56:56 +0200 |
---|---|---|
committer | Markus Teich <markus.teich@stusta.mhn.de> | 2015-04-12 22:56:56 +0200 |
commit | 87ef23296b1c83f5da762da6e3177fc9f41ae281 (patch) | |
tree | d0574ce72dfd2f81238d2dfd41f9dd1f31a0ee37 | |
parent | edb657eb96cd3431e438140e2bcc72b1646443dd (diff) | |
download | sent-87ef23296b1c83f5da762da6e3177fc9f41ae281.tar.gz sent-87ef23296b1c83f5da762da6e3177fc9f41ae281.tar.bz2 sent-87ef23296b1c83f5da762da6e3177fc9f41ae281.zip |
drw: fixup drw_rect function
-rw-r--r-- | drw.c | 16 | ||||
-rw-r--r-- | drw.h | 2 |
2 files changed, 8 insertions, 10 deletions
@@ -204,17 +204,15 @@ drw_setscheme(Drw *drw, Scm *scm) { } void -drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) { - int dx; - - if(!drw || !drw->fontcount || !drw->scheme) +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) +{ + if (!drw || !drw->scheme) return; XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg.pix : drw->scheme->fg.pix); - dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4; - if(filled) - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx+1, dx+1); - else if(empty) - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx, dx); + if (filled) + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); } int @@ -57,7 +57,7 @@ void drw_setfont(Drw *drw, Fnt *font); void drw_setscheme(Drw *drw, Scm *scm); /* Drawing functions */ -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert); +void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); /* Map functions */ |