Link: for terminal=true apps use TerminalDialog (#104)

* LinkApp: for `terminal=true` apps use gmenu2x's TerminalDialog()

* editLink(): add "Terminal" bool option

Author: Apaczer

src/gmenu2x.cpp

@@ -2097,6 +2097,7 @@ void GMenu2X::editLink() {
 	string linkSelDir = menu->selLinkApp()->getSelectorDir();
 	bool useSelector = !linkSelDir.empty();
 	bool linkSelBrowser = menu->selLinkApp()->getSelectorBrowser();
+	bool linkTerminal = menu->selLinkApp()->getTerminal();
 	string linkSelScreens = menu->selLinkApp()->getSelectorScreens();
 	string linkSelAliases = menu->selLinkApp()->getAliasFile();
 	int linkClock = menu->selLinkApp()->getCPU();
@@ -2163,6 +2164,7 @@ void GMenu2X::editLink() {
 	sd.addSetting(new MenuSettingFile(			this, tr["Aliases"],		tr["File containing a list of aliases for the selector"], &linkSelAliases, ".txt,.dat", linkExec, dialogTitle, dialogIcon));
 	sd.addSetting(new MenuSettingImage(			this, tr["Backdrop"],		tr["Select an image backdrop"], &linkBackdrop, ".png,.bmp,.jpg,.jpeg", linkExec, dialogTitle, dialogIcon));
 	sd.addSetting(new MenuSettingFile(			this, tr["Manual"],			tr["Select a Manual or Readme file"], &linkManual, ".png,.bmp,.jpg,.jpeg,.txt,.me", linkExec, dialogTitle, dialogIcon));
+	sd.addSetting(new MenuSettingBool(			this, tr["Terminal"],		tr["Output app via Terminal Dialog"], &linkTerminal));
 #if defined(TARGET_WIZ) || defined(TARGET_CAANOO)
 	bool linkUseGinge = menu->selLinkApp()->getUseGinge();
 	string ginge_prep = exe_path() + "/ginge/ginge_prep";
@@ -2206,6 +2208,7 @@ void GMenu2X::editLink() {
 		menu->selLinkApp()->setCPU(linkClock);
 		menu->selLinkApp()->setKbdLayout(linkKbdLayout);
 		menu->selLinkApp()->setTefix(linkTefix);
+		menu->selLinkApp()->setTerminal(linkTerminal);
 
 #if defined(HW_GAMMA)
 		menu->selLinkApp()->setGamma(linkGamma);

src/linkapp.cpp

@@ -26,6 +26,7 @@
 #include "menu.h"
 #include "selector.h"
 #include "messagebox.h"
+#include "terminaldialog.h"
 #include "debug.h"
 
 using namespace std;
@@ -412,7 +413,9 @@ void LinkApp::launch(const string &selectedFile, string dir) {
 		}
 	}
 
-	INFO("Executing '%s' (%s %s)", title.c_str(), exec.c_str(), params.c_str());
+	string execcmd = exec + " " + params;
+
+	INFO("Executing '%s' (%s)", title.c_str(), execcmd.c_str());
 
 #if defined(OPK_SUPPORT)
 	if (isOPK()) {
@@ -478,28 +481,39 @@ void LinkApp::launch(const string &selectedFile, string dir) {
 		command = "HOME=" + params + " " + command;
 	}
 
-	gmenu2x->quit(false);
-
-	if (getTerminal()) gmenu2x->enableTerminal();
-
-	// execle("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL, environ);
-	pid_t son = fork();
-	if (!son) {
-		execlp("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL);
-		ERROR("execlp of shell cmd \"%s\" failed", command.c_str());
-	}
-	int status;
-	waitpid(son, &status, 0);
-	INFO("Last launched app \"%s\" exited with status=%i", command.c_str(), status);
-	
-	if (gmenu2x->confInt["saveAutoStart"]) {
-		// gmenu2x->confStr["datetime"] = get_date_time();
-		// gmenu2x->writeConfig();
-		gmenu2x->shutdownOS();
-	} else {
-		//we already called SDL_Quit try relaunching gmenu2x
-		chdir(exe_path().c_str());
-		execlp("./gmenu2x", "./gmenu2x", NULL); // can't use gmenu2x->reinit() since we've called quit()
+	if (getTerminal())
+#if defined(CUS_TERM)
+		gmenu2x->enableTerminal();
+#else
+	{
+		chdir(exe_path().c_str()); // we're returrning to menu so change cur wdir back to gmenu2x
+		TerminalDialog td(gmenu2x, this->getTitle().c_str(), execcmd, "icons/configure.png");
+		td.exec(command);
+		gmenu2x->initMenu();
+		return;
+	} else
+#endif
+	{
+		gmenu2x->quit(false);
+		// execle("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL, environ);
+		pid_t son = fork();
+		if (!son) {
+			execlp("/bin/sh", "/bin/sh", "-c", command.c_str(), NULL);
+			ERROR("execlp of shell cmd \"%s\" failed", command.c_str());
+		}
+		int status;
+		waitpid(son, &status, 0);
+		INFO("Last launched app \"%s\" exited with status=%i", command.c_str(), status);
+		
+		if (gmenu2x->confInt["saveAutoStart"]) {
+			// gmenu2x->confStr["datetime"] = get_date_time();
+			// gmenu2x->writeConfig();
+			gmenu2x->shutdownOS();
+		} else {
+			//we already called SDL_Quit try relaunching gmenu2x
+			chdir(exe_path().c_str());
+			execlp("./gmenu2x", "./gmenu2x", NULL); // can't use gmenu2x->reinit() since we've called quit()
+		}
 	}
 }