 |
incorporated recent drw changes - libsl - shared code master of various suckles… |
 |
git clone git://git.suckless.org/libsl |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 96fe0f030abeb962b07ad4fc390ca8ad926bb9aa |
|
parent 397537761c5a6303bba45c273327786570fc4a2e |
|
Author: Anselm R Garbe <[email protected]> |
|
Date: Wed, 19 Jun 2013 19:36:54 +0200 |
|
|
|
incorporated recent drw changes |
|
|
|
Diffstat: |
|
M drw.c | 22 ++++++++++------------ |
|
M drw.h | 6 +++--- |
|
|
|
2 files changed, 13 insertions(+), 15 deletions(-) |
|
--- |
|
diff --git a/drw.c b/drw.c |
|
@@ -109,9 +109,8 @@ drw_clr_create(Drw *drw, const char *clrname) { |
|
|
|
void |
|
drw_clr_free(Clr *clr) { |
|
- if(!clr) |
|
- return; |
|
- free(clr); |
|
+ if(clr) |
|
+ free(clr); |
|
} |
|
|
|
void |
|
@@ -121,19 +120,18 @@ drw_setfont(Drw *drw, Fnt *font) { |
|
} |
|
|
|
void |
|
-drw_settheme(Drw *drw, Theme *theme) { |
|
- if(!drw || !theme) |
|
- return; |
|
- drw->theme = theme; |
|
+drw_setscheme(Drw *drw, ClrScheme *scheme) { |
|
+ if(drw && scheme) |
|
+ drw->scheme = scheme; |
|
} |
|
|
|
void |
|
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, i… |
|
int dx; |
|
|
|
- if(!drw || !drw->font || !drw->theme) |
|
+ if(!drw || !drw->font || !drw->scheme) |
|
return; |
|
- XSetForeground(drw->dpy, drw->gc, invert ? drw->theme->bg->rgb : drw->… |
|
+ XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->rgb : drw-… |
|
dx = (drw->font->ascent + drw->font->descent + 2) / 4; |
|
if(filled) |
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx+… |
|
@@ -147,9 +145,9 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned i… |
|
int i, tx, ty, th, len, olen; |
|
Extnts tex; |
|
|
|
- if(!drw || !drw->theme) |
|
+ if(!drw || !drw->scheme) |
|
return; |
|
- XSetForeground(drw->dpy, drw->gc, invert ? drw->theme->fg->rgb : drw->… |
|
+ XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->rgb : drw-… |
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); |
|
if(!text || !drw->font) |
|
return; |
|
@@ -166,7 +164,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned i… |
|
memcpy(buf, text, len); |
|
if(len < olen) |
|
for(i = len; i && i > len - 3; buf[--i] = '.'); |
|
- XSetForeground(drw->dpy, drw->gc, invert ? drw->theme->bg->rgb : drw->… |
|
+ XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->rgb : drw-… |
|
if(drw->font->set) |
|
XmbDrawString(drw->dpy, drw->drawable, drw->font->set, drw->gc… |
|
else |
|
diff --git a/drw.h b/drw.h |
|
@@ -20,7 +20,7 @@ typedef struct { |
|
Clr *fg; |
|
Clr *bg; |
|
Clr *border; |
|
-} Theme; |
|
+} ClrScheme; |
|
|
|
typedef struct { |
|
unsigned int w, h; |
|
@@ -29,7 +29,7 @@ typedef struct { |
|
Window root; |
|
Drawable drawable; |
|
GC gc; |
|
- Theme *theme; |
|
+ ClrScheme *scheme; |
|
Fnt *font; |
|
} Drw; |
|
|
|
@@ -59,7 +59,7 @@ void drw_cur_free(Drw *drw, Cur *cursor); |
|
|
|
/* Drawing context manipulation */ |
|
void drw_setfont(Drw *drw, Fnt *font); |
|
-void drw_settheme(Drw *drw, Theme *theme); |
|
+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 fill… |
