Merge pull request #1 from madlambda/add-launcher

add simple launcher menu entry

Author: katcipis

src/cmd/rio/dat.h

@@ -4,7 +4,7 @@
 #define CORNER		_corner
 #define	INSET		_inset
 #define MAXHIDDEN	128
-#define B3FIXED 	5
+#define B3FIXED 	6
 #define NUMVIRTUALS	12
 
 #define AllButtonMask	(Button1Mask|Button2Mask|Button3Mask \
@@ -140,6 +140,7 @@ extern int			nostalgia;
 extern char		**myargv;
 extern Bool 		shape;
 extern char 		*termprog;
+extern char 		*launcher;
 extern char 		*shell;
 extern char 		*version[];
 extern int			_border;

src/cmd/rio/main.c

@@ -28,6 +28,7 @@ XFontStruct 	*font;
 int 			nostalgia;
 char			**myargv;
 char			*termprog;
+char			*launcher;
 char			*shell;
 Bool			shape;
 int 			_border = 4;
@@ -108,6 +109,8 @@ main(int argc, char *argv[])
 		}
 		else if(strcmp(argv[i], "-term") == 0 && i+1<argc)
 			termprog = argv[++i];
+		else if(strcmp(argv[i], "-launcher") == 0 && i+1 < argc) 
+			launcher = argv[++i];
 		else if(strcmp(argv[i], "-virtuals") == 0 && i+1<argc){
 			numvirtuals = atoi(argv[++i]);
 			if(numvirtuals < 0 || numvirtuals > 12){

src/cmd/rio/menu.c

@@ -54,6 +54,7 @@ Menu b2menu =
 char	*b3items[B3FIXED+MAXHIDDEN+1] =
 {
 	"New",
+	"Launch",
 	"Reshape",
 	"Move",
 	"Delete",
@@ -64,6 +65,7 @@ char	*b3items[B3FIXED+MAXHIDDEN+1] =
 enum
 {
 	New,
+	Launch,
 	Reshape,
 	Move,
 	Delete,
@@ -80,6 +82,34 @@ Menu	egg =
 	version
 };
 
+void
+runterm() {
+	if(termprog != NULL){
+		execl(shell, shell, "-c", termprog, (char*)0);
+		fprintf(stderr, "rio: exec %s", shell);
+		perror(" failed");
+	}
+	execlp("9term", "9term", scrolling ? "-ws" : "-w", (char*)0);
+	execlp("xterm", "xterm", "-ut", (char*)0);
+	perror("rio: exec 9term/xterm failed");
+	exit(1);
+}
+
+void
+runlauncher() {
+	if(launcher != NULL) {
+		/* launcher parameters uses configured shell syntax */
+		execl(shell, shell, "-c", launcher, (char*)0);
+		perror("rio: launcher failed");
+
+		/* will try default launcher */
+	}
+
+	execlp("dmenu_run", "dmenu_run", (char*)0);	
+	perror("rio: exec dmenu_run failed");
+	exit(1);
+}
+
 void
 button(XButtonEvent *e)
 {
@@ -157,7 +187,10 @@ button(XButtonEvent *e)
 		cmapnofocus(s);
 	switch (n = menuhit(e, &b3menu)){
 	case New:
-		spawn(s);
+		spawn(s, runterm);
+		break;
+	case Launch:
+		spawn(s, runlauncher);
 		break;
 	case Reshape:
 		reshape(selectwin(1, 0, s), Button3, sweep, 0);
@@ -184,7 +217,7 @@ button(XButtonEvent *e)
 }
 
 void
-spawn(ScreenInfo *s)
+spawn(ScreenInfo *s, void (*fn)())
 {
 	/*
 	 * ugly dance to cause sweeping for terminals.
@@ -205,15 +238,9 @@ spawn(ScreenInfo *s)
 			signal(SIGINT, SIG_DFL);
 			signal(SIGTERM, SIG_DFL);
 			signal(SIGHUP, SIG_DFL);
-			if(termprog != NULL){
-				execl(shell, shell, "-c", termprog, (char*)0);
-				fprintf(stderr, "rio: exec %s", shell);
-				perror(" failed");
-			}
-			execlp("9term", "9term", scrolling ? "-ws" : "-w", (char*)0);
-			execlp("xterm", "xterm", "-ut", (char*)0);
-			perror("rio: exec 9term/xterm failed");
-			exit(1);
+
+			// run in child process
+			fn();
 		}
 		exit(0);
 	}