refactor: remove scancode mapping

We don't actually need this. This reverts commit 1613c45 and parts of c940750.
osfans · Dec 9, 2024 · 19c5cab · 19c5cab
1 parent a1c11df
commit 19c5cab
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 437 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,31 +77,29 @@ class Rime :
     override suspend fun processKey(
         value: Int,
         modifiers: UInt,
-        code: Int,
         up: Boolean,
     ): Boolean =
         withRimeContext {
             processRimeKey(value, modifiers.toInt()).also {
                 if (it) {
                     ipcResponseCallback()
                 } else {
-                    keyEventCallback(KeyValue(value), KeyModifiers(modifiers), code, up)
+                    keyEventCallback(KeyValue(value), KeyModifiers(modifiers), up)
                 }
             }
         }
 
     override suspend fun processKey(
         value: KeyValue,
         modifiers: KeyModifiers,
-        code: Int,
         up: Boolean,
     ): Boolean =
         withRimeContext {
             processRimeKey(value.value, modifiers.toInt()).also {
                 if (it) {
                     ipcResponseCallback()
                 } else {
-                    keyEventCallback(value, modifiers, code, up)
+                    keyEventCallback(value, modifiers, up)
                 }
             }
         }
@@ -470,10 +468,9 @@ class Rime :
         private fun keyEventCallback(
             value: KeyValue,
             modifiers: KeyModifiers,
-            code: Int,
             up: Boolean,
         ) {
-            handleRimeEvent(RimeEvent.EventType.Key, RimeEvent.KeyEvent.Data(value, modifiers, code, up))
+            handleRimeEvent(RimeEvent.EventType.Key, RimeEvent.KeyEvent.Data(value, modifiers, value.value, up))
         }
 
         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,14 +22,12 @@ interface RimeApi {
     suspend fun processKey(
         value: Int,
         modifiers: UInt = 0u,
-        code: Int = 0,
         up: Boolean = false,
     ): Boolean
 
     suspend fun processKey(
         value: KeyValue,
         modifiers: KeyModifiers,
-        code: Int = 0,
         up: Boolean = false,
     ): Boolean
 

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,7 +42,6 @@ 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
@@ -252,11 +251,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                             sendDownKeyEvent(eventTime, keyCode, it.modifiers.metaState)
                         }
                     } else {
-                        if (!it.up && it.unicode > 0) {
-                            commitText(Char(it.unicode).toString())
-                        } else {
-                            Timber.w("Unhandled Rime KeyEvent: $it")
-                        }
+                        Timber.w("Unhandled Rime KeyEvent: $it")
                     }
                 }
             else -> {}
@@ -603,7 +598,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                 0,
                 metaState,
                 KeyCharacterMap.VIRTUAL_KEYBOARD,
-                ScancodeMapping.keyCodeToScancode(keyEventCode),
+                0,
                 KeyEvent.FLAG_SOFT_KEYBOARD or KeyEvent.FLAG_KEEP_TOUCH_MODE,
                 InputDevice.SOURCE_KEYBOARD,
             ),
@@ -625,7 +620,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                 0,
                 metaState,
                 KeyCharacterMap.VIRTUAL_KEYBOARD,
-                ScancodeMapping.keyCodeToScancode(keyEventCode),
+                0,
                 KeyEvent.FLAG_SOFT_KEYBOARD or KeyEvent.FLAG_KEEP_TOUCH_MODE,
                 InputDevice.SOURCE_KEYBOARD,
             ),
@@ -724,14 +719,14 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
         val charCode = event.unicodeChar
         if (charCode > 0 && charCode != '\t'.code && charCode != '\n'.code) {
             postRimeJob {
-                processKey(charCode, modifiers.modifiers, event.scanCode, up)
+                processKey(charCode, modifiers.modifiers, up)
             }
             return true
         }
         val keyVal = KeyValue.fromKeyEvent(event)
         if (keyVal.value != RimeKeyMapping.RimeKey_VoidSymbol) {
             postRimeJob {
-                processKey(keyVal, modifiers, event.scanCode, up)
+                processKey(keyVal, modifiers, up)
             }
             return true
         }

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt
@@ -15,7 +15,6 @@ import com.osfans.trime.core.KeyModifiers
 import com.osfans.trime.core.Rime
 import com.osfans.trime.core.RimeApi
 import com.osfans.trime.core.RimeKeyMapping
-import com.osfans.trime.core.ScancodeMapping
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.daemon.launchOnReady
 import com.osfans.trime.data.prefs.AppPrefs
@@ -261,9 +260,8 @@ class CommonKeyboardActionListener(
                         .takeIf { it != RimeKeyMapping.RimeKey_VoidSymbol }
                         ?: Rime.getRimeKeycodeByName(Keycode.keyNameOf(keyEventCode))
                 val modifiers = KeyModifiers.fromMetaState(metaState).modifiers
-                val code = ScancodeMapping.keyCodeToScancode(keyEventCode)
                 service.postRimeJob {
-                    if (processKey(value, modifiers, code)) {
+                    if (processKey(value, modifiers)) {
                         shouldReleaseKey = true
                         Timber.d("handleKey: processKey")
                         return@postRimeJob