diff --git a/drw.c b/drw.c index b130405..3566077 100644 --- a/drw.c +++ b/drw.c @@ -126,17 +126,16 @@ drw_setscheme(Drw *drw, ClrScheme *scheme) { } void -drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) { +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) { int dx; if(!drw || !drw->font || !drw->scheme) return; XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->rgb : drw->scheme->fg->rgb); - dx = (drw->font->ascent + drw->font->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); + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); } void diff --git a/drw.h b/drw.h index a5f34e0..d0c6cf2 100644 --- a/drw.h +++ b/drw.h @@ -62,7 +62,7 @@ void drw_setfont(Drw *drw, Fnt *font); void drw_setscheme(Drw *drw, ClrScheme *scheme); /* 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); void drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); /* Map functions */