From: Anselm R Garbe Date: Mon, 18 Aug 2008 08:55:36 +0000 (+0100) Subject: applied Martin Hurton's drawtext() patch X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=97699e5b1b8d50d2ec332c4643d69d666348d7e9;p=dwm.git applied Martin Hurton's drawtext() patch --- 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]);