made function signatures more consistent to my coding style

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 6ca043d..60567b2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,8 @@
 #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>
@@ -40,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
-{
+calcoffsets() {
        unsigned int tw, w;
 
        if(!curr)
@@ -69,8 +70,7 @@ calcoffsets()
 }
 
 static void
-drawmenu()
-{
+drawmenu() {
        Item *i;
 
        dc.x = 0;
@@ -108,8 +108,7 @@ drawmenu()
 }
 
 static void
-match(char *pattern)
-{
+match(char *pattern) {
        unsigned int plen;
        Item *i, *j;
 
@@ -149,8 +148,7 @@ match(char *pattern)
 }
 
 static void
-kpress(XKeyEvent * e)
-{
+kpress(XKeyEvent * e) {
        char buf[32];
        int num, prev_nitem;
        unsigned int i, len;
@@ -249,8 +247,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
-readstdin()
-{
+readstdin() {
        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
@@ -287,9 +284,10 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
        char *maxname;
+       fd_set rd;
+       struct timeval timeout;
        Item *i;
        XEvent ev;
        XSetWindowAttributes wa;
@@ -307,13 +305,23 @@ main(int argc, char *argv[])
        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);
 
+       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);
@@ -366,7 +374,6 @@ main(int argc, char *argv[])
                }
        }
 
-       XUngrabKeyboard(dpy, CurrentTime);
        while(allitems) {
                i = allitems->next;
                free(allitems->text);
@@ -380,6 +387,8 @@ main(int argc, char *argv[])
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, win);
+UninitializedEnd:
+       XUngrabKeyboard(dpy, CurrentTime);
        XCloseDisplay(dpy);
 
        return ret;