fix: could not scroll down the unrolled candidates

Revert the refactors "update context in rime engine lifecycle looper", which will cause unnecessary context update.
osfans · Oct 4, 2024 · a83725d · a83725d
1 parent 7920903
commit a83725d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 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
@@ -59,10 +59,6 @@ class Rime :
                     lifecycleImpl.emitState(RimeLifecycle.State.READY)
                 }
 
-                override fun nativeScheduleTasks() {
-                    requestRimeResponse()
-                }
-
                 override fun nativeFinalize() {
                     exitRime()
                 }
@@ -84,25 +80,25 @@ class Rime :
         modifiers: UInt,
     ): Boolean =
         withRimeContext {
-            processRimeKey(value, modifiers.toInt())
+            processRimeKey(value, modifiers.toInt()).also { if (it) requestRimeResponse() }
         }
 
     override suspend fun processKey(
         value: KeyValue,
         modifiers: KeyModifiers,
     ): Boolean =
         withRimeContext {
-            processRimeKey(value.value, modifiers.toInt())
+            processRimeKey(value.value, modifiers.toInt()).also { if (it) requestRimeResponse() }
         }
 
     override suspend fun selectCandidate(idx: Int): Boolean =
         withRimeContext {
-            selectRimeCandidate(idx)
+            selectRimeCandidate(idx).also { if (it) requestRimeResponse() }
         }
 
     override suspend fun forgetCandidate(idx: Int): Boolean =
         withRimeContext {
-            forgetRimeCandidate(idx)
+            forgetRimeCandidate(idx).also { if (it) requestRimeResponse() }
         }
 
     override suspend fun availableSchemata(): Array<SchemaItem> = withRimeContext { getAvailableRimeSchemaList() }
@@ -123,11 +119,12 @@ class Rime :
             schema ?: schemaItemCached
         }
 
-    override suspend fun commitComposition(): Boolean = withRimeContext { commitRimeComposition() }
+    override suspend fun commitComposition(): Boolean = withRimeContext { commitRimeComposition().also { if (it) requestRimeResponse() } }
 
     override suspend fun clearComposition() =
         withRimeContext {
             clearRimeComposition()
+            requestRimeResponse()
         }
 
     override suspend fun setRuntimeOption(
@@ -291,7 +288,7 @@ class Rime :
             Timber.d("processKey: keyCode=$keycode, mask=$mask")
             return processRimeKey(keycode, mask).also {
                 Timber.d("processKey ${if (it) "success" else "failed"}")
-                requestRimeResponse()
+                if (it) requestRimeResponse()
             }
         }
 
@@ -303,7 +300,7 @@ class Rime :
                 sequence.toString().replace("{}", "{braceleft}{braceright}"),
             ).also {
                 Timber.d("simulateKeySequence ${if (it) "success" else "failed"}")
-                requestRimeResponse()
+                if (it) requestRimeResponse()
             }
         }
 

diff --git a/app/src/main/java/com/osfans/trime/core/RimeDispatcher.kt b/app/src/main/java/com/osfans/trime/core/RimeDispatcher.kt
@@ -33,8 +33,6 @@ class RimeDispatcher(
     interface RimeLooper {
         fun nativeStartup(fullCheck: Boolean)
 
-        fun nativeScheduleTasks()
-
         fun nativeFinalize()
     }
 
@@ -94,7 +92,6 @@ class RimeDispatcher(
                     while (isActive && isRunning.get()) {
                         // TODO: because we have nothing to block currently,
                         //  here we use a channel to wait for a signal.
-                        looper.nativeScheduleTasks()
                         runBlocking { channel.receive() }
                         while (true) {
                             val block = queue.poll() ?: break