diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml
index d0708d2b4c..fbd099c8c7 100644
--- a/oem/firstvoices/windows/src/xml/strings.xml
+++ b/oem/firstvoices/windows/src/xml/strings.xml
@@ -512,6 +512,16 @@
+
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 324394bae2..d9d386760b 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -660,7 +660,7 @@ export default class KeymanEngine extends KeymanEngineBase
-
+
+
+
+
+
-
+
+
+
+
+
diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml
index 774a4d5e42..c8910b55b9 100644
--- a/windows/src/desktop/kmshell/xml/strings.xml
+++ b/windows/src/desktop/kmshell/xml/strings.xml
@@ -377,6 +377,11 @@
Simulate AltGr with Ctrl+Alt
+
+
+
+ Allow right modifier for hotkeys
+
@@ -536,6 +541,16 @@
Copyright © SIL International. All Rights Reserved.
+
+
+
+ Created by %1$s
+
+
+
+
+ Copyright © %1$s. All Rights Reserved.
+
diff --git a/windows/src/engine/keyman32/hotkeys.cpp b/windows/src/engine/keyman32/hotkeys.cpp
index e7fdbe3d79..1652397d77 100644
--- a/windows/src/engine/keyman32/hotkeys.cpp
+++ b/windows/src/engine/keyman32/hotkeys.cpp
@@ -139,8 +139,6 @@ Hotkey *Hotkeys::GetHotkey(DWORD hotkey)
{
for (int i = 0; i < m_nHotkeys; i++) {
if (m_hotkeys[i].HotkeyValue == hotkey) {
- SendDebugMessageFormat(
- "LanguageHotkey[%d] = {HotkeyValue: %x, hkl: %x} passed in: %x", i, m_hotkeys[i].HotkeyValue, m_hotkeys[i].hkl, hotkey);
return &m_hotkeys[i];
}
}
diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp
index 603996ec9c..a6a84faf44 100644
--- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp
+++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp
@@ -129,6 +129,25 @@ BOOL IsTouchPanelVisible() {
return touchPanelVisible;
}
+/*
+ Cache AllowRightModifierHotKey for this session
+*/
+BOOL AllowRightModifierHotKey() {
+ static BOOL flag_AllowRightModifierHotKey = FALSE;
+ static BOOL loaded = FALSE;
+
+ if (!loaded) {
+ RegistryReadOnly reg(HKEY_CURRENT_USER);
+ if (reg.OpenKeyReadOnly(REGSZ_KeymanCU)) {
+ if (reg.ValueExists(REGSZ_AllowRightModifierHotKey)) {
+ flag_AllowRightModifierHotKey = !!reg.ReadInteger(REGSZ_AllowRightModifierHotKey);
+ }
+ }
+ loaded = TRUE; // Set loaded to TRUE whether or not the key exists
+ }
+ return flag_AllowRightModifierHotKey;
+}
+
LRESULT _kmnLowLevelKeyboardProc(
_In_ int nCode,
_In_ WPARAM wParam,
@@ -150,16 +169,33 @@ LRESULT _kmnLowLevelKeyboardProc(
// #5190: Don't cache modifier state because sometimes we won't receive
// modifier change events (e.g. on lock screen)
- FHotkeyShiftState = 0;
- if (GetKeyState(VK_LCONTROL) < 0) FHotkeyShiftState |= HK_CTRL;
- if (GetKeyState(VK_RCONTROL) < 0) FHotkeyShiftState |= HK_RCTRL_INVALID;
- if (GetKeyState(VK_LMENU) < 0) FHotkeyShiftState |= HK_ALT;
- if (GetKeyState(VK_RMENU) < 0) FHotkeyShiftState |= HK_RALT_INVALID;
- if (GetKeyState(VK_LSHIFT) < 0) FHotkeyShiftState |= HK_SHIFT;
- if (GetKeyState(VK_RSHIFT) < 0) FHotkeyShiftState |= HK_RSHIFT_INVALID;
- //TODO: #8064. Can remove debug message once issue #8064 is resolved
- SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x]", FHotkeyShiftState);
+ FHotkeyShiftState = 0;
+ if (GetKeyState(VK_LCONTROL) < 0) {
+ FHotkeyShiftState |= HK_CTRL;
+ }
+
+ if (GetKeyState(VK_RCONTROL) < 0) {
+ FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID;
+ }
+
+ if (GetKeyState(VK_LMENU) < 0) {
+ FHotkeyShiftState |= HK_ALT;
+ }
+
+ if (GetKeyState(VK_RMENU) < 0) {
+ FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_ALT : HK_RALT_INVALID;
+ }
+
+ if (GetKeyState(VK_LSHIFT) < 0) {
+ FHotkeyShiftState |= HK_SHIFT;
+ }
+ if (GetKeyState(VK_RSHIFT) < 0) {
+ FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID;
+ }
+
+ //TODO: #8064. Can remove debug message once issue #8064 is resolved
+ SendDebugMessageFormat("[FHotkeyShiftState:%x]", FHotkeyShiftState);
// #7337 Post the modifier state ensuring the serialized queue is in sync
// Note that the modifier key may be posted again with WM_KEYMAN_KEY_EVENT,
@@ -243,30 +279,24 @@ BOOL ProcessHotkey(UINT vkCode, BOOL isUp, DWORD ShiftState) {
Hotkeys *hotkeys = Hotkeys::Instance(); // I4641
if (!hotkeys) {
- SendDebugMessageFormat("Failed to get Instance");
return FALSE;
}
Hotkey *hotkey = hotkeys->GetHotkey(ShiftState | vkCode); // I4641
if (!hotkey) {
- SendDebugMessageFormat("GetHotkey Null");
return FALSE;
}
if (isUp) {
- SendDebugMessageFormat("Is Up");
return TRUE;
}
if (hotkey->HotkeyType == hktInterface) {
- SendDebugMessageFormat("PostMasterController");
Globals::PostMasterController(wm_keyman_control, MAKELONG(KMC_INTERFACEHOTKEY, hotkey->Target), 0);
}
else {
- SendDebugMessageFormat("ReportKeyboardChanged");
ReportKeyboardChanged(PC_HOTKEYCHANGE, hotkey->hkl == 0 ? TF_PROFILETYPE_INPUTPROCESSOR : TF_PROFILETYPE_KEYBOARDLAYOUT, 0, hotkey->hkl, GUID_NULL, hotkey->profileGUID);
}
- SendDebugMessageFormat("PostDummyKeyEvent");
/* Generate a dummy keystroke to block menu activations, etc but let the shift key through */
PostDummyKeyEvent(); // I3301 - this is imperfect because we don't deal with HC_NOREMOVE. But good enough? // I3534 // I4844
diff --git a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
index ce1b8af33a..906e121f07 100644
--- a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
+++ b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
@@ -121,12 +121,13 @@ type
GroupName: string;
end;
-const KeymanOptionInfo: array[0..15] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552
+const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552
// Global options
(opt: koKeyboardHotkeysAreToggle; RegistryName: SRegValue_KeyboardHotkeysAreToggle; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'),
(opt: koSwitchLanguageForAllApplications; RegistryName: SRegValue_SwitchLanguageForAllApplications; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), // I2277 // I4393
(opt: koAltGrCtrlAlt; RegistryName: SRegValue_AltGrCtrlAlt; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'),
+ (opt: koRightModifierHK; RegistryName: SRegValue_AllowRightModifierHotKey; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'),
(opt: koShowHints; RegistryName: SRegValue_EnableHints; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'),
(opt: koBaseLayout; RegistryName: SRegValue_UnderlyingLayout; OptionType: kotLong; IntValue: 0; GroupName: 'kogGeneral'),
diff --git a/windows/src/global/delphi/general/KeymanOptionNames.pas b/windows/src/global/delphi/general/KeymanOptionNames.pas
index 27aef82ab5..73356d19cb 100644
--- a/windows/src/global/delphi/general/KeymanOptionNames.pas
+++ b/windows/src/global/delphi/general/KeymanOptionNames.pas
@@ -5,7 +5,10 @@ interface
type
TUtilKeymanOption = (
// General options
- koKeyboardHotkeysAreToggle, koAltGrCtrlAlt, koReleaseShiftKeysAfterKeyPress,
+ koKeyboardHotkeysAreToggle,
+ koAltGrCtrlAlt,
+ koRightModifierHK,
+ koReleaseShiftKeysAfterKeyPress,
koShowHints, // I1256
// Startup options
koTestKeymanFunctioning,