refactor: utilize scancode to improve key event handling

osfans · Nov 7, 2024 · c940750 · c940750
1 parent 1613c45
commit c940750
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt
@@ -77,27 +77,29 @@ class Rime :
     override suspend fun processKey(
         value: Int,
         modifiers: UInt,
+        code: Int,
     ): Boolean =
         withRimeContext {
             processRimeKey(value, modifiers.toInt()).also {
                 if (it) {
                     ipcResponseCallback()
                 } else {
-                    keyEventCallback(KeyValue(value), KeyModifiers(modifiers))
+                    keyEventCallback(KeyValue(value), KeyModifiers(modifiers), code)
                 }
             }
         }
 
     override suspend fun processKey(
         value: KeyValue,
         modifiers: KeyModifiers,
+        code: Int,
     ): Boolean =
         withRimeContext {
             processRimeKey(value.value, modifiers.toInt()).also {
                 if (it) {
                     ipcResponseCallback()
                 } else {
-                    keyEventCallback(value, modifiers)
+                    keyEventCallback(value, modifiers, code)
                 }
             }
         }
@@ -450,8 +452,9 @@ class Rime :
         private fun keyEventCallback(
             value: KeyValue,
             modifiers: KeyModifiers,
+            code: Int,
         ) {
-            handleRimeEvent(RimeEvent.EventType.Key, RimeEvent.KeyEvent.Data(value, modifiers))
+            handleRimeEvent(RimeEvent.EventType.Key, RimeEvent.KeyEvent.Data(value, modifiers, code))
         }
 
         private fun <T> handleRimeEvent(

diff --git a/app/src/main/java/com/osfans/trime/core/RimeApi.kt b/app/src/main/java/com/osfans/trime/core/RimeApi.kt
@@ -22,11 +22,13 @@ interface RimeApi {
     suspend fun processKey(
         value: Int,
         modifiers: UInt = 0u,
+        code: Int = 0,
     ): Boolean
 
     suspend fun processKey(
         value: KeyValue,
         modifiers: KeyModifiers,
+        code: Int = 0,
     ): Boolean
 
     suspend fun selectCandidate(idx: Int): Boolean

diff --git a/app/src/main/java/com/osfans/trime/core/RimeEvent.kt b/app/src/main/java/com/osfans/trime/core/RimeEvent.kt
@@ -30,6 +30,7 @@ sealed class RimeEvent<T>(
         data class Data(
             val value: KeyValue,
             val modifiers: KeyModifiers,
+            val unicode: Int,
         )
     }
 

diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -42,6 +42,7 @@ import com.osfans.trime.core.RimeEvent
 import com.osfans.trime.core.RimeKeyMapping
 import com.osfans.trime.core.RimeNotification
 import com.osfans.trime.core.RimeProto
+import com.osfans.trime.core.ScancodeMapping
 import com.osfans.trime.daemon.RimeDaemon
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.data.db.DraftHelper
@@ -302,8 +303,8 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                             sendDownKeyEvent(eventTime, keyCode, it.modifiers.metaState)
                         }
                     } else {
-                        if (it.modifiers.modifiers != KeyModifier.Release.modifier && it.value.value > 0) {
-                            commitText(Char(it.value.value).toString())
+                        if (it.modifiers.modifiers != KeyModifier.Release.modifier && it.unicode > 0) {
+                            commitText(Char(it.unicode).toString())
                         } else {
                             Timber.w("Unhandled Rime KeyEvent: $it")
                         }
@@ -647,7 +648,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                 0,
                 metaState,
                 KeyCharacterMap.VIRTUAL_KEYBOARD,
-                0,
+                ScancodeMapping.keyCodeToScancode(keyEventCode),
                 KeyEvent.FLAG_SOFT_KEYBOARD or KeyEvent.FLAG_KEEP_TOUCH_MODE,
                 InputDevice.SOURCE_KEYBOARD,
             ),
@@ -669,7 +670,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                 0,
                 metaState,
                 KeyCharacterMap.VIRTUAL_KEYBOARD,
-                0,
+                ScancodeMapping.keyCodeToScancode(keyEventCode),
                 KeyEvent.FLAG_SOFT_KEYBOARD or KeyEvent.FLAG_KEEP_TOUCH_MODE,
                 InputDevice.SOURCE_KEYBOARD,
             ),
@@ -767,14 +768,14 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
         val charCode = event.unicodeChar
         if (charCode > 0 && charCode != '\t'.code) {
             postRimeJob {
-                processKey(charCode, modifiers.modifiers)
+                processKey(charCode, modifiers.modifiers, event.scanCode)
             }
             return true
         }
         val keyVal = KeyValue.fromKeyEvent(event)
         if (keyVal.value != RimeKeyMapping.RimeKey_VoidSymbol) {
             postRimeJob {
-                processKey(keyVal, modifiers)
+                processKey(keyVal, modifiers, event.scanCode)
             }
             return true
         }
@@ -832,9 +833,10 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                 .takeIf { it != RimeKeyMapping.RimeKey_VoidSymbol }
                 ?: Rime.getRimeKeycodeByName(Keycode.keyNameOf(keyEventCode))
         val modifiers = KeyModifiers.fromMetaState(metaState).modifiers
+        val code = ScancodeMapping.keyCodeToScancode(keyEventCode)
         var result = false
         postRimeJob {
-            if (!processKey(value, modifiers)) {
+            if (!processKey(value, modifiers, code)) {
                 if (!hookKeyboard(keyEventCode, metaState)) {
                     if (!openCategory(keyEventCode)) {
                         result = false