@@ -11,11 +11,15 @@ static const char *prompt = NULL; /* -p option; prompt to the left of | |||||
static const char *colors[SchemeLast][2] = { | static const char *colors[SchemeLast][2] = { | ||||
/* fg bg */ | /* fg bg */ | ||||
[SchemeNorm] = { "#bbbbbb", "#222222" }, | [SchemeNorm] = { "#bbbbbb", "#222222" }, | ||||
[SchemeSel] = { "#eeeeee", "#41008c" }, | |||||
[SchemeSel] = { "#eeeeee", "#630fe8" }, | |||||
[SchemeOut] = { "#000000", "#00ffff" }, | [SchemeOut] = { "#000000", "#00ffff" }, | ||||
}; | }; | ||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | ||||
static unsigned int lines = 0; | static unsigned int lines = 0; | ||||
static unsigned int lineheight = 37; /* -h option; minimum height of a menu line */ | |||||
static int dmx = 10; /* put dmenu at this x offset */ | |||||
static int dmy = 10; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */ | |||||
static unsigned int dmw = 1900; /* make dmenu this wide */ | |||||
/* | /* | ||||
* Characters not considered part of a word while deleting words | * Characters not considered part of a word while deleting words | ||||
@@ -0,0 +1,24 @@ | |||||
/* See LICENSE file for copyright and license details. */ | |||||
/* Default settings; can be overriden by command line. */ | |||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ | |||||
/* -fn option overrides fonts[0]; default X11 font or font set */ | |||||
static const char *fonts[] = { | |||||
"monospace:size=13", | |||||
"fontawesome:size=15" | |||||
}; | |||||
static const char *prompt = NULL; /* -p option; prompt to the left of input field */ | |||||
static const char *colors[SchemeLast][2] = { | |||||
/* fg bg */ | |||||
[SchemeNorm] = { "#bbbbbb", "#222222" }, | |||||
[SchemeSel] = { "#eeeeee", "#630fe8" }, | |||||
[SchemeOut] = { "#000000", "#00ffff" }, | |||||
}; | |||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | |||||
static unsigned int lines = 0; | |||||
/* | |||||
* Characters not considered part of a word while deleting words | |||||
* for example: " /?\"&[]" | |||||
*/ | |||||
static const char worddelimiters[] = " "; |
@@ -11,11 +11,15 @@ static const char *prompt = NULL; /* -p option; prompt to the left of | |||||
static const char *colors[SchemeLast][2] = { | static const char *colors[SchemeLast][2] = { | ||||
/* fg bg */ | /* fg bg */ | ||||
[SchemeNorm] = { "#bbbbbb", "#222222" }, | [SchemeNorm] = { "#bbbbbb", "#222222" }, | ||||
[SchemeSel] = { "#eeeeee", "#41008c" }, | |||||
[SchemeSel] = { "#eeeeee", "#630fe8" }, | |||||
[SchemeOut] = { "#000000", "#00ffff" }, | [SchemeOut] = { "#000000", "#00ffff" }, | ||||
}; | }; | ||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | ||||
static unsigned int lines = 0; | static unsigned int lines = 0; | ||||
static unsigned int lineheight = 37; /* -h option; minimum height of a menu line */ | |||||
static int dmx = 10; /* put dmenu at this x offset */ | |||||
static int dmy = 10; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */ | |||||
static unsigned int dmw = 1900; /* make dmenu this wide */ | |||||
/* | /* | ||||
* Characters not considered part of a word while deleting words | * Characters not considered part of a word while deleting words | ||||
@@ -0,0 +1,94 @@ | |||||
From 87f92a561c31246f6f9effc0e89ef92677c87746 Mon Sep 17 00:00:00 2001 | |||||
From: astier <aleksandrs.stier@uni-bielefeld.de> | |||||
Date: Wed, 27 Feb 2019 21:44:55 +0100 | |||||
Subject: [PATCH] Add an option which defines the lineheight | |||||
Despite both the panel and dmenu using the same font (a Terminus 12), | |||||
dmenu is shorter and the panel is visible from under the dmenu bar. | |||||
The appearance can be even more distracting when using similar colors | |||||
for background and selections. With the option added by this patch, | |||||
dmenu can be launched with a '-h 24', thus completely covering the panel. | |||||
--- | |||||
config.def.h | 1 + | |||||
dmenu.1 | 3 +++ | |||||
dmenu.c | 10 ++++++++-- | |||||
3 files changed, 12 insertions(+), 2 deletions(-) | |||||
diff --git a/config.def.h b/config.def.h | |||||
index 1edb647..317fa2f 100644 | |||||
--- a/config.def.h | |||||
+++ b/config.def.h | |||||
@@ -15,6 +15,7 @@ static const char *colors[SchemeLast][2] = { | |||||
}; | |||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | |||||
static unsigned int lines = 0; | |||||
+static unsigned int lineheight = 0; /* -h option; minimum height of a menu line */ | |||||
/* | |||||
* Characters not considered part of a word while deleting words | |||||
diff --git a/dmenu.1 b/dmenu.1 | |||||
index 323f93c..7ef34d2 100644 | |||||
--- a/dmenu.1 | |||||
+++ b/dmenu.1 | |||||
@@ -50,6 +50,9 @@ dmenu matches menu items case insensitively. | |||||
.BI \-l " lines" | |||||
dmenu lists items vertically, with the given number of lines. | |||||
.TP | |||||
+.BI \-h " height" | |||||
+dmenu uses a menu line of at least 'height' pixels tall, but no less than 8. | |||||
+.TP | |||||
.BI \-m " monitor" | |||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting | |||||
from 0. | |||||
diff --git a/dmenu.c b/dmenu.c | |||||
index 6b8f51b..45d1946 100644 | |||||
--- a/dmenu.c | |||||
+++ b/dmenu.c | |||||
@@ -131,7 +131,7 @@ drawmenu(void) | |||||
{ | |||||
unsigned int curpos; | |||||
struct item *item; | |||||
- int x = 0, y = 0, w; | |||||
+ int x = 0, y = 0, fh = drw->fonts->h, w; | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_rect(drw, 0, 0, mw, mh, 1, 1); | |||||
@@ -148,7 +148,7 @@ drawmenu(void) | |||||
curpos = TEXTW(text) - TEXTW(&text[cursor]); | |||||
if ((curpos += lrpad / 2 - 1) < w) { | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
- drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); | |||||
+ drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0); | |||||
} | |||||
if (lines > 0) { | |||||
@@ -604,6 +604,7 @@ setup(void) | |||||
/* calculate menu geometry */ | |||||
bh = drw->fonts->h + 2; | |||||
+ bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */ | |||||
lines = MAX(lines, 0); | |||||
mh = (lines + 1) * bh; | |||||
#ifdef XINERAMA | |||||
@@ -683,6 +684,7 @@ static void | |||||
usage(void) | |||||
{ | |||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | |||||
+ " [-h height]\n" | |||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | |||||
exit(1); | |||||
} | |||||
@@ -716,6 +718,10 @@ main(int argc, char *argv[]) | |||||
prompt = argv[++i]; | |||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */ | |||||
fonts[0] = argv[++i]; | |||||
+ else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */ | |||||
+ lineheight = atoi(argv[++i]); | |||||
+ lineheight = MAX(lineheight,8); /* reasonable default in case of value too small/negative */ | |||||
+ } | |||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */ | |||||
colors[SchemeNorm][ColBg] = argv[++i]; | |||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ | |||||
-- | |||||
2.21.0 | |||||
@@ -0,0 +1,116 @@ | |||||
From 7dc7cb96cdda9ad66e33109223c4cc297a7721d1 Mon Sep 17 00:00:00 2001 | |||||
From: Alex Cole <ajzcole@airmail.cc> | |||||
Date: Tue, 6 Oct 2020 10:42:07 +1300 | |||||
Subject: [PATCH] Updated xyw for 5.0 properly | |||||
--- | |||||
dmenu.1 | 24 ++++++++++++++++++++++++ | |||||
dmenu.c | 22 ++++++++++++++++------ | |||||
2 files changed, 40 insertions(+), 6 deletions(-) | |||||
diff --git a/dmenu.1 b/dmenu.1 | |||||
index 323f93c..a4ecbbb 100644 | |||||
--- a/dmenu.1 | |||||
+++ b/dmenu.1 | |||||
@@ -8,6 +8,12 @@ dmenu \- dynamic menu | |||||
.IR lines ] | |||||
.RB [ \-m | |||||
.IR monitor ] | |||||
+.RB [ \-x | |||||
+.IR xoffset ] | |||||
+.RB [ \-y | |||||
+.IR yoffset ] | |||||
+.RB [ \-z | |||||
+.IR width ] | |||||
.RB [ \-p | |||||
.IR prompt ] | |||||
.RB [ \-fn | |||||
@@ -54,6 +60,24 @@ dmenu lists items vertically, with the given number of lines. | |||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting | |||||
from 0. | |||||
.TP | |||||
+.BI \-x " xoffset" | |||||
+dmenu is placed at this offset measured from the left side of the monitor. | |||||
+Can be negative. | |||||
+If option | |||||
+.B \-m | |||||
+is present, the measurement will use the given monitor. | |||||
+.TP | |||||
+.BI \-y " yoffset" | |||||
+dmenu is placed at this offset measured from the top of the monitor. If the | |||||
+.B \-b | |||||
+option is used, the offset is measured from the bottom. Can be negative. | |||||
+If option | |||||
+.B \-m | |||||
+is present, the measurement will use the given monitor. | |||||
+.TP | |||||
+.BI \-z " width" | |||||
+sets the width of the dmenu window. | |||||
+.TP | |||||
.BI \-p " prompt" | |||||
defines the prompt to be displayed to the left of the input field. | |||||
.TP | |||||
diff --git a/dmenu.c b/dmenu.c | |||||
index 65f25ce..7be19ae 100644 | |||||
--- a/dmenu.c | |||||
+++ b/dmenu.c | |||||
@@ -37,6 +37,9 @@ struct item { | |||||
static char text[BUFSIZ] = ""; | |||||
static char *embed; | |||||
static int bh, mw, mh; | |||||
+static int dmx = 0; /* put dmenu at this x offset */ | |||||
+static int dmy = 0; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */ | |||||
+static unsigned int dmw = 0; /* make dmenu this wide */ | |||||
static int inputw = 0, promptw; | |||||
static int lrpad; /* sum of left and right padding */ | |||||
static size_t cursor; | |||||
@@ -637,9 +640,9 @@ setup(void) | |||||
if (INTERSECT(x, y, 1, 1, info[i])) | |||||
break; | |||||
- x = info[i].x_org; | |||||
- y = info[i].y_org + (topbar ? 0 : info[i].height - mh); | |||||
- mw = info[i].width; | |||||
+ x = info[i].x_org + dmx; | |||||
+ y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy); | |||||
+ mw = (dmw>0 ? dmw : info[i].width); | |||||
XFree(info); | |||||
} else | |||||
#endif | |||||
@@ -647,9 +650,9 @@ setup(void) | |||||
if (!XGetWindowAttributes(dpy, parentwin, &wa)) | |||||
die("could not get embedding window attributes: 0x%lx", | |||||
parentwin); | |||||
- x = 0; | |||||
- y = topbar ? 0 : wa.height - mh; | |||||
- mw = wa.width; | |||||
+ x = dmx; | |||||
+ y = topbar ? dmy : wa.height - mh - dmy; | |||||
+ mw = (dmw>0 ? dmw : wa.width); | |||||
} | |||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | |||||
inputw = MIN(inputw, mw/3); | |||||
@@ -690,6 +693,7 @@ static void | |||||
usage(void) | |||||
{ | |||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | |||||
+ " [-x xoffset] [-y yoffset] [-z width]\n" | |||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | |||||
exit(1); | |||||
} | |||||
@@ -717,6 +721,12 @@ main(int argc, char *argv[]) | |||||
/* these options take one argument */ | |||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ | |||||
lines = atoi(argv[++i]); | |||||
+ else if (!strcmp(argv[i], "-x")) /* window x offset */ | |||||
+ dmx = atoi(argv[++i]); | |||||
+ else if (!strcmp(argv[i], "-y")) /* window y offset (from bottom up if -b) */ | |||||
+ dmy = atoi(argv[++i]); | |||||
+ else if (!strcmp(argv[i], "-z")) /* make dmenu this wide */ | |||||
+ dmw = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-m")) | |||||
mon = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ | |||||
-- | |||||
2.28.0 | |||||
@@ -8,6 +8,12 @@ dmenu \- dynamic menu | |||||
.IR lines ] | .IR lines ] | ||||
.RB [ \-m | .RB [ \-m | ||||
.IR monitor ] | .IR monitor ] | ||||
.RB [ \-x | |||||
.IR xoffset ] | |||||
.RB [ \-y | |||||
.IR yoffset ] | |||||
.RB [ \-z | |||||
.IR width ] | |||||
.RB [ \-p | .RB [ \-p | ||||
.IR prompt ] | .IR prompt ] | ||||
.RB [ \-fn | .RB [ \-fn | ||||
@@ -50,10 +56,31 @@ dmenu matches menu items case insensitively. | |||||
.BI \-l " lines" | .BI \-l " lines" | ||||
dmenu lists items vertically, with the given number of lines. | dmenu lists items vertically, with the given number of lines. | ||||
.TP | .TP | ||||
.BI \-h " height" | |||||
dmenu uses a menu line of at least 'height' pixels tall, but no less than 8. | |||||
.TP | |||||
.BI \-m " monitor" | .BI \-m " monitor" | ||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting | dmenu is displayed on the monitor number supplied. Monitor numbers are starting | ||||
from 0. | from 0. | ||||
.TP | .TP | ||||
.BI \-x " xoffset" | |||||
dmenu is placed at this offset measured from the left side of the monitor. | |||||
Can be negative. | |||||
If option | |||||
.B \-m | |||||
is present, the measurement will use the given monitor. | |||||
.TP | |||||
.BI \-y " yoffset" | |||||
dmenu is placed at this offset measured from the top of the monitor. If the | |||||
.B \-b | |||||
option is used, the offset is measured from the bottom. Can be negative. | |||||
If option | |||||
.B \-m | |||||
is present, the measurement will use the given monitor. | |||||
.TP | |||||
.BI \-z " width" | |||||
sets the width of the dmenu window. | |||||
.TP | |||||
.BI \-p " prompt" | .BI \-p " prompt" | ||||
defines the prompt to be displayed to the left of the input field. | defines the prompt to be displayed to the left of the input field. | ||||
.TP | .TP | ||||
@@ -0,0 +1,197 @@ | |||||
.TH DMENU 1 dmenu\-VERSION | |||||
.SH NAME | |||||
dmenu \- dynamic menu | |||||
.SH SYNOPSIS | |||||
.B dmenu | |||||
.RB [ \-bfiv ] | |||||
.RB [ \-l | |||||
.IR lines ] | |||||
.RB [ \-m | |||||
.IR monitor ] | |||||
.RB [ \-p | |||||
.IR prompt ] | |||||
.RB [ \-fn | |||||
.IR font ] | |||||
.RB [ \-nb | |||||
.IR color ] | |||||
.RB [ \-nf | |||||
.IR color ] | |||||
.RB [ \-sb | |||||
.IR color ] | |||||
.RB [ \-sf | |||||
.IR color ] | |||||
.RB [ \-w | |||||
.IR windowid ] | |||||
.P | |||||
.BR dmenu_run " ..." | |||||
.SH DESCRIPTION | |||||
.B dmenu | |||||
is a dynamic menu for X, which reads a list of newline\-separated items from | |||||
stdin. When the user selects an item and presses Return, their choice is printed | |||||
to stdout and dmenu terminates. Entering text will narrow the items to those | |||||
matching the tokens in the input. | |||||
.P | |||||
.B dmenu_run | |||||
is a script used by | |||||
.IR dwm (1) | |||||
which lists programs in the user's $PATH and runs the result in their $SHELL. | |||||
.SH OPTIONS | |||||
.TP | |||||
.B \-b | |||||
dmenu appears at the bottom of the screen. | |||||
.TP | |||||
.B \-f | |||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This | |||||
is faster, but will lock up X until stdin reaches end\-of\-file. | |||||
.TP | |||||
.B \-i | |||||
dmenu matches menu items case insensitively. | |||||
.TP | |||||
.BI \-l " lines" | |||||
dmenu lists items vertically, with the given number of lines. | |||||
.TP | |||||
.BI \-h " height" | |||||
dmenu uses a menu line of at least 'height' pixels tall, but no less than 8. | |||||
.TP | |||||
.BI \-m " monitor" | |||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting | |||||
from 0. | |||||
.TP | |||||
.BI \-p " prompt" | |||||
defines the prompt to be displayed to the left of the input field. | |||||
.TP | |||||
.BI \-fn " font" | |||||
defines the font or font set used. | |||||
.TP | |||||
.BI \-nb " color" | |||||
defines the normal background color. | |||||
.IR #RGB , | |||||
.IR #RRGGBB , | |||||
and X color names are supported. | |||||
.TP | |||||
.BI \-nf " color" | |||||
defines the normal foreground color. | |||||
.TP | |||||
.BI \-sb " color" | |||||
defines the selected background color. | |||||
.TP | |||||
.BI \-sf " color" | |||||
defines the selected foreground color. | |||||
.TP | |||||
.B \-v | |||||
prints version information to stdout, then exits. | |||||
.TP | |||||
.BI \-w " windowid" | |||||
embed into windowid. | |||||
.SH USAGE | |||||
dmenu is completely controlled by the keyboard. Items are selected using the | |||||
arrow keys, page up, page down, home, and end. | |||||
.TP | |||||
.B Tab | |||||
Copy the selected item to the input field. | |||||
.TP | |||||
.B Return | |||||
Confirm selection. Prints the selected item to stdout and exits, returning | |||||
success. | |||||
.TP | |||||
.B Ctrl-Return | |||||
Confirm selection. Prints the selected item to stdout and continues. | |||||
.TP | |||||
.B Shift\-Return | |||||
Confirm input. Prints the input text to stdout and exits, returning success. | |||||
.TP | |||||
.B Escape | |||||
Exit without selecting an item, returning failure. | |||||
.TP | |||||
.B Ctrl-Left | |||||
Move cursor to the start of the current word | |||||
.TP | |||||
.B Ctrl-Right | |||||
Move cursor to the end of the current word | |||||
.TP | |||||
.B C\-a | |||||
Home | |||||
.TP | |||||
.B C\-b | |||||
Left | |||||
.TP | |||||
.B C\-c | |||||
Escape | |||||
.TP | |||||
.B C\-d | |||||
Delete | |||||
.TP | |||||
.B C\-e | |||||
End | |||||
.TP | |||||
.B C\-f | |||||
Right | |||||
.TP | |||||
.B C\-g | |||||
Escape | |||||
.TP | |||||
.B C\-h | |||||
Backspace | |||||
.TP | |||||
.B C\-i | |||||
Tab | |||||
.TP | |||||
.B C\-j | |||||
Return | |||||
.TP | |||||
.B C\-J | |||||
Shift-Return | |||||
.TP | |||||
.B C\-k | |||||
Delete line right | |||||
.TP | |||||
.B C\-m | |||||
Return | |||||
.TP | |||||
.B C\-M | |||||
Shift-Return | |||||
.TP | |||||
.B C\-n | |||||
Down | |||||
.TP | |||||
.B C\-p | |||||
Up | |||||
.TP | |||||
.B C\-u | |||||
Delete line left | |||||
.TP | |||||
.B C\-w | |||||
Delete word left | |||||
.TP | |||||
.B C\-y | |||||
Paste from primary X selection | |||||
.TP | |||||
.B C\-Y | |||||
Paste from X clipboard | |||||
.TP | |||||
.B M\-b | |||||
Move cursor to the start of the current word | |||||
.TP | |||||
.B M\-f | |||||
Move cursor to the end of the current word | |||||
.TP | |||||
.B M\-g | |||||
Home | |||||
.TP | |||||
.B M\-G | |||||
End | |||||
.TP | |||||
.B M\-h | |||||
Up | |||||
.TP | |||||
.B M\-j | |||||
Page down | |||||
.TP | |||||
.B M\-k | |||||
Page up | |||||
.TP | |||||
.B M\-l | |||||
Down | |||||
.SH SEE ALSO | |||||
.IR dwm (1), | |||||
.IR stest (1) |
@@ -131,7 +131,7 @@ drawmenu(void) | |||||
{ | { | ||||
unsigned int curpos; | unsigned int curpos; | ||||
struct item *item; | struct item *item; | ||||
int x = 0, y = 0, w; | |||||
int x = 0, y = 0, fh = drw->fonts->h, w; | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | drw_setscheme(drw, scheme[SchemeNorm]); | ||||
drw_rect(drw, 0, 0, mw, mh, 1, 1); | drw_rect(drw, 0, 0, mw, mh, 1, 1); | ||||
@@ -148,7 +148,7 @@ drawmenu(void) | |||||
curpos = TEXTW(text) - TEXTW(&text[cursor]); | curpos = TEXTW(text) - TEXTW(&text[cursor]); | ||||
if ((curpos += lrpad / 2 - 1) < w) { | if ((curpos += lrpad / 2 - 1) < w) { | ||||
drw_setscheme(drw, scheme[SchemeNorm]); | drw_setscheme(drw, scheme[SchemeNorm]); | ||||
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); | |||||
drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0); | |||||
} | } | ||||
if (lines > 0) { | if (lines > 0) { | ||||
@@ -609,6 +609,7 @@ setup(void) | |||||
/* calculate menu geometry */ | /* calculate menu geometry */ | ||||
bh = drw->fonts->h + 2; | bh = drw->fonts->h + 2; | ||||
bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */ | |||||
lines = MAX(lines, 0); | lines = MAX(lines, 0); | ||||
mh = (lines + 1) * bh; | mh = (lines + 1) * bh; | ||||
#ifdef XINERAMA | #ifdef XINERAMA | ||||
@@ -637,9 +638,9 @@ setup(void) | |||||
if (INTERSECT(x, y, 1, 1, info[i])) | if (INTERSECT(x, y, 1, 1, info[i])) | ||||
break; | break; | ||||
x = info[i].x_org; | |||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh); | |||||
mw = info[i].width; | |||||
x = info[i].x_org + dmx; | |||||
y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy); | |||||
mw = (dmw>0 ? dmw : info[i].width); | |||||
XFree(info); | XFree(info); | ||||
} else | } else | ||||
#endif | #endif | ||||
@@ -647,9 +648,9 @@ setup(void) | |||||
if (!XGetWindowAttributes(dpy, parentwin, &wa)) | if (!XGetWindowAttributes(dpy, parentwin, &wa)) | ||||
die("could not get embedding window attributes: 0x%lx", | die("could not get embedding window attributes: 0x%lx", | ||||
parentwin); | parentwin); | ||||
x = 0; | |||||
y = topbar ? 0 : wa.height - mh; | |||||
mw = wa.width; | |||||
x = dmx; | |||||
y = topbar ? dmy : wa.height - mh - dmy; | |||||
mw = (dmw>0 ? dmw : wa.width); | |||||
} | } | ||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | ||||
inputw = MIN(inputw, mw/3); | inputw = MIN(inputw, mw/3); | ||||
@@ -690,6 +691,8 @@ static void | |||||
usage(void) | usage(void) | ||||
{ | { | ||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | ||||
" [-x xoffset] [-y yoffset] [-z width]\n" | |||||
" [-h height]\n" | |||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | ||||
exit(1); | exit(1); | ||||
} | } | ||||
@@ -717,12 +720,22 @@ main(int argc, char *argv[]) | |||||
/* these options take one argument */ | /* these options take one argument */ | ||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ | else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ | ||||
lines = atoi(argv[++i]); | lines = atoi(argv[++i]); | ||||
else if (!strcmp(argv[i], "-x")) /* window x offset */ | |||||
dmx = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-y")) /* window y offset (from bottom up if -b) */ | |||||
dmy = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-z")) /* make dmenu this wide */ | |||||
dmw = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-m")) | else if (!strcmp(argv[i], "-m")) | ||||
mon = atoi(argv[++i]); | mon = atoi(argv[++i]); | ||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ | else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ | ||||
prompt = argv[++i]; | prompt = argv[++i]; | ||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */ | else if (!strcmp(argv[i], "-fn")) /* font or font set */ | ||||
fonts[0] = argv[++i]; | fonts[0] = argv[++i]; | ||||
else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */ | |||||
lineheight = atoi(argv[++i]); | |||||
lineheight = MAX(lineheight,8); /* reasonable default in case of value too small/negative */ | |||||
} | |||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */ | else if (!strcmp(argv[i], "-nb")) /* normal background color */ | ||||
colors[SchemeNorm][ColBg] = argv[++i]; | colors[SchemeNorm][ColBg] = argv[++i]; | ||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ | else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ | ||||
@@ -0,0 +1,777 @@ | |||||
/* See LICENSE file for copyright and license details. */ | |||||
#include <ctype.h> | |||||
#include <locale.h> | |||||
#include <stdio.h> | |||||
#include <stdlib.h> | |||||
#include <string.h> | |||||
#include <strings.h> | |||||
#include <time.h> | |||||
#include <unistd.h> | |||||
#include <X11/Xlib.h> | |||||
#include <X11/Xatom.h> | |||||
#include <X11/Xutil.h> | |||||
#ifdef XINERAMA | |||||
#include <X11/extensions/Xinerama.h> | |||||
#endif | |||||
#include <X11/Xft/Xft.h> | |||||
#include "drw.h" | |||||
#include "util.h" | |||||
/* macros */ | |||||
#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ | |||||
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) | |||||
#define LENGTH(X) (sizeof X / sizeof X[0]) | |||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) | |||||
/* enums */ | |||||
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ | |||||
struct item { | |||||
char *text; | |||||
struct item *left, *right; | |||||
int out; | |||||
}; | |||||
static char text[BUFSIZ] = ""; | |||||
static char *embed; | |||||
static int bh, mw, mh; | |||||
static int inputw = 0, promptw; | |||||
static int lrpad; /* sum of left and right padding */ | |||||
static size_t cursor; | |||||
static struct item *items = NULL; | |||||
static struct item *matches, *matchend; | |||||
static struct item *prev, *curr, *next, *sel; | |||||
static int mon = -1, screen; | |||||
static Atom clip, utf8; | |||||
static Display *dpy; | |||||
static Window root, parentwin, win; | |||||
static XIC xic; | |||||
static Drw *drw; | |||||
static Clr *scheme[SchemeLast]; | |||||
#include "config.h" | |||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; | |||||
static char *(*fstrstr)(const char *, const char *) = strstr; | |||||
static void | |||||
appenditem(struct item *item, struct item **list, struct item **last) | |||||
{ | |||||
if (*last) | |||||
(*last)->right = item; | |||||
else | |||||
*list = item; | |||||
item->left = *last; | |||||
item->right = NULL; | |||||
*last = item; | |||||
} | |||||
static void | |||||
calcoffsets(void) | |||||
{ | |||||
int i, n; | |||||
if (lines > 0) | |||||
n = lines * bh; | |||||
else | |||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); | |||||
/* calculate which items will begin the next page and previous page */ | |||||
for (i = 0, next = curr; next; next = next->right) | |||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n) | |||||
break; | |||||
for (i = 0, prev = curr; prev && prev->left; prev = prev->left) | |||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) | |||||
break; | |||||
} | |||||
static void | |||||
cleanup(void) | |||||
{ | |||||
size_t i; | |||||
XUngrabKey(dpy, AnyKey, AnyModifier, root); | |||||
for (i = 0; i < SchemeLast; i++) | |||||
free(scheme[i]); | |||||
drw_free(drw); | |||||
XSync(dpy, False); | |||||
XCloseDisplay(dpy); | |||||
} | |||||
static char * | |||||
cistrstr(const char *s, const char *sub) | |||||
{ | |||||
size_t len; | |||||
for (len = strlen(sub); *s; s++) | |||||
if (!strncasecmp(s, sub, len)) | |||||
return (char *)s; | |||||
return NULL; | |||||
} | |||||
static int | |||||
drawitem(struct item *item, int x, int y, int w) | |||||
{ | |||||
if (item == sel) | |||||
drw_setscheme(drw, scheme[SchemeSel]); | |||||
else if (item->out) | |||||
drw_setscheme(drw, scheme[SchemeOut]); | |||||
else | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); | |||||
} | |||||
static void | |||||
drawmenu(void) | |||||
{ | |||||
unsigned int curpos; | |||||
struct item *item; | |||||
int x = 0, y = 0, fh = drw->fonts->h, w; | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_rect(drw, 0, 0, mw, mh, 1, 1); | |||||
if (prompt && *prompt) { | |||||
drw_setscheme(drw, scheme[SchemeSel]); | |||||
x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); | |||||
} | |||||
/* draw input field */ | |||||
w = (lines > 0 || !matches) ? mw - x : inputw; | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); | |||||
curpos = TEXTW(text) - TEXTW(&text[cursor]); | |||||
if ((curpos += lrpad / 2 - 1) < w) { | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0); | |||||
} | |||||
if (lines > 0) { | |||||
/* draw vertical list */ | |||||
for (item = curr; item != next; item = item->right) | |||||
drawitem(item, x, y += bh, mw - x); | |||||
} else if (matches) { | |||||
/* draw horizontal list */ | |||||
x += inputw; | |||||
w = TEXTW("<"); | |||||
if (curr->left) { | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0); | |||||
} | |||||
x += w; | |||||
for (item = curr; item != next; item = item->right) | |||||
x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">"))); | |||||
if (next) { | |||||
w = TEXTW(">"); | |||||
drw_setscheme(drw, scheme[SchemeNorm]); | |||||
drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); | |||||
} | |||||
} | |||||
drw_map(drw, win, 0, 0, mw, mh); | |||||
} | |||||
static void | |||||
grabfocus(void) | |||||
{ | |||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; | |||||
Window focuswin; | |||||
int i, revertwin; | |||||
for (i = 0; i < 100; ++i) { | |||||
XGetInputFocus(dpy, &focuswin, &revertwin); | |||||
if (focuswin == win) | |||||
return; | |||||
XSetInputFocus(dpy, win, RevertToParent, CurrentTime); | |||||
nanosleep(&ts, NULL); | |||||
} | |||||
die("cannot grab focus"); | |||||
} | |||||
static void | |||||
grabkeyboard(void) | |||||
{ | |||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; | |||||
int i; | |||||
if (embed) | |||||
return; | |||||
/* try to grab keyboard, we may have to wait for another process to ungrab */ | |||||
for (i = 0; i < 1000; i++) { | |||||
if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, | |||||
GrabModeAsync, CurrentTime) == GrabSuccess) | |||||
return; | |||||
nanosleep(&ts, NULL); | |||||
} | |||||
die("cannot grab keyboard"); | |||||
} | |||||
static void | |||||
match(void) | |||||
{ | |||||
static char **tokv = NULL; | |||||
static int tokn = 0; | |||||
char buf[sizeof text], *s; | |||||
int i, tokc = 0; | |||||
size_t len, textsize; | |||||
struct item *item, *lprefix, *lsubstr, *prefixend, *substrend; | |||||
strcpy(buf, text); | |||||
/* separate input text into tokens to be matched individually */ | |||||
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " ")) | |||||
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) | |||||
die("cannot realloc %u bytes:", tokn * sizeof *tokv); | |||||
len = tokc ? strlen(tokv[0]) : 0; | |||||
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; | |||||
textsize = strlen(text) + 1; | |||||
for (item = items; item && item->text; item++) { | |||||
for (i = 0; i < tokc; i++) | |||||
if (!fstrstr(item->text, tokv[i])) | |||||
break; | |||||
if (i != tokc) /* not all tokens match */ | |||||
continue; | |||||
/* exact matches go first, then prefixes, then substrings */ | |||||
if (!tokc || !fstrncmp(text, item->text, textsize)) | |||||
appenditem(item, &matches, &matchend); | |||||
else if (!fstrncmp(tokv[0], item->text, len)) | |||||
appenditem(item, &lprefix, &prefixend); | |||||
else | |||||
appenditem(item, &lsubstr, &substrend); | |||||
} | |||||
if (lprefix) { | |||||
if (matches) { | |||||
matchend->right = lprefix; | |||||
lprefix->left = matchend; | |||||
} else | |||||
matches = lprefix; | |||||
matchend = prefixend; | |||||
} | |||||
if (lsubstr) { | |||||
if (matches) { | |||||
matchend->right = lsubstr; | |||||
lsubstr->left = matchend; | |||||
} else | |||||
matches = lsubstr; | |||||
matchend = substrend; | |||||
} | |||||
curr = sel = matches; | |||||
calcoffsets(); | |||||
} | |||||
static void | |||||
insert(const char *str, ssize_t n) | |||||
{ | |||||
if (strlen(text) + n > sizeof text - 1) | |||||
return; | |||||
/* move existing text out of the way, insert new text, and update cursor */ | |||||
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); | |||||
if (n > 0) | |||||
memcpy(&text[cursor], str, n); | |||||
cursor += n; | |||||
match(); | |||||
} | |||||
static size_t | |||||
nextrune(int inc) | |||||
{ | |||||
ssize_t n; | |||||
/* return location of next utf8 rune in the given direction (+1 or -1) */ | |||||
for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc) | |||||
; | |||||
return n; | |||||
} | |||||
static void | |||||
movewordedge(int dir) | |||||
{ | |||||
if (dir < 0) { /* move cursor to the start of the word*/ | |||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) | |||||
cursor = nextrune(-1); | |||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) | |||||
cursor = nextrune(-1); | |||||
} else { /* move cursor to the end of the word */ | |||||
while (text[cursor] && strchr(worddelimiters, text[cursor])) | |||||
cursor = nextrune(+1); | |||||
while (text[cursor] && !strchr(worddelimiters, text[cursor])) | |||||
cursor = nextrune(+1); | |||||
} | |||||
} | |||||
static void | |||||
keypress(XKeyEvent *ev) | |||||
{ | |||||
char buf[32]; | |||||
int len; | |||||
KeySym ksym; | |||||
Status status; | |||||
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); | |||||
switch (status) { | |||||
default: /* XLookupNone, XBufferOverflow */ | |||||
return; | |||||
case XLookupChars: | |||||
goto insert; | |||||
case XLookupKeySym: | |||||
case XLookupBoth: | |||||
break; | |||||
} | |||||
if (ev->state & ControlMask) { | |||||
switch(ksym) { | |||||
case XK_a: ksym = XK_Home; break; | |||||
case XK_b: ksym = XK_Left; break; | |||||
case XK_c: ksym = XK_Escape; break; | |||||
case XK_d: ksym = XK_Delete; break; | |||||
case XK_e: ksym = XK_End; break; | |||||
case XK_f: ksym = XK_Right; break; | |||||
case XK_g: ksym = XK_Escape; break; | |||||
case XK_h: ksym = XK_BackSpace; break; | |||||
case XK_i: ksym = XK_Tab; break; | |||||
case XK_j: /* fallthrough */ | |||||
case XK_J: /* fallthrough */ | |||||
case XK_m: /* fallthrough */ | |||||
case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; | |||||
case XK_n: ksym = XK_Down; break; | |||||
case XK_p: ksym = XK_Up; break; | |||||
case XK_k: /* delete right */ | |||||
text[cursor] = '\0'; | |||||
match(); | |||||
break; | |||||
case XK_u: /* delete left */ | |||||
insert(NULL, 0 - cursor); | |||||
break; | |||||
case XK_w: /* delete word */ | |||||
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) | |||||
insert(NULL, nextrune(-1) - cursor); | |||||
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) | |||||
insert(NULL, nextrune(-1) - cursor); | |||||
break; | |||||
case XK_y: /* paste selection */ | |||||
case XK_Y: | |||||
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, | |||||
utf8, utf8, win, CurrentTime); | |||||
return; | |||||
case XK_Left: | |||||
movewordedge(-1); | |||||
goto draw; | |||||
case XK_Right: | |||||
movewordedge(+1); | |||||
goto draw; | |||||
case XK_Return: | |||||
case XK_KP_Enter: | |||||
break; | |||||
case XK_bracketleft: | |||||
cleanup(); | |||||
exit(1); | |||||
default: | |||||
return; | |||||
} | |||||
} else if (ev->state & Mod1Mask) { | |||||
switch(ksym) { | |||||
case XK_b: | |||||
movewordedge(-1); | |||||
goto draw; | |||||
case XK_f: | |||||
movewordedge(+1); | |||||
goto draw; | |||||
case XK_g: ksym = XK_Home; break; | |||||
case XK_G: ksym = XK_End; break; | |||||
case XK_h: ksym = XK_Up; break; | |||||
case XK_j: ksym = XK_Next; break; | |||||
case XK_k: ksym = XK_Prior; break; | |||||
case XK_l: ksym = XK_Down; break; | |||||
default: | |||||
return; | |||||
} | |||||
} | |||||
switch(ksym) { | |||||
default: | |||||
insert: | |||||
if (!iscntrl(*buf)) | |||||
insert(buf, len); | |||||
break; | |||||
case XK_Delete: | |||||
if (text[cursor] == '\0') | |||||
return; | |||||
cursor = nextrune(+1); | |||||
/* fallthrough */ | |||||
case XK_BackSpace: | |||||
if (cursor == 0) | |||||
return; | |||||
insert(NULL, nextrune(-1) - cursor); | |||||
break; | |||||
case XK_End: | |||||
if (text[cursor] != '\0') { | |||||
cursor = strlen(text); | |||||
break; | |||||
} | |||||
if (next) { | |||||
/* jump to end of list and position items in reverse */ | |||||
curr = matchend; | |||||
calcoffsets(); | |||||
curr = prev; | |||||
calcoffsets(); | |||||
while (next && (curr = curr->right)) | |||||
calcoffsets(); | |||||
} | |||||
sel = matchend; | |||||
break; | |||||
case XK_Escape: | |||||
cleanup(); | |||||
exit(1); | |||||
case XK_Home: | |||||
if (sel == matches) { | |||||
cursor = 0; | |||||
break; | |||||
} | |||||
sel = curr = matches; | |||||
calcoffsets(); | |||||
break; | |||||
case XK_Left: | |||||
if (cursor > 0 && (!sel || !sel->left || lines > 0)) { | |||||
cursor = nextrune(-1); | |||||
break; | |||||
} | |||||
if (lines > 0) | |||||
return; | |||||
/* fallthrough */ | |||||
case XK_Up: | |||||
if (sel && sel->left && (sel = sel->left)->right == curr) { | |||||
curr = prev; | |||||
calcoffsets(); | |||||
} | |||||
break; | |||||
case XK_Next: | |||||
if (!next) | |||||
return; | |||||
sel = curr = next; | |||||
calcoffsets(); | |||||
break; | |||||
case XK_Prior: | |||||
if (!prev) | |||||
return; | |||||
sel = curr = prev; | |||||
calcoffsets(); | |||||
break; | |||||
case XK_Return: | |||||
case XK_KP_Enter: | |||||
puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); | |||||
if (!(ev->state & ControlMask)) { | |||||
cleanup(); | |||||
exit(0); | |||||
} | |||||
if (sel) | |||||
sel->out = 1; | |||||
break; | |||||
case XK_Right: | |||||
if (text[cursor] != '\0') { | |||||
cursor = nextrune(+1); | |||||
break; | |||||
} | |||||
if (lines > 0) | |||||
return; | |||||
/* fallthrough */ | |||||
case XK_Down: | |||||
if (sel && sel->right && (sel = sel->right) == next) { | |||||
curr = next; | |||||
calcoffsets(); | |||||
} | |||||
break; | |||||
case XK_Tab: | |||||
if (!sel) | |||||
return; | |||||
strncpy(text, sel->text, sizeof text - 1); | |||||
text[sizeof text - 1] = '\0'; | |||||
cursor = strlen(text); | |||||
match(); | |||||
break; | |||||
} | |||||
draw: | |||||
drawmenu(); | |||||
} | |||||
static void | |||||
paste(void) | |||||
{ | |||||
char *p, *q; | |||||
int di; | |||||
unsigned long dl; | |||||
Atom da; | |||||
/* we have been given the current selection, now insert it into input */ | |||||
if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, | |||||
utf8, &da, &di, &dl, &dl, (unsigned char **)&p) | |||||
== Success && p) { | |||||
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); | |||||
XFree(p); | |||||
} | |||||
drawmenu(); | |||||
} | |||||
static void | |||||
readstdin(void) | |||||
{ | |||||
char buf[sizeof text], *p; | |||||
size_t i, imax = 0, size = 0; | |||||
unsigned int tmpmax = 0; | |||||
/* read each line from stdin and add it to the item list */ | |||||
for (i = 0; fgets(buf, sizeof buf, stdin); i++) { | |||||
if (i + 1 >= size / sizeof *items) | |||||
if (!(items = realloc(items, (size += BUFSIZ)))) | |||||
die("cannot realloc %u bytes:", size); | |||||
if ((p = strchr(buf, '\n'))) | |||||
*p = '\0'; | |||||
if (!(items[i].text = strdup(buf))) | |||||
die("cannot strdup %u bytes:", strlen(buf) + 1); | |||||
items[i].out = 0; | |||||
drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); | |||||
if (tmpmax > inputw) { | |||||
inputw = tmpmax; | |||||
imax = i; | |||||
} | |||||
} | |||||
if (items) | |||||
items[i].text = NULL; | |||||
inputw = items ? TEXTW(items[imax].text) : 0; | |||||
lines = MIN(lines, i); | |||||
} | |||||
static void | |||||
run(void) | |||||
{ | |||||
XEvent ev; | |||||
while (!XNextEvent(dpy, &ev)) { | |||||
if (XFilterEvent(&ev, win)) | |||||
continue; | |||||
switch(ev.type) { | |||||
case DestroyNotify: | |||||
if (ev.xdestroywindow.window != win) | |||||
break; | |||||
cleanup(); | |||||
exit(1); | |||||
case Expose: | |||||
if (ev.xexpose.count == 0) | |||||
drw_map(drw, win, 0, 0, mw, mh); | |||||
break; | |||||
case FocusIn: | |||||
/* regrab focus from parent window */ | |||||
if (ev.xfocus.window != win) | |||||
grabfocus(); | |||||
break; | |||||
case KeyPress: | |||||
keypress(&ev.xkey); | |||||
break; | |||||
case SelectionNotify: | |||||
if (ev.xselection.property == utf8) | |||||
paste(); | |||||
break; | |||||
case VisibilityNotify: | |||||
if (ev.xvisibility.state != VisibilityUnobscured) | |||||
XRaiseWindow(dpy, win); | |||||
break; | |||||
} | |||||
} | |||||
} | |||||
static void | |||||
setup(void) | |||||
{ | |||||
int x, y, i, j; | |||||
unsigned int du; | |||||
XSetWindowAttributes swa; | |||||
XIM xim; | |||||
Window w, dw, *dws; | |||||
XWindowAttributes wa; | |||||
XClassHint ch = {"dmenu", "dmenu"}; | |||||
#ifdef XINERAMA | |||||
XineramaScreenInfo *info; | |||||
Window pw; | |||||
int a, di, n, area = 0; | |||||
#endif | |||||
/* init appearance */ | |||||
for (j = 0; j < SchemeLast; j++) | |||||
scheme[j] = drw_scm_create(drw, colors[j], 2); | |||||
clip = XInternAtom(dpy, "CLIPBOARD", False); | |||||
utf8 = XInternAtom(dpy, "UTF8_STRING", False); | |||||
/* calculate menu geometry */ | |||||
bh = drw->fonts->h + 2; | |||||
bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */ | |||||
lines = MAX(lines, 0); | |||||
mh = (lines + 1) * bh; | |||||
#ifdef XINERAMA | |||||
i = 0; | |||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { | |||||
XGetInputFocus(dpy, &w, &di); | |||||
if (mon >= 0 && mon < n) | |||||
i = mon; | |||||
else if (w != root && w != PointerRoot && w != None) { | |||||
/* find top-level window containing current input focus */ | |||||
do { | |||||
if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) | |||||
XFree(dws); | |||||
} while (w != root && w != pw); | |||||
/* find xinerama screen with which the window intersects most */ | |||||
if (XGetWindowAttributes(dpy, pw, &wa)) | |||||
for (j = 0; j < n; j++) | |||||
if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { | |||||
area = a; | |||||
i = j; | |||||
} | |||||
} | |||||
/* no focused window is on screen, so use pointer location instead */ | |||||
if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) | |||||
for (i = 0; i < n; i++) | |||||
if (INTERSECT(x, y, 1, 1, info[i])) | |||||
break; | |||||
x = info[i].x_org; | |||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh); | |||||
mw = info[i].width; | |||||
XFree(info); | |||||
} else | |||||
#endif | |||||
{ | |||||
if (!XGetWindowAttributes(dpy, parentwin, &wa)) | |||||
die("could not get embedding window attributes: 0x%lx", | |||||
parentwin); | |||||
x = 0; | |||||
y = topbar ? 0 : wa.height - mh; | |||||
mw = wa.width; | |||||
} | |||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | |||||
inputw = MIN(inputw, mw/3); | |||||
match(); | |||||
/* create menu window */ | |||||
swa.override_redirect = True; | |||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; | |||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; | |||||
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, | |||||
CopyFromParent, CopyFromParent, CopyFromParent, | |||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); | |||||
XSetClassHint(dpy, win, &ch); | |||||
/* input methods */ | |||||
if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) | |||||
die("XOpenIM failed: could not open input device"); | |||||
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, | |||||
XNClientWindow, win, XNFocusWindow, win, NULL); | |||||
XMapRaised(dpy, win); | |||||
if (embed) { | |||||
XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); | |||||
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { | |||||
for (i = 0; i < du && dws[i] != win; ++i) | |||||
XSelectInput(dpy, dws[i], FocusChangeMask); | |||||
XFree(dws); | |||||
} | |||||
grabfocus(); | |||||
} | |||||
drw_resize(drw, mw, mh); | |||||
drawmenu(); | |||||
} | |||||
static void | |||||
usage(void) | |||||
{ | |||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | |||||
" [-h height]\n" | |||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | |||||
exit(1); | |||||
} | |||||
int | |||||
main(int argc, char *argv[]) | |||||
{ | |||||
XWindowAttributes wa; | |||||
int i, fast = 0; | |||||
for (i = 1; i < argc; i++) | |||||
/* these options take no arguments */ | |||||
if (!strcmp(argv[i], "-v")) { /* prints version information */ | |||||
puts("dmenu-"VERSION); | |||||
exit(0); | |||||
} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ | |||||
topbar = 0; | |||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ | |||||
fast = 1; | |||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ | |||||
fstrncmp = strncasecmp; | |||||
fstrstr = cistrstr; | |||||
} else if (i + 1 == argc) | |||||
usage(); | |||||
/* these options take one argument */ | |||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ | |||||
lines = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-m")) | |||||
mon = atoi(argv[++i]); | |||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ | |||||
prompt = argv[++i]; | |||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */ | |||||
fonts[0] = argv[++i]; | |||||
else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */ | |||||
lineheight = atoi(argv[++i]); | |||||
lineheight = MAX(lineheight,8); /* reasonable default in case of value too small/negative */ | |||||
} | |||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */ | |||||
colors[SchemeNorm][ColBg] = argv[++i]; | |||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ | |||||
colors[SchemeNorm][ColFg] = argv[++i]; | |||||
else if (!strcmp(argv[i], "-sb")) /* selected background color */ | |||||
colors[SchemeSel][ColBg] = argv[++i]; | |||||
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ | |||||
colors[SchemeSel][ColFg] = argv[++i]; | |||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */ | |||||
embed = argv[++i]; | |||||
else | |||||
usage(); | |||||
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) | |||||
fputs("warning: no locale support\n", stderr); | |||||
if (!(dpy = XOpenDisplay(NULL))) | |||||
die("cannot open display"); | |||||
screen = DefaultScreen(dpy); | |||||
root = RootWindow(dpy, screen); | |||||
if (!embed || !(parentwin = strtol(embed, NULL, 0))) | |||||
parentwin = root; | |||||
if (!XGetWindowAttributes(dpy, parentwin, &wa)) | |||||
die("could not get embedding window attributes: 0x%lx", | |||||
parentwin); | |||||
drw = drw_create(dpy, screen, root, wa.width, wa.height); | |||||
if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) | |||||
die("no fonts could be loaded."); | |||||
lrpad = drw->fonts->h; | |||||
#ifdef __OpenBSD__ | |||||
if (pledge("stdio rpath", NULL) == -1) | |||||
die("pledge"); | |||||
#endif | |||||
if (fast && !isatty(0)) { | |||||
grabkeyboard(); | |||||
readstdin(); | |||||
} else { | |||||
readstdin(); | |||||
grabkeyboard(); | |||||
} | |||||
setup(); | |||||
run(); | |||||
return 1; /* unreachable */ | |||||
} |
@@ -0,0 +1,10 @@ | |||||
--- dmenu.c | |||||
+++ dmenu.c | |||||
@@ -693,6 +696,7 @@ static void | |||||
usage(void) | |||||
{ | |||||
fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" | |||||
+ " [-x xoffset] [-y yoffset] [-z width]\n" | |||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); | |||||
exit(1); | |||||
} |