commit 89398cbc713155dc07c28414ca89d0abdb3604c2
Author: Mykyta Holubakha <[email protected]>
Date: Sat Oct 29 00:40:39 2022 +0300
[dmenu] Port lineheight patches to 5.2
diff --git
a/tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-5.2.diff
b/tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-5.2.diff
new file mode 100644
index 00000000..a5e8468a
--- /dev/null
+++ b/tools.suckless.org/dmenu/patches/line-height/dmenu-lineheight-5.2.diff
@@ -0,0 +1,106 @@
+From ba103e38ea4ab07f9a3ee90627714b9bea17c329 Mon Sep 17 00:00:00 2001
+From: pskry <[email protected]>
+Date: Sun, 8 Nov 2020 22:04:22 +0100
+Subject: [PATCH] Add an option which defines the lineheight
+
+Despite both the panel and dmenu using the same font (a Terminus 12),
+dmenu is shorter and the panel is visible from under the dmenu bar.
+The appearance can be even more distracting when using similar colors
+for background and selections. With the option added by this patch,
+dmenu can be launched with a '-h 24', thus completely covering the panel.
+---
+ config.def.h | 3 +++
+ dmenu.1 | 5 +++++
+ dmenu.c | 11 ++++++++---
+ 3 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 1edb647..4394dec 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -15,6 +15,9 @@ static const char *colors[SchemeLast][2] = {
+ };
+ /* -l option; if nonzero, dmenu uses vertical list with given number of lines
*/
+ static unsigned int lines = 0;
++/* -h option; minimum height of a menu line */
++static unsigned int lineheight = 0;
++static unsigned int min_lineheight = 8;
+
+ /*
+ * Characters not considered part of a word while deleting words
+diff --git a/dmenu.1 b/dmenu.1
+index 323f93c..f2a82b4 100644
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -6,6 +6,8 @@ dmenu \- dynamic menu
+ .RB [ \-bfiv ]
+ .RB [ \-l
+ .IR lines ]
++.RB [ \-h
++.IR height ]
+ .RB [ \-m
+ .IR monitor ]
+ .RB [ \-p
+@@ -50,6 +52,9 @@ dmenu matches menu items case insensitively.
+ .BI \-l " lines"
+ dmenu lists items vertically, with the given number of lines.
+ .TP
++.BI \-h " height"
++dmenu uses a menu line of at least 'height' pixels tall, but no less than 8.
++.TP
+ .BI \-m " monitor"
+ dmenu is displayed on the monitor number supplied. Monitor numbers are
starting
+ from 0.
+diff --git a/dmenu.c b/dmenu.c
+index e7be8af..82b204b 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -148,7 +148,7 @@ drawmenu(void)
+ {
+ unsigned int curpos;
+ struct item *item;
+- int x = 0, y = 0, w;
++ int x = 0, y = 0, fh = drw->fonts->h, w;
+
+ drw_setscheme(drw, scheme[SchemeNorm]);
+ drw_rect(drw, 0, 0, mw, mh, 1, 1);
+@@ -165,7 +165,7 @@ drawmenu(void)
+ curpos = TEXTW(text) - TEXTW(&text[cursor]);
+ if ((curpos += lrpad / 2 - 1) < w) {
+ drw_setscheme(drw, scheme[SchemeNorm]);
+- drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
++ drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0);
+ }
+
+ if (lines > 0) {
+@@ -630,6 +630,7 @@ setup(void)
+
+ /* calculate menu geometry */
+ bh = drw->fonts->h + 2;
++ bh = MAX(bh,lineheight); /* make a menu line AT LEAST
'lineheight' tall */
+ lines = MAX(lines, 0);
+ mh = (lines + 1) * bh;
+ #ifdef XINERAMA
+@@ -710,7 +711,7 @@ setup(void)
+ static void
+ usage(void)
+ {
+- die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]
"
++ die("usage: dmenu [-bfiv] [-l lines] [-h height] [-p prompt] [-fn font]
[-m monitor]
"
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-w
windowid]");
+ }
+
+@@ -737,6 +738,10 @@ main(int argc, char *argv[])
+ /* these options take one argument */
+ else if (!strcmp(argv[i], "-l")) /* number of lines in
vertical list */
+ lines = atoi(argv[++i]);
++ else if (!strcmp(argv[i], "-h")) { /* minimum height of one
menu line */
++ lineheight = atoi(argv[++i]);
++ lineheight = MAX(lineheight, min_lineheight);
++ }
+ else if (!strcmp(argv[i], "-m"))
+ mon = atoi(argv[++i]);
+ else if (!strcmp(argv[i], "-p")) /* adds prompt to left of
input field */
+--
+2.38.1
+
diff --git a/tools.suckless.org/dmenu/patches/line-height/index.md
b/tools.suckless.org/dmenu/patches/line-height/index.md
index 9dfbfc34..5e5192fc 100644
--- a/tools.suckless.org/dmenu/patches/line-height/index.md
+++ b/tools.suckless.org/dmenu/patches/line-height/index.md
@@ -26,6 +26,7 @@ The line height value is also used when dmenu is used in
'vertical' mode ('-l' o
Download
--------
+* [dmenu-lineheight-5.2.diff](dmenu-lineheight-5.2.diff)
* [dmenu-lineheight-5.0.diff](dmenu-lineheight-5.0.diff)
* [dmenu-lineheight-4.9.diff](dmenu-lineheight-4.9.diff)
* [dmenu-lineheight-4.7.diff](dmenu-lineheight-4.7.diff)
