 |
drw: a valid (non-NULL) Drw and Fnt context must be passed - dmenu - dynamic me… |
 |
git clone git://git.suckless.org/dmenu |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 1f2226df1380f178240bb81dddcad6c5ff2e9d62 |
|
parent 5a20b409c673a6736c3f9326cb54edc32908f717 |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Tue, 20 Oct 2015 22:53:55 +0200 |
|
|
|
drw: a valid (non-NULL) Drw and Fnt context must be passed |
|
|
|
don't do these checks on this level. However for resource drw_*_free |
|
we will allow it. |
|
|
|
Diffstat: |
|
M drw.c | 19 +++---------------- |
|
|
|
1 file changed, 3 insertions(+), 16 deletions(-) |
|
--- |
|
diff --git a/drw.c b/drw.c |
|
@@ -82,8 +82,6 @@ drw_create(Display *dpy, int screen, Window root, unsigned in… |
|
void |
|
drw_resize(Drw *drw, unsigned int w, unsigned int h) |
|
{ |
|
- if (!drw) |
|
- return; |
|
drw->w = w; |
|
drw->h = h; |
|
if (drw->drawable) |
|
@@ -188,8 +186,6 @@ Clr * |
|
drw_clr_create(Drw *drw, const char *clrname) |
|
{ |
|
Clr *clr; |
|
- if (!drw) |
|
- return NULL; |
|
|
|
clr = ecalloc(1, sizeof(Clr)); |
|
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), |
|
@@ -210,15 +206,13 @@ drw_clr_free(Clr *clr) |
|
void |
|
drw_setscheme(Drw *drw, ClrScheme *scheme) |
|
{ |
|
- if (!drw) |
|
- return; |
|
drw->scheme = scheme; |
|
} |
|
|
|
void |
|
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, i… |
|
{ |
|
- if (!drw || !drw->scheme) |
|
+ if (!drw->scheme) |
|
return; |
|
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw-… |
|
if (filled) |
|
@@ -369,8 +363,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned i… |
|
void |
|
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) |
|
{ |
|
- if (!drw) |
|
- return; |
|
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); |
|
XSync(drw->dpy, False); |
|
} |
|
@@ -380,8 +372,6 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int … |
|
{ |
|
XGlyphInfo ext; |
|
|
|
- if (!font || !text) |
|
- return; |
|
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext… |
|
tex->h = font->h; |
|
tex->w = ext.xOff; |
|
@@ -392,9 +382,8 @@ drw_font_getexts_width(Fnt *font, const char *text, unsigne… |
|
{ |
|
Extnts tex; |
|
|
|
- if (!font) |
|
- return -1; |
|
drw_font_getexts(font, text, len, &tex); |
|
+ |
|
return tex.w; |
|
} |
|
|
|
@@ -403,8 +392,6 @@ drw_cur_create(Drw *drw, int shape) |
|
{ |
|
Cur *cur; |
|
|
|
- if (!drw) |
|
- return NULL; |
|
cur = ecalloc(1, sizeof(Cur)); |
|
cur->cursor = XCreateFontCursor(drw->dpy, shape); |
|
|
|
@@ -414,7 +401,7 @@ drw_cur_create(Drw *drw, int shape) |
|
void |
|
drw_cur_free(Drw *drw, Cur *cursor) |
|
{ |
|
- if (!drw || !cursor) |
|
+ if (!cursor) |
|
return; |
|
XFreeCursor(drw->dpy, cursor->cursor); |
|
free(cursor); |
