git.stevedylan.dev

drw: a valid (non-NULL) Drw and Fnt context must be passed 1f2226df

don't do these checks on this level. However for resource drw_*_free
we will allow it.

Hiltjo Posthuma · 2015-10-20 22:53 1 file(s) · +3 −16

drw.c +3 −16

void
drw_resize(Drw *drw, unsigned int w, unsigned int h)
{
	if (!drw)
		return;
	drw->w = w;
	drw->h = h;
	if (drw->drawable)

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),

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, int empty, int invert)
{
	if (!drw || !drw->scheme)
	if (!drw->scheme)
		return;
	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
	if (filled)

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);
}

{
	XGlyphInfo ext;

	if (!font || !text)
		return;
	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
	tex->h = font->h;
	tex->w = ext.xOff;

{
	Extnts tex;

	if (!font)
		return -1;
	drw_font_getexts(font, text, len, &tex);

	return tex.w;
}


{
	Cur *cur;

	if (!drw)
		return NULL;
	cur = ecalloc(1, sizeof(Cur));
	cur->cursor = XCreateFontCursor(drw->dpy, shape);


void
drw_cur_free(Drw *drw, Cur *cursor)
{
	if (!drw || !cursor)
	if (!cursor)
		return;
	XFreeCursor(drw->dpy, cursor->cursor);
	free(cursor);

82	82		void
83	83		drw_resize(Drw *drw, unsigned int w, unsigned int h)
84	84		{
85		-	if (!drw)
86		-	return;
87	85		drw->w = w;
88	86		drw->h = h;
89	87		if (drw->drawable)

188	186		drw_clr_create(Drw drw, const char clrname)
189	187		{
190	188		Clr *clr;
191		-	if (!drw)
192		-	return NULL;
193	189
194	190		clr = ecalloc(1, sizeof(Clr));
195	191		if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),

210	206		void
211	207		drw_setscheme(Drw drw, ClrScheme scheme)
212	208		{
213		-	if (!drw)
214		-	return;
215	209		drw->scheme = scheme;
216	210		}
217	211
218	212		void
219	213		drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
220	214		{
221		-	if (!drw \|\| !drw->scheme)
	215	+	if (!drw->scheme)
222	216		return;
223	217		XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
224	218		if (filled)

369	363		void
370	364		drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
371	365		{
372		-	if (!drw)
373		-	return;
374	366		XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
375	367		XSync(drw->dpy, False);
376	368		}

380	372		{
381	373		XGlyphInfo ext;
382	374
383		-	if (!font \|\| !text)
384		-	return;
385	375		XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
386	376		tex->h = font->h;
387	377		tex->w = ext.xOff;

392	382		{
393	383		Extnts tex;
394	384
395		-	if (!font)
396		-	return -1;
397	385		drw_font_getexts(font, text, len, &tex);
	386	+
398	387		return tex.w;
399	388		}
400	389

403	392		{
404	393		Cur *cur;
405	394
406		-	if (!drw)
407		-	return NULL;
408	395		cur = ecalloc(1, sizeof(Cur));
409	396		cur->cursor = XCreateFontCursor(drw->dpy, shape);
410	397

414	401		void
415	402		drw_cur_free(Drw drw, Cur cursor)
416	403		{
417		-	if (!drw \|\| !cursor)
	404	+	if (!cursor)
418	405		return;
419	406		XFreeCursor(drw->dpy, cursor->cursor);
420	407		free(cursor);