Added tag 1.3 for changeset 2eb9997be51cb1b11a8900728ccc0904f9371157

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 14524c9..3fa1e54 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,9 +1,7 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>

  * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */

-

 #include "dmenu.h"
 
 #include <ctype.h>
 #include "dmenu.h"
 
 #include <ctype.h>


@@ -11,6 +9,8 @@
 #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>
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>


@@ -24,14 +24,12 @@ struct Item {
 
 /* static */
 
 
 /* static */
 

-static char *title, 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 mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;

-static unsigned int tw = 0;
-static unsigned int cw = 0;
-static Bool done = False;
+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 *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;


@@ -42,13 +40,11 @@ static Window root;
 static Window win;
 
 static void
 static Window win;
 
 static void

-calcoffsets()
-{
+calcoffsets(void) {

        unsigned int tw, w;
 
        if(!curr)
                return;
        unsigned int tw, w;
 
        if(!curr)
                return;

-

        w = cmdw + 2 * SPACE;
        for(next = curr; next; next=next->right) {
                tw = textw(next->text);
        w = cmdw + 2 * SPACE;
        for(next = curr; next; next=next->right) {
                tw = textw(next->text);


@@ -58,7 +54,6 @@ calcoffsets()
                if(w > mw)
                        break;
        }
                if(w > mw)
                        break;
        }

-

        w = cmdw + 2 * SPACE;
        for(prev = curr; prev && prev->left; prev=prev->left) {
                tw = textw(prev->left->text);
        w = cmdw + 2 * SPACE;
        for(prev = curr; prev && prev->left; prev=prev->left) {
                tw = textw(prev->left->text);


@@ -71,71 +66,49 @@ calcoffsets()
 }
 
 static void
 }
 
 static void

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

        Item *i;
 
        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        Item *i;
 
        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(NULL, False, False);
-
+       drawtext(NULL, dc.norm);

        /* print command */
        /* print command */

-       if(!title || text[0]) {
-               cmdw = cw;
-               if(cmdw && item)
-                       dc.w = cmdw;
-               drawtext(text, False, False);
-       }
-       else {
-               cmdw = tw;
+       if(cmdw && item)

                dc.w = cmdw;
                dc.w = cmdw;

-               drawtext(title, False, False);
-       }
-       dc.x += dc.w;
-
+       drawtext(text[0] ? text : NULL, dc.norm);
+       dc.x += cmdw;

        if(curr) {
                dc.w = SPACE;
        if(curr) {
                dc.w = SPACE;

-               drawtext((curr && curr->left) ? "<" : NULL, False, False);
+               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);

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

-

                /* determine maximum items */
                for(i = curr; i != next; i=i->right) {
                /* determine maximum items */
                for(i = curr; i != next; i=i->right) {

-                       dc.border = False;

                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;
                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;

-                       drawtext(i->text, sel == i, sel == i);
+                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);

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

-

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

-               drawtext(next ? ">" : NULL, False, False);
+               drawtext(next ? ">" : NULL, dc.norm);

        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
 }
 
 static void
        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
 }
 
 static void

-input(char *pattern)
-{
+match(char *pattern) {

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

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

        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;
        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;

-

        for(i = allitems; i; i=i->next)
                if(!plen || !strncmp(pattern, i->text, plen)) {
                        if(!j)
        for(i = allitems; i; i=i->next)
                if(!plen || !strncmp(pattern, i->text, plen)) {
                        if(!j)


@@ -159,14 +132,12 @@ input(char *pattern)
                        j = i;
                        nitem++;
                }
                        j = i;
                        nitem++;
                }

-

        curr = prev = next = sel = item;
        calcoffsets();
 }
 
 static void
        curr = prev = next = sel = item;
        calcoffsets();
 }
 
 static void

-kpress(XKeyEvent * e)
-{
+kpress(XKeyEvent * e) {

        char buf[32];
        int num, prev_nitem;
        unsigned int i, len;
        char buf[32];
        int num, prev_nitem;
        unsigned int i, len;


@@ -175,12 +146,10 @@ kpress(XKeyEvent * e)
        len = strlen(text);
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
        len = strlen(text);
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof(buf), &ksym, 0);

-

        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))
                return;
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                        || IsPrivateKeypadKey(ksym))
                return;

-

        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
                switch (ksym) {
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
                switch (ksym) {


@@ -188,18 +157,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;

-                       input(text);
+                       match(text);

                        drawmenu();
                        return;
                        break;
                        drawmenu();
                        return;
                        break;

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

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


@@ -216,7 +183,7 @@ kpress(XKeyEvent * e)
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));

-               input(text);
+               match(text);

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


@@ -228,29 +195,27 @@ kpress(XKeyEvent * e)
                }
                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;

-                               input(text);
+                               match(text);

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

-                       input(text);
+                       match(text);

                }
                break;
        default:
                }
                break;
        default:


@@ -260,15 +225,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));

-                       input(text);
+                       match(text);

                }
        }
        drawmenu();
 }
 
 static char *
                }
        }
        drawmenu();
 }
 
 static char *

-readinput()
-{
+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;


@@ -284,7 +248,6 @@ readinput()
                        maxname = p;
                        max = len;
                }
                        maxname = p;
                        max = len;
                }

-

                new = emalloc(sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;
                new = emalloc(sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;


@@ -305,93 +268,98 @@ Display *dpy;
 DC dc = {0};
 
 int
 DC dc = {0};
 
 int

-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
+       char *font = FONT;

        char *maxname;
        char *maxname;

+       char *normbg = NORMBGCOLOR;
+       char *normfg = NORMFGCOLOR;
+       char *selbg = SELBGCOLOR;
+       char *selfg = SELFGCOLOR;
+       fd_set rd;

        int i;
        int i;

+       struct timeval timeout;
+       Item *itm;

        XEvent ev;
        XSetWindowAttributes wa;
 
        XEvent ev;
        XSetWindowAttributes wa;
 

+       timeout.tv_usec = 0;
+       timeout.tv_sec = 3;

        /* command line args */
        /* command line args */

-       for(i = 1; i < argc; i++) {
-               if (argv[i][0] == '-')
-                       switch (argv[i][1]) {
-                       case 'v':
-                               fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-                               exit(EXIT_SUCCESS);
-                               break;
-                       case 't':
-                               if(++i < argc) {
-                                       title = argv[i];
-                                       break;
-                               }
-                       default:
-                               eprint("usage: dmenu [-v] [-t <title>]\n");
-                               break;
-                       }
+       for(i = 1; i < argc; i++)
+               if(!strncmp(argv[i], "-font", 6))
+                       font = argv[++i];
+               else if(!strncmp(argv[i], "-normbg", 8))
+                       normbg = argv[++i];
+               else if(!strncmp(argv[i], "-normfg", 8))
+                       normfg = argv[++i];
+               else if(!strncmp(argv[i], "-selbg", 7))
+                       selbg = argv[++i];
+               else if(!strncmp(argv[i], "-selfg", 7))
+                       selfg = argv[++i];
+               else if(!strncmp(argv[i], "-t", 3))
+                       timeout.tv_sec = atoi(argv[++i]);
+               else if(!strncmp(argv[i], "-v", 3)) {
+                       fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+                       exit(EXIT_SUCCESS);
+               }

                else
                else

-                       eprint("usage: dmenu [-v] [-t <title>]\n");
-       }
-
+                       eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);

        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 = readinput();
-
-       /* 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);

-
+       FD_ZERO(&rd);
+       FD_SET(STDIN_FILENO, &rd);
+       if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
+               goto UninitializedEnd;
+       maxname = readstdin();

        /* style */
        /* style */

-       dc.bg = getcolor(BGCOLOR);
-       dc.fg = getcolor(FGCOLOR);
-       dc.border = getcolor(BORDERCOLOR);
-       setfont(FONT);
-
+       dc.norm[ColBG] = getcolor(normbg);
+       dc.norm[ColFG] = getcolor(normfg);
+       dc.sel[ColBG] = getcolor(selbg);
+       dc.sel[ColFG] = getcolor(selfg);
+       setfont(font);
+       /* menu window */

        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;

-

        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);

-       mh = dc.font.height + 4;
-
+       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));

-

        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        /* pixmap */
        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(maxname);
-       if(cw > mw / 3)
-               cw = mw / 3;
-
-       if(title) {
-               tw = textw(title);
-               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;

-       input(text);
+       match(text);

        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);
 
        /* main event loop */
        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);
 
        /* 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 KeyPress:
                        kpress(&ev.xkey);
                        break;


@@ -399,16 +367,24 @@ main(int argc, char *argv[])
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;

-               default:
-                       break;

                }
                }

-       }

 
 

-       XUngrabKeyboard(dpy, CurrentTime);
+       /* cleanup */
+       while(allitems) {
+               itm = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = itm;
+       }
+       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);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, win);

+UninitializedEnd:
+       XUngrabKeyboard(dpy, CurrentTime);

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-

        return ret;
 }
        return ret;
 }