 |
drw: fixup drw_rect function - sent - simple plaintext presentation tool |
 |
git clone git://git.suckless.org/sent |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 87ef23296b1c83f5da762da6e3177fc9f41ae281 |
|
parent edb657eb96cd3431e438140e2bcc72b1646443dd |
|
Author: Markus Teich <[email protected]> |
|
Date: Sun, 12 Apr 2015 22:56:56 +0200 |
|
|
|
drw: fixup drw_rect function |
|
|
|
Diffstat: |
|
M drw.c | 16 +++++++--------- |
|
M drw.h | 2 +- |
|
|
|
2 files changed, 8 insertions(+), 10 deletions(-) |
|
--- |
|
diff --git a/drw.c b/drw.c |
|
@@ -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, i… |
|
- int dx; |
|
- |
|
- if(!drw || !drw->fontcount || !drw->scheme) |
|
+drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, i… |
|
+{ |
|
+ if (!drw || !drw->scheme) |
|
return; |
|
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg.pix : drw->… |
|
- 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+… |
|
- else if(empty) |
|
- XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, 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 |
|
diff --git a/drw.h b/drw.h |
|
@@ -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 fill… |
|
+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int fill… |
|
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const cha… |
|
|
|
/* Map functions */ |
