applied a change made by Uriel to dmenu (though I didn't applied everything)

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 18263d5..77a61b9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,94 +11,117 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

+#include <sys/select.h>
+#include <sys/time.h>

 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
 typedef struct Item Item;
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
 typedef struct Item Item;

-

 struct Item {
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
 };
 
 struct Item {
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
 };
 

-static Display *dpy;
-static Window root;
-static Window win;
-static Bool done = False;
-
-static Item *allitem = NULL;   /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
-static Item *sel = NULL;
-static Item *nextoff = NULL;
-static Item *prevoff = NULL;
-static Item *curroff = NULL;
+/* static */

 
 

-static int screen, mx, my, mw, mh;
-static char *title = NULL;

 static char text[4096];
 static char text[4096];

+static int mx, my, mw, mh;

 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;

-static unsigned int tw = 0;
-static unsigned int cw = 0;
-static const int seek = 30;            /* 30px */
-
-static Brush brush = {0};
-
-static void draw_menu();
-static void kpress(XKeyEvent * e);
-
-static char version[] = "dmenu - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static Bool running = True;
+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 root;
+static Window win;

 
 static void
 
 static void

-update_offsets()
-{
-       unsigned int tw, w = cmdw + 2 * seek;
+calcoffsets(void) {
+       unsigned int tw, w;

 
 

-       if(!curroff)
+       if(!curr)

                return;
 
                return;
 

-       for(nextoff = curroff; nextoff; nextoff=nextoff->right) {
-               tw = textw(&brush.font, nextoff->text);
+       w = cmdw + 2 * SPACE;
+       for(next = curr; next; next=next->right) {
+               tw = textw(next->text);

                if(tw > mw / 3)
                        tw = mw / 3;
                if(tw > mw / 3)
                        tw = mw / 3;

-               w += tw + brush.font.height;
+               w += tw;

                if(w > mw)
                        break;
        }
 
                if(w > mw)
                        break;
        }
 

-       w = cmdw + 2 * seek;
-       for(prevoff = curroff; prevoff && prevoff->left; prevoff=prevoff->left) {
-               tw = textw(&brush.font, prevoff->left->text);
+       w = cmdw + 2 * SPACE;
+       for(prev = curr; prev && prev->left; prev=prev->left) {
+               tw = textw(prev->left->text);

                if(tw > mw / 3)
                        tw = mw / 3;
                if(tw > mw / 3)
                        tw = mw / 3;

-               w += tw + brush.font.height;
+               w += tw;

                if(w > mw)
                        break;
        }
 }
 
 static void
                if(w > mw)
                        break;
        }
 }
 
 static void

-update_items(char *pattern)
-{
-       unsigned int plen = strlen(pattern);
+drawmenu(void) {
+       Item *i;
+
+       dc.x = 0;
+       dc.y = 0;
+       dc.w = mw;
+       dc.h = mh;
+       drawtext(NULL, dc.norm);
+
+       /* print command */
+       if(cmdw && item)
+               dc.w = cmdw;
+       drawtext(text[0] ? text : NULL, dc.norm);
+       dc.x += cmdw;
+
+       if(curr) {
+               dc.w = SPACE;
+               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
+               dc.x += dc.w;
+
+               /* determine maximum items */
+               for(i = curr; i != next; i=i->right) {
+                       dc.w = textw(i->text);
+                       if(dc.w > mw / 3)
+                               dc.w = mw / 3;
+                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+                       dc.x += dc.w;
+               }
+
+               dc.x = mw - SPACE;
+               dc.w = SPACE;
+               drawtext(next ? ">" : NULL, dc.norm);
+       }
+       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
+       XFlush(dpy);
+}
+
+static void
+match(char *pattern) {
+       unsigned int plen;

        Item *i, *j;
 
        if(!pattern)
                return;
 
        Item *i, *j;
 
        if(!pattern)
                return;
 

-       if(!title || *pattern)
-               cmdw = cw;
-       else
-               cmdw = tw;
-
+       plen = strlen(pattern);

        item = j = NULL;
        nitem = 0;
 
        item = j = NULL;
        nitem = 0;
 

-       for(i = allitem; i; i=i->next)
-               if(!plen || !strncmp(pattern, i->text, plen)) {
+       for(i = allitems; i; i=i->next)
+               if(plen ? !strncmp(pattern, i->text, plen) :
+                               strncmp(pattern, i->text, plen) && strstr(i->text, pattern)) {

                        if(!j)
                                item = i;
                        else
                        if(!j)
                                item = i;
                        else


@@ -108,88 +131,19 @@ update_items(char *pattern)
                        j = i;
                        nitem++;
                }
                        j = i;
                        nitem++;
                }

-       for(i = allitem; i; i=i->next)
-               if(plen && strncmp(pattern, i->text, plen)
-                               && strstr(i->text, pattern)) {
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
-               }
-
-       curroff = prevoff = nextoff = sel = item;
-
-       update_offsets();
-}
-
-/* creates brush structs for brush mode drawing */
-static void
-draw_menu()
-{
-       Item *i;
-
-       brush.x = 0;
-       brush.y = 0;
-       brush.w = mw;
-       brush.h = mh;
-       draw(dpy, &brush, False, 0);
-
-       /* print command */
-       if(!title || text[0]) {
-               cmdw = cw;
-               if(cmdw && item)
-                       brush.w = cmdw;
-               draw(dpy, &brush, False, text);
-       }
-       else {
-               cmdw = tw;
-               brush.w = cmdw;
-               draw(dpy, &brush, False, title);
-       }
-       brush.x += brush.w;
-
-       if(curroff) {
-               brush.w = seek;
-               draw(dpy, &brush, False, (curroff && curroff->left) ? "<" : 0);
-               brush.x += brush.w;
-
-               /* determine maximum items */
-               for(i = curroff; i != nextoff; i=i->right) {
-                       brush.border = False;
-                       brush.w = textw(&brush.font, i->text);
-                       if(brush.w > mw / 3)
-                               brush.w = mw / 3;
-                       brush.w += brush.font.height;
-                       if(sel == i) {
-                               swap((void **)&brush.fg, (void **)&brush.bg);
-                               draw(dpy, &brush, True, i->text);
-                               swap((void **)&brush.fg, (void **)&brush.bg);
-                       }
-                       else
-                               draw(dpy, &brush, False, i->text);
-                       brush.x += brush.w;
-               }

 
 

-               brush.x = mw - seek;
-               brush.w = seek;
-               draw(dpy, &brush, False, nextoff ? ">" : 0);
-       }
-       XCopyArea(dpy, brush.drawable, win, brush.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
+       curr = prev = next = sel = item;
+       calcoffsets();

 }
 
 static void
 }
 
 static void

-kpress(XKeyEvent * e)
-{
-       KeySym ksym;
+kpress(XKeyEvent * e) {

        char buf[32];
        int num, prev_nitem;
        char buf[32];
        int num, prev_nitem;

-       unsigned int i, len = strlen(text);
+       unsigned int i, len;
+       KeySym ksym;

 
 

+       len = strlen(text);

        buf[0] = 0;
        num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
 
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
 


@@ -205,18 +159,16 @@ kpress(XKeyEvent * e)
                        return;
                        break;
                case XK_h:
                        return;
                        break;
                case XK_h:

+               case XK_H:

                        ksym = XK_BackSpace;
                        break;
                        ksym = XK_BackSpace;
                        break;

-               case XK_U:

                case XK_u:
                case XK_u:

+               case XK_U:

                        text[0] = 0;
                        text[0] = 0;

-                       update_items(text);
-                       draw_menu();
+                       match(text);
+                       drawmenu();

                        return;
                        break;
                        return;
                        break;

-               case XK_bracketleft:
-                       ksym = XK_Escape;
-                       break;

                }
        }
        switch(ksym) {
                }
        }
        switch(ksym) {


@@ -224,50 +176,48 @@ kpress(XKeyEvent * e)
                if(!(sel && sel->left))
                        return;
                sel=sel->left;
                if(!(sel && sel->left))
                        return;
                sel=sel->left;

-               if(sel->right == curroff) {
-                       curroff = prevoff;
-                       update_offsets();
+               if(sel->right == curr) {
+                       curr = prev;
+                       calcoffsets();

                }
                break;
        case XK_Tab:
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));
                }
                break;
        case XK_Tab:
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));

-               update_items(text);
+               match(text);

                break;
        case XK_Right:
                if(!(sel && sel->right))
                        return;
                sel=sel->right;
                break;
        case XK_Right:
                if(!(sel && sel->right))
                        return;
                sel=sel->right;

-               if(sel == nextoff) {
-                       curroff = nextoff;
-                       update_offsets();
+               if(sel == next) {
+                       curr = next;
+                       calcoffsets();

                }
                break;
        case XK_Return:
                }
                break;
        case XK_Return:

-               if(e->state & ShiftMask) {
-                       if(text)
-                               fprintf(stdout, "%s", text);
-               }
+               if((e->state & ShiftMask) && text)
+                       fprintf(stdout, "%s", text);

                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);
                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);

-               done = True;
+               running = False;

                break;
        case XK_Escape:
                ret = 1;
                break;
        case XK_Escape:
                ret = 1;

-               done = True;
+               running = False;

                break;
        case XK_BackSpace:
                if((i = len)) {
                        prev_nitem = nitem;
                        do {
                                text[--i] = 0;
                break;
        case XK_BackSpace:
                if((i = len)) {
                        prev_nitem = nitem;
                        do {
                                text[--i] = 0;

-                               update_items(text);
+                               match(text);

                        } while(i && nitem && prev_nitem == nitem);
                        } while(i && nitem && prev_nitem == nitem);

-                       update_items(text);
+                       match(text);

                }
                break;
        default:
                }
                break;
        default:


@@ -277,15 +227,14 @@ kpress(XKeyEvent * e)
                                strncat(text, buf, sizeof(text));
                        else
                                strncpy(text, buf, sizeof(text));
                                strncat(text, buf, sizeof(text));
                        else
                                strncpy(text, buf, sizeof(text));

-                       update_items(text);
+                       match(text);

                }
        }
                }
        }

-       draw_menu();
+       drawmenu();

 }
 
 static char *
 }
 
 static char *

-read_allitems()
-{
+readstdin(void) {

        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;


@@ -306,7 +255,7 @@ read_allitems()
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)

-                       allitem = new;
+                       allitems = new;

                else 
                        i->next = new;
                i = new;
                else 
                        i->next = new;
                i = new;


@@ -315,51 +264,57 @@ read_allitems()
        return maxname;
 }
 
        return maxname;
 }
 

+/* extern */
+
+int screen;
+Display *dpy;
+DC dc = {0};
+

 int
 int

-main(int argc, char *argv[])
-{
-       int i;
-       XSetWindowAttributes wa;
+main(int argc, char *argv[]) {

        char *maxname;
        char *maxname;

+       fd_set rd;
+       struct timeval timeout;
+       Item *i;

        XEvent ev;
        XEvent ev;

+       XSetWindowAttributes wa;

 
 

-       /* command line args */
-       for(i = 1; i < argc; i++) {
-               if (argv[i][0] == '-')
-                       switch (argv[i][1]) {
-                       case 'v':
-                               fprintf(stdout, "%s", version);
-                               exit(0);
-                               break;
-                       case 't':
-                               if(++i < argc) {
-                                       title = argv[i];
-                                       break;
-                               }
-                       default:
-                               eprint("usage: dmenu [-v] [-t <title>]\n");
-                               break;
-                       }
-               else
-                       eprint("usage: dmenu [-v] [-t <title>]\n");
+       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+               fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               exit(EXIT_SUCCESS);

        }
        }

+       else if(argc != 1)
+               eprint("usage: dmenu [-v]\n");

 
        dpy = XOpenDisplay(0);
        if(!dpy)
 
        dpy = XOpenDisplay(0);
        if(!dpy)

-               eprint("dmenu: cannot open dpy\n");
+               eprint("dmenu: cannot open display\n");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 

-       maxname = read_allitems();
-
-       /* grab as early as possible, but after reading all items!!! */
+       /* Note, the select() construction allows to grab all keypresses as
+        * early as possible, to not loose them. But if there is no standard
+        * input supplied, we will make sure to exit after MAX_WAIT_STDIN
+        * seconds. This is convenience behavior for rapid typers.
+        */ 

        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
                         GrabModeAsync, CurrentTime) != GrabSuccess)
                usleep(1000);
 
        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
                         GrabModeAsync, CurrentTime) != GrabSuccess)
                usleep(1000);
 

+       timeout.tv_usec = 0;
+       timeout.tv_sec = STDIN_TIMEOUT;
+       FD_ZERO(&rd);
+       FD_SET(STDIN_FILENO, &rd);
+       if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
+               goto UninitializedEnd;
+       maxname = readstdin();
+

        /* style */
        /* style */

-       loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
-       loadfont(dpy, &brush.font, FONT);
+       dc.sel[ColBG] = getcolor(SELBGCOLOR);
+       dc.sel[ColFG] = getcolor(SELFGCOLOR);
+       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+       setfont(FONT);

 
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
 
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;


@@ -367,59 +322,60 @@ main(int argc, char *argv[])
 
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
 
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);

-       mh = texth(&brush.font);
+       mh = dc.font.height + 2;

 
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
 
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));

-       XFlush(dpy);

 
        /* pixmap */
 
        /* pixmap */

-       brush.gc = XCreateGC(dpy, root, 0, 0);
-       brush.drawable = XCreatePixmap(dpy, win, mw, mh,
-                       DefaultDepth(dpy, screen));
-       XFlush(dpy);
+       dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);

 
        if(maxname)
 
        if(maxname)

-               cw = textw(&brush.font, maxname) + brush.font.height;
-       if(cw > mw / 3)
-               cw = mw / 3;
-
-       if(title) {
-               tw = textw(&brush.font, title) + brush.font.height;
-               if(tw > mw / 3)
-                       tw = mw / 3;
-       }
-
-       cmdw = title ? tw : cw;
+               cmdw = textw(maxname);
+       if(cmdw > mw / 3)
+               cmdw = mw / 3;

 
        text[0] = 0;
 
        text[0] = 0;

-       update_items(text);
+       match(text);

        XMapRaised(dpy, win);
        XMapRaised(dpy, win);

-       draw_menu();
-       XFlush(dpy);
+       drawmenu();
+       XSync(dpy, False);

 
        /* main event loop */
 
        /* main event loop */

-       while(!done && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev)) {

                switch (ev.type) {
                switch (ev.type) {

+               default:        /* ignore all crap */
+                       break;

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case Expose:
                        if(ev.xexpose.count == 0)
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case Expose:
                        if(ev.xexpose.count == 0)

-                               draw_menu();
-                       break;
-               default:
+                               drawmenu();

                        break;
                }
        }
 
                        break;
                }
        }
 

-       XUngrabKeyboard(dpy, CurrentTime);
-       XFreePixmap(dpy, brush.drawable);
-       XFreeGC(dpy, brush.gc);
+       while(allitems) {
+               i = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = i;
+       }
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);

        XDestroyWindow(dpy, win);
        XDestroyWindow(dpy, win);

+UninitializedEnd:
+       XUngrabKeyboard(dpy, CurrentTime);

        XCloseDisplay(dpy);
 
        return ret;
        XCloseDisplay(dpy);
 
        return ret;