dwm

my fork of dwm
Index Commits Files Refs README LICENSE
commit 97699e5b1b8d50d2ec332c4643d69d666348d7e9
parent 2dc7f42fd7fc8f1fc8d837265221654e8565eb6b
Author: Anselm R Garbe <garbeam@gmail.com>
Date:   Mon, 18 Aug 2008 09:55:36 +0100

applied Martin Hurton's drawtext() patch
Diffstat:
Mdwm.c | 5++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dwm.c b/dwm.c
@@ -577,15 +577,14 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
     if(!text)
         return;
     olen = strlen(text);
-    len = MIN(olen, sizeof buf);
-    memcpy(buf, text, len);
     h = dc.font.ascent + dc.font.descent;
     y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
     x = dc.x + (h / 2);
     /* shorten text if necessary */
-    for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+    for(len = MIN(olen, sizeof buf); len && (i = textnw(buf, len)) > dc.w - h; len--);
     if(!len)
         return;
+    memcpy(buf, text, len);
     if(len < olen)
         for(i = len; i && i > len - 3; buf[--i] = '.');
     XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);