2 files changed, 18 insertions, 2 deletions

diff --git a/drw.c b/drw.c
index e65d069..7d985b1 100644
--- a/drw.c
+++ b/drw.c
@@ -268,7 +268,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                 return 0;
 
         if (!render) {
-                w = ~w;
+                w = invert ? invert : ~invert;
         } else {
                 XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
                 XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
@@ -300,7 +300,13 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
 
                                         if (ew + tmpw > w) {
                                                 overflow = 1;
-                                                utf8strlen = ellipsis_len;
+                                                /* called from drw_fontset_getwidth_clamp():
+                                                 * it wants the width AFTER the overflow
+                                                 */
+                                                if (!render)
+                                                        x += tmpw;
+                                                else
+                                                        utf8strlen = ellipsis_len;
                                         } else if (curfont == usedfont) {
                                                 utf8strlen += utf8charlen;
                                                 text += utf8charlen;
@@ -397,6 +403,15 @@ drw_fontset_getwidth(Drw *drw, const char *text)
         return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
 }
 
+unsigned int
+drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
+{
+        unsigned int tmp = 0;
+        if (drw && drw->fonts && text && n)
+                tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
+        return MIN(n, tmp);
+}
+
 void
 drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
 {
diff --git a/drw.h b/drw.h
index 4c67419..fd7631b 100644
--- a/drw.h
+++ b/drw.h
@@ -35,6 +35,7 @@ void drw_free(Drw *drw);
 Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
 void drw_fontset_free(Fnt* set);
 unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
+unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
 void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
 
 /* Colorscheme abstraction */