mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02: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>
101 lines
3.5 KiB
C++
101 lines
3.5 KiB
C++
#pragma once
|
|
#include "pch.h"
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
#include <string>
|
|
|
|
#include "../modules/interface/powertoy_module_interface.h"
|
|
#include "centralized_hotkeys.h"
|
|
#include "common/utils/json.h"
|
|
|
|
namespace HotkeyConflictDetector
|
|
{
|
|
using Hotkey = PowertoyModuleIface::Hotkey;
|
|
using HotkeyEx = PowertoyModuleIface::HotkeyEx;
|
|
using Shortcut = CentralizedHotkeys::Shortcut;
|
|
|
|
struct HotkeyConflictInfo
|
|
{
|
|
Hotkey hotkey;
|
|
std::wstring moduleName;
|
|
int hotkeyID = 0;
|
|
|
|
inline bool operator==(const HotkeyConflictInfo& other) const
|
|
{
|
|
return hotkey == other.hotkey &&
|
|
moduleName == other.moduleName &&
|
|
hotkeyID == other.hotkeyID;
|
|
}
|
|
};
|
|
|
|
Hotkey ShortcutToHotkey(const CentralizedHotkeys::Shortcut& shortcut);
|
|
|
|
enum HotkeyConflictType
|
|
{
|
|
NoConflict = 0,
|
|
SystemConflict = 1,
|
|
InAppConflict = 2,
|
|
};
|
|
|
|
class HotkeyConflictManager
|
|
{
|
|
public:
|
|
static HotkeyConflictManager& GetInstance();
|
|
|
|
HotkeyConflictType HasConflict(const Hotkey& hotkey, const wchar_t* moduleName, const int hotkeyID);
|
|
HotkeyConflictType HotkeyConflictManager::HasConflict(Hotkey const& _hotkey);
|
|
std::vector<HotkeyConflictInfo> HotkeyConflictManager::GetAllConflicts(Hotkey const& hotkey);
|
|
bool AddHotkey(const Hotkey& hotkey, const wchar_t* moduleName, const int hotkeyID, bool isEnabled);
|
|
std::vector<HotkeyConflictInfo> RemoveHotkeyByModule(const std::wstring& moduleName);
|
|
|
|
void EnableHotkeyByModule(const std::wstring& moduleName);
|
|
void DisableHotkeyByModule(const std::wstring& moduleName);
|
|
|
|
json::JsonObject GetHotkeyConflictsAsJson();
|
|
|
|
private:
|
|
static std::mutex instanceMutex;
|
|
static HotkeyConflictManager* instance;
|
|
|
|
std::mutex hotkeyMutex;
|
|
// Hotkey in hotkeyMap means the hotkey has been registered successfully
|
|
std::unordered_map<uint16_t, HotkeyConflictInfo> hotkeyMap;
|
|
// Hotkey in sysConflictHotkeyMap means the hotkey has conflict with system defined hotkeys
|
|
std::unordered_map<uint16_t, std::unordered_set<HotkeyConflictInfo>> sysConflictHotkeyMap;
|
|
// Hotkey in inAppConflictHotkeyMap means the hotkey has conflict with other modules
|
|
std::unordered_map<uint16_t, std::unordered_set<HotkeyConflictInfo>> inAppConflictHotkeyMap;
|
|
|
|
std::unordered_map<std::wstring, std::vector<HotkeyConflictInfo>> disabledHotkeys;
|
|
|
|
uint16_t GetHotkeyHandle(const Hotkey&);
|
|
bool HasConflictWithSystemHotkey(const Hotkey&);
|
|
|
|
HotkeyConflictManager() = default;
|
|
};
|
|
};
|
|
|
|
namespace std
|
|
{
|
|
template<>
|
|
struct hash<HotkeyConflictDetector::HotkeyConflictInfo>
|
|
{
|
|
size_t operator()(const HotkeyConflictDetector::HotkeyConflictInfo& info) const
|
|
{
|
|
|
|
size_t hotkeyHash =
|
|
(info.hotkey.win ? 1ULL : 0ULL) |
|
|
((info.hotkey.ctrl ? 1ULL : 0ULL) << 1) |
|
|
((info.hotkey.shift ? 1ULL : 0ULL) << 2) |
|
|
((info.hotkey.alt ? 1ULL : 0ULL) << 3) |
|
|
(static_cast<size_t>(info.hotkey.key) << 4);
|
|
|
|
size_t moduleHash = std::hash<std::wstring>{}(info.moduleName);
|
|
size_t idHash = std::hash<int>{}(info.hotkeyID);
|
|
|
|
return hotkeyHash ^
|
|
((moduleHash << 1) | (moduleHash >> (sizeof(size_t) * 8 - 1))) ^ // rotate left 1 bit
|
|
((idHash << 2) | (idHash >> (sizeof(size_t) * 8 - 2))); // rotate left 2 bits
|
|
}
|
|
};
|
|
}
|