wmii

commit d202e339aba516e0c3587800cc0f7f90e0fc67ef
parent 28c50a26deac21af9998e3cd3eb7f3642d1ca84a
Author: Kris Maglione <jg@suckless.org>
Date:   Sun, 29 Mar 2009 23:07:36 -0400

Don't grab the keyboard until EOF when isatty(0)

Diffstat:
cmd/menu/dat.h
 | 
2
++
cmd/menu/main.c
 | 
7
++++++-
cmd/menu/menu.c
 | 
1
-

3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cmd/menu/dat.h b/cmd/menu/dat.h
@@ -57,6 +57,8 @@ EXTERN Visual*	render_visual;
 
 EXTERN IxpServer	srv;
 
+EXTERN Window*	barwin;
+
 EXTERN Item*	items;
 EXTERN Item*	matchfirst;
 EXTERN Item*	matchstart;
diff --git a/cmd/menu/main.c b/cmd/menu/main.c
@@ -8,6 +8,7 @@
 #include <X11/Xproto.h>
 #include <locale.h>
 #include <strings.h>
+#include <unistd.h>
 #include <bio.h>
 #include "fns.h"
 #define link _link
@@ -251,7 +252,8 @@ main(int argc, char *argv[]) {
 	initdisplay();
 
 	xext_init();
-	menu_init();
+	if(!isatty(0))
+		menu_init();
 
 	if(address && *address)
 		client = ixp_mount(address);
@@ -294,6 +296,9 @@ main(int argc, char *argv[]) {
 		}
 	}
 
+	if(barwin == nil)
+		menu_init();
+
 	init_screens();
 
 	i = ixp_serverloop(&srv);
diff --git a/cmd/menu/menu.c b/cmd/menu/menu.c
@@ -4,7 +4,6 @@
 #include <unistd.h>
 #include "fns.h"
 
-static Window*	barwin;
 static Handlers handlers;
 
 static int	ltwidth;