feat: change key label when shift key on

Author: tumuyan

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

@@ -59,14 +59,18 @@ enum class Keycode {
 
     companion object {
 
+        // librime keyname (x11) - trime keycode (兼容Android)
         private val convertMap: HashMap<String, Keycode> = hashMapOf()
+
+        // 部分符号的 trime keycode (兼容Android) - key label
         private val reverseMap: HashMap<Keycode, String> = hashMapOf()
 
         init {
-            for (type in Keycode.values()) {
+            for (type in values()) {
                 convertMap[type.toString()] = type
             }
 
+            // android keycode 包含的数字开头的按键
             reverseMap[_3D_MODE] = "3D_MODE"
             reverseMap[_0] = "0"
             reverseMap[_1] = "1"
@@ -81,19 +85,26 @@ enum class Keycode {
             reverseMap[_8] = "8"
             reverseMap[_9] = "9"
 
-            reverseMap[KP_0] = "0"
-            reverseMap[KP_1] = "1"
-            reverseMap[KP_2] = "2"
-            reverseMap[KP_3] = "3"
-            reverseMap[KP_4] = "4"
-            reverseMap[KP_5] = "5"
-            reverseMap[KP_6] = "6"
-            reverseMap[KP_7] = "7"
-            reverseMap[KP_8] = "8"
-            reverseMap[KP_9] = "9"
-            reverseMap[KP_8] = "8"
-            reverseMap[KP_9] = "9"
-
+            // android keycode 已包含的符号
+            reverseMap[grave] = "`"
+            reverseMap[at] = "@"
+            reverseMap[numbersign] = "#"
+            reverseMap[asterisk] = "*"
+            reverseMap[parenleft] = "("
+            reverseMap[parenright] = ")"
+            reverseMap[minus] = "-"
+            reverseMap[equal] = "="
+            reverseMap[plus] = "+"
+            reverseMap[bracketleft] = "["
+            reverseMap[bracketright] = "]"
+            reverseMap[backslash] = "\\"
+            reverseMap[semicolon] = ";"
+            reverseMap[apostrophe] = "'"
+            reverseMap[comma] = ","
+            reverseMap[period] = "."
+            reverseMap[slash] = "/"
+
+            // android keycode未包含的符号
             reverseMap[exclam] = "!"
             reverseMap[quotedbl] = "\""
             reverseMap[dollar] = "$"
@@ -113,18 +124,30 @@ enum class Keycode {
             reverseMap.forEach {
                 convertMap[it.value] = it.key
             }
+
+            // android keycode 包含的小键盘，仅用于输出label，不用于label转按键
+            reverseMap[KP_0] = "0"
+            reverseMap[KP_1] = "1"
+            reverseMap[KP_2] = "2"
+            reverseMap[KP_3] = "3"
+            reverseMap[KP_4] = "4"
+            reverseMap[KP_5] = "5"
+            reverseMap[KP_6] = "6"
+            reverseMap[KP_7] = "7"
+            reverseMap[KP_8] = "8"
+            reverseMap[KP_9] = "9"
+            reverseMap[KP_8] = "8"
+            reverseMap[KP_9] = "9"
         }
 
         fun isStdKey(keycode: Int): Boolean {
-            return keycode < A.ordinal
+            return keycode < A.ordinal && keycode > 0
         }
 
         fun hasSymbolLabel(keycode: Int): Boolean {
             if (keycode < 0 || keycode > values().size)
                 return false
-
-            return keycode >= A.ordinal ||
-                (keycode >= KP_0.ordinal && keycode <= KP_9.ordinal)
+            return keycode >= A.ordinal || reverseMap.containsKey(values()[keycode])
         }
 
         fun getSymbolLabell(keycode: Keycode): String {

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

@@ -39,7 +39,7 @@ public class Event {
   private int code;
   private int mask = 0;
   private String text;
-  private String label;
+  private String label, shiftLabel;
   private String preview;
   private List<?> states;
   private String command;
@@ -100,6 +100,20 @@ public Event(Keyboard keyboard, @NonNull String s) {
       text = s;
       label = labelPattern.matcher(s).replaceAll("");
     }
+
+    shiftLabel = label;
+    if (Keycode.Companion.isStdKey(code)) { // Android keycode区域
+      if (Key.getKcm().isPrintingKey(code)) {
+        int mMask = KeyEvent.META_SHIFT_ON | mask;
+        KeyEvent event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, code, 0, mMask);
+        int k = event.getUnicodeChar(mMask);
+        Timber.d(
+            "shiftLabel = " + shiftLabel + " keycode=" + code + ", mask=" + mMask + ", k=" + k);
+        if (k > 0) {
+          shiftLabel = "" + ((char) (k));
+        }
+      }
+    }
   }
 
   public Event(String s) {
@@ -179,6 +193,8 @@ else if (s.length() == 1
 
   public String getLabel() {
     if (!TextUtils.isEmpty(toggle)) return (String) states.get(Rime.getOption(toggle) ? 1 : 0);
+    if ((mKeyboard.getModifer() | mask & KeyEvent.META_SHIFT_ON) != 0)
+      return adjustCase(shiftLabel);
     return adjustCase(label);
   }
 
@@ -217,13 +233,22 @@ private void parseLabel() {
     }
   }
 
-  public static String getDisplayLabel(int keyCode) {
+  public String getDisplayLabel(int keyCode) {
     String s = "";
-    if (Keycode.Companion.isStdKey(keyCode)) { // 字母數字
+    if (Keycode.Companion.isStdKey(keyCode)) {
+      // Android keycode区域
       if (Key.getKcm().isPrintingKey(keyCode)) {
-        char c = Key.getKcm().getDisplayLabel(keyCode);
-        if (Character.isUpperCase(c)) c = Character.toLowerCase(c);
-        s = String.valueOf(c);
+        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);
       }
@@ -237,10 +262,8 @@ public static int getClickCode(String s) {
     int keyCode = -1;
     if (TextUtils.isEmpty(s)) { // 空鍵
       keyCode = 0;
-    } else if (Keycode.fromString(s) != Keycode.VoidSymbol) { // 字母數字
+    } else if (Keycode.fromString(s) != Keycode.VoidSymbol) {
       keyCode = Keycode.keyCodeOf(s);
-    } else if (symbolAliases.containsKey(s)) {
-      keyCode = symbolAliases.get(s);
     }
     return keyCode;
   }
@@ -285,27 +308,4 @@ public boolean isAlt() {
           put("SYM", KeyEvent.META_SYM_ON);
         }
       };
-
-  private static final Map<String, Integer> symbolAliases =
-      new HashMap<String, Integer>() {
-        {
-          put("#", KeyEvent.KEYCODE_POUND);
-          put("'", KeyEvent.KEYCODE_APOSTROPHE);
-          put("(", KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN);
-          put(")", KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN);
-          put("*", KeyEvent.KEYCODE_STAR);
-          put("+", KeyEvent.KEYCODE_PLUS);
-          put(",", KeyEvent.KEYCODE_COMMA);
-          put("-", KeyEvent.KEYCODE_MINUS);
-          put(".", KeyEvent.KEYCODE_PERIOD);
-          put("/", KeyEvent.KEYCODE_SLASH);
-          put(";", KeyEvent.KEYCODE_SEMICOLON);
-          put("=", KeyEvent.KEYCODE_EQUALS);
-          put("@", KeyEvent.KEYCODE_AT);
-          put("\\", KeyEvent.KEYCODE_BACKSLASH);
-          put("[", KeyEvent.KEYCODE_LEFT_BRACKET);
-          put("`", KeyEvent.KEYCODE_GRAVE);
-          put("]", KeyEvent.KEYCODE_RIGHT_BRACKET);
-        }
-      };
 }