diff options
| author | zachir <zachir@librem.one> | 2023-02-21 13:48:38 -0600 | 
|---|---|---|
| committer | zachir <zachir@librem.one> | 2023-02-21 13:48:38 -0600 | 
| commit | 59fbcc368693d01182e41ec8f397b9e47325cd8c (patch) | |
| tree | 108cef8fb94eca02ee0a5e768bd5f1ae86daec7e /patches | |
| parent | addad8d7671563820a8a10cb181e1034d1891678 (diff) | |
add center patch
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/dmenu-center-5.2.diff | 104 | 
1 files changed, 104 insertions, 0 deletions
| diff --git a/patches/dmenu-center-5.2.diff b/patches/dmenu-center-5.2.diff new file mode 100644 index 0000000..9401dc5 --- /dev/null +++ b/patches/dmenu-center-5.2.diff @@ -0,0 +1,104 @@ +diff --git a/config.def.h b/config.def.h +index 1edb647..88ef264 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -2,6 +2,8 @@ + /* Default settings; can be overriden by command line. */ +  + static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */ ++static int centered = 0;                    /* -c option; centers dmenu on screen */ ++static int min_width = 500;                    /* minimum width when centered */ + /* -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 27b7a30..427fb04 100644 +--- a/dmenu.c ++++ b/dmenu.c +@@ -96,6 +96,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) / 2); ++		} 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 */ +@@ -733,6 +757,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; | 
