Merge pull request elfmz#2539 from spnethw/tmppanel_tweak_open_execut…

…e_logic_in_showmenufromlist tmppanel: tweak open/execute logic in ShowMenuFromList()
akruphi · Dec 3, 2024 · 1cf67b9 · 1cf67b9
2 parents d7e4612 + 034b004
commit 1cf67b9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 20 deletions.
diff --git a/far2l/far2sdk/farplug-mb.h b/far2l/far2sdk/farplug-mb.h
@@ -1574,7 +1574,8 @@ namespace oldfar
 		EF_NOTIFY = 0x08,     // notify when command completed (if such notifications enabled in settings)
 		EF_NOCMDPRINT = 0x10, // dont print command in command line nor include it to history
 		EF_OPEN = 0x20,       // use desktop shell (if present) to open command (e.g. URLs, documents..)
-		EF_MAYBGND = 0x40     // allow put command to background mode
+		EF_MAYBGND = 0x40,     // allow put command to background mode
+		EF_EXTERNALTERM = 0x80 // execute command in configured external terminal
 	};
 
 	typedef int (WINAPI *FAREXECUTE)(const char *CmdStr, unsigned int ExecFlags);

diff --git a/far2l/far2sdk/farplug-wide.h b/far2l/far2sdk/farplug-wide.h
@@ -1984,7 +1984,8 @@ enum EXECUTEFLAGS
 	EF_NOTIFY = 0x08,     // notify when command completed (if such notifications enabled in settings)
 	EF_NOCMDPRINT = 0x10, // dont print command in command line nor include it to history
 	EF_OPEN = 0x20,       // use desktop shell (if present) to open command (e.g. URLs, documents..)
-	EF_MAYBGND = 0x40     // allow put command to background mode
+	EF_MAYBGND = 0x40,     // allow put command to background mode
+	EF_EXTERNALTERM = 0x80 // execute command in configured external terminal
 };
 
 typedef int (WINAPI *FAREXECUTE)(const wchar_t *CmdStr, unsigned int ExecFlags);

diff --git a/far2l/src/execute.cpp b/far2l/src/execute.cpp
@@ -298,6 +298,13 @@ static int farExecuteASynched(const char *CmdStr, unsigned int ExecFlags)
 		return farExecuteASynched(OpenCmd.c_str(), ExecFlags & (~EF_OPEN));
 	}
 
+	if (ExecFlags & EF_EXTERNALTERM) {
+		std::string OpenCmd = GetOpenShVerb("exec");
+		OpenCmd+= ' ';
+		OpenCmd+= CmdStr;
+		return farExecuteASynched(OpenCmd.c_str(), ExecFlags & (~EF_EXTERNALTERM));
+	}
+
 	const bool may_notify = (ExecFlags & (EF_NOTIFY | EF_NOWAIT)) == EF_NOTIFY && Opt.NotifOpt.OnConsole;
 	if (ExecFlags & (EF_HIDEOUT | EF_NOWAIT)) {
 		r = NotVTExecute(CmdStr, (ExecFlags & EF_NOWAIT) != 0, (ExecFlags & EF_SUDO) != 0);

diff --git a/tmppanel/src/TmpPanel.cpp b/tmppanel/src/TmpPanel.cpp
@@ -326,7 +326,7 @@ void ReadFileLines(int fd, DWORD FileSizeLow, TCHAR **argv, TCHAR *args, UINT *n
 			int BreakCode;
 			static const int BreakKeys[2] = {MAKELONG(VK_RETURN, PKF_SHIFT), 0};
 
-			int ExitCode = Info.Menu(Info.ModuleNumber, -1, -1, 0, FMENU_WRAPMODE, Title, NULL,
+			int ExitCode = Info.Menu(Info.ModuleNumber, -1, -1, 0, FMENU_WRAPMODE, Title, L"Enter Shift+Enter Esc Ctrl+Alt+F",
 					_T("Contents"), &BreakKeys[0], &BreakCode, fmi, argc);
 
 			for (int i = 0; i < argc; ++i)
@@ -341,29 +341,56 @@ void ReadFileLines(int fd, DWORD FileSizeLow, TCHAR **argv, TCHAR *args, UINT *n
 				ExpandEnvStrs(p, TMP);
 				p = TMP;
 
-				int bShellExecute = BreakCode != -1;
+				bool bShellExecute = BreakCode != -1;
 
-				if (!bShellExecute) {
-					FAR_FIND_DATA FindData = {};
-					if (TmpPanel::GetFileInfoAndValidate(p, &FindData, FALSE)) {
-						if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-							Info.Control(INVALID_HANDLE_VALUE, FCTL_SETPANELDIR, 0, (LONG_PTR)p);
-						} else {
-							bShellExecute = TRUE;
-						}
+				enum { ACTION_NOP, ACTION_SETPANELDIR, ACTION_SETCMDLINE, ACTION_OPEN,
+					   ACTION_EXECUTE} Action = ACTION_NOP;
+
+				FAR_FIND_DATA FindData = {};
+
+				if (TmpPanel::GetFileInfoAndValidate(p, &FindData, FALSE)) {
+					if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+						Action = bShellExecute ? ACTION_OPEN : ACTION_SETPANELDIR;
+					} else if (FindData.dwFileAttributes & FILE_ATTRIBUTE_EXECUTABLE) {
+						Action = ACTION_EXECUTE;
 					} else {
+						Action = ACTION_OPEN;
+					}
+				} else {
+					Action = bShellExecute ? ACTION_OPEN : ACTION_SETCMDLINE;
+				}
+
+				if (FindData.lpwszFileName) {
+					free((void *)FindData.lpwszFileName);
+				}
+
+				switch (Action) {
+					case ACTION_SETPANELDIR: {
+						Info.Control(INVALID_HANDLE_VALUE, FCTL_SETPANELDIR, 0, (LONG_PTR)p);
+						break;
+					}
+
+					case ACTION_SETCMDLINE: {
 						Info.Control(PANEL_ACTIVE, FCTL_SETCMDLINE, 0, (LONG_PTR)p);
+						break;
 					}
-					if (FindData.lpwszFileName) {
-						free((void *)FindData.lpwszFileName);
+
+					case ACTION_OPEN: {
+						std::wstring cmd = p;
+						QuoteCmdArgIfNeed(cmd);
+						FSF.Execute(cmd.c_str(), EF_OPEN | EF_NOCMDPRINT | EF_NOWAIT);
+						break;
+					}
+
+					case ACTION_EXECUTE: {
+						std::wstring cmd = p;
+						QuoteCmdArgIfNeed(cmd);
+						FSF.Execute(cmd.c_str(), bShellExecute ? EF_EXTERNALTERM | EF_NOCMDPRINT | EF_HIDEOUT: EF_MAYBGND);
+						break;
 					}
-				}
 
-				if (bShellExecute) {
-					DWORD flags = EF_OPEN | EF_NOCMDPRINT | EF_NOWAIT;
-					std::wstring cmd = p;
-					QuoteCmdArgIfNeed(cmd);
-					FSF.Execute(cmd.c_str(), flags);
+					default:
+						;
 				}
 			}
 		}