Apply numbers patch

diff --git a/dmenu.c b/dmenu.c
index 9ecbd8608a2b6c952160fdef6e2871ad107cad7c..49b60ab577a86d165e5741ed012767c77876e916 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -25,6 +25,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, SchemeNormHighlight, SchemeSelHighlight,
@@ -38,6 +40,7 @@ struct item {
        double distance;
 };
 
+static char numbers[NUMBERSBUFSIZE] = "";
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
@@ -172,6 +175,21 @@ drawitem(struct item *item, int x, int y, int w)
        return r;
 }
 
+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)
 {
@@ -197,6 +215,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)
@@ -211,13 +230,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);
 }