commit 71efa86591878eeacb892f3494eb962fcefc8d66
parent 4d825beef3ec45c984e0a47590ceb38cbbe68b89
Author: Erik Letson <hmagellan@hmagellan.com>
Date: Wed, 26 Aug 2020 16:45:00 -0500
added numbers
Diffstat:
3 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/README b/README
@@ -42,7 +42,7 @@ patches!
(1). https://tools.suckless.org/dmenu/patches/
- CURRENT PROGRESS: 17/32 patches supported
+ CURRENT PROGRESS: 18/32 patches supported
3/32 patches unsupported
USUPPORTED PATCHES:
diff --git a/patches/numbers/USAGE b/patches/numbers/USAGE
@@ -0,0 +1,21 @@
+numbers - Display the number of matches in dmenu
+Source: https://tools.suckless.org/dmenu/patches/numbers/dmenu-numbers-4.9.diff
+Original Author: Miles Alan m@milesalan.com
+
+Description from source:
+ """
+ Adds text which displays the number of matched and total items in the top right corner of
+ dmenu.
+ """
+
+== YOU MUST ==
+(1). Place the patch file in /etc/portage/patches/x11-misc/dmenu/ and run 'emerge dmenu'
+
+== YOU PROBABLY SHOULD ==
+No further action is required.
+
+== PATCH MODIFICATIONS ==
+No modifications were made to this patch
+
+== INCOMPATIBILITIES ==
+No known specific incompatibilities.
diff --git a/patches/numbers/numbers.patch b/patches/numbers/numbers.patch
@@ -0,0 +1,81 @@
+From 61abc60dbfaa8ec63fcd176307308aee88a19e32 Mon Sep 17 00:00:00 2001
+From: Miles Alan <m@milesalan.com>
+Date: Sat, 10 Aug 2019 17:20:08 -0500
+Subject: [PATCH] Display number of matched and total items in top right corner
+
+---
+ dmenu.c | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/dmenu.c b/dmenu.c
+index 6b8f51b..98c5810 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -24,6 +24,8 @@
+ * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+ #define LENGTH(X) (sizeof X / sizeof X[0])
+ #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
++#define NUMBERSMAXDIGITS 100
++#define NUMBERSBUFSIZE (NUMBERSMAXDIGITS * 2) + 1
+
+ /* enums */
+ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+@@ -34,6 +36,7 @@ struct item {
+ int out;
+ };
+
++static char numbers[NUMBERSBUFSIZE] = "";
+ static char text[BUFSIZ] = "";
+ static char *embed;
+ static int bh, mw, mh;
+@@ -126,6 +129,21 @@ drawitem(struct item *item, int x, int y, int w)
+ return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+ }
+
++static void
++recalculatenumbers()
++{
++ unsigned int numer = 0, denom = 0;
++ struct item *item;
++ if (matchend) {
++ numer++;
++ for (item = matchend; item && item->left; item = item->left)
++ numer++;
++ }
++ for (item = items; item && item->text; item++)
++ denom++;
++ snprintf(numbers, NUMBERSBUFSIZE, "%d/%d", numer, denom);
++}
++
+ static void
+ drawmenu(void)
+ {
+@@ -151,6 +169,7 @@ drawmenu(void)
+ drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
+ }
+
++ recalculatenumbers();
+ if (lines > 0) {
+ /* draw vertical list */
+ for (item = curr; item != next; item = item->right)
+@@ -165,13 +184,15 @@ drawmenu(void)
+ }
+ x += w;
+ for (item = curr; item != next; item = item->right)
+- x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
++ x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">") - TEXTW(numbers)));
+ if (next) {
+ w = TEXTW(">");
+ drw_setscheme(drw, scheme[SchemeNorm]);
+- drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
++ drw_text(drw, mw - w - TEXTW(numbers), 0, w, bh, lrpad / 2, ">", 0);
+ }
+ }
++ drw_setscheme(drw, scheme[SchemeNorm]);
++ drw_text(drw, mw - TEXTW(numbers), 0, TEXTW(numbers), bh, lrpad / 2, numbers, 0);
+ drw_map(drw, win, 0, 0, mw, mh);
+ }
+
+--
+2.19.2
+
