underline match

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 2cc2cad..9386e06 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -8,16 +8,7 @@
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
-#include <draw.h>
-
-/* macros */
-#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
-#define MIN(a, b)               ((a) < (b) ? (a) : (b))
-#define MAX(a, b)               ((a) > (b) ? (a) : (b))
-#define IS_UTF8_1ST_CHAR(c)     ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
+#include "dmenu.h"

 
 typedef struct Item Item;
 struct Item {
 
 typedef struct Item Item;
 struct Item {


@@ -33,41 +24,23 @@ static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
 static void dinput(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
 static void dinput(void);

-static void drawmenu(void);
+static void drawitem(const char *s, unsigned long col[ColLast]);

 static void drawmenuh(void);
 static void drawmenuv(void);
 static void drawmenuh(void);
 static void drawmenuv(void);

-static void grabkeyboard(void);
-static void kpress(XKeyEvent *e);
-static void match(char *pattern);
+static void match(void);

 static void readstdin(void);
 static void readstdin(void);

-static void run(void);
-static void setup(void);
-
-#include "config.h"

 
 /* variables */
 static char **argp = NULL;
 static char *maxname = NULL;
 
 /* variables */
 static char **argp = NULL;
 static char *maxname = NULL;

-static char *prompt = NULL;
-static char text[4096];
-static int cmdw = 0;
-static int promptw = 0;
-static int screen;
+static unsigned int cmdw = 0;

 static unsigned int lines = 0;
 static unsigned int lines = 0;

-static unsigned int numlockmask = 0;
-static unsigned int mw, mh;
-static unsigned long normcol[ColLast];
-static unsigned long selcol[ColLast];
-static Bool topbar = True;
-static DC dc;
-static Display *dpy;

 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;

-static Window win, root;

 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static void (*calcoffsets)(void) = calcoffsetsh;
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static void (*calcoffsets)(void) = calcoffsetsh;


@@ -85,14 +58,13 @@ appenditem(Item *i, Item **list, Item **last) {
 
 void
 calcoffsetsh(void) {
 
 void
 calcoffsetsh(void) {

-       unsigned int x;
+       unsigned int w, x;

 
 

-       x = promptw + cmdw + (2 * spaceitem);
-       for(next = curr; next; next = next->right)
+       w = promptw + cmdw + textw(&dc, "<") + textw(&dc, ">");
+       for(x = w, next = curr; next; next = next->right)

                if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
                        break;
                if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
                        break;

-       x = promptw + cmdw + (2 * spaceitem);
-       for(prev = curr; prev && prev->left; prev = prev->left)
+       for(x = w, prev = curr; prev && prev->left; prev = prev->left)

                if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
                        break;
 }
                if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
                        break;
 }


@@ -157,30 +129,42 @@ dinput(void) {
 }
 
 void
 }
 
 void

-drawmenu(void) {
+drawbar(void) {

        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(&dc, NULL, normcol, False);
+       drawbox(&dc, normcol);

        dc.h = dc.font.height + 2;
        dc.y = topbar ? 0 : mh - dc.h;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
        dc.h = dc.font.height + 2;
        dc.y = topbar ? 0 : mh - dc.h;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;

-               drawtext(&dc, prompt, selcol, False);
+               drawbox(&dc, selcol);
+               drawtext(&dc, prompt, selcol);

                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;

-       drawtext(&dc, *text ? text : NULL, normcol, False);
+       drawtext(&dc, text, normcol);

        if(lines > 0)
                drawmenuv();
        else if(curr)
                drawmenuh();
        if(lines > 0)
                drawmenuv();
        else if(curr)
                drawmenuh();

-       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
+       commitdraw(&dc, win);
+}
+
+void
+drawitem(const char *s, unsigned long col[ColLast]) {
+       const char *p;
+       unsigned int w = textnw(&dc, text, strlen(text));
+
+       drawbox(&dc, col);
+       drawtext(&dc, s, col);
+       for(p = fstrstr(s, text); *text && (p = fstrstr(p, text)); p++)
+               drawline(&dc, textnw(&dc, s, p-s) + dc.h/2 - 1, dc.h-2, w, 1, col);

 }
 
 void
 }
 
 void


@@ -188,17 +172,17 @@ drawmenuh(void) {
        Item *i;
 
        dc.x += cmdw;
        Item *i;
 
        dc.x += cmdw;

-       dc.w = spaceitem;
-       drawtext(&dc, curr->left ? "<" : NULL, normcol, False);
+       dc.w = textw(&dc, "<");
+       drawtext(&dc, curr->left ? "<" : NULL, normcol);

        dc.x += dc.w;
        for(i = curr; i != next; i = i->right) {
                dc.w = MIN(textw(&dc, i->text), mw / 3);
        dc.x += dc.w;
        for(i = curr; i != next; i = i->right) {
                dc.w = MIN(textw(&dc, i->text), mw / 3);

-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
+               drawitem(i->text, (sel == i) ? selcol : normcol);

                dc.x += dc.w;
        }
                dc.x += dc.w;
        }

-       dc.w = spaceitem;
+       dc.w = textw(&dc, ">");

        dc.x = mw - dc.w;
        dc.x = mw - dc.w;

-       drawtext(&dc, next ? ">" : NULL, normcol, False);
+       drawtext(&dc, next ? ">" : NULL, normcol);

 }
 
 void
 }
 
 void


@@ -209,7 +193,7 @@ drawmenuv(void) {
        dc.y = topbar ? dc.h : 0;
        dc.w = mw - dc.x;
        for(i = curr; i != next; i = i->right) {
        dc.y = topbar ? dc.h : 0;
        dc.w = mw - dc.x;
        for(i = curr; i != next; i = i->right) {

-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
+               drawitem(i->text, (sel == i) ? selcol : normcol);

                dc.y += dc.h;
        }
        if(!XGetWindowAttributes(dpy, win, &wa))
                dc.y += dc.h;
        }
        if(!XGetWindowAttributes(dpy, win, &wa))


@@ -217,20 +201,6 @@ drawmenuv(void) {
        XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
 }
 
        XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
 }
 

-void
-grabkeyboard(void) {
-       unsigned int len;
-
-       for(len = 1000; len; len--) {
-               if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-               == GrabSuccess)
-                       break;
-               usleep(1000);
-       }
-       if(!len)
-               exit(EXIT_FAILURE);
-}
-

 void
 kpress(XKeyEvent *e) {
        char buf[sizeof text];
 void
 kpress(XKeyEvent *e) {
        char buf[sizeof text];


@@ -286,7 +256,7 @@ kpress(XKeyEvent *e) {
                        break;
                case XK_u:
                        text[0] = '\0';
                        break;
                case XK_u:
                        text[0] = '\0';

-                       match(text);
+                       match();

                        break;
                case XK_w:
                        if(len == 0)
                        break;
                case XK_w:
                        if(len == 0)


@@ -295,7 +265,7 @@ kpress(XKeyEvent *e) {
                        while(i-- > 0 && text[i] == ' ');
                        while(i-- > 0 && text[i] != ' ');
                        text[++i] = '\0';
                        while(i-- > 0 && text[i] == ' ');
                        while(i-- > 0 && text[i] != ' ');
                        text[++i] = '\0';

-                       match(text);
+                       match();

                        break;
                }
        }
                        break;
                }
        }


@@ -305,7 +275,7 @@ kpress(XKeyEvent *e) {
                if(num && !iscntrl((int) buf[0])) {
                        memcpy(text + len, buf, num + 1);
                        len += num;
                if(num && !iscntrl((int) buf[0])) {
                        memcpy(text + len, buf, num + 1);
                        len += num;

-                       match(text);
+                       match();

                }
                break;
        case XK_BackSpace:
                }
                break;
        case XK_BackSpace:


@@ -314,7 +284,7 @@ kpress(XKeyEvent *e) {
                for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
                len -= i;
                text[len] = '\0';
                for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
                len -= i;
                text[len] = '\0';

-               match(text);
+               match();

                break;
        case XK_End:
                while(next) {
                break;
        case XK_End:
                while(next) {


@@ -374,24 +344,22 @@ kpress(XKeyEvent *e) {
                dinput();
                break;
        }
                dinput();
                break;
        }

-       drawmenu();
+       drawbar();

 }
 
 void
 }
 
 void

-match(char *pattern) {
-       unsigned int plen;
+match(void) {
+       unsigned int len;

        Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
        Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 

-       if(!pattern)
-               return;
-       plen = strlen(pattern);
+       len = strlen(text);

        item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)
        item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)

-               if(!fstrncmp(pattern, i->text, plen + 1))
+               if(!fstrncmp(text, i->text, len + 1))

                        appenditem(i, &lexact, &exactend);
                        appenditem(i, &lexact, &exactend);

-               else if(!fstrncmp(pattern, i->text, plen))
+               else if(!fstrncmp(text, i->text, len))

                        appenditem(i, &lprefix, &prefixend);
                        appenditem(i, &lprefix, &prefixend);

-               else if(fstrstr(i->text, pattern))
+               else if(fstrstr(i->text, text))

                        appenditem(i, &lsubstr, &substrend);
        if(lexact) {
                item = lexact;
                        appenditem(i, &lsubstr, &substrend);
        if(lexact) {
                item = lexact;


@@ -445,103 +413,6 @@ readstdin(void) {
        }
 }
 
        }
 }
 

-void
-run(void) {
-       XEvent ev;
-
-       /* main event loop */
-       XSync(dpy, False);
-       while(!XNextEvent(dpy, &ev))
-               switch(ev.type) {
-               case KeyPress:
-                       kpress(&ev.xkey);
-                       break;
-               case Expose:
-                       if(ev.xexpose.count == 0)
-                               drawmenu();
-                       break;
-               case VisibilityNotify:
-                       if(ev.xvisibility.state != VisibilityUnobscured)
-                               XRaiseWindow(dpy, win);
-                       break;
-               }
-       exit(EXIT_FAILURE);
-}
-
-void
-setup(void) {
-       int i, j, x, y;
-#if XINERAMA
-       int n;
-       XineramaScreenInfo *info = NULL;
-#endif
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
-               }
-       XFreeModifiermap(modmap);
-
-       dc.dpy = dpy;
-       normcol[ColBG] = getcolor(&dc, normbgcolor);
-       normcol[ColFG] = getcolor(&dc, normfgcolor);
-       selcol[ColBG] = getcolor(&dc, selbgcolor);
-       selcol[ColFG] = getcolor(&dc, selfgcolor);
-       initfont(&dc, font);
-
-       /* menu window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-
-       /* menu window geometry */
-       mh = (dc.font.height + 2) * (lines + 1);
-#if XINERAMA
-       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
-               i = 0;
-               if(n > 1) {
-                       int di;
-                       unsigned int dui;
-                       Window dummy;
-                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
-                               for(i = 0; i < n; i++)
-                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
-                                               break;
-               }
-               x = info[i].x_org;
-               y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
-               mw = info[i].width;
-               XFree(info);
-       }
-       else
-#endif
-       {
-               x = 0;
-               y = topbar ? 0 : mh - DisplayHeight(dpy, screen);
-               mw = DisplayWidth(dpy, screen);
-       }
-
-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
-       setupdraw(&dc, win);
-       if(maxname)
-               cmdw = MIN(textw(&dc, maxname), mw / 3);
-       if(prompt)
-               promptw = MIN(textw(&dc, prompt), mw / 5);
-       text[0] = '\0';
-       match(text);
-       XMapRaised(dpy, win);
-}
-

 int
 main(int argc, char *argv[]) {
        unsigned int i;
 int
 main(int argc, char *argv[]) {
        unsigned int i;


@@ -601,7 +472,10 @@ main(int argc, char *argv[]) {
 
        readstdin();
        grabkeyboard();
 
        readstdin();
        grabkeyboard();

-       setup();
+       setup(lines);
+       if(maxname)
+               cmdw = MIN(textw(&dc, maxname), mw / 3);
+       match();

        run();
        return 0;
 }
        run();
        return 0;
 }