From: Markus Teich <markus.teich@stusta.mhn.de>
Date: Sat, 31 Oct 2015 17:07:07 +0000 (+0100)
Subject: fix font width calculations
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=a9ca2473fd72462eaf90346258119c13c74bddcb;p=sent.git

fix font width calculations
---

diff --git a/drw.c b/drw.c
index 196f53b..9335967 100644
--- a/drw.c
+++ b/drw.c
@@ -379,7 +379,7 @@ unsigned int
 drw_fontset_getwidth(Drw *drw, const char *text) {
 	if (!drw || !drw->fonts || !text)
 		return 0;
-	return drw_text(drw, 0, 0, 0, 0, text, 0) + drw->fonts->h;
+	return drw_text(drw, 0, 0, 0, 0, text, 0);
 }
 
 void
diff --git a/sent.c b/sent.c
index b27d944..9bda178 100644
--- a/sent.c
+++ b/sent.c
@@ -312,17 +312,18 @@ void pngdraw(Image *img)
 void getfontsize(char *str, unsigned int *width, unsigned int *height)
 {
 	size_t i;
-	size_t len = strlen(str);
 
 	for (i = 0; i < NUMFONTSCALES; i++) {
 		drw_setfontset(d, fonts[i]);
-		drw_font_getexts(fonts[i], str, len, width, height);
+		*height = fonts[i]->h;
+		*width = drw_fontset_getwidth(d, str);
 		if (*width  > xw.uw || *height > xw.uh)
 			break;
 	}
 	if (i > 0) {
 		drw_setfontset(d, fonts[i-1]);
-		drw_font_getexts(fonts[i-1], str, len, width, height);
+		*height = fonts[i-1]->h;
+		*width = drw_fontset_getwidth(d, str);
 	}
 	*width += d->fonts->h;
 }