Add FWPARS cmdline argument.

eziosella · eziosella · commit 5def1c584ae7 · 2019-05-12T15:18:15.000+02:00
This argument forwards parameters to ConEmu app.

	e.g. Cmder.exe /FWPARS "-min -tsa"

In this case Cmder will start minimized on TaskBar
diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 | `/SINGLE`                 | Start Cmder in single mode.                                                              |
 | `/START [start_path]`     | Folder path to start in.                                                                 |
 | `/TASK [task_name]`       | Task to start after launch.                                                              |
+| `/FWPARS [ConEmu params]` | Forwads parameters to ConEmu                                                             |
 
 ## Context Menu Integration
 
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
@@ -71,7 +71,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }
 
-void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true)
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring pars2fw = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@@ -98,6 +98,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 
 	std::wstring cmderStart = path;
 	std::wstring cmderTask = taskName;
+	std::wstring cmderPars2CEmu = pars2fw;
 
 	std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
 	userConfigDirPath[cfgRoot.length()] = 0;
@@ -391,6 +392,11 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		swprintf_s(args, L"%s  -loadcfgfile \"%s\"", args, userConEmuCfgPath);
 	}
 
+	if (!streqi(cmderPars2CEmu.c_str(), L""))
+	{
+		swprintf_s(args, L"%s %s", args, cmderPars2CEmu.c_str());
+	}
+
 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
 	if (wcscmp(userConfigDirPath, configDirPath) != 0)
 	{
@@ -527,6 +533,7 @@ struct cmderOptions
 	std::wstring cmderStart = L"";
 	std::wstring cmderTask = L"";
 	std::wstring cmderRegScope = L"USER";
+	std::wstring cmderPars2CEmu = L"";
 	bool cmderSingle = false;
 	bool cmderUserCfg = true;
 	bool registerApp = false;
@@ -620,6 +627,11 @@ cmderOptions GetOption()
 					}
 				}
 			}
+			else if (_wcsicmp(L"/fwpars", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderPars2CEmu = szArgList[i + 1];
+				i++;
+			}
 			else if (cmderOptions.cmderStart == L"")
 			{
 				int len = wcslen(szArgList[i]);
@@ -635,13 +647,13 @@ cmderOptions GetOption()
 				}
 				else
 				{
-					MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+					MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /fwpars [ConEmu parameters to fw]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
 					cmderOptions.error = true;
 				}
 			}
 			else
 			{
-				MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+				MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /fwpars [ConEmu parameters to fw]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
 				cmderOptions.error = true;
 			}
 		}
@@ -683,7 +695,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg);
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderPars2CEmu);
 	}
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ bool FileExists(const wchar_t * filePath)`
`71`	`71`	`return false;`
`72`	`72`	`}`
`73`	`73`
`74`		`-void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true)`
	`74`	`+void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring pars2fw = L"")`
`75`	`75`	`{`
`76`	`76`	`#if USE_TASKBAR_API`
`77`	`77`	`wchar_t appId[MAX_PATH] = { 0 };`
`@@ -98,6 +98,7 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr`
`98`	`98`
`99`	`99`	`std::wstring cmderStart = path;`
`100`	`100`	`std::wstring cmderTask = taskName;`
	`101`	`+ std::wstring cmderPars2CEmu = pars2fw;`
`101`	`102`
`102`	`103`	`std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);`
`103`	`104`	`userConfigDirPath[cfgRoot.length()] = 0;`
`@@ -391,6 +392,11 @@ void StartCmder(std::wstring path = L"", bool is_single_mode = false, std::wstr`
`391`	`392`	`swprintf_s(args, L"%s -loadcfgfile \"%s\"", args, userConEmuCfgPath);`
`392`	`393`	`}`
`393`	`394`
	`395`	`+ if (!streqi(cmderPars2CEmu.c_str(), L""))`
	`396`	`+ {`
	`397`	`+ swprintf_s(args, L"%s %s", args, cmderPars2CEmu.c_str());`
	`398`	`+ }`
	`399`	`+`
`394`	`400`	`SetEnvironmentVariable(L"CMDER_ROOT", exeDir);`
`395`	`401`	`if (wcscmp(userConfigDirPath, configDirPath) != 0)`
`396`	`402`	`{`
`@@ -527,6 +533,7 @@ struct cmderOptions`
`527`	`533`	`std::wstring cmderStart = L"";`
`528`	`534`	`std::wstring cmderTask = L"";`
`529`	`535`	`std::wstring cmderRegScope = L"USER";`
	`536`	`+ std::wstring cmderPars2CEmu = L"";`
`530`	`537`	`bool cmderSingle = false;`
`531`	`538`	`bool cmderUserCfg = true;`
`532`	`539`	`bool registerApp = false;`
`@@ -620,6 +627,11 @@ cmderOptions GetOption()`
`620`	`627`	`}`
`621`	`628`	`}`
`622`	`629`	`}`
	`630`	`+ else if (_wcsicmp(L"/fwpars", szArgList[i]) == 0)`
	`631`	`+ {`
	`632`	`+ cmderOptions.cmderPars2CEmu = szArgList[i + 1];`
	`633`	`+ i++;`
	`634`	`+ }`
`623`	`635`	`else if (cmderOptions.cmderStart == L"")`
`624`	`636`	`{`
`625`	`637`	`int len = wcslen(szArgList[i]);`
`@@ -635,13 +647,13 @@ cmderOptions GetOption()`
`635`	`647`	`}`
`636`	`648`	`else`
`637`	`649`	`{`
`638`		`- MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] \| [Start in Path]]\n\n /single\n\n /m\n\nor\n\n /register [USER \| ALL]\n\nor\n\n /unregister [USER \| ALL]\n", MB_TITLE, MB_OK);`
	`650`	`+ MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] \| [Start in Path]]\n\n /single\n\n /m\n\n /fwpars [ConEmu parameters to fw]\n\nor\n\n /register [USER \| ALL]\n\nor\n\n /unregister [USER \| ALL]\n", MB_TITLE, MB_OK);`
`639`	`651`	`cmderOptions.error = true;`
`640`	`652`	`}`
`641`	`653`	`}`
`642`	`654`	`else`
`643`	`655`	`{`
`644`		`- MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] \| [Start in Path]]\n\n /single\n\n /m\n\nor\n\n /register [USER \| ALL]\n\nor\n\n /unregister [USER \| ALL]\n", MB_TITLE, MB_OK);`
	`656`	`+ MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n /c [CMDER User Root Path]\n\n /task [ConEmu Task Name]\n\n [/start [Start in Path] \| [Start in Path]]\n\n /single\n\n /m\n\n /fwpars [ConEmu parameters to fw]\n\nor\n\n /register [USER \| ALL]\n\nor\n\n /unregister [USER \| ALL]\n", MB_TITLE, MB_OK);`
`645`	`657`	`cmderOptions.error = true;`
`646`	`658`	`}`
`647`	`659`	`}`
`@@ -683,7 +695,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,`
`683`	`695`	`}`
`684`	`696`	`else`
`685`	`697`	`{`
`686`		`- StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg);`
	`698`	`+ StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderPars2CEmu);`
`687`	`699`	`}`
`688`	`700`
`689`	`701`	`return 0;`