mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 19:27:56 +01:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Implements comprehensive hotkey conflict detection and resolution system for PowerToys, providing real-time conflict checking and centralized management interface. ## PR Checklist - [ ] **Closes:** #xxx - [x] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [x] **Localization:** All end-user-facing strings can be localized - [x] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [x] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: [Shortcut conflict detction dev spec](https://github.com/MicrosoftDocs/windows-dev-docs/pull/5519) ## TODO Lists - [x] Add real-time hotkey validation functionality to the hotkey dialog - [x] Immediately detect conflicts and update shortcut conflict status after applying new shortcuts - [x] Return conflict list from runner hotkey conflict detector for conflict checking. - [x] Implement the Tooltip for every shortcut control - [x] Add dialog UI for showing all the shortcut conflicts - [x] Support changing shortcut directly inside the shortcut conflict window/dialog, no need to nav to the settings page. - [x] Redesign the `ShortcutConflictDialogContentControl` to align with the spec - [x] Add navigating and changing hotkey auctionability to the `ShortcutConflictDialogContentControl` - [x] Add telemetry. Impemented in [another PR](https://github.com/shuaiyuanxx/PowerToys/pull/47) ## Shortcut Conflict Support Modules  <details> <summary>Demo videos</summary> https://github.com/user-attachments/assets/476d992c-c6ca-4bcd-a3f2-b26cc612d1b9 https://github.com/user-attachments/assets/1c1a2537-de54-4db2-bdbf-6f1908ff1ce7 https://github.com/user-attachments/assets/9c992254-fc2b-402c-beec-20fceef25e6b https://github.com/user-attachments/assets/d66abc1c-b8bf-45f8-a552-ec989dab310f </details> <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Manually validation performed. --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com> Co-authored-by: Niels Laute <niels.laute@live.nl>
116 lines
4.2 KiB
C++
116 lines
4.2 KiB
C++
#include "pch.h"
|
|
#include "powertoy_module.h"
|
|
#include "centralized_kb_hook.h"
|
|
#include "centralized_hotkeys.h"
|
|
#include <common/logger/logger.h>
|
|
#include <common/utils/winapi_error.h>
|
|
|
|
std::map<std::wstring, PowertoyModule>& modules()
|
|
{
|
|
static std::map<std::wstring, PowertoyModule> modules;
|
|
return modules;
|
|
}
|
|
|
|
PowertoyModule load_powertoy(const std::wstring_view filename)
|
|
{
|
|
auto handle = winrt::check_pointer(LoadLibraryW(filename.data()));
|
|
auto create = reinterpret_cast<powertoy_create_func>(GetProcAddress(handle, "powertoy_create"));
|
|
if (!create)
|
|
{
|
|
FreeLibrary(handle);
|
|
winrt::throw_last_error();
|
|
}
|
|
auto pt_module = create();
|
|
if (!pt_module)
|
|
{
|
|
FreeLibrary(handle);
|
|
winrt::throw_hresult(winrt::hresult(E_POINTER));
|
|
}
|
|
return PowertoyModule(pt_module, handle);
|
|
}
|
|
|
|
json::JsonObject PowertoyModule::json_config() const
|
|
{
|
|
int size = 0;
|
|
pt_module->get_config(nullptr, &size);
|
|
std::wstring result;
|
|
result.resize(static_cast<size_t>(size) - 1);
|
|
pt_module->get_config(result.data(), &size);
|
|
return json::JsonObject::Parse(result);
|
|
}
|
|
|
|
PowertoyModule::PowertoyModule(PowertoyModuleIface* pt_module, HMODULE handle) :
|
|
handle(handle), pt_module(pt_module), hkmng(HotkeyConflictDetector::HotkeyConflictManager::GetInstance())
|
|
{
|
|
if (!pt_module)
|
|
{
|
|
throw std::runtime_error("Module not initialized");
|
|
}
|
|
|
|
remove_hotkey_records();
|
|
update_hotkeys();
|
|
UpdateHotkeyEx();
|
|
}
|
|
|
|
void PowertoyModule::update_hotkeys()
|
|
{
|
|
CentralizedKeyboardHook::ClearModuleHotkeys(pt_module->get_key());
|
|
|
|
size_t hotkeyCount = pt_module->get_hotkeys(nullptr, 0);
|
|
std::vector<PowertoyModuleIface::Hotkey> hotkeys(hotkeyCount);
|
|
pt_module->get_hotkeys(hotkeys.data(), hotkeyCount);
|
|
|
|
auto modulePtr = pt_module.get();
|
|
|
|
for (size_t i = 0; i < hotkeyCount; i++)
|
|
{
|
|
if (hotkeys[i].isShown)
|
|
{
|
|
hkmng.AddHotkey(hotkeys[i], pt_module->get_key(), static_cast<int>(i), pt_module->is_enabled());
|
|
|
|
CentralizedKeyboardHook::SetHotkeyAction(pt_module->get_key(), hotkeys[i], [modulePtr, i] {
|
|
Logger::trace(L"{} hotkey is invoked from Centralized keyboard hook", modulePtr->get_key());
|
|
return modulePtr->on_hotkey(i);
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
void PowertoyModule::UpdateHotkeyEx()
|
|
{
|
|
CentralizedHotkeys::UnregisterHotkeysForModule(pt_module->get_key());
|
|
|
|
auto container = pt_module->GetHotkeyEx();
|
|
if (container.has_value() && pt_module->is_enabled())
|
|
{
|
|
hkmng.RemoveHotkeyByModule(pt_module->get_key());
|
|
|
|
auto hotkey = container.value();
|
|
auto modulePtr = pt_module.get();
|
|
auto action = [modulePtr](WORD /*modifiersMask*/, WORD /*vkCode*/) {
|
|
Logger::trace(L"{} hotkey Ex is invoked from Centralized keyboard hook", modulePtr->get_key());
|
|
modulePtr->OnHotkeyEx();
|
|
};
|
|
|
|
HotkeyConflictDetector::Hotkey _hotkey = HotkeyConflictDetector::ShortcutToHotkey({ hotkey.modifiersMask, hotkey.vkCode });
|
|
hkmng.AddHotkey(_hotkey, pt_module->get_key(), 0, pt_module->is_enabled()); // This is the only one activation hotkey, so we use "0" as the name.
|
|
|
|
CentralizedHotkeys::AddHotkeyAction({ hotkey.modifiersMask, hotkey.vkCode }, { pt_module->get_key(), action });
|
|
}
|
|
|
|
// HACK:
|
|
// Just for enabling the shortcut guide legacy behavior of pressing the Windows Key.
|
|
// This is not the sort of behavior we'd like to have generalized on other modules.
|
|
// But this was a way to bring back the long windows key behavior that the community wanted back while maintaining the separate process.
|
|
if (pt_module->keep_track_of_pressed_win_key())
|
|
{
|
|
auto modulePtr = pt_module.get();
|
|
auto action = [modulePtr] {
|
|
modulePtr->OnHotkeyEx();
|
|
return false;
|
|
};
|
|
CentralizedKeyboardHook::AddPressedKeyAction(pt_module->get_key(), VK_LWIN, pt_module->milliseconds_win_key_must_be_pressed(), action);
|
|
CentralizedKeyboardHook::AddPressedKeyAction(pt_module->get_key(), VK_RWIN, pt_module->milliseconds_win_key_must_be_pressed(), action);
|
|
}
|
|
}
|