Implemented custom hotkey actions

SuiteExternalRelations.cpp

@@ -684,20 +684,26 @@ void SuiteExtRel::LaunchCommandPrompt(const wchar_t* dir)
 
 int SuiteExtRel::FireEvent(bool long_press, SuiteSettings *settings)
 {
-	std::wstring snk_path=settings->GetSnkPath();
-	DWORD dwAttrib=GetFileAttributes(snk_path.c_str());
-	if (dwAttrib==INVALID_FILE_ATTRIBUTES||(dwAttrib&FILE_ATTRIBUTE_DIRECTORY)) {
-		ErrorMessage(L"Path to SnK is not valid!");
-		return ERR_SUITEEXTREL+9;
+	std::wstring snk_cmdline;
+	if (long_press?settings->IsCustomLhk():settings->IsCustomShk()) {
+		if (long_press)
+			snk_cmdline=settings->GetCustomLhk();
+		else
+			snk_cmdline=settings->GetCustomShk();
+	} else {
+		snk_cmdline=settings->GetSnkPath();
+		DWORD dwAttrib=GetFileAttributes(snk_cmdline.c_str());
+		if (dwAttrib==INVALID_FILE_ATTRIBUTES||(dwAttrib&FILE_ATTRIBUTE_DIRECTORY)) {
+			ErrorMessage(L"Path to SnK is not valid!");
+			return ERR_SUITEEXTREL+9;
+		}
+		snk_cmdline=QuoteArgument(snk_cmdline.c_str())+L" /sec /bpp +p /cmd=";
+		if (long_press)
+			snk_cmdline.append(QuoteArgument(settings->GetLhkCfgPath().c_str()));
+		else
+			snk_cmdline.append(QuoteArgument(settings->GetShkCfgPath().c_str()));
 	}
 
-	std::wstring snk_cmdline=QuoteArgument(snk_path.c_str());
-	snk_cmdline.append(L" /sec /bpp +p /cmd=");
-	if (long_press)
-		snk_cmdline.append(QuoteArgument(settings->GetLhkCfgPath().c_str()));
-	else
-		snk_cmdline.append(QuoteArgument(settings->GetShkCfgPath().c_str()));
-
 	PROCESS_INFORMATION pi={};
 	STARTUPINFO si={sizeof(STARTUPINFO), NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, STARTF_USESHOWWINDOW, SW_SHOWNORMAL};
 	if (CreateProcess(NULL, const_cast<wchar_t*>(snk_cmdline.c_str()), NULL, NULL, FALSE, HIGH_PRIORITY_CLASS, NULL, NULL, &si, &pi)) {

SuiteMain.cpp

@@ -22,7 +22,6 @@ bool IconMenuProc(HotkeyEngine* &hk_engine, SuiteSettings *settings, KeyTriplet
 
 void CloseEventHandler(SuiteSettings *settings, TskbrNtfAreaIcon *sender);
 void EndsessionTrueEventHandler(SuiteSettings *settings, TskbrNtfAreaIcon *sender, bool critical);
-void DisabledFallbackHandler(TskbrNtfAreaIcon *sender);
 bool CheckIfElevationRequired();
 HBITMAP GetUacShieldBitmap();
 
@@ -38,27 +37,37 @@ int SuiteMain(SuiteSettings *settings)
 	TskbrNtfAreaIcon* SnkIcon=NULL;
 	HotkeyEngine* SnkHotkey=NULL;
 
-	std::wstring snk_path=settings->GetSnkPath();
-	DWORD dwAttrib=GetFileAttributes(snk_path.c_str());
-	if (dwAttrib==INVALID_FILE_ATTRIBUTES||(dwAttrib&FILE_ATTRIBUTE_DIRECTORY)) {
-		const wchar_t *wrn_msg=L"Path to SnK is not valid!\n\nPlease choose valid SnK path.";
-		if (fnTaskDialog) {
-			int btn_clicked;
-			fnTaskDialog(NULL, NULL, SNK_HS_TITLE, NULL, wrn_msg, TDCBF_OK_BUTTON, TD_WARNING_ICON, &btn_clicked);
-		} else {
-			MessageBox(NULL, wrn_msg, SNK_HS_TITLE, MB_ICONWARNING|MB_OK);
-		}
-		if (SuiteExtRel::LaunchSnkOpenDialog(snk_path))
-			settings->SetSnkPath(snk_path);
-		else {
-			ErrorMessage(L"Path to SnK is not valid!");
-			return ERR_SUITEMAIN+1;
+	std::wstring snk_path;
+	if (!settings->IsCustomShk()||!settings->IsCustomLhk()) {
+		snk_path=settings->GetSnkPath();
+		DWORD dwAttrib=GetFileAttributes(snk_path.c_str());
+		if (dwAttrib==INVALID_FILE_ATTRIBUTES||(dwAttrib&FILE_ATTRIBUTE_DIRECTORY)) {
+			const wchar_t *wrn_msg=L"Path to SnK is not valid!\n\nPlease choose valid SnK path.";
+			if (fnTaskDialog) {
+				int btn_clicked;
+				fnTaskDialog(NULL, NULL, SNK_HS_TITLE, NULL, wrn_msg, TDCBF_OK_BUTTON, TD_WARNING_ICON, &btn_clicked);
+			} else {
+				MessageBox(NULL, wrn_msg, SNK_HS_TITLE, MB_ICONWARNING|MB_OK);
+			}
+			if (SuiteExtRel::LaunchSnkOpenDialog(snk_path))
+				settings->SetSnkPath(snk_path);
+			else {
+				ErrorMessage(L"Path to SnK is not valid!");
+				return ERR_SUITEMAIN+1;
+			}
 		}
-	}	
-	std::wstring snk_cmdline_s=QuoteArgument(snk_path.c_str())+L" /sec /bpp +p /cmd=";
-	std::wstring snk_cmdline_l=snk_cmdline_s;
-	snk_cmdline_s+=QuoteArgument(settings->GetShkCfgPath().c_str());
-	snk_cmdline_l+=QuoteArgument(settings->GetLhkCfgPath().c_str());
+		snk_path=QuoteArgument(snk_path.c_str())+L" /sec /bpp +p /cmd=";
+	}
+	std::wstring snk_cmdline_s;
+	std::wstring snk_cmdline_l;
+	if (settings->IsCustomShk())
+		snk_cmdline_s=settings->GetCustomShk();
+	else
+		snk_cmdline_s=snk_path+QuoteArgument(settings->GetShkCfgPath().c_str());		
+	if (settings->IsCustomLhk())
+		snk_cmdline_l=settings->GetCustomLhk();
+	else
+		snk_cmdline_l=snk_path+QuoteArgument(settings->GetLhkCfgPath().c_str());
 
 	//CreateProcessW requires lpCommandLine to be non-const string because it may edit it
 	//MSDN doesn't provide details on why it may happen, but actually it will occur when lpApplicationName is not provided
@@ -187,6 +196,18 @@ bool IconMenuProc(HotkeyEngine* &hk_engine, SuiteSettings *settings, KeyTriplet
 		case IDM_EDIT_SHK:
 		case IDM_EDIT_LHK:
 			{
+				if (LOWORD(wParam)==IDM_EDIT_SHK?settings->IsCustomShk():settings->IsCustomLhk()) {
+					bool create_file=false;
+					const wchar_t* MSG_TEXT=L"Custom action is set in config.\n\nPlease edit config file instead.";
+					if (fnTaskDialog) {
+						int btn_clicked;
+						fnTaskDialog(NULL, NULL, SNK_HS_TITLE, NULL, MSG_TEXT, TDCBF_OK_BUTTON, TD_INFORMATION_ICON, &btn_clicked);
+					} else {
+						MessageBox(NULL, MSG_TEXT, SNK_HS_TITLE, MB_ICONASTERISK|MB_OK);
+					}
+					return true;
+				}
+
 				std::wstring cfg_path=LOWORD(wParam)==IDM_EDIT_SHK?settings->GetShkCfgPath():settings->GetLhkCfgPath();
 
 				DWORD dwAttrib=GetFileAttributes(cfg_path.c_str());

SuiteSettings.h

@@ -46,6 +46,8 @@ class SuiteSettings {
 	std::wstring GetSnkPath() const { return ExpandEnvironmentStringsWrapper(snk_path); }
 	std::wstring GetCustomShk() const { return ExpandEnvironmentStringsWrapper(custom_shk); }
 	std::wstring GetCustomLhk() const { return ExpandEnvironmentStringsWrapper(custom_lhk); }
+	bool IsCustomShk() const { return custom_shk.length(); }
+	bool IsCustomLhk() const { return custom_lhk.length(); }
 	void SetSnkPath(const std::wstring &snk_path);
 	bool IsStored() const { return stored; }