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

[MWB]Migrate to PowerToys-style shortcuts and better defaults(#27442)

Browse Source 
* [MWB] Migrate to PowerToys-style shortcuts and disable Ctrlx3 for multiple mode

* f: analyzer fixes

* f: add Win to all default shortcuts

* f: remove capture screen feature

* f: add ability to disable shortcut

* f: restrict disabling shortcuts only for MWB for now, because we don't explicitly support this feature anywhere else

* handle downgrade->upgrade scenario

* f: res loader

* f: fix disabled state

* f: fix L hotkey handling
This commit is contained in:
Andrey Nekrasov
2023-07-26 13:46:41 +02:00
committed by GitHub
parent 61aa0a1f79
commit a99b2e0bc0
13 changed files with 354 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/MouseWithoutBorders/App/Class/Common.cs
View File

@@ -17,6 +17,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Windows.Forms;
using Microsoft.PowerToys.Settings.UI.Library;
// <summary>
// Most of the helper methods.
@@ -115,6 +116,11 @@ namespace MouseWithoutBorders
internal static Process CurrentProcess { get; set; }
internal static bool HotkeyMatched(int vkCode, bool winDown, bool ctrlDown, bool altDown, bool shiftDown, HotkeySettings hotkey)
{
return !hotkey.IsEmpty() && (vkCode == hotkey.Code) && (!hotkey.Win || winDown) && (!hotkey.Alt || altDown) && (!hotkey.Shift || shiftDown) && (!hotkey.Ctrl || ctrlDown);
}
public static string BinaryName
{
get => Common.binaryName;

235
src/modules/MouseWithoutBorders/App/Class/InputHook.cs
View File

@@ -11,11 +11,13 @@
// 2023- Included in PowerToys.
// </history>
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Microsoft.PowerToys.Settings.UI.Library;
[module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.InputHook.#MouseHookProc(System.Int32,System.Int32,System.IntPtr)", Justification = "Dotnet port with style preservation")]
[module: SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "MouseWithoutBorders.InputHook.#ProcessKeyEx(System.Int32,System.Int32)", Justification = "Dotnet port with style preservation")]
@@ -364,17 +366,8 @@ namespace MouseWithoutBorders.Class
}
}
// Returns false if we do not want to redirect the keystrokes to other machine(s).
private int ctrlTouchesDnIndex;
private int ctrlTouchesUpIndex = 1;
private const int CONTROL_TOUCH = 4;
private readonly long[] ctrlTouches = new long[CONTROL_TOUCH];
private bool ProcessKeyEx(int vkCode, int flags, KEYBDDATA hookCallbackKeybdData)
{
bool allTouched;
if ((flags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
{
EasyMouseKeyDown = false;
@@ -389,13 +382,6 @@ namespace MouseWithoutBorders.Class
case VK.LCONTROL:
case VK.RCONTROL:
CtrlDown = false;
if (Setting.Values.HotKeySwitch2AllPC == 1)
{
ctrlTouches[ctrlTouchesUpIndex] = Common.GetTick();
ctrlTouchesUpIndex = ((ctrlTouchesUpIndex % CONTROL_TOUCH) + 2) % CONTROL_TOUCH;
}
break;
case VK.LMENU:
@@ -424,32 +410,7 @@ namespace MouseWithoutBorders.Class
case VK.LCONTROL:
case VK.RCONTROL:
Common.LogDebug("VK.RCONTROL");
CtrlDown = true;
if (Setting.Values.HotKeySwitch2AllPC == 1)
{
ctrlTouches[ctrlTouchesDnIndex] = Common.GetTick();
ctrlTouchesDnIndex = (ctrlTouchesDnIndex + 2) % CONTROL_TOUCH;
}
allTouched = true;
for (int i = 0; i < CONTROL_TOUCH; i++)
{
if (ctrlTouches[i] == 0 || Common.GetTick() - ctrlTouches[i] > 400)
{
allTouched = false;
break;
}
}
if (allTouched && Common.GetTick() - Common.JustGotAKey > 1000)
{
ResetLastSwitchKeys();
Common.SwitchToMultipleMode(Common.DesMachineID != ID.ALL, true);
}
break;
case VK.LMENU:
@@ -484,24 +445,6 @@ namespace MouseWithoutBorders.Class
break;
case (VK)'L':
if (winDown)
{
winDown = false;
if (Common.DesMachineID != ID.ALL)
{
KeyboardEvent(hookCallbackKeybdData);
Common.SwitchToMachine(Common.MachineName.Trim());
}
}
else
{
return ProcessHotKeys(vkCode, hookCallbackKeybdData);
}
break;
case VK.ESCAPE:
if (Common.IsTopMostMessageNotNull())
{
@@ -529,19 +472,114 @@ namespace MouseWithoutBorders.Class
private static long lastHotKeyLockMachine;
private void ResetModifiersState(HotkeySettings matchingHotkey)
{
CtrlDown = CtrlDown && matchingHotkey.Ctrl;
altDown = altDown && matchingHotkey.Alt;
shiftDown = shiftDown && matchingHotkey.Shift;
winDown = winDown && matchingHotkey.Win;
}
private List<short> GetVkCodesList(HotkeySettings hotkey)
{
var list = new List<short>();
if (hotkey.Alt)
{
list.Add((short)VK.MENU);
}
if (hotkey.Shift)
{
list.Add((short)VK.SHIFT);
}
if (hotkey.Win)
{
list.Add((short)VK.LWIN);
}
if (hotkey.Ctrl)
{
list.Add((short)VK.CONTROL);
}
if (hotkey.Code != 0)
{
list.Add((short)hotkey.Code);
}
return list;
}
private bool ProcessHotKeys(int vkCode, KEYBDDATA hookCallbackKeybdData)
{
if (vkCode == Setting.Values.HotKeyCaptureScreen && CtrlDown && shiftDown && !altDown &&
(Common.DesMachineID == Common.MachineID || Common.DesMachineID == ID.ALL))
if (Common.HotkeyMatched(vkCode, winDown, CtrlDown, altDown, shiftDown, Setting.Values.HotKeySwitch2AllPC))
{
CtrlDown = shiftDown = false;
ResetLastSwitchKeys();
Common.SwitchToMultipleMode(Common.DesMachineID != ID.ALL, true);
}
if (Common.HotkeyMatched(vkCode, winDown, CtrlDown, altDown, shiftDown, Setting.Values.HotKeyToggleEasyMouse))
{
if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
{
Common.PrepareScreenCapture();
EasyMouseOption easyMouseOption = (EasyMouseOption)Setting.Values.EasyMouse;
if (easyMouseOption is EasyMouseOption.Disable or EasyMouseOption.Enable)
{
Setting.Values.EasyMouse = (int)(easyMouseOption == EasyMouseOption.Disable ? EasyMouseOption.Enable : EasyMouseOption.Disable);
Common.ShowToolTip($"Easy Mouse has been toggled to [{(EasyMouseOption)Setting.Values.EasyMouse}] by a hotkey. You can change the hotkey in the Settings form.", 5000);
return false;
}
}
}
else if (Common.HotkeyMatched(vkCode, winDown, CtrlDown, altDown, shiftDown, Setting.Values.HotKeyLockMachine))
{
if (!Common.RunOnLogonDesktop
&& !Common.RunOnScrSaverDesktop)
{
if (Common.GetTick() - lastHotKeyLockMachine < 500)
{
Common.SwitchToMultipleMode(true, true);
var codes = GetVkCodesList(Setting.Values.HotKeyLockMachine);
foreach (var code in codes)
{
hookCallbackKeybdData.wVk = code;
KeyboardEvent(hookCallbackKeybdData);
}
hookCallbackKeybdData.dwFlags |= (int)Common.LLKHF.UP;
foreach (var code in codes)
{
hookCallbackKeybdData.wVk = code;
KeyboardEvent(hookCallbackKeybdData);
}
Common.SwitchToMultipleMode(false, true);
_ = NativeMethods.LockWorkStation();
}
else
{
KeyboardEvent(hookCallbackKeybdData);
}
lastHotKeyLockMachine = Common.GetTick();
return false;
}
}
else if (Common.HotkeyMatched(vkCode, winDown, CtrlDown, altDown, shiftDown, Setting.Values.HotKeyReconnect))
{
Common.ShowToolTip("Reconnecting...", 2000);
Common.LastReconnectByHotKeyTime = Common.GetTick();
Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
return false;
}
if (CtrlDown && altDown)
{
@@ -578,72 +616,6 @@ namespace MouseWithoutBorders.Class
return false;
}
}
else if (vkCode == Setting.Values.HotKeyLockMachine)
{
if (!Common.RunOnLogonDesktop
&& !Common.RunOnScrSaverDesktop)
{
if (Common.GetTick() - lastHotKeyLockMachine < 500)
{
Common.SwitchToMultipleMode(true, true);
hookCallbackKeybdData.wVk = (short)VK.LCONTROL;
KeyboardEvent(hookCallbackKeybdData);
hookCallbackKeybdData.wVk = (short)VK.LMENU;
KeyboardEvent(hookCallbackKeybdData);
hookCallbackKeybdData.wVk = vkCode;
KeyboardEvent(hookCallbackKeybdData);
hookCallbackKeybdData.dwFlags |= (int)Common.LLKHF.UP;
hookCallbackKeybdData.wVk = (short)VK.LCONTROL;
KeyboardEvent(hookCallbackKeybdData);
hookCallbackKeybdData.wVk = (short)VK.LMENU;
KeyboardEvent(hookCallbackKeybdData);
hookCallbackKeybdData.wVk = vkCode;
KeyboardEvent(hookCallbackKeybdData);
Common.SwitchToMultipleMode(false, true);
_ = NativeMethods.LockWorkStation();
}
else
{
KeyboardEvent(hookCallbackKeybdData);
}
lastHotKeyLockMachine = Common.GetTick();
return false;
}
}
else if (vkCode == Setting.Values.HotKeyReconnect)
{
Common.ShowToolTip("Reconnecting...", 2000);
Common.LastReconnectByHotKeyTime = Common.GetTick();
Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
return false;
}
else if (vkCode == Setting.Values.HotKeySwitch2AllPC)
{
Common.SwitchToMultipleMode(Common.DesMachineID != ID.ALL, true);
return false;
}
else if (vkCode == Setting.Values.HotKeyToggleEasyMouse)
{
if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
{
EasyMouseOption easyMouseOption = (EasyMouseOption)Setting.Values.EasyMouse;
if (easyMouseOption is EasyMouseOption.Disable or EasyMouseOption.Enable)
{
Setting.Values.EasyMouse = (int)(easyMouseOption == EasyMouseOption.Disable ? EasyMouseOption.Enable : EasyMouseOption.Disable);
Common.ShowToolTip($"Easy Mouse has been toggled to [{(EasyMouseOption)Setting.Values.EasyMouse}] by a hotkey. You can change the hotkey in the Settings form.", 5000);
return false;
}
}
}
}
return true;
@@ -685,11 +657,6 @@ namespace MouseWithoutBorders.Class
internal void ResetLastSwitchKeys()
{
for (int i = 0; i < CONTROL_TOUCH; i++)
{
ctrlTouches[i] = 0;
}
CtrlDown = winDown = altDown = false;
}
}

30
src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
View File

@@ -15,6 +15,7 @@ using System.Globalization;
using System.Runtime.InteropServices;
using System.ServiceProcess;
using System.Threading.Tasks;
using Microsoft.PowerToys.Settings.UI.Library;
using Windows.UI.Input.Preview.Injection;
using static MouseWithoutBorders.Class.NativeMethods;
@@ -353,6 +354,14 @@ namespace MouseWithoutBorders.Class
private static bool altDown;
private static bool shiftDown;
private static void ResetModifiersState(HotkeySettings matchingHotkey)
{
ctrlDown = ctrlDown && matchingHotkey.Ctrl;
altDown = altDown && matchingHotkey.Alt;
shiftDown = shiftDown && matchingHotkey.Shift;
winDown = winDown && matchingHotkey.Win;
}
private static void InputProcessKeyEx(int vkCode, int flags, out bool eatKey)
{
eatKey = false;
@@ -387,28 +396,15 @@ namespace MouseWithoutBorders.Class
}
else
{
if (vkCode == Setting.Values.HotKeyLockMachine)
if (Common.HotkeyMatched(vkCode, winDown, ctrlDown, altDown, shiftDown, Setting.Values.HotKeyLockMachine))
{
if (!Common.RunOnLogonDesktop
&& !Common.RunOnScrSaverDesktop)
{
if (ctrlDown && altDown)
{
ctrlDown = altDown = false;
eatKey = true;
Common.ReleaseAllKeys();
_ = NativeMethods.LockWorkStation();
}
}
}
else if (vkCode == Setting.Values.HotKeyCaptureScreen && ctrlDown && shiftDown && !altDown)
{
ctrlDown = shiftDown = false;
if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
{
Common.PrepareScreenCapture();
ResetModifiersState(Setting.Values.HotKeyLockMachine);
eatKey = true;
Common.ReleaseAllKeys();
_ = NativeMethods.LockWorkStation();
}
}

56
src/modules/MouseWithoutBorders/App/Class/Setting.cs
View File

@@ -648,13 +648,24 @@ namespace MouseWithoutBorders.Class
}
}
internal int HotKeyToggleEasyMouse
internal HotkeySettings HotKeySwitch2AllPC
{
get
{
lock (_loadingSettingsLock)
{
return _properties.HotKeyToggleEasyMouse.Value;
return _properties.Switch2AllPCShortcut;
}
}
}
internal HotkeySettings HotKeyToggleEasyMouse
{
get
{
lock (_loadingSettingsLock)
{
return _properties.ToggleEasyMouseShortcut;
}
}
@@ -662,18 +673,18 @@ namespace MouseWithoutBorders.Class
{
lock (_loadingSettingsLock)
{
_properties.HotKeyToggleEasyMouse.Value = value;
_properties.ToggleEasyMouseShortcut = value;
}
}
}
internal int HotKeyLockMachine
internal HotkeySettings HotKeyLockMachine
{
get
{
lock (_loadingSettingsLock)
{
return _properties.HotKeyLockMachine.Value;
return _properties.LockMachineShortcut;
}
}
@@ -681,18 +692,18 @@ namespace MouseWithoutBorders.Class
{
lock (_loadingSettingsLock)
{
_properties.HotKeyLockMachine.Value = value;
_properties.LockMachineShortcut = value;
}
}
}
internal int HotKeyReconnect
internal HotkeySettings HotKeyReconnect
{
get
{
lock (_loadingSettingsLock)
{
return _properties.HotKeyReconnect.Value;
return _properties.ReconnectShortcut;
}
}
@@ -700,19 +711,11 @@ namespace MouseWithoutBorders.Class
{
lock (_loadingSettingsLock)
{
_properties.HotKeyReconnect.Value = value;
_properties.ReconnectShortcut = value;
}
}
}
internal int HotKeyCaptureScreen
{
get
{
return 0;
}
}
internal int HotKeyExitMM
{
get
@@ -721,25 +724,6 @@ namespace MouseWithoutBorders.Class
}
}
internal int HotKeySwitch2AllPC
{
get
{
lock (_loadingSettingsLock)
{
return _properties.HotKeySwitch2AllPC.Value;
}
}
set
{
lock (_loadingSettingsLock)
{
_properties.HotKeySwitch2AllPC.Value = value;
}
}
}
private int switchCount;
internal int SwitchCount

11
src/modules/MouseWithoutBorders/App/Form/frmMatrix.Designer.cs generated
View File

@@ -1,5 +1,6 @@
using System.Windows.Forms;
using System.Collections.Generic;
using System.Drawing;
namespace MouseWithoutBorders
{
@@ -713,6 +714,16 @@ namespace MouseWithoutBorders
this.groupBoxShortcuts.TabIndex = 200;
this.groupBoxShortcuts.TabStop = false;
this.groupBoxShortcuts.Text = " &Keyboard Shortcuts ";
ToolTip groupBoxToolTip = new ToolTip();
groupBoxToolTip.SetToolTip(this.groupBoxShortcuts, "These settings are controlled by the PowerToys.Settings application.");
foreach (Control control in this.groupBoxShortcuts.Controls)
{
control.Enabled = false;
}
//
// labelScreenCapture
//

16
src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
View File

@@ -830,13 +830,11 @@ namespace MouseWithoutBorders
comboBoxShowSettings.Text = "Disable";
comboBoxExitMM.Text = Setting.Values.HotKeyExitMM == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeyExitMM });
#if OBSOLETE_SHORTCUTS
comboBoxLockMachine.Text = Setting.Values.HotKeyLockMachine == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeyLockMachine });
comboBoxReconnect.Text = Setting.Values.HotKeyReconnect == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeyReconnect });
comboBoxScreenCapture.Text = Setting.Values.HotKeyCaptureScreen == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeyCaptureScreen });
comboBoxSwitchToAllPC.Text = Setting.Values.HotKeySwitch2AllPC == 1
? "Ctrl*3"
: Setting.Values.HotKeySwitch2AllPC == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeySwitch2AllPC });
@@ -844,6 +842,7 @@ namespace MouseWithoutBorders
comboBoxEasyMouseOption.Text = ((EasyMouseOption)Setting.Values.EasyMouse).ToString();
comboBoxEasyMouse.Text = Setting.Values.HotKeyToggleEasyMouse == 0 ? "Disable" : new string(new char[] { (char)Setting.Values.HotKeyToggleEasyMouse });
#endif
}
private void RadioButton_CheckedChanged(object sender, EventArgs e)
@@ -870,6 +869,7 @@ namespace MouseWithoutBorders
private void ComboBoxLockMachine_TextChanged(object sender, EventArgs e)
{
#if OBSOLETE_SHORTCUTS
if (comboBoxLockMachine.Text.Contains("Disable"))
{
Setting.Values.HotKeyLockMachine = 0;
@@ -878,10 +878,12 @@ namespace MouseWithoutBorders
{
Setting.Values.HotKeyLockMachine = comboBoxLockMachine.Text[0];
}
#endif
}
private void ComboBoxSwitchToAllPC_TextChanged(object sender, EventArgs e)
{
#if OBSOLETE_SHORTCUTS
if (comboBoxSwitchToAllPC.Text.Contains("Disable"))
{
Setting.Values.HotKeySwitch2AllPC = 0;
@@ -894,7 +896,7 @@ namespace MouseWithoutBorders
{
Setting.Values.HotKeySwitch2AllPC = comboBoxSwitchToAllPC.Text[0];
}
#endif
ShowUpdateMessage();
}
@@ -957,6 +959,7 @@ namespace MouseWithoutBorders
private void ComboBoxReconnect_TextChanged(object sender, EventArgs e)
{
#if OBSOLETE_SHORTCUTS
if (comboBoxReconnect.Text.Contains("Disable"))
{
Setting.Values.HotKeyReconnect = 0;
@@ -965,7 +968,7 @@ namespace MouseWithoutBorders
{
Setting.Values.HotKeyReconnect = comboBoxReconnect.Text[0];
}
#endif
ShowUpdateMessage();
}
@@ -1006,6 +1009,7 @@ namespace MouseWithoutBorders
private void ComboBoxEasyMouse_TextChanged(object sender, EventArgs e)
{
#if OBSOLETE_SHORTCUTS
if (comboBoxEasyMouse.Text.Contains("Disable"))
{
Setting.Values.HotKeyToggleEasyMouse = 0;
@@ -1014,7 +1018,7 @@ namespace MouseWithoutBorders
{
Setting.Values.HotKeyToggleEasyMouse = comboBoxEasyMouse.Text[0];
}
#endif
ShowUpdateMessage();
}