fix: some key with shift couldn't input in ascii mode

Author: tumuyan

app/src/main/java/com/osfans/trime/ime/core/Trime.java

@@ -934,12 +934,15 @@ public boolean onRimeKey(int[] event) {
   private boolean composeEvent(@NonNull KeyEvent event) {
     final int keyCode = event.getKeyCode();
     if (keyCode == KeyEvent.KEYCODE_MENU) return false; // 不處理 Menu 鍵
-    if (Keycode.Companion.hasSymbolLabel(keyCode)) return false; // 只處理安卓標準按鍵
+    if (!Keycode.Companion.isStdKey(keyCode)) return false; // 只處理安卓標準按鍵
     if (event.getRepeatCount() == 0 && Key.isTrimeModifierKey(keyCode)) {
       boolean ret =
           onRimeKey(
               Event.getRimeEvent(
-                  keyCode, event.getAction() == KeyEvent.ACTION_DOWN ? 0 : Rime.META_RELEASE_ON));
+                  keyCode,
+                  event.getAction() == KeyEvent.ACTION_DOWN
+                      ? event.getModifiers()
+                      : Rime.META_RELEASE_ON));
       if (isComposing()) setCandidatesViewShown(textInputManager.isComposable()); // 藍牙鍵盤打字時顯示候選欄
       return ret;
     }

app/src/main/java/com/osfans/trime/ime/enums/Keycode.kt

@@ -2,6 +2,8 @@ package com.osfans.trime.ime.enums
 
 import android.text.TextUtils
 import android.view.KeyEvent
+import com.osfans.trime.ime.keyboard.Key
+import timber.log.Timber
 
 enum class Keycode {
     // 与原trime.yaml主题android_key/name小节相比，差异如下：
@@ -144,6 +146,52 @@ enum class Keycode {
             return keycode < A.ordinal && keycode > 0
         }
 
+        fun toStdKeyEvent(keycode: Int, mask: Int = 0): IntArray {
+            var event = IntArray(2)
+            if (keycode < 0 || keycode > values().size)
+                return event
+            if (keycode < A.ordinal) {
+                event[0] = keycode
+                event[1] = mask
+            } else {
+                if (keycode <= Z.ordinal)
+                    event[0] = keycode - A.ordinal + a.ordinal
+                else if (keycode == exclam.ordinal)
+                    event[0] = _1.ordinal
+                else if (keycode == dollar.ordinal)
+                    event[0] = _4.ordinal
+                else if (keycode == percent.ordinal)
+                    event[0] = _5.ordinal
+                else if (keycode == asciicircum.ordinal)
+                    event[0] = _6.ordinal
+                else if (keycode == ampersand.ordinal)
+                    event[0] = _7.ordinal
+                else if (keycode == quotedbl.ordinal)
+                    event[0] = apostrophe.ordinal
+                else if (keycode == colon.ordinal)
+                    event[0] = semicolon.ordinal
+                else if (keycode == less.ordinal)
+                    event[0] = comma.ordinal
+                else if (keycode == greater.ordinal)
+                    event[0] = period.ordinal
+                else if (keycode == question.ordinal)
+                    event[0] = slash.ordinal
+                else if (keycode == underscore.ordinal)
+                    event[0] = minus.ordinal
+                else if (keycode == braceleft.ordinal)
+                    event[0] = bracketleft.ordinal
+                else if (keycode == braceright.ordinal)
+                    event[0] = bracketright.ordinal
+                else if (keycode == asciitilde.ordinal)
+                    event[0] = grave.ordinal
+                else if (keycode == bar.ordinal)
+                    event[0] = backslash.ordinal
+
+                event[1] = mask or KeyEvent.META_SHIFT_ON
+            }
+            return event
+        }
+
         fun hasSymbolLabel(keycode: Int): Boolean {
             if (keycode < 0 || keycode > values().size)
                 return false
@@ -154,6 +202,30 @@ enum class Keycode {
             return reverseMap[keycode] ?: ""
         }
 
+        fun getDisplayLabel(keyCode: Int, mask: Int): String? {
+            var s: String? = ""
+            if (isStdKey(keyCode)) {
+                // Android keycode区域
+                if (Key.getKcm().isPrintingKey(keyCode)) {
+                    val event = KeyEvent(0, 0, KeyEvent.ACTION_DOWN, keyCode, 0, mask)
+                    val k = event.getUnicodeChar(mask)
+                    Timber.d("getDisplayLabel() keycode=$keyCode, mask=$mask, k=$k")
+                    if (k > 0) {
+                        s += k.toChar()
+                    } else {
+                        var c = Key.getKcm().getDisplayLabel(keyCode)
+                        if (Character.isUpperCase(c)) c = c.lowercaseChar()
+                        s = c.toString()
+                    }
+                } else {
+                    s = keyNameOf(keyCode)
+                }
+            } else if (hasSymbolLabel(keyCode)) { // 可見符號
+                s = getSymbolLabell(valueOf(keyCode))
+            }
+            return s
+        }
+
         private val masks = hashMapOf(
             "Shift" to KeyEvent.META_SHIFT_ON,
             "Control" to KeyEvent.META_CTRL_ON,

app/src/main/java/com/osfans/trime/ime/keyboard/Event.java

@@ -229,35 +229,10 @@ private void parseLabel() {
     if (c == KeyEvent.KEYCODE_SPACE) {
       label = Rime.getSchemaName();
     } else {
-      if (c > 0) label = getDisplayLabel(c);
+      if (c > 0) label = Keycode.Companion.getDisplayLabel(c, mask);
     }
   }
 
-  public String getDisplayLabel(int keyCode) {
-    String s = "";
-    if (Keycode.Companion.isStdKey(keyCode)) {
-      // Android keycode区域
-      if (Key.getKcm().isPrintingKey(keyCode)) {
-        KeyEvent event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, keyCode, 0, mask);
-        int k = event.getUnicodeChar(mask);
-
-        Timber.d("getDisplayLabel() keycode=" + keyCode + ", mask=" + mask + ", k=" + k);
-        if (k > 0) {
-          s += ((char) (k));
-        } else {
-          char c = Key.getKcm().getDisplayLabel(keyCode);
-          if (Character.isUpperCase(c)) c = Character.toLowerCase(c);
-          s = String.valueOf(c);
-        }
-      } else {
-        s = Keycode.keyNameOf(keyCode);
-      }
-    } else if (Keycode.Companion.hasSymbolLabel(keyCode)) { // 可見符號
-      s = Keycode.Companion.getSymbolLabell(Keycode.valueOf(keyCode));
-    }
-    return s;
-  }
-
   public static int getClickCode(String s) {
     int keyCode = -1;
     if (TextUtils.isEmpty(s)) { // 空鍵

app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt

@@ -13,7 +13,7 @@ import com.osfans.trime.ime.broadcast.IntentReceiver
 import com.osfans.trime.ime.core.EditorInstance
 import com.osfans.trime.ime.core.Speech
 import com.osfans.trime.ime.core.Trime
-import com.osfans.trime.ime.enums.Keycode
+import com.osfans.trime.ime.enums.Keycode.Companion.toStdKeyEvent
 import com.osfans.trime.ime.enums.SymbolKeyboardType
 import com.osfans.trime.ime.keyboard.Event
 import com.osfans.trime.ime.keyboard.Keyboard.printModifierKeyState
@@ -421,14 +421,13 @@ class TextInputManager private constructor() :
 
     override fun onKey(keyEventCode: Int, metaState: Int) {
         printModifierKeyState(metaState, "keyEventCode=" + keyEventCode)
+
+        // 优先由librime处理按键事件
         if (trime.handleKey(keyEventCode, metaState)) return
-        if (Keycode.hasSymbolLabel(keyEventCode)) {
-            needSendUpRimeKey = false
-            activeEditorInstance.commitText(Keycode.getSymbolLabell(Keycode.valueOf(keyEventCode)))
-            return
-        }
+        // 大写字母和部分符号转换为Shift+Android keyevent
+        val event = toStdKeyEvent(keyEventCode, metaState)
         needSendUpRimeKey = false
-        activeEditorInstance.sendDownUpKeyEvent(keyEventCode, metaState)
+        activeEditorInstance.sendDownUpKeyEvent(event[0], event[1])
     }
 
     override fun onText(text: CharSequence?) {