alt_as_control

rime · Jan 4, 2024 · 18e8959 · 18e8959
1 parent 72f833d
commit 18e8959
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/rime/gear/key_binding_processor.h b/src/rime/gear/key_binding_processor.h
@@ -21,9 +21,10 @@ class KeyBindingProcessor {
 
   enum FallbackOptions {
     None = 0,
-    ShiftAsControl = (1 << 0),
-    IgnoreShift = (1 << 1),
-    All = ShiftAsControl | IgnoreShift,
+    AltAsControl = (1 << 0),
+    ShiftAsControl = (1 << 1),
+    IgnoreShift = (1 << 2),
+    All = AltAsControl | ShiftAsControl | IgnoreShift
   };
 
   struct ActionDef {

diff --git a/src/rime/gear/key_binding_processor_impl.h b/src/rime/gear/key_binding_processor_impl.h
@@ -21,11 +21,19 @@ ProcessResult KeyBindingProcessor<T, N>::ProcessKeyEvent(
     return kAccepted;
   }
   // try to match the fallback options
-  if (key_event.ctrl() || key_event.alt()) {
+  if (key_event.ctrl() || key_event.super()) {
     return kNoop;
   }
+  if (key_event.alt() && (fallback_options & AltAsControl)) {
+    KeyEvent alt_as_control{
+        key_event.keycode(),
+        (key_event.modifier() & ~kAltMask) | kControlMask};
+    if (Accept(alt_as_control, ctx, keymap)) {
+      return kAccepted;
+    }
+  }
   if (key_event.shift()) {
-    if ((fallback_options & ShiftAsControl) != 0) {
+    if ((fallback_options & ShiftAsControl) && !key_event.alt()) {
       KeyEvent shift_as_control{
           key_event.keycode(),
           (key_event.modifier() & ~kShiftMask) | kControlMask};