commit e120d4dd7da15cfc35204a32b68d3b87afaff5e2
Author: [email protected] <Nihal Jere>
Date: Sat Jan 11 21:26:28 2020 -0600
updated dmenu center patch with adjustable minimum width
diff --git
a/tools.suckless.org/dmenu/patches/center/dmenu-center-20191105-f1ca0d0.diff
b/tools.suckless.org/dmenu/patches/center/dmenu-center-20200111-8cd37e1.diff
similarity index 83%
rename from
tools.suckless.org/dmenu/patches/center/dmenu-center-20191105-f1ca0d0.diff
rename to
tools.suckless.org/dmenu/patches/center/dmenu-center-20200111-8cd37e1.diff
index 3f789df2..af249a62 100644
--- a/tools.suckless.org/dmenu/patches/center/dmenu-center-20191105-f1ca0d0.diff
+++ b/tools.suckless.org/dmenu/patches/center/dmenu-center-20200111-8cd37e1.diff
@@ -1,23 +1,24 @@
-From f1ca0d0c35769f3197781eb875f2359a9d33007d Mon Sep 17 00:00:00 2001
-From: "[email protected]" <Nihal Jere>
-Date: Tue, 5 Nov 2019 18:33:00 -0600
-Subject: [PATCH] Improved center patch. Can now be enabled using a flag
+From 8cd37e1ab9e7cb025224aeb3543f1a5be8bceb93 Mon Sep 17 00:00:00 2001
+From: Nihal Jere <[email protected]>
+Date: Sat, 11 Jan 2020 21:16:08 -0600
+Subject: [PATCH] center patch now has adjustable minimum width
---
- config.def.h | 1 +
+ config.def.h | 2 ++
dmenu.1 | 3 +++
dmenu.c | 39 ++++++++++++++++++++++++++++++++-------
- 3 files changed, 36 insertions(+), 7 deletions(-)
+ 3 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/config.def.h b/config.def.h
-index 1edb647..7ee3247 100644
+index 1edb647..88ef264 100644
--- a/config.def.h
+++ b/config.def.h
-@@ -2,6 +2,7 @@
+@@ -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"
@@ -36,7 +37,7 @@ index 323f93c..c036baa 100644
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 65f25ce..bc7d087 100644
+index 65f25ce..041c7f8 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -89,6 +89,15 @@ calcoffsets(void)
@@ -71,7 +72,7 @@ index 65f25ce..bc7d087 100644
- y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
- mw = info[i].width;
+ if (centered) {
-+ mw = MIN(MAX(max_textw() + promptw, 100),
info[i].width);
++ 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 {
@@ -92,7 +93,7 @@ index 65f25ce..bc7d087 100644
- mw = wa.width;
+
+ if (centered) {
-+ mw = MIN(MAX(max_textw() + promptw, 100), wa.width);
++ mw = MIN(MAX(max_textw() + promptw, min_width),
wa.width);
+ x = (wa.width - mw) / 2;
+ y = (wa.height - mh) / 2;
+ } else {
@@ -115,5 +116,5 @@ index 65f25ce..bc7d087 100644
fstrncmp = strncasecmp;
fstrstr = cistrstr;
--
-2.23.0
+2.24.1
diff --git a/tools.suckless.org/dmenu/patches/center/index.md
b/tools.suckless.org/dmenu/patches/center/index.md
index be0db98e..8553e2de 100644
--- a/tools.suckless.org/dmenu/patches/center/index.md
+++ b/tools.suckless.org/dmenu/patches/center/index.md
@@ -12,14 +12,14 @@ which is hard to integrate into programs which call dmenu
directly, eg surf or
tabbed. On the other hand, This small standalone patch is instantaneous and
works globally.
-With `dmenu-center-20191105-f1ca0d0.diff`, you can use _-c_ to center dmenu.
+With `dmenu-center-20200111-f1ca0d0.diff`, you can use _-c_ to center dmenu.
Download
--------
-* [dmenu-center-20191105-f1ca0d0.diff](dmenu-center-20191105-f1ca0d0.diff)
* [dmenu-center-4.8.diff](dmenu-center-4.8.diff)
+* [dmenu-center-20200111-f1ca0d0.diff](dmenu-center-20200111-f1ca0d0.diff)
Authors
-------
* Ed van Bruggen <[email protected]>
-* Nihal Jere <[email protected]> (20191105)
+* Nihal Jere <[email protected]> (20200111)
