[dev] [libsl] [PATCH 1/4] drw: fixup font_getexts

[Markus Teich]

---
 drw.c | 30 +++++++++++-------------------
 drw.h |  8 +-------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/drw.c b/drw.c
index eb3b3c3..6c0859e 100644
--- a/drw.c
+++ b/drw.c
@@ -220,7 +220,7 @@ int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char 
*text, int invert) {
        char buf[1024];
        int tx, ty, th;
-       Extnts tex;
+       unsigned int ew;
        Colormap cmap;
        Visual *vis;
        XftDraw *d;
@@ -282,10 +282,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);
@@ -300,8 +300,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned 
int h, const char *tex
                                        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;
                        }
                }
 
@@ -372,24 +372,16 @@ 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;
-
-       if(!font)
-               return -1;
-       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
@@ -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);
@@ -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.0.5