speedie/spmenu
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases 15 Wiki Activity

Add -itt/-itb option for positioning items above/below prompt

Browse source
This commit is contained in:
speedie 2023-07-25 00:11:17 +02:00
parent 6b6d5b77c5
commit da05068117
10 changed files with 58 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/docs.md
View file

@ -211,6 +211,12 @@ in the config files.
`-c, --center`
: Position spmenu at the center of the screen
`-itt, --item-top`
: Position items above all other elements
`-itb, --item-bottom`
: Position items below all other elements
`-hm, --hide-mode`
: Hide mode indicator

3
docs/spmenu.conf
View file

@ -187,7 +187,8 @@ spmenu = {
} );
/* Line options */
line = ( { height = 1; // Height of each line (px)
line = ( { itemposition = 0; // Item position (0: Bottom, 1: Top)
height = 1; // Height of each line (px)
lines = 0; // Number of lines (number)
columns = 10; // Number of columns (number)
overridelines = 1; // Allow overriding lines using keybinds (0/1)

6
libs/argv.c
View file

@ -126,6 +126,10 @@ void readargs(int argc, char *argv[]) {
menuposition = 1;
} else if (!strcmp(argv[i], "-c") || (!strcmp(argv[i], "--center"))) { // appears at the center of the screen
menuposition = 2;
} else if (!strcmp(argv[i], "-itt") || (!strcmp(argv[i], "--item-top"))) { // items are placed above prompt
itemposition = 1;
} else if (!strcmp(argv[i], "-itb") || (!strcmp(argv[i], "--item-bottom"))) { // items are placed below prompt
menuposition = 0;
} else if (!strcmp(argv[i], "-nm") || (!strcmp(argv[i], "--normal"))) { // normal mode
mode = 0;
} else if (!strcmp(argv[i], "-im") || (!strcmp(argv[i], "--insert"))) { // insert mode
@ -663,6 +667,8 @@ void usage(int status) {
"spmenu -t, --top Position spmenu at the top of the screen\n"
"spmenu -b, --bottom Position spmenu at the bottom of the screen\n"
"spmenu -c, --center Position spmenu at the center of the screen\n"
"spmenu -itt, --item-top Position items above all other elements\n"
"spmenu -itb, --item-bottom Position items below all other elements\n"
, status ? stderr : stdout);
// more args

1
libs/conf/config.c
View file

@ -753,6 +753,7 @@ void conf_init(void) {
config_setting_t *conf = config_setting_get_elem(line_setting, i);
// look up
config_setting_lookup_int(conf, "itemposition", &itemposition); // spmenu.line.itemposition
config_setting_lookup_int(conf, "height", &lineheight); // spmenu.line.height
config_setting_lookup_int(conf, "lines", &lines); // spmenu.line.lines
config_setting_lookup_int(conf, "columns", &columns); // spmenu.line.columns

35
libs/draw.c
View file

@ -686,39 +686,58 @@ void drawmenu_layer(void) {
calcoffsets();
get_mh();
int nh = 1;
// sp.bh must be removed from menu height resizing later
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) && lines) {
y -= sp.bh;
nh = 0;
}
if (!hidemode) {
modew = pango_mode ? TEXTWM(tx.modetext) : TEXTW(tx.modetext);
}
if (!hideprompt) {
w = sp.promptw;
x = drawprompt(x, y, w);
x = drawprompt(x, y + (nh ? lines ? itemposition ? (sp.mh - sp.bh) : 0 : 0 : 0), w);
}
if (!hideinput) {
w = (lines > 0 || !matches) ? sp.mw - x : sp.inputw;
x = drawinput(x, y, w);
x = drawinput(x, y + (nh ? lines ? itemposition ? (sp.mh - sp.bh) : 0 : 0 : 0), w);
}
if (!hidemode) modew = pango_mode ? TEXTWM(tx.modetext) : TEXTW(tx.modetext);
// draw the items, this function also calls drawrarrow() and drawlarrow()
if (!hideitem) drawitem(x, y, w);
if (!hideitem) {
drawitem(x, y - (nh ? lines ? itemposition ? sp.bh : 0 : 0 : 0), w);
}
if (!hidematchcount) {
w = numberw;
drawnumber(sp.mw - numberw - modew - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh, y, w);
drawnumber(
sp.mw - numberw - modew - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh,
y + (nh ? lines ? itemposition ? (sp.mh - sp.bh) : 0 : 0 : 0),
w
);
}
if (!hidemode) {
w = modew;
drawmode(sp.mw - modew - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh, y, w);
drawmode(
sp.mw - modew - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh,
y + (nh ? lines ? itemposition ? (sp.mh - sp.bh) : 0 : 0 : 0),
w
);
}
if (!hidecaps) {
w = capsw;
drawcaps(sp.mw - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh, y, w);
drawcaps(
sp.mw - capsw - 2 * sp.sp - 2 * borderwidth - menumarginh,
y + (nh ? lines ? itemposition ? (sp.mh - sp.bh) : 0 : 0 : 0),
w
);
}
#if USEX

1
libs/options.h
View file

@ -103,6 +103,7 @@ static int regex = 0; /* Whether or not to enable regex ma
static char *listfile = NULL; /* File to read entries from instead of stdin. NULL means read from stdin instead. */
/* Line options */
static int itemposition = 1; /* Item position (0: Bottom, 1: Top) */
static int lineheight = 1; /* Line height (0: Calculate automatically) */
static int lines = 0; /* Default number of lines */
static int columns = 10; /* Default number of columns */

1
libs/theme/theme.c
View file

@ -438,6 +438,7 @@ void theme_load(void) {
config_setting_t *conf = config_setting_get_elem(line_setting, i);
// look up
config_setting_lookup_int(conf, "itemposition", &itemposition); // theme.line.itemposition
config_setting_lookup_int(conf, "height", &lineheight); // theme.line.height
config_setting_lookup_int(conf, "indentitems", &indentitems); // theme.line.indentitems
}

6
libs/wl/wayland.c
View file

@ -280,7 +280,9 @@ void buttonpress_wl(uint32_t button, double ex, double ey) {
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) && lines) {
yp = 1;
} else if (lines && ey < h + menumarginv && ey > menumarginv) {
} else if (!itemposition && lines && ey <= h + menumarginv && ey >= menumarginv) {
yp = 1;
} else if (itemposition && lines && ey >= (sp.mh - h) + menumarginv) {
yp = 1;
} else if (!lines) {
yp = 1;
@ -320,7 +322,7 @@ void buttonpress_wl(uint32_t button, double ex, double ey) {
ey -= menumarginv;
if (hideprompt && hideinput && hidemode && hidematchcount && hidecaps) {
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) || itemposition) {
ey += h;
}

6
libs/x11/mouse.c
View file

@ -27,7 +27,9 @@ void buttonpress_x11(XEvent *e) {
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) && lines) {
yp = 1;
} else if (lines && ev->y < h + menumarginv && ev->y > menumarginv) {
} else if (!itemposition && lines && ev->y <= h + menumarginv && ev->y >= menumarginv) {
yp = 1;
} else if (itemposition && lines && ev->y >= (sp.mh - h) + menumarginv) {
yp = 1;
} else if (!lines) {
yp = 1;
@ -69,7 +71,7 @@ void buttonpress_x11(XEvent *e) {
ev->y -= menumarginv;
if (hideprompt && hideinput && hidemode && hidematchcount && hidecaps) {
if ((hideprompt && hideinput && hidemode && hidematchcount && hidecaps) || itemposition) {
ev->y += h;
}

6
spmenu.1
View file

@ -239,6 +239,12 @@ Position spmenu at the bottom of the screen
\f[V]-c, --center\f[R]
Position spmenu at the center of the screen
.TP
\f[V]-itt, --item-top\f[R]
Position items above all other elements
.TP
\f[V]-itb, --item-bottom\f[R]
Position items below all other elements
.TP
\f[V]-hm, --hide-mode\f[R]
Hide mode indicator
.TP