From e0e54f2ececed37fc0cae5f8987746a1dbfbdb7e Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Wed, 25 Feb 2009 14:42:40 +0000
Subject: [PATCH] Support for launching with terminal Added missing title in fl
 file

---
 ede-launch/ede-launch.cpp   | 32 ++++++++++++++++++++++++--------
 ede-launch/fl/ede-launch.fl | 19 ++++++++++++-------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/ede-launch/ede-launch.cpp b/ede-launch/ede-launch.cpp
index 7236a1b..5c06979 100644
--- a/ede-launch/ede-launch.cpp
+++ b/ede-launch/ede-launch.cpp
@@ -15,6 +15,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>
+#include <FL/Fl_Check_Button.H>
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Pixmap.H>
 #include <edelib/Run.h>
@@ -31,9 +32,11 @@
 
 EDELIB_NS_USING(run_program_fmt)
 
-static Fl_Pixmap image_run(run_xpm);
-static Fl_Input* dialog_input;
-static int       ret;
+static Fl_Pixmap        image_run(run_xpm);
+static Fl_Input*        dialog_input;
+static Fl_Check_Button* in_term;
+
+static int ret;
 
 void help(void) {
 	puts("Usage: ede-launch [OPTIONS] program");
@@ -183,12 +186,22 @@ static void ok_cb(Fl_Widget*, void* w) {
 	/* do not block dialog when program is starting */
 	Fl::check();
 
-	/* TODO: is 'cmd' safe to use here? */
-	start_child_process_with_core(cmd);
+	/* TODO: is 'cmd' safe after hide? */
+	if(in_term->value()) {
+		char buff[128];
+		char* term = getenv("TERM");
+		if(!term)
+			term = "xterm";
+
+		snprintf(buff, sizeof(buff), "%s -e %s", term, cmd);
+		start_child_process_with_core(buff);
+	} else {
+		start_child_process_with_core(cmd);
+	}
 }
 
 static void start_dialog(int argc, char** argv) {
-	LaunchWindow* win = new LaunchWindow(370, 160, _("Run Command"));
+	LaunchWindow* win = new LaunchWindow(370, 195, _("Run Command"));
 	win->begin();
 		Fl_Box* icon = new Fl_Box(10, 10, 55, 55);
 		icon->image(image_run);
@@ -198,9 +211,12 @@ static void start_dialog(int argc, char** argv) {
 
 		dialog_input = new Fl_Input(70, 90, 290, 25, _("Open:"));
 
-		Fl_Button* ok = new Fl_Button(175, 125, 90, 25, _("&OK"));
+		in_term = new Fl_Check_Button(70, 125, 290, 25, _("Run in terminal"));
+		in_term->down_box(FL_DOWN_BOX);
+
+		Fl_Button* ok = new Fl_Button(175, 160, 90, 25, _("&OK"));
 		ok->callback(ok_cb, win);
-		Fl_Button* cancel = new Fl_Button(270, 125, 90, 25, _("&Cancel"));
+		Fl_Button* cancel = new Fl_Button(270, 160, 90, 25, _("&Cancel"));
 		cancel->callback(cancel_cb, win);
 	win->end();
 	win->show(argc, argv);
diff --git a/ede-launch/fl/ede-launch.fl b/ede-launch/fl/ede-launch.fl
index 2882c25..5a0d8ae 100644
--- a/ede-launch/fl/ede-launch.fl
+++ b/ede-launch/fl/ede-launch.fl
@@ -4,8 +4,9 @@ header_name {.h}
 code_name {.cxx}
 Function {} {open
 } {
-  Fl_Window {} {open
-    xywh {433 276 370 160} type Double visible
+  Fl_Window {} {
+    label {Run Command} open
+    xywh {433 276 370 195} type Double visible
   } {
     Fl_Box {} {
       image {../icons/run.xpm} xywh {10 10 55 55} labelsize 14
@@ -18,13 +19,17 @@ Function {} {open
       label {Open:}
       xywh {70 90 290 25}
     }
-    Fl_Button {} {
-      label {&OK}
-      xywh {175 125 90 25}
+    Fl_Check_Button {} {
+      label {Run in terminal} selected
+      xywh {70 125 290 25} down_box DOWN_BOX
     }
     Fl_Button {} {
-      label {&Cancel} selected
-      xywh {270 125 90 25}
+      label {&OK}
+      xywh {175 160 90 25}
+    }
+    Fl_Button {} {
+      label {&Cancel}
+      xywh {270 160 90 25}
     }
   }
 }