Tovi Jaeschke-Rogers
4 weeks ago
5 changed files with 419 additions and 8 deletions
Split View
Diff Options
-
+16 -0config.def.h
-
+39 -0config.h
-
+3 -0dmenu.1
-
+242 -8dmenu.c
-
+119 -0patches/dmenu-center-20240616-36c3d68.diff
+ 16
- 0
config.def.h
View File
+ 39
- 0
config.h
View File
| @ -0,0 +1,39 @@ | |||
| /* 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 */ | |||
| static int centered = 1; /* -c option; centers dmenu on screen */ | |||
| static int min_width = 500; /* minimum width when centered */ | |||
| static const float menu_height_ratio = 4.0f; /* This is the ratio used in the original calculation */ | |||
| /* -fn option overrides fonts[0]; default X11 font or font set */ | |||
| static const char *fonts[] = { | |||
| "monospace:size=10" | |||
| }; | |||
| 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", "#005577" }, | |||
| [SchemeOut] = { "#000000", "#00ffff" }, | |||
| [SchemeCursor] = { "#222222", "#bbbbbb"}, | |||
| }; | |||
| /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ | |||
| static unsigned int lines = 10; | |||
| /* | |||
| * Characters not considered part of a word while deleting words | |||
| * for example: " /?\"&[]" | |||
| */ | |||
| static const char worddelimiters[] = " "; | |||
| /* | |||
| * -vi option; if nonzero, vi mode is always enabled and can be | |||
| * accessed with the global_esc keysym + mod mask | |||
| */ | |||
| static unsigned int vi_mode = 1; | |||
| static unsigned int start_mode = 0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */ | |||
| static Key global_esc = { XK_Escape }; /* escape key when vi mode is not enabled explicitly */ | |||
| static Key quit_keys[] = { | |||
| /* keysym modifier */ | |||
| { XK_Escape, 0 } | |||
| }; | |||
+ 3
- 0
dmenu.1
View File
+ 242
- 8
dmenu.c
View File
+ 119
- 0
patches/dmenu-center-20240616-36c3d68.diff
View File
| @ -0,0 +1,119 @@ | |||
| From 36c3d68f185f47cbb754569775b7888728be4711 Mon Sep 17 00:00:00 2001 | |||
| From: elbachir-one <bachiralfa@gmail.com> | |||
| Date: Sun, 16 Jun 2024 21:28:41 +0100 | |||
| Subject: [PATCH] Adding an option to change the height as well | |||
| --- | |||
| config.def.h | 3 +++ | |||
| dmenu.1 | 3 +++ | |||
| dmenu.c | 38 ++++++++++++++++++++++++++++++++------ | |||
| 3 files changed, 38 insertions(+), 6 deletions(-) | |||
| diff --git a/config.def.h b/config.def.h | |||
| index 1edb647..832896f 100644 | |||
| --- a/config.def.h | |||
| +++ b/config.def.h | |||
| @@ -2,6 +2,9 @@ | |||
| /* Default settings; can be overriden by command line. */ | |||
| static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ | |||
| +static int centered = 1; /* -c option; centers dmenu on screen */ | |||
| +static int min_width = 500; /* minimum width when centered */ | |||
| +static const float menu_height_ratio = 4.0f; /* This is the ratio used in the original calculation */ | |||
| /* -fn option overrides fonts[0]; default X11 font or font set */ | |||
| static const char *fonts[] = { | |||
| "monospace:size=10" | |||
| diff --git a/dmenu.1 b/dmenu.1 | |||
| index 323f93c..c036baa 100644 | |||
| --- a/dmenu.1 | |||
| +++ b/dmenu.1 | |||
| @@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL. | |||
| .B \-b | |||
| dmenu appears at the bottom of the screen. | |||
| .TP | |||
| +.B \-c | |||
| +dmenu appears centered on 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. | |||
| diff --git a/dmenu.c b/dmenu.c | |||
| index 40f93e0..32d6a9d 100644 | |||
| --- a/dmenu.c | |||
| +++ b/dmenu.c | |||
| @@ -95,6 +95,15 @@ calcoffsets(void) | |||
| break; | |||
| } | |||
| +static int | |||
| +max_textw(void) | |||
| +{ | |||
| + int len = 0; | |||
| + for (struct item *item = items; item && item->text; item++) | |||
| + len = MAX(TEXTW(item->text), len); | |||
| + return len; | |||
| +} | |||
| + | |||
| static void | |||
| cleanup(void) | |||
| { | |||
| @@ -636,6 +645,7 @@ setup(void) | |||
| bh = drw->fonts->h + 2; | |||
| lines = MAX(lines, 0); | |||
| mh = (lines + 1) * bh; | |||
| + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | |||
| #ifdef XINERAMA | |||
| i = 0; | |||
| if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { | |||
| @@ -662,9 +672,16 @@ setup(void) | |||
| if (INTERSECT(x, y, 1, 1, info[i]) != 0) | |||
| break; | |||
| - x = info[i].x_org; | |||
| - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); | |||
| - mw = info[i].width; | |||
| + if (centered) { | |||
| + mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width); | |||
| + x = info[i].x_org + ((info[i].width - mw) / 2); | |||
| + y = info[i].y_org + ((info[i].height - mh) / menu_height_ratio); | |||
| + } else { | |||
| + x = info[i].x_org; | |||
| + y = info[i].y_org + (topbar ? 0 : info[i].height - mh); | |||
| + mw = info[i].width; | |||
| + } | |||
| + | |||
| XFree(info); | |||
| } else | |||
| #endif | |||
| @@ -672,9 +689,16 @@ 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; | |||
| + | |||
| + if (centered) { | |||
| + mw = MIN(MAX(max_textw() + promptw, min_width), wa.width); | |||
| + x = (wa.width - mw) / 2; | |||
| + y = (wa.height - mh) / 2; | |||
| + } else { | |||
| + x = 0; | |||
| + y = topbar ? 0 : wa.height - mh; | |||
| + mw = wa.width; | |||
| + } | |||
| } | |||
| promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; | |||
| inputw = mw / 3; /* input width: ~33% of monitor width */ | |||
| @@ -734,6 +758,8 @@ main(int argc, char *argv[]) | |||
| topbar = 0; | |||
| else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ | |||
| fast = 1; | |||
| + else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */ | |||
| + centered = 1; | |||
| else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ | |||
| fstrncmp = strncasecmp; | |||
| fstrstr = cistrstr; | |||
| -- | |||
| 2.45.2 | |||