new libdraw, typo fixes
31ffcd3b
2 file(s) · +6 −6
| 52 | 52 | dmenu lists items vertically, with the given number of lines. |
|
| 53 | 53 | .TP |
|
| 54 | 54 | .BI \-p " prompt" |
|
| 55 | - | defines the prompt to be displayed to the left of the input area. |
|
| 55 | + | defines the prompt to be displayed to the left of the input field. |
|
| 56 | 56 | .TP |
|
| 57 | 57 | .BI \-fn " font" |
|
| 58 | 58 | defines the font set used. |
| 119 | 119 | dc->x = dc->w; |
|
| 120 | 120 | } |
|
| 121 | 121 | dc->w = mw - dc->x; |
|
| 122 | - | /* print input area */ |
|
| 122 | + | /* print input field */ |
|
| 123 | 123 | if(matches && lines == 0 && textw(dc, text) <= inputw) |
|
| 124 | 124 | dc->w = inputw; |
|
| 125 | 125 | drawtext(dc, text, normcol); |
|
| 339 | 339 | ||
| 340 | 340 | void |
|
| 341 | 341 | match(void) { |
|
| 342 | - | unsigned int len; |
|
| 342 | + | size_t len; |
|
| 343 | 343 | Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; |
|
| 344 | 344 | ||
| 345 | 345 | len = strlen(text); |
|
| 454 | 454 | selcol[ColBG] = getcolor(dc, selbgcolor); |
|
| 455 | 455 | selcol[ColFG] = getcolor(dc, selfgcolor); |
|
| 456 | 456 | ||
| 457 | - | /* input window geometry */ |
|
| 457 | + | /* menu geometry */ |
|
| 458 | 458 | mh = (dc->font.height + 2) * (lines + 1); |
|
| 459 | 459 | #ifdef XINERAMA |
|
| 460 | 460 | if((info = XineramaQueryScreens(dc->dpy, &n))) { |
|
| 478 | 478 | y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; |
|
| 479 | 479 | mw = DisplayWidth(dc->dpy, screen); |
|
| 480 | 480 | } |
|
| 481 | - | /* input window */ |
|
| 481 | + | /* menu window */ |
|
| 482 | 482 | wa.override_redirect = True; |
|
| 483 | 483 | wa.background_pixmap = ParentRelative; |
|
| 484 | 484 | wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; |
|
| 488 | 488 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
|
| 489 | 489 | ||
| 490 | 490 | grabkeyboard(); |
|
| 491 | - | setcanvas(dc, win, mw, mh); |
|
| 491 | + | setcanvas(dc, mw, mh); |
|
| 492 | 492 | inputw = MIN(inputw, mw/3); |
|
| 493 | 493 | promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; |
|
| 494 | 494 | XMapRaised(dc->dpy, win); |
|