Partially revert 44c7de3: fix items text width offset calculation

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 4f22ffe..8e84fbd 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>

-#include <stdbool.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -23,8 +22,7 @@
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])

-#define TEXTNW(X,N)           (drw_font_getexts_width(drw->fonts[0], (X), (N)))
-#define TEXTW(X)              (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
+#define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)

 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */


@@ -32,13 +30,14 @@ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 struct item {
        char *text;
        struct item *left, *right;
 struct item {
        char *text;
        struct item *left, *right;

-       bool out;
+       int out;

 };
 
 static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int sw, sh; /* X display screen geometry width, height */
 };
 
 static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int sw, sh; /* X display screen geometry width, height */

-static int inputw, promptw;
+static int inputw = 0, promptw;
+static int lrpad; /* sum of left and right padding */

 static size_t cursor;
 static struct item *items = NULL;
 static struct item *matches, *matchend;
 static size_t cursor;
 static struct item *items = NULL;
 static struct item *matches, *matchend;


@@ -50,8 +49,8 @@ static Display *dpy;
 static Window root, win;
 static XIC xic;
 
 static Window root, win;
 static XIC xic;
 

-static ClrScheme scheme[SchemeLast];

 static Drw *drw;
 static Drw *drw;

+static Clr *scheme[SchemeLast];

 
 #include "config.h"
 
 
 #include "config.h"
 


@@ -92,13 +91,11 @@ calcoffsets(void)
 static void
 cleanup(void)
 {
 static void
 cleanup(void)
 {

+       size_t i;
+

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

-       drw_clr_free(scheme[SchemeNorm].bg);
-       drw_clr_free(scheme[SchemeNorm].fg);
-       drw_clr_free(scheme[SchemeSel].fg);
-       drw_clr_free(scheme[SchemeSel].bg);
-       drw_clr_free(scheme[SchemeOut].fg);
-       drw_clr_free(scheme[SchemeOut].bg);
+       for (i = 0; i < SchemeLast; i++)
+               free(scheme[i]);

        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);


@@ -115,70 +112,63 @@ cistrstr(const char *s, const char *sub)
        return NULL;
 }
 
        return NULL;
 }
 

+static int
+drawitem(struct item *item, int x, int y, int w)
+{
+       if (item == sel)
+               drw_setscheme(drw, scheme[SchemeSel]);
+       else if (item->out)
+               drw_setscheme(drw, scheme[SchemeOut]);
+       else
+               drw_setscheme(drw, scheme[SchemeNorm]);
+
+       return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+}
+

 static void
 drawmenu(void)
 {
 static void
 drawmenu(void)
 {

-       int curpos;
+       unsigned int curpos;

        struct item *item;
        struct item *item;

-       int x = 0, y = 0, h = bh, w;
+       int x = 0, y = 0, w;

 
 

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_rect(drw, 0, 0, mw, mh, 1, 1, 1);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_rect(drw, 0, 0, mw, mh, 1, 1);

 
        if (prompt && *prompt) {
 
        if (prompt && *prompt) {

-               drw_setscheme(drw, &scheme[SchemeSel]);
-               drw_text(drw, x, 0, promptw, bh, prompt, 0);
-               x += promptw;
+               drw_setscheme(drw, scheme[SchemeSel]);
+               x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);

        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;
        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, text, 0);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);

 
 

-       if ((curpos = TEXTNW(text, cursor) + bh / 2 - 2) < w) {
-               drw_setscheme(drw, &scheme[SchemeNorm]);
-               drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0);
+       drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
+       if ((curpos += lrpad / 2 - 1) < w) {
+               drw_setscheme(drw, scheme[SchemeNorm]);
+               drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);

        }
 
        if (lines > 0) {
                /* draw vertical list */
        }
 
        if (lines > 0) {
                /* draw vertical list */

-               w = mw - x;
-               for (item = curr; item != next; item = item->right) {
-                       y += h;
-                       if (item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if (item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-
-                       drw_text(drw, x, y, w, bh, item->text, 0);
-               }
+               for (item = curr; item != next; item = item->right)
+                       drawitem(item, x, y += bh, mw - x);

        } else if (matches) {
                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");
                if (curr->left) {
        } else if (matches) {
                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");
                if (curr->left) {

-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, "<", 0);
-               }
-               for (item = curr; item != next; item = item->right) {
-                       x += w;
-                       w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-
-                       if (item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if (item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, item->text, 0);
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);

                }
                }

-               w = TEXTW(">");
-               x = mw - w;
+               x += w;
+               for (item = curr; item != next; item = item->right)
+                       x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));

                if (next) {
                if (next) {

-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, ">", 0);
+                       w = TEXTW(">");
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);

                }
        }
        drw_map(drw, win, 0, 0, mw, mh);
                }
        }
        drw_map(drw, win, 0, 0, mw, mh);


@@ -192,8 +182,8 @@ grabkeyboard(void)
 
        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {
 
        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {

-               if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True,
-                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+               if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
+                                 GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }


@@ -315,9 +305,9 @@ keypress(XKeyEvent *ev)
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */

-                       while (cursor > 0 && text[nextrune(-1)] == ' ')
+                       while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                                insert(NULL, nextrune(-1) - cursor);

-                       while (cursor > 0 && text[nextrune(-1)] != ' ')
+                       while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */
                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */


@@ -421,7 +411,7 @@ keypress(XKeyEvent *ev)
                        exit(0);
                }
                if (sel)
                        exit(0);
                }
                if (sel)

-                       sel->out = true;
+                       sel->out = 1;

                break;
        case XK_Right:
                if (text[cursor] != '\0') {
                break;
        case XK_Right:
                if (text[cursor] != '\0') {


@@ -468,8 +458,9 @@ paste(void)
 static void
 readstdin(void)
 {
 static void
 readstdin(void)
 {

-       char buf[sizeof text], *p, *maxstr = NULL;
-       size_t i, max = 0, size = 0;
+       char buf[sizeof text], *p;
+       size_t i, imax = 0, size = 0;
+       unsigned int tmpmax = 0;

 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {


@@ -480,13 +471,16 @@ readstdin(void)
                        *p = '\0';
                if (!(items[i].text = strdup(buf)))
                        die("cannot strdup %u bytes:", strlen(buf) + 1);
                        *p = '\0';
                if (!(items[i].text = strdup(buf)))
                        die("cannot strdup %u bytes:", strlen(buf) + 1);

-               items[i].out = false;
-               if (strlen(items[i].text) > max)
-                       max = strlen(maxstr = items[i].text);
+               items[i].out = 0;
+               drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
+               if (tmpmax > inputw) {
+                       inputw = tmpmax;
+                       imax = i;
+               }

        }
        if (items)
                items[i].text = NULL;
        }
        if (items)
                items[i].text = NULL;

-       inputw = maxstr ? TEXTW(maxstr) : 0;
+       inputw = items ? TEXTW(items[imax].text) : 0;

        lines = MIN(lines, i);
 }
 
        lines = MIN(lines, i);
 }
 


@@ -533,18 +527,15 @@ setup(void)
 #endif
 
        /* init appearance */
 #endif
 
        /* init appearance */

-       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-       scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor);
-       scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor);
+       scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 2);
+       scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 2);
+       scheme[SchemeOut] = drw_scm_create(drw, colors[SchemeOut], 2);

 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */
 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */

-       bh = drw->fonts[0]->h + 2;
+       bh = drw->fonts->h + 2;

        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA


@@ -552,7 +543,7 @@ setup(void)
                XGetInputFocus(dpy, &w, &di);
                if (mon != -1 && mon < n)
                        i = mon;
                XGetInputFocus(dpy, &w, &di);
                if (mon != -1 && mon < n)
                        i = mon;

-               if (!i && w != root && w != PointerRoot && w != None) {
+               else if (w != root && w != PointerRoot && w != None) {

                        /* find top-level window containing current input focus */
                        do {
                                if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
                        /* find top-level window containing current input focus */
                        do {
                                if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)


@@ -583,13 +574,13 @@ setup(void)
                y = topbar ? 0 : sh - mh;
                mw = sw;
        }
                y = topbar ? 0 : sh - mh;
                mw = sw;
        }

-       promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
+       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;

        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;
        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;

-       swa.background_pixel = scheme[SchemeNorm].bg->pix;
+       swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;

        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dpy, screen), CopyFromParent,
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dpy, screen), CopyFromParent,


@@ -617,8 +608,7 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {

-       bool fast = false;
-       int i;
+       int i, fast = 0;

 
        for (i = 1; i < argc; i++)
                /* these options take no arguments */
 
        for (i = 1; i < argc; i++)
                /* these options take no arguments */


@@ -626,9 +616,9 @@ main(int argc, char *argv[])
                        puts("dmenu-"VERSION);
                        exit(0);
                } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
                        puts("dmenu-"VERSION);
                        exit(0);
                } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */

-                       topbar = false;
+                       topbar = 0;

                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */

-                       fast = true;
+                       fast = 1;

                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;


@@ -644,13 +634,13 @@ main(int argc, char *argv[])
                else if (!strcmp(argv[i], "-fn"))  /* font or font set */
                        fonts[0] = argv[++i];
                else if (!strcmp(argv[i], "-nb"))  /* normal background color */
                else if (!strcmp(argv[i], "-fn"))  /* font or font set */
                        fonts[0] = argv[++i];
                else if (!strcmp(argv[i], "-nb"))  /* normal background color */

-                       normbgcolor = argv[++i];
+                       colors[SchemeNorm][ColBg] = argv[++i];

                else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
                else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */

-                       normfgcolor = argv[++i];
+                       colors[SchemeNorm][ColFg] = argv[++i];

                else if (!strcmp(argv[i], "-sb"))  /* selected background color */
                else if (!strcmp(argv[i], "-sb"))  /* selected background color */

-                       selbgcolor = argv[++i];
+                       colors[SchemeSel][ColBg] = argv[++i];

                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */

-                       selfgcolor = argv[++i];
+                       colors[SchemeSel][ColFg] = argv[++i];

                else
                        usage();
 
                else
                        usage();
 


@@ -663,10 +653,9 @@ main(int argc, char *argv[])
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        drw = drw_create(dpy, screen, root, sw, sh);
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        drw = drw_create(dpy, screen, root, sw, sh);

-       drw_load_fonts(drw, fonts, LENGTH(fonts));
-       if (!drw->fontcount)
+       if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))

                die("no fonts could be loaded.\n");
                die("no fonts could be loaded.\n");

-       drw_setscheme(drw, &scheme[SchemeNorm]);
+       lrpad = drw->fonts->h;

 
        if (fast) {
                grabkeyboard();
 
        if (fast) {
                grabkeyboard();