KeyHandler // Improve Alt+Fwd/Bwd support.

Source/Modules/ControllerModules/KeyHandler_Core.swift

@@ -375,8 +375,8 @@ class KeyHandler {
 
   /// 組字器的游標位置。
   var compositorCursorIndex: Int {
-    get { compositor.cursorIndex }
+    get { compositor.cursor }
-    set { compositor.cursorIndex = newValue }
+    set { compositor.cursor = newValue }
   }
 
   /// 組字器的目前的長度。

Source/Modules/ControllerModules/KeyHandler_States.swift

@@ -662,14 +662,14 @@ extension KeyHandler {
         stateCallback(state)
       }
     } else if input.isOptionHold {
-      if compositorCursorIndex < compositorLength {
+      // 游標跳轉動作無論怎樣都會執行，但如果出了執行失敗的結果的話則觸發報錯流程。
-        compositorCursorIndex = nextPhrasePosition
+      if !compositor.jumpCursorBySpan(to: .front) {
-        stateCallback(buildInputtingState)
-      } else {
         IME.prtDebugIntel("33C3B580")
         errorCallback()
         stateCallback(state)
+        return true
       }
+      stateCallback(buildInputtingState)
     } else {
       if compositorCursorIndex < compositorLength {
         compositorCursorIndex += 1
@@ -727,17 +727,14 @@ extension KeyHandler {
         stateCallback(state)
       }
     } else if input.isOptionHold {
-      if compositorCursorIndex > 1 {
+      // 游標跳轉動作無論怎樣都會執行，但如果出了執行失敗的結果的話則觸發報錯流程。
-        compositorCursorIndex -= 2
+      if !compositor.jumpCursorBySpan(to: .rear) {
-        stateCallback(buildInputtingState)
-      } else if compositorCursorIndex == 1 {
-        compositorCursorIndex = 0
-        stateCallback(buildInputtingState)
-      } else {
         IME.prtDebugIntel("8D50DD9E")
         errorCallback()
         stateCallback(state)
+        return true
       }
+      stateCallback(buildInputtingState)
     } else {
       if compositorCursorIndex > 0 {
         compositorCursorIndex -= 1