kske/dmenu
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new libdraw, typo fixes

Browse Source
This commit is contained in:
Connor Lane Smith
2010-08-05 15:41:56 +01:00
parent 9cf07b4b9b
commit 31ffcd3b9a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dmenu.1
View File

@@ -52,7 +52,7 @@ dmenu matches menu items case insensitively.
dmenu lists items vertically, with the given number of lines. dmenu lists items vertically, with the given number of lines.
.TP .TP
.BI \-p " prompt" .BI \-p " prompt"
defines the prompt to be displayed to the left of the input area. defines the prompt to be displayed to the left of the input field.
.TP .TP
.BI \-fn " font" .BI \-fn " font"
defines the font set used. defines the font set used.

10
dmenu.c
View File

@@ -119,7 +119,7 @@ drawmenu(void) {
dc->x = dc->w; dc->x = dc->w;
} }
dc->w = mw - dc->x; dc->w = mw - dc->x;
/* print input area */ /* print input field */
if(matches && lines == 0 && textw(dc, text) <= inputw) if(matches && lines == 0 && textw(dc, text) <= inputw)
dc->w = inputw; dc->w = inputw;
drawtext(dc, text, normcol); drawtext(dc, text, normcol);
@@ -339,7 +339,7 @@ keypress(XKeyEvent *e) {
void void
match(void) { match(void) {
unsigned int len; size_t len;
Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
len = strlen(text); len = strlen(text);
@@ -454,7 +454,7 @@ setup(void) {
selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColBG] = getcolor(dc, selbgcolor);
selcol[ColFG] = getcolor(dc, selfgcolor); selcol[ColFG] = getcolor(dc, selfgcolor);
/* input window geometry */ /* menu geometry */
mh = (dc->font.height + 2) * (lines + 1); mh = (dc->font.height + 2) * (lines + 1);
#ifdef XINERAMA #ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) { if((info = XineramaQueryScreens(dc->dpy, &n))) {
@@ -478,7 +478,7 @@ setup(void) {
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
mw = DisplayWidth(dc->dpy, screen); mw = DisplayWidth(dc->dpy, screen);
} }
/* input window */ /* menu window */
wa.override_redirect = True; wa.override_redirect = True;
wa.background_pixmap = ParentRelative; wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
@@ -488,7 +488,7 @@ setup(void) {
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
grabkeyboard(); grabkeyboard();
setcanvas(dc, win, mw, mh); setcanvas(dc, mw, mh);
inputw = MIN(inputw, mw/3); inputw = MIN(inputw, mw/3);
promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
XMapRaised(dc->dpy, win); XMapRaised(dc->dpy, win);