Compare commits
1 Commits
mydmenu
...
lineheight
| Author | SHA1 | Date | |
|---|---|---|---|
| dc414415a9 |
@ -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
|
||||
|
||||
3
dmenu.1
3
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.
|
||||
|
||||
10
dmenu.c
10
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) {
|
||||
@ -609,6 +609,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
|
||||
@ -690,6 +691,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);
|
||||
}
|
||||
@ -723,6 +725,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 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user