Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Partially revert 44c7de3: fix items text width offset calculation
[dmenu.git] / drw.c
diff --git a/drw.c b/drw.c
index 0423873..95839c9 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -9,7 +9,7 @@
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
-#define UTF_SIZ 4
+#define UTF_SIZ     4
 
 static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 
 static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
@@ -17,50 +17,54 @@ static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000
 static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 static long
 static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 static long
-utf8decodebyte(const char c, size_t *i) {
-       for(*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-               if(((unsigned char)c & utfmask[*i]) == utfbyte[*i])
+utf8decodebyte(const char c, size_t *i)
+{
+       for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
+               if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
                        return (unsigned char)c & ~utfmask[*i];
        return 0;
 }
 
 static size_t
                        return (unsigned char)c & ~utfmask[*i];
        return 0;
 }
 
 static size_t
-utf8validate(long *u, size_t i) {
-       if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+utf8validate(long *u, size_t i)
+{
+       if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
                *u = UTF_INVALID;
                *u = UTF_INVALID;
-       for(i = 1; *u > utfmax[i]; ++i)
+       for (i = 1; *u > utfmax[i]; ++i)
                ;
        return i;
 }
 
 static size_t
                ;
        return i;
 }
 
 static size_t
-utf8decode(const char *c, long *u, size_t clen) {
+utf8decode(const char *c, long *u, size_t clen)
+{
        size_t i, j, len, type;
        long udecoded;
 
        *u = UTF_INVALID;
        size_t i, j, len, type;
        long udecoded;
 
        *u = UTF_INVALID;
-       if(!clen)
+       if (!clen)
                return 0;
        udecoded = utf8decodebyte(c[0], &len);
                return 0;
        udecoded = utf8decodebyte(c[0], &len);
-       if(!BETWEEN(len, 1, UTF_SIZ))
+       if (!BETWEEN(len, 1, UTF_SIZ))
                return 1;
                return 1;
-       for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+       for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-               if(type != 0)
+               if (type)
                        return j;
        }
                        return j;
        }
-       if(j < len)
+       if (j < len)
                return 0;
        *u = udecoded;
        utf8validate(u, len);
                return 0;
        *u = udecoded;
        utf8validate(u, len);
+
        return len;
 }
 
 Drw *
        return len;
 }
 
 Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
-       Drw *drw = (Drw *)calloc(1, sizeof(Drw));
-       if(!drw)
-               return NULL;
+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
+{
+       Drw *drw = ecalloc(1, sizeof(Drw));
+
        drw->dpy = dpy;
        drw->screen = screen;
        drw->root = root;
        drw->dpy = dpy;
        drw->screen = screen;
        drw->root = root;
@@ -68,164 +72,178 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
        drw->h = h;
        drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
        drw->gc = XCreateGC(dpy, root, 0, NULL);
        drw->h = h;
        drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
        drw->gc = XCreateGC(dpy, root, 0, NULL);
-       drw->fontcount = 0;
        XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
        XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
+
        return drw;
 }
 
 void
        return drw;
 }
 
 void
-drw_resize(Drw *drw, unsigned int w, unsigned int h) {
-       if(!drw)
+drw_resize(Drw *drw, unsigned int w, unsigned int h)
+{
+       if (!drw)
                return;
                return;
+
        drw->w = w;
        drw->h = h;
        drw->w = w;
        drw->h = h;
-       if(drw->drawable != 0)
+       if (drw->drawable)
                XFreePixmap(drw->dpy, drw->drawable);
        drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
 }
 
 void
                XFreePixmap(drw->dpy, drw->drawable);
        drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
 }
 
 void
-drw_free(Drw *drw) {
-       size_t i;
-
-       for (i = 0; i < drw->fontcount; i++) {
-               drw_font_free(drw->fonts[i]);
-       }
+drw_free(Drw *drw)
+{
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
        free(drw);
 }
 
 /* This function is an implementation detail. Library users should use
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
        free(drw);
 }
 
 /* This function is an implementation detail. Library users should use
- * drw_font_create instead.
+ * drw_fontset_create instead.
  */
 static Fnt *
  */
 static Fnt *
-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
+xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
+{
        Fnt *font;
        Fnt *font;
-
-       if (!(fontname || fontpattern))
-               die("No font specified.\n");
-
-       if (!(font = (Fnt *)calloc(1, sizeof(Fnt))))
-               return NULL;
+       XftFont *xfont = NULL;
+       FcPattern *pattern = NULL;
 
        if (fontname) {
 
        if (fontname) {
-               /* Using the pattern found at font->xfont->pattern does not yield same
-                * the same substitution results as using the pattern returned by
+               /* Using the pattern found at font->xfont->pattern does not yield the
+                * same substitution results as using the pattern returned by
                 * FcNameParse; using the latter results in the desired fallback
                 * FcNameParse; using the latter results in the desired fallback
-                * behaviour whereas the former just results in
-                * missing-character-rectangles being drawn, at least with some fonts.
-                */
-               if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) ||
-                   !(font->pattern = FcNameParse((FcChar8 *) fontname))) {
-                       if (font->xfont) {
-                               XftFontClose(drw->dpy, font->xfont);
-                               font->xfont = NULL;
-                       }
-                       fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
+                * behaviour whereas the former just results in missing-character
+                * rectangles being drawn, at least with some fonts. */
+               if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
+                       fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
+                       return NULL;
+               }
+               if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
+                       fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
+                       XftFontClose(drw->dpy, xfont);
+                       return NULL;
                }
        } else if (fontpattern) {
                }
        } else if (fontpattern) {
-               if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-                       fprintf(stderr, "error, cannot load font pattern.\n");
-               } else {
-                       font->pattern = NULL;
+               if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
+                       fprintf(stderr, "error, cannot load font from pattern.\n");
+                       return NULL;
                }
                }
+       } else {
+               die("no font specified.\n");
        }
 
        }
 
-       if (!font->xfont) {
-               free(font);
-               return NULL;
-       }
-
-       font->ascent = font->xfont->ascent;
-       font->descent = font->xfont->descent;
-       font->h = font->ascent + font->descent;
+       font = ecalloc(1, sizeof(Fnt));
+       font->xfont = xfont;
+       font->pattern = pattern;
+       font->h = xfont->ascent + xfont->descent;
        font->dpy = drw->dpy;
        font->dpy = drw->dpy;
+
        return font;
 }
 
        return font;
 }
 
-Fnt*
-drw_font_create(Drw *drw, const char *fontname) {
-       return drw_font_xcreate(drw, fontname, NULL);
+static void
+xfont_free(Fnt *font)
+{
+       if (!font)
+               return;
+       if (font->pattern)
+               FcPatternDestroy(font->pattern);
+       XftFontClose(font->dpy, font->xfont);
+       free(font);
 }
 
 }
 
-void
-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
+Fnt*
+drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
+{
+       Fnt *cur, *ret = NULL;
        size_t i;
        size_t i;
-       Fnt *font;
 
 
-       for (i = 0; i < fontcount; i++) {
-               if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
-                       die("Font cache exhausted.\n");
-               } else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
-                       drw->fonts[drw->fontcount++] = font;
+       if (!drw || !fonts)
+               return NULL;
+
+       for (i = 1; i <= fontcount; i++) {
+               if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
+                       cur->next = ret;
+                       ret = cur;
                }
        }
                }
        }
+       return (drw->fonts = ret);
+}
+
+void
+drw_fontset_free(Fnt *font)
+{
+       if (font) {
+               drw_fontset_free(font->next);
+               xfont_free(font);
+       }
 }
 
 void
 }
 
 void
-drw_font_free(Fnt *font) {
-       if(!font)
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
+{
+       if (!drw || !dest || !clrname)
                return;
                return;
-       if(font->pattern)
-               FcPatternDestroy(font->pattern);
-       XftFontClose(font->dpy, font->xfont);
-       free(font);
+
+       if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
+                              DefaultColormap(drw->dpy, drw->screen),
+                              clrname, dest))
+               die("error, cannot allocate color '%s'\n", clrname);
 }
 
 }
 
+/* Wrapper to create color schemes. The caller has to call free(3) on the
+ * returned color scheme when done using it. */
 Clr *
 Clr *
-drw_clr_create(Drw *drw, const char *clrname) {
-       Clr *clr;
-       Colormap cmap;
-       Visual *vis;
+drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
+{
+       size_t i;
+       Clr *ret;
 
 
-       if(!drw)
-               return NULL;
-       clr = (Clr *)calloc(1, sizeof(Clr));
-       if(!clr)
+       /* need at least two colors for a scheme */
+       if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
                return NULL;
                return NULL;
-       cmap = DefaultColormap(drw->dpy, drw->screen);
-       vis = DefaultVisual(drw->dpy, drw->screen);
-       if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
-               die("error, cannot allocate color '%s'\n", clrname);
-       clr->pix = clr->rgb.pixel;
-       return clr;
+
+       for (i = 0; i < clrcount; i++)
+               drw_clr_create(drw, &ret[i], clrnames[i]);
+       return ret;
 }
 
 void
 }
 
 void
-drw_clr_free(Clr *clr) {
-       free(clr);
+drw_setfontset(Drw *drw, Fnt *set)
+{
+       if (drw)
+               drw->fonts = set;
 }
 
 void
 }
 
 void
-drw_setscheme(Drw *drw, ClrScheme *scheme) {
-       if(!drw)
-               return;
-       drw->scheme = scheme;
+drw_setscheme(Drw *drw, Clr *scm)
+{
+       if (drw)
+               drw->scheme = scm;
 }
 
 void
 }
 
 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)
+drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
+{
+       if (!drw || !drw->scheme)
                return;
                return;
-       XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
-       if(filled)
-               XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
-       else if(empty)
-               XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+       XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
+       if (filled)
+               XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+       else
+               XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
 }
 
 int
 }
 
 int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
+drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
+{
        char buf[1024];
        char buf[1024];
-       int tx, ty, th;
-       Extnts tex;
-       Colormap cmap;
-       Visual *vis;
-       XftDraw *d;
-       Fnt *curfont, *nextfont;
+       int ty;
+       unsigned int ew;
+       XftDraw *d = NULL;
+       Fnt *usedfont, *curfont, *nextfont;
        size_t i, len;
        size_t i, len;
-       int utf8strlen, utf8charlen, render;
+       int utf8strlen, utf8charlen, render = x || y || w || h;
        long utf8codepoint = 0;
        const char *utf8str;
        FcCharSet *fccharset;
        long utf8codepoint = 0;
        const char *utf8str;
        FcCharSet *fccharset;
@@ -234,73 +252,67 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
        XftResult result;
        int charexists = 0;
 
        XftResult result;
        int charexists = 0;
 
-       if (!(render = x || y || w || h)) {
-               w = ~w;
-       }
-
-       if (!drw || !drw->scheme) {
+       if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
                return 0;
                return 0;
-       } else if (render) {
-               XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
-               XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-       }
 
 
-       if (!text || !drw->fontcount) {
-               return 0;
-       } else if (render) {
-               cmap = DefaultColormap(drw->dpy, drw->screen);
-               vis = DefaultVisual(drw->dpy, drw->screen);
-               d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
+       if (!render) {
+               w = ~w;
+       } else {
+               XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
+               XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+               d = XftDrawCreate(drw->dpy, drw->drawable,
+                                 DefaultVisual(drw->dpy, drw->screen),
+                                 DefaultColormap(drw->dpy, drw->screen));
+               x += lpad;
+               w -= lpad;
        }
 
        }
 
-       curfont = drw->fonts[0];
+       usedfont = drw->fonts;
        while (1) {
                utf8strlen = 0;
                utf8str = text;
                nextfont = NULL;
                while (*text) {
                        utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
        while (1) {
                utf8strlen = 0;
                utf8str = text;
                nextfont = NULL;
                while (*text) {
                        utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
-                       for (i = 0; i < drw->fontcount; i++) {
-                               charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
+                       for (curfont = drw->fonts; curfont; curfont = curfont->next) {
+                               charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
                                if (charexists) {
                                if (charexists) {
-                                       if (drw->fonts[i] == curfont) {
+                                       if (curfont == usedfont) {
                                                utf8strlen += utf8charlen;
                                                text += utf8charlen;
                                        } else {
                                                utf8strlen += utf8charlen;
                                                text += utf8charlen;
                                        } else {
-                                               nextfont = drw->fonts[i];
+                                               nextfont = curfont;
                                        }
                                        break;
                                }
                        }
 
                                        }
                                        break;
                                }
                        }
 
-                       if (!charexists || (nextfont && nextfont != curfont)) {
+                       if (!charexists || nextfont)
                                break;
                                break;
-                       } else {
+                       else
                                charexists = 0;
                                charexists = 0;
-                       }
                }
 
                if (utf8strlen) {
                }
 
                if (utf8strlen) {
-                       drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
+                       drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
                        /* shorten text if necessary */
                        /* 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; len--)
+                               drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
 
                        if (len) {
                                memcpy(buf, utf8str, len);
                                buf[len] = '\0';
 
                        if (len) {
                                memcpy(buf, utf8str, len);
                                buf[len] = '\0';
-                               if(len < utf8strlen)
-                                       for(i = len; i && i > len - 3; buf[--i] = '.');
+                               if (len < utf8strlen)
+                                       for (i = len; i && i > len - 3; buf[--i] = '.')
+                                               ; /* NOP */
 
                                if (render) {
 
                                if (render) {
-                                       th = curfont->ascent + curfont->descent;
-                                       ty = y + (h / 2) - (th / 2) + curfont->ascent;
-                                       tx = x + (h / 2);
-                                       XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
+                                       ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
+                                       XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
+                                                         usedfont->xfont, x, ty, (XftChar8 *)buf, len);
                                }
                                }
-
-                               x += tex.w;
-                               w -= tex.w;
+                               x += ew;
+                               w -= ew;
                        }
                }
 
                        }
                }
 
@@ -308,28 +320,21 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                        break;
                } else if (nextfont) {
                        charexists = 0;
                        break;
                } else if (nextfont) {
                        charexists = 0;
-                       curfont = nextfont;
+                       usedfont = nextfont;
                } else {
                        /* Regardless of whether or not a fallback font is found, the
                } else {
                        /* Regardless of whether or not a fallback font is found, the
-                        * character must be drawn.
-                        */
+                        * character must be drawn. */
                        charexists = 1;
 
                        charexists = 1;
 
-                       if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
-                               continue;
-                       }
-
                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 
                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 
-                       if (!drw->fonts[0]->pattern) {
-                               /* Refer to the comment in drw_font_xcreate for more
-                                * information.
-                                */
-                               die("The first font in the cache must be loaded from a font string.\n");
+                       if (!drw->fonts->pattern) {
+                               /* Refer to the comment in xfont_create for more information. */
+                               die("the first font in the cache must be loaded from a font string.\n");
                        }
 
                        }
 
-                       fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
+                       fcpattern = FcPatternDuplicate(drw->fonts->pattern);
                        FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
 
                        FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
 
@@ -341,73 +346,76 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                        FcPatternDestroy(fcpattern);
 
                        if (match) {
                        FcPatternDestroy(fcpattern);
 
                        if (match) {
-                               curfont = drw_font_xcreate(drw, NULL, match);
-                               if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
-                                       drw->fonts[drw->fontcount++] = curfont;
+                               usedfont = xfont_create(drw, NULL, match);
+                               if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
+                                       for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
+                                               ; /* NOP */
+                                       curfont->next = usedfont;
                                } else {
                                } else {
-                                       if (curfont) {
-                                               drw_font_free(curfont);
-                                       }
-                                       curfont = drw->fonts[0];
+                                       xfont_free(usedfont);
+                                       usedfont = drw->fonts;
                                }
                        }
                }
        }
                                }
                        }
                }
        }
-
-       if (render) {
+       if (d)
                XftDrawDestroy(d);
                XftDrawDestroy(d);
-       }
 
 
-       return x;
+       return x + (render ? w : 0);
 }
 
 void
 }
 
 void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
-       if(!drw)
+drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
+{
+       if (!drw)
                return;
                return;
+
        XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
        XSync(drw->dpy, False);
 }
 
        XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
        XSync(drw->dpy, False);
 }
 
+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, 0, text, 0);
+}
 
 void
 
 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;
 
        XGlyphInfo ext;
 
-       if(!font || !text)
+       if (!font || !text)
                return;
                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;
+       XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
+       if (w)
+               *w = ext.xOff;
+       if (h)
+               *h = font->h;
 }
 
 Cur *
 }
 
 Cur *
-drw_cur_create(Drw *drw, int shape) {
+drw_cur_create(Drw *drw, int shape)
+{
        Cur *cur;
 
        Cur *cur;
 
-       if(!drw)
-               return NULL;
-       cur = (Cur *)calloc(1, sizeof(Cur));
-       if (!cur)
+       if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
                return NULL;
                return NULL;
+
        cur->cursor = XCreateFontCursor(drw->dpy, shape);
        cur->cursor = XCreateFontCursor(drw->dpy, shape);
+
        return cur;
 }
 
 void
        return cur;
 }
 
 void
-drw_cur_free(Drw *drw, Cur *cursor) {
-       if(!drw || !cursor)
+drw_cur_free(Drw *drw, Cur *cursor)
+{
+       if (!cursor)
                return;
                return;
+
        XFreeCursor(drw->dpy, cursor->cursor);
        free(cursor);
 }
        XFreeCursor(drw->dpy, cursor->cursor);
        free(cursor);
 }