t* My version of sent
URI git clone git://git.codevoid.de/sent-sdk.git
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 87ef23296b1c83f5da762da6e3177fc9f41ae281
DIR parent edb657eb96cd3431e438140e2bcc72b1646443dd
URI Author: Markus Teich <markus.teich@stusta.mhn.de>
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(-)
---
DIR diff --git a/drw.c b/drw.c
t@@ -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
DIR diff --git a/drw.h b/drw.h
t@@ -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 */