Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Keyboard Manager] Enable App-specific shortcuts in the KBM backend (#4628)

Browse Source 
* Enable app specific shortcut remapping

* Fixed lowercase function call

* Add test file

* Moved GetForegroundProcess to II and added tests

* Fixed runtime error while testing due to heap allocation across dll boundary

* Renamed function

* Remove unused code

* Changed process checking step to include substrings

* Changed back to exact match included match without file extension
This commit is contained in:
Arjun Balgovind
2020-07-06 16:45:53 -07:00
committed by GitHub
parent 70405045d7
commit 1533c9315f
15 changed files with 241 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/modules/keyboardmanager/common/Helpers.cpp
View File

@@ -189,8 +189,8 @@ namespace KeyboardManagerHelper
keyEventArray[index].ki.dwExtraInfo = extraInfo;
}
// Function to return the window in focus
HWND GetFocusWindowHandle()
// Function to return window handle for a full screen UWP app
HWND GetFullscreenUWPWindowHandle()
{
// Using GetGUIThreadInfo for getting the process of the window in focus. GetForegroundWindow has issues with UWP apps as it returns the Application Frame Host as its linked process
GUITHREADINFO guiThreadInfo;
@@ -208,30 +208,44 @@ namespace KeyboardManagerHelper
// Function to return the executable name of the application in focus
std::wstring GetCurrentApplication(bool keepPath)
{
HWND current_window_handle = GetFocusWindowHandle();
DWORD process_id;
DWORD nSize = MAX_PATH;
WCHAR buffer[MAX_PATH] = { 0 };
// Get process ID of the focus window
DWORD thread_id = GetWindowThreadProcessId(current_window_handle, &process_id);
HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, process_id);
// Get full path of the executable
bool res = QueryFullProcessImageName(hProc, 0, buffer, &nSize);
HWND current_window_handle = GetForegroundWindow();
std::wstring process_name;
CloseHandle(hProc);
process_name = buffer;
if (res)
if (current_window_handle != nullptr)
{
PathStripPath(buffer);
std::wstring process_path = get_process_path(current_window_handle);
process_name = process_path;
// Get process name from path
PathStripPath(&process_path[0]);
// Remove elements after null character
process_path.erase(std::find(process_path.begin(), process_path.end(), L'\0'), process_path.end());
// If the UWP app is in full-screen, then using GetForegroundWindow approach might fail
if (process_path == L"ApplicationFrameHost.exe")
{
HWND fullscreen_window_handle = GetFullscreenUWPWindowHandle();
if (fullscreen_window_handle != nullptr)
{
process_path = get_process_path(fullscreen_window_handle);
process_name = process_path;
// Get process name from path
PathStripPath(&process_path[0]);
// Remove elements after null character
process_path.erase(std::find(process_path.begin(), process_path.end(), L'\0'), process_path.end());
}
}
// If keepPath is false, then return only the name of the process
if (!keepPath)
{
process_name = buffer;
process_name = process_path;
}
}
return process_name;
}
}