Lucas-mother3/spmenu
1
0
Fork 0
forked from speedie/spmenu
Code Pull requests Activity

Add image resize option

Browse source
This commit is contained in:
speedie 2023-06-12 00:26:35 +02:00
parent 4d505459b1
commit 1c4c68dcc6
9 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/docs.md
View file

@ -317,6 +317,12 @@ You may use long, descriptive arguments or the shorter arguments.
`-itc, --image-topcenter`
: Position the image in the top center
`-ir, --image-resize`
: Allow spmenu to resize itself to fit the image
`-nir, --no-image-resize`
: Don't allow spmenu to resize itself to fit the image
`-wm, --managed, --x11-client`
: Spawn spmenu as a window manager controlled client/window (X11 only)

1
docs/example.Xresources
View file

@ -165,6 +165,7 @@ spmenu.sgr: 1
!! Image
spmenu.imagewidth: 200
spmenu.imageheight: 200
spmenu.imageresize: 1
spmenu.imagegaps: 0
spmenu.imageposition: 0
spmenu.generatecache: 1

1
docs/spmenu.conf
View file

@ -194,6 +194,7 @@ spmenu = {
/* Image options */
image = ( { width = 200; // Image width (px)
height = 200; // Image height (px)
resize = 1; // Allow spmenu to resize itself to fit the image (0/1)
gaps = 0; // Image gaps (px)
position = 0; // Image position (0: Top, 1: Bottom, 2: Center, 3: Top center)
cache = 1; // Cache images (0/1)

29
libs/argv.c
View file

@ -369,7 +369,10 @@ void readargs(int argc, char *argv[]) {
if(sscanf(buf, "%dx%d", &imagewidth, &imageheight) == 1)
imageheight = imagewidth;
} else if (!strcmp(argv[i], "-ir") || (!strcmp(argv[i], "--image-resize"))) { // image resize
imageresize = 1;
} else if (!strcmp(argv[i], "-nir") || (!strcmp(argv[i], "--no-image-resize"))) { // no image resize
imageresize = 0;
} else if (!strcmp(argv[i], "-w") || (!strcmp(argv[i], "--embed"))) { // embedding window id
#if USEX
embed = argv[++i];
@ -562,7 +565,8 @@ void usage(int status) {
"spmenu -nt, --no-allow-typing Don't allow typing, the user must select an option\n"
, status ? stderr : stdout);
fputs("spmenu -x, --x-position <x offset> Offset spmenu x position by <x offset> (X11 only)\n"
fputs(
"spmenu -x, --x-position <x offset> Offset spmenu x position by <x offset> (X11 only)\n"
"spmenu -y, --y-position <y offset> Offset spmenu y position by <y offset> (X11 only)\n"
"spmenu -n, --preselect <line> Preselect <line> in the list of items\n"
"spmenu -z, --width <width> Width of the spmenu window\n"
@ -584,7 +588,8 @@ void usage(int status) {
, status ? stderr : stdout);
// more args
fputs("spmenu -hm, --hide-mode Hide mode indicator\n"
fputs(
"spmenu -hm, --hide-mode Hide mode indicator\n"
"spmenu -hmc, --hide-match-count Hide match count\n"
"spmenu -hla, --hide-left-arrow Hide left arrow\n"
"spmenu -hra, --hide-right-arrow Hide right arrow\n"
@ -624,15 +629,22 @@ void usage(int status) {
"spmenu -hom, --horizontal-margin <margin> Set the horizontal margin to <margin>\n"
"spmenu -la, --left-arrow-symbol <symbol> Set the left arrow to <symbol>\n"
"spmenu -ra, --right-arrow-symbol <symbol> Set the right arrow to <symbol>\n"
, status ? stderr : stdout);
// image related
fputs(
"spmenu -is, --image-size <size> Set image size to <size>\n"
"spmenu -it, --image-top Position the image at the top\n"
"spmenu -ib, --image-bottom Position the image at the bottom\n"
"spmenu -ic, --image-center Position the image in the center\n"
"spmenu -itc, --image-topcenter Position the image in the top center\n"
"spmenu -ir, --image-resize Allow spmenu to resize itself to fit the image\n"
"spmenu -nir, --no-image-resize Don't allow spmenu to resize itself to fit the image\n"
, status ? stderr : stdout);
// general/config related
fputs("spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window (X11 only)\n"
fputs(
"spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window (X11 only)\n"
"spmenu -nwm, --unmanaged Don't spawn spmenu as a window manager controlled client/window (X11 only)\n"
"spmenu -cf, --config-file <file> Set config file to load to <file>\n"
"spmenu -lcfg, --load-config Load spmenu configuration (~/.config/spmenu/spmenu.conf)\n"
@ -650,7 +662,8 @@ void usage(int status) {
"\n", status ? stderr : stdout);
// colors
fputs("- Appearance arguments -\n"
fputs(
"- Appearance arguments -\n"
"spmenu -fn, --font <font> Set the spmenu font to <font>\n"
"spmenu -nif, --normal-item-foreground <color> Set the normal item foreground color\n"
"spmenu -nib, --normal-item-background <color> Set the normal item background color\n"
@ -685,7 +698,8 @@ void usage(int status) {
, status ? stderr : stdout);
// sgr sequences
fputs("spmenu -sgr0, --sgr0 <color> Set the SGR 0 color\n"
fputs(
"spmenu -sgr0, --sgr0 <color> Set the SGR 0 color\n"
"spmenu -sgr1, --sgr1 <color> Set the SGR 1 color\n"
"spmenu -sgr2, --sgr2 <color> Set the SGR 2 color\n"
"spmenu -sgr3, --sgr3 <color> Set the SGR 3 color\n"
@ -704,7 +718,8 @@ void usage(int status) {
"\n", status ? stderr : stdout);
// dmenu compat
fputs("- dmenu compatibility -\n"
fputs(
"- dmenu compatibility -\n"
"spmenu -S Don't sort matches\n"
"spmenu -i Use case-insensitive matching\n"
"spmenu -nb <color> Set the normal background color\n"

1
libs/conf/config.c
View file

@ -410,6 +410,7 @@ void conf_init(void) {
// look up
config_setting_lookup_int(conf, "width", &imagewidth); // spmenu.image.width
config_setting_lookup_int(conf, "height", &imageheight); // spmenu.image.height
config_setting_lookup_int(conf, "resize", &imageresize); // spmenu.image.resize
config_setting_lookup_int(conf, "gaps", &imageheight); // spmenu.image.gaps
config_setting_lookup_int(conf, "position", &imageposition); // spmenu.image.position
config_setting_lookup_int(conf, "cache", &generatecache); // spmenu.image.cache

2
libs/img.c
View file

@ -71,7 +71,7 @@ void drawimage(void) {
xta += menumarginh;
wta += menumarginv;
if (mh != bh + height + leftmargin * 2 - wtr) { // menu height cannot be smaller than image height
if (mh != bh + height + leftmargin * 2 - wtr && imageresize) { // menu height cannot be smaller than image height
resizetoimageheight(width, height);
}

5
libs/options.h
View file

@ -49,8 +49,9 @@ static int capspwlstyle = 2; /* Caps lock indicator powerline sty
static int dockproperty = 1; /* Set _NET_WM_WINDOW_TYPE_DOCK */
/* Image options */
static int imagewidth = 200; /* Default image width */
static int imageheight = 200; /* Default image height */
static int imagewidth = 200; /* Default image width (px) */
static int imageheight = 200; /* Default image height (px) */
static int imageresize = 1; /* Allow the spmenu window to resize itself to fit the image (0/1) */
static int imagegaps = 0; /* Image gaps */
static int imageposition = 0; /* Image position (0: Top, 1: Bottom, 2: Center, 3: Top center) */
static int generatecache = 1; /* Generate image cache by default */

1
libs/x11/xresources.h
View file

@ -152,6 +152,7 @@ ResourcePref resources[] = {
{ "imageheight", INTEGER, &imageheight },
{ "imagegaps", INTEGER, &imagegaps },
{ "imageposition", INTEGER, &imageposition },
{ "imageresize", INTEGER, &imageresize },
{ "generatecache", INTEGER, &generatecache },
{ "maxcache", INTEGER, &maxcache },
{ "mode", INTEGER, &mode },

6
spmenu.1
View file

@ -341,6 +341,12 @@ Position the image in the center
\f[V]-itc, --image-topcenter\f[R]
Position the image in the top center
.TP
\f[V]-ir, --image-resize\f[R]
Allow spmenu to resize itself to fit the image
.TP
\f[V]-nir, --no-image-resize\f[R]
Don\[cq]t allow spmenu to resize itself to fit the image
.TP
\f[V]-wm, --managed, --x11-client\f[R]
Spawn spmenu as a window manager controlled client/window (X11 only)
.TP