aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R Garbe2008-08-18 09:55:36 +0100
committerAnselm R Garbe2008-08-18 09:55:36 +0100
commit97699e5b1b8d50d2ec332c4643d69d666348d7e9 (patch)
tree12dc3f056d6a47997f085a631c212387bb2d34d7
parent2dc7f42fd7fc8f1fc8d837265221654e8565eb6b (diff)
applied Martin Hurton's drawtext() patch
-rw-r--r--dwm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/dwm.c b/dwm.c
index c31343c..d903e9a 100644
--- 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]);