about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2008-08-18 09:55:36 +0100
committerAnselm R Garbe <garbeam@gmail.com>2008-08-18 09:55:36 +0100
commit97699e5b1b8d50d2ec332c4643d69d666348d7e9 (patch)
tree12dc3f056d6a47997f085a631c212387bb2d34d7
parent2dc7f42fd7fc8f1fc8d837265221654e8565eb6b (diff)
downloaddwm-97699e5b1b8d50d2ec332c4643d69d666348d7e9.tar.gz
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]);
href='#n150'>150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259