Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
abc...
[dmenu.git]
/
dmenu.c
diff --git
a/dmenu.c
b/dmenu.c
index
a9c0f60
..
d67c1ae
100644
(file)
--- a/
dmenu.c
+++ b/
dmenu.c
@@
-213,8
+213,8
@@
drawmenu(void) {
void
drawtext(const char *text, unsigned long col[ColLast]) {
void
drawtext(const char *text, unsigned long col[ColLast]) {
- int i, x, y, h, len, olen;
char buf[256];
char buf[256];
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
@@
-226,7
+226,7
@@
drawtext(const char *text, unsigned long col[ColLast]) {
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- for(len = MIN(olen, sizeof buf); len &&
(i = textnw(buf, len)
) > dc.w - h; len--);
+ for(len = MIN(olen, sizeof buf); len &&
textnw(buf, len
) > dc.w - h; len--);
if(!len)
return;
memcpy(buf, text, len);
if(!len)
return;
memcpy(buf, text, len);