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>
200 lines
7.7 KiB
C#
200 lines
7.7 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
|
|
using Microsoft.PowerToys.Settings.UI.Views;
|
|
using Windows.Data.Json;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI.Services
|
|
{
|
|
public class IPCResponseService
|
|
{
|
|
private static IPCResponseService _instance;
|
|
|
|
public static IPCResponseService Instance => _instance ??= new IPCResponseService();
|
|
|
|
public static event EventHandler<AllHotkeyConflictsEventArgs> AllHotkeyConflictsReceived;
|
|
|
|
public void RegisterForIPC()
|
|
{
|
|
ShellPage.ShellHandler?.IPCResponseHandleList.Add(ProcessIPCMessage);
|
|
}
|
|
|
|
public void UnregisterFromIPC()
|
|
{
|
|
ShellPage.ShellHandler?.IPCResponseHandleList.Remove(ProcessIPCMessage);
|
|
}
|
|
|
|
private void ProcessIPCMessage(JsonObject json)
|
|
{
|
|
try
|
|
{
|
|
if (json.TryGetValue("response_type", out IJsonValue responseTypeValue) &&
|
|
responseTypeValue.ValueType == JsonValueType.String)
|
|
{
|
|
string responseType = responseTypeValue.GetString();
|
|
|
|
if (responseType.Equals("hotkey_conflict_result", StringComparison.Ordinal))
|
|
{
|
|
ProcessHotkeyConflictResult(json);
|
|
}
|
|
else if (responseType.Equals("all_hotkey_conflicts", StringComparison.Ordinal))
|
|
{
|
|
ProcessAllHotkeyConflicts(json);
|
|
}
|
|
}
|
|
}
|
|
catch (Exception)
|
|
{
|
|
}
|
|
}
|
|
|
|
private void ProcessHotkeyConflictResult(JsonObject json)
|
|
{
|
|
string requestId = string.Empty;
|
|
if (json.TryGetValue("request_id", out IJsonValue requestIdValue) &&
|
|
requestIdValue.ValueType == JsonValueType.String)
|
|
{
|
|
requestId = requestIdValue.GetString();
|
|
}
|
|
|
|
bool hasConflict = false;
|
|
if (json.TryGetValue("has_conflict", out IJsonValue hasConflictValue) &&
|
|
hasConflictValue.ValueType == JsonValueType.Boolean)
|
|
{
|
|
hasConflict = hasConflictValue.GetBoolean();
|
|
}
|
|
|
|
var allConflicts = new List<ModuleHotkeyData>();
|
|
|
|
if (hasConflict)
|
|
{
|
|
// Parse the all_conflicts array
|
|
if (json.TryGetValue("all_conflicts", out IJsonValue allConflictsValue) &&
|
|
allConflictsValue.ValueType == JsonValueType.Array)
|
|
{
|
|
var conflictsArray = allConflictsValue.GetArray();
|
|
foreach (var conflictItem in conflictsArray)
|
|
{
|
|
if (conflictItem.ValueType == JsonValueType.Object)
|
|
{
|
|
var conflictObj = conflictItem.GetObject();
|
|
|
|
string moduleName = string.Empty;
|
|
int hotkeyID = -1;
|
|
|
|
if (conflictObj.TryGetValue("module", out IJsonValue moduleValue) &&
|
|
moduleValue.ValueType == JsonValueType.String)
|
|
{
|
|
moduleName = moduleValue.GetString();
|
|
}
|
|
|
|
if (conflictObj.TryGetValue("hotkeyID", out IJsonValue hotkeyValue) &&
|
|
hotkeyValue.ValueType == JsonValueType.Number)
|
|
{
|
|
hotkeyID = (int)hotkeyValue.GetNumber();
|
|
}
|
|
|
|
allConflicts.Add(new ModuleHotkeyData
|
|
{
|
|
ModuleName = moduleName,
|
|
HotkeyID = hotkeyID,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
var response = new HotkeyConflictResponse
|
|
{
|
|
RequestId = requestId,
|
|
HasConflict = hasConflict,
|
|
AllConflicts = allConflicts,
|
|
};
|
|
|
|
HotkeyConflictHelper.HandleHotkeyConflictResponse(response);
|
|
}
|
|
|
|
private void ProcessAllHotkeyConflicts(JsonObject json)
|
|
{
|
|
var allConflicts = new AllHotkeyConflictsData();
|
|
|
|
if (json.TryGetValue("inAppConflicts", out IJsonValue inAppValue) &&
|
|
inAppValue.ValueType == JsonValueType.Array)
|
|
{
|
|
var inAppArray = inAppValue.GetArray();
|
|
foreach (var conflictGroup in inAppArray)
|
|
{
|
|
var conflictObj = conflictGroup.GetObject();
|
|
var conflictData = ParseConflictGroup(conflictObj, false);
|
|
if (conflictData != null)
|
|
{
|
|
allConflicts.InAppConflicts.Add(conflictData);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (json.TryGetValue("sysConflicts", out IJsonValue sysValue) &&
|
|
sysValue.ValueType == JsonValueType.Array)
|
|
{
|
|
var sysArray = sysValue.GetArray();
|
|
foreach (var conflictGroup in sysArray)
|
|
{
|
|
var conflictObj = conflictGroup.GetObject();
|
|
var conflictData = ParseConflictGroup(conflictObj, true);
|
|
if (conflictData != null)
|
|
{
|
|
allConflicts.SystemConflicts.Add(conflictData);
|
|
}
|
|
}
|
|
}
|
|
|
|
AllHotkeyConflictsReceived?.Invoke(this, new AllHotkeyConflictsEventArgs(allConflicts));
|
|
}
|
|
|
|
private HotkeyConflictGroupData ParseConflictGroup(JsonObject conflictObj, bool isSystemConflict)
|
|
{
|
|
if (!conflictObj.TryGetValue("hotkey", out var hotkeyValue) ||
|
|
!conflictObj.TryGetValue("modules", out var modulesValue))
|
|
{
|
|
return null;
|
|
}
|
|
|
|
var hotkeyObj = hotkeyValue.GetObject();
|
|
bool win = hotkeyObj.TryGetValue("win", out var winVal) && winVal.GetBoolean();
|
|
bool ctrl = hotkeyObj.TryGetValue("ctrl", out var ctrlVal) && ctrlVal.GetBoolean();
|
|
bool shift = hotkeyObj.TryGetValue("shift", out var shiftVal) && shiftVal.GetBoolean();
|
|
bool alt = hotkeyObj.TryGetValue("alt", out var altVal) && altVal.GetBoolean();
|
|
int key = hotkeyObj.TryGetValue("key", out var keyVal) ? (int)keyVal.GetNumber() : 0;
|
|
|
|
var conflictGroup = new HotkeyConflictGroupData
|
|
{
|
|
Hotkey = new HotkeyData { Win = win, Ctrl = ctrl, Shift = shift, Alt = alt, Key = key },
|
|
IsSystemConflict = isSystemConflict,
|
|
Modules = new List<ModuleHotkeyData>(),
|
|
};
|
|
|
|
var modulesArray = modulesValue.GetArray();
|
|
foreach (var module in modulesArray)
|
|
{
|
|
var moduleObj = module.GetObject();
|
|
string moduleName = moduleObj.TryGetValue("moduleName", out var modNameVal) ? modNameVal.GetString() : string.Empty;
|
|
int hotkeyID = moduleObj.TryGetValue("hotkeyID", out var hotkeyIDVal) ? (int)hotkeyIDVal.GetNumber() : -1;
|
|
|
|
conflictGroup.Modules.Add(new ModuleHotkeyData
|
|
{
|
|
ModuleName = moduleName,
|
|
HotkeyID = hotkeyID,
|
|
});
|
|
}
|
|
|
|
return conflictGroup;
|
|
}
|
|
}
|
|
}
|