Fix shift on GBoard and improve stuck key detection

hack123457 · Jan 16, 2020 · 143e93d · 143e93d
1 parent 6bf2092
commit 143e93d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 21 deletions.
diff --git a/Blink/SceneDelegate.swift b/Blink/SceneDelegate.swift
@@ -118,15 +118,17 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
       debugPrint("BK:", "stuck!!!")
       input.setTrackingModifierFlags([])
 
-      let ctrl = UIHostingController(rootView: StuckView(keyCode: key, dismissAction: {
-        spCtrl.onStuckOpCommand()
-      }))
-
-      ctrl.modalPresentationStyle = .formSheet
-      spCtrl.stuckKeyCode = key
-      spCtrl.present(ctrl, animated: false)
+      if input.isHardwareKB && key == .commandLeft {
+        let ctrl = UIHostingController(rootView: StuckView(keyCode: key, dismissAction: {
+          spCtrl.onStuckOpCommand()
+        }))
+
+        ctrl.modalPresentationStyle = .formSheet
+        spCtrl.stuckKeyCode = key
+        spCtrl.present(ctrl, animated: false)
 
-      return
+        return
+      }
     }
 
     spCtrl.stuckKeyCode = nil

diff --git a/Blink/SmarterKeys/SmarterTermInput.swift b/Blink/SmarterKeys/SmarterTermInput.swift
@@ -37,6 +37,8 @@ class SmarterTermInput: KBWebView {
   private var _hideSmartKeysWithHKB = !BKUserConfigurationManager.userSettingsValue(forKey: BKUserConfigShowSmartKeysWithXKeyBoard)
   private var _inputAccessoryView: UIView? = nil
 
+  var isHardwareKB: Bool { _kbView.traits.isHKBAttached }
+
   var device: TermDevice? = nil {
     didSet { reportStateReset() }
   }
@@ -125,7 +127,7 @@ class SmarterTermInput: KBWebView {
   private func _reportLang() {
     let lang = self.textInputMode?.primaryLanguage ?? ""
     _kbView.lang = lang
-    reportLang(lang)
+    reportLang(lang, isHardwareKB: _kbView.traits.isHKBAttached)
   }
 
   override var inputAssistantItem: UITextInputAssistantItem {
@@ -513,6 +515,11 @@ extension SmarterTermInput {
   func stuckKey() -> KeyCode? {
     let mods: UIKeyModifierFlags = [.shift, .control, .alternate, .command]
     let stuck = mods.intersection(trackingModifierFlags)
+
+    // Return command key first
+    if stuck.contains(.command) {
+      return KeyCode.commandLeft
+    }
 
     if stuck.contains(.shift) {
       return KeyCode.shiftLeft
@@ -525,10 +532,6 @@ extension SmarterTermInput {
       return KeyCode.optionLeft
     }
 
-    if stuck.contains(.command) {
-      return KeyCode.commandLeft
-    }
-
     return nil
   }
 }

diff --git a/KB/JS/dist/kb.js b/KB/JS/dist/kb.js
diff --git a/KB/JS/src/Keyboard.ts b/KB/JS/src/Keyboard.ts
@@ -178,6 +178,7 @@ export default class Keyboard implements IKeyboard {
 
   _lang: string = 'en';
   _langWithDeletes = false;
+  _isHKB = false;
 
   hasSelection: boolean = false;
 
@@ -522,6 +523,13 @@ export default class Keyboard implements IKeyboard {
         return;
       }
 
+      if (!this._isHKB) {
+        // Some software KBs doesn't report shift presses (GBoard for instance)
+        this._output(key);
+        _blockEvent(e);
+        return;
+      }
+
       // TODO: may be remove accents only after options key is pressed.
       let out = this._removeAccents ? _removeAccents(key) : key;
       this._removeAccents = false;
@@ -685,11 +693,14 @@ export default class Keyboard implements IKeyboard {
   }
 
   // Keyboard language change
-  _handleLang(lang: string) {
-    this._lang = lang;
-    this._langWithDeletes = lang === 'ko-KR';
+  _handleLang(langAndKB: string) {
+    let parts = langAndKB.split(':');
+    this._lang = parts[0];
+    this._isHKB = parts[1] === 'hw';
+
+    this._langWithDeletes = this._lang === 'ko-KR';
     this._stateReset(this.hasSelection);
-    if (lang != 'dictation') {
+    if (this._lang !== 'dictation') {
       op('voice', {data: ''});
     }
   }

diff --git a/KB/Native/Views/KBWebViewBase.h b/KB/Native/Views/KBWebViewBase.h
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly) UIKeyModifierFlags trackingModifierFlags;
 
 - (void)reportStateReset:(BOOL)hasSelection;
-- (void)reportLang:(NSString *) lang;
+- (void)reportLang:(NSString *) lang isHardwareKB: (BOOL)isHardwareKB;
 - (void)reportHex:(NSString *) hex;
 - (void)reportPress:(UIKeyModifierFlags)mods keyId:(NSString *)keyId;
 - (void)reportToolbarPress:(UIKeyModifierFlags)mods keyId:(NSString *)keyId;

diff --git a/KB/Native/Views/KBWebViewBase.m b/KB/Native/Views/KBWebViewBase.m
@@ -144,8 +144,8 @@ - (void)setHasSelection:(BOOL)value {
   [self report:@"selection" arg:value ? @"true" : @"false"];
 }
 
-- (void)reportLang:(NSString *) lang {
-  [self report:@"lang" arg:[NSString stringWithFormat:@"\"%@\"", lang]];
+- (void)reportLang:(NSString *) lang isHardwareKB: (BOOL)isHardwareKB; {
+  [self report:@"lang" arg:[NSString stringWithFormat:@"\"%@:%@\"", lang, isHardwareKB ? @"hw" : @"sw"]];
 }
 
 - (void)_keyDown:(KeyCommand *)cmd {