# HG changeset patch # User Anselm R.Garbe # Date 1155538335 -7200 # Node ID bf6792e3e7008edad2243932e5cc7a76b1c7f5d0 # Parent a47b3b0d7bf4e36104a05ca87db8d7fca8af8a0b fixed string cutting in draw.c diff -r a47b3b0d7bf4 -r bf6792e3e700 draw.c --- a/draw.c Mon Aug 14 08:43:19 2006 +0200 +++ b/draw.c Mon Aug 14 08:52:15 2006 +0200 @@ -26,7 +26,7 @@ { int x, y, w, h; static char buf[256]; - unsigned int len; + unsigned int len, olen; XGCValues gcv; XPoint points[5]; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; @@ -51,7 +51,7 @@ return; w = 0; - len = strlen(text); + olen = len = strlen(text); if(len >= sizeof(buf)) len = sizeof(buf) - 1; memcpy(buf, text, len); @@ -64,6 +64,14 @@ /* shorten text if necessary */ while(len && (w = textnw(buf, len)) > dc.w - h) buf[--len] = 0; + if(len < olen) { + if(len > 3) + memcpy(buf + len - 4, "...\0", 4); + else if(len > 2) + memcpy(buf + len - 3, "..\0", 3); + else if(len > 1) + memcpy(buf + len - 2, ".\0", 2); + } if(w > dc.w) return; /* too long */