[hackers] [PATCH 3/8] drw: simplify font_getexts

From: Markus Teich <markus.teich_AT_stusta.mhn.de>
Date: Sun, 22 May 2016 22:29:20 +0200

The struct Extnts was pointless. With the new interface there is also no need to
have an extra function which just extracts the width.

---
 drw.c | 33 ++++++++++++++-------------------
 drw.h |  8 +-------
 2 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/drw.c b/drw.c
index f49200b..ac27cdc 100644
--- a/drw.c
+++ b/drw.c
_AT_@ -223,7 +223,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 {
 	char buf[1024];
 	int tx, ty, th;
-	Extnts tex;
+	unsigned int ew;
 	XftDraw *d = NULL;
 	Fnt *curfont, *nextfont;
 	size_t i, len;
_AT_@ -277,10 +277,10 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 		}
 
 		if (utf8strlen) {
-			drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
+			drw_font_getexts(curfont, utf8str, utf8strlen, &ew, NULL);
 			/* shorten text if necessary */
-			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
-				drw_font_getexts(curfont, utf8str, len, &tex);
+			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (ew > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
+				drw_font_getexts(curfont, utf8str, len, &ew, NULL);
 
 			if (len) {
 				memcpy(buf, utf8str, len);
_AT_@ -294,8 +294,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 					tx = x + (h / 2);
 					XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
 				}
-				x += tex.w;
-				w -= tex.w;
+				x += ew;
+				w -= ew;
 			}
 		}
 
_AT_@ -358,23 +358,18 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
 }
 
 void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
+drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
 {
 	XGlyphInfo ext;
 
+	if (!font || !text)
+		return;
+
 	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	tex->h = font->h;
-	tex->w = ext.xOff;
-}
-
-unsigned int
-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
-{
-	Extnts tex;
-
-	drw_font_getexts(font, text, len, &tex);
-
-	return tex.w;
+	if (w)
+		*w = ext.xOff;
+	if (h)
+		*h = font->h;
 }
 
 Cur *
diff --git a/drw.h b/drw.h
index 536171b..28f7c61 100644
--- a/drw.h
+++ b/drw.h
_AT_@ -37,11 +37,6 @@ typedef struct {
 	Fnt *fonts[DRW_FONT_CACHE_SIZE];
 } Drw;
 
-typedef struct {
-	unsigned int w;
-	unsigned int h;
-} Extnts;
-
 /* Drawable abstraction */
 Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
_AT_@ -51,8 +46,7 @@ void drw_free(Drw *drw);
 Fnt *drw_font_create(Drw *drw, const char *fontname);
 void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount);
 void drw_font_free(Fnt *font);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *extnts);
-unsigned int drw_font_getexts_width(Fnt *font, const char *text, unsigned int len);
+void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
 
 /* Colour abstraction */
 Clr *drw_clr_create(Drw *drw, const char *clrname);
-- 
2.7.3

Received on Sun May 22 2016 - 22:29:20 CEST