aboutsummaryrefslogtreecommitdiff
path: root/dmenu.c
diff options
context:
space:
mode:
Diffstat (limited to 'dmenu.c')
-rw-r--r--dmenu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/dmenu.c b/dmenu.c
index c367645..f5d2bd1 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -119,7 +119,7 @@ drawmenu(void) {
119 dc->x = dc->w; 119 dc->x = dc->w;
120 } 120 }
121 dc->w = mw - dc->x; 121 dc->w = mw - dc->x;
122 /* print input area */ 122 /* print input field */
123 if(matches && lines == 0 && textw(dc, text) <= inputw) 123 if(matches && lines == 0 && textw(dc, text) <= inputw)
124 dc->w = inputw; 124 dc->w = inputw;
125 drawtext(dc, text, normcol); 125 drawtext(dc, text, normcol);
@@ -339,7 +339,7 @@ keypress(XKeyEvent *e) {
339 339
340void 340void
341match(void) { 341match(void) {
342 unsigned int len; 342 size_t len;
343 Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; 343 Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
344 344
345 len = strlen(text); 345 len = strlen(text);
@@ -454,7 +454,7 @@ setup(void) {
454 selcol[ColBG] = getcolor(dc, selbgcolor); 454 selcol[ColBG] = getcolor(dc, selbgcolor);
455 selcol[ColFG] = getcolor(dc, selfgcolor); 455 selcol[ColFG] = getcolor(dc, selfgcolor);
456 456
457 /* input window geometry */ 457 /* menu geometry */
458 mh = (dc->font.height + 2) * (lines + 1); 458 mh = (dc->font.height + 2) * (lines + 1);
459#ifdef XINERAMA 459#ifdef XINERAMA
460 if((info = XineramaQueryScreens(dc->dpy, &n))) { 460 if((info = XineramaQueryScreens(dc->dpy, &n))) {
@@ -478,7 +478,7 @@ setup(void) {
478 y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; 478 y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
479 mw = DisplayWidth(dc->dpy, screen); 479 mw = DisplayWidth(dc->dpy, screen);
480 } 480 }
481 /* input window */ 481 /* menu window */
482 wa.override_redirect = True; 482 wa.override_redirect = True;
483 wa.background_pixmap = ParentRelative; 483 wa.background_pixmap = ParentRelative;
484 wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; 484 wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
@@ -488,7 +488,7 @@ setup(void) {
488 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); 488 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
489 489
490 grabkeyboard(); 490 grabkeyboard();
491 setcanvas(dc, win, mw, mh); 491 setcanvas(dc, mw, mh);
492 inputw = MIN(inputw, mw/3); 492 inputw = MIN(inputw, mw/3);
493 promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; 493 promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
494 XMapRaised(dc->dpy, win); 494 XMapRaised(dc->dpy, win);