From ef3ee18387b8cfe3282d53a33f0f47fb58b6d8c9 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Mon, 4 May 2015 20:30:57 +0200 Subject: [PATCH 1/4] drw: drw_rect: use specified w and h --- drw.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drw.c b/drw.c index eb3b3c3..4d3e238 100644 --- a/drw.c +++ b/drw.c @@ -204,16 +204,13 @@ 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) { - int dx; - - if(!drw || !drw->fontcount || !drw->scheme) + 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); + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1); else if(empty) - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx, dx); + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); } int -- 2.3.7