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 51fa20f..77a61b9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,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>


@@ -40,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
 static Window win;
 
 static void

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

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


@@ -69,8 +70,7 @@ calcoffsets()
 }
 
 static void
 }
 
 static void

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

        Item *i;
 
        dc.x = 0;
        Item *i;
 
        dc.x = 0;


@@ -108,8 +108,7 @@ drawmenu()
 }
 
 static void
 }
 
 static void

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

        unsigned int plen;
        Item *i, *j;
 
        unsigned int plen;
        Item *i, *j;
 


@@ -121,19 +120,8 @@ match(char *pattern)
        nitem = 0;
 
        for(i = allitems; i; i=i->next)
        nitem = 0;
 
        for(i = allitems; i; i=i->next)

-               if(!plen || !strncmp(pattern, i->text, plen)) {
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
-               }
-       for(i = allitems; i; i=i->next)
-               if(plen && strncmp(pattern, i->text, plen)
-                               && strstr(i->text, pattern)) {
+               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


@@ -149,8 +137,7 @@ match(char *pattern)
 }
 
 static void
 }
 
 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;


@@ -210,10 +197,8 @@ 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)
                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)


@@ -249,8 +234,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
 }
 
 static char *

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


@@ -287,9 +271,10 @@ Display *dpy;
 DC dc = {0};
 
 int
 DC dc = {0};
 
 int

-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {

        char *maxname;
        char *maxname;

+       fd_set rd;
+       struct timeval timeout;

        Item *i;
        XEvent ev;
        XSetWindowAttributes wa;
        Item *i;
        XEvent ev;
        XSetWindowAttributes wa;


@@ -307,13 +292,23 @@ main(int argc, char *argv[])
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 

-       maxname = readstdin();
-
-       /* 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 */
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        /* style */
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);


@@ -354,6 +349,8 @@ main(int argc, char *argv[])
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {

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

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;


@@ -361,12 +358,9 @@ main(int argc, char *argv[])
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;

-               default:
-                       break;

                }
        }
 
                }
        }
 

-       XUngrabKeyboard(dpy, CurrentTime);

        while(allitems) {
                i = allitems->next;
                free(allitems->text);
        while(allitems) {
                i = allitems->next;
                free(allitems->text);


@@ -380,6 +374,8 @@ main(int argc, char *argv[])
        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);
 
        return ret;
        XCloseDisplay(dpy);
 
        return ret;