floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

InputHandler // Allow moving cursor in candidate state. 

- The hotkey is (Shift+)Opt+FWD/BWD.
This commit is contained in:
ShikiSuen 2024-01-29 20:53:01 +08:00
parent 24cf7e9971
commit aac80eba7d
1 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleCandidate.swift
View File

@ -150,16 +150,54 @@ extension InputHandler {
_ = ctlCandidate.showPreviousPage() ? {}() : delegate.callError("9569955D")
return true
case .kUpArrow, .kDownArrow, .kLeftArrow, .kRightArrow:
handleArrowKey: switch (keyCodeType, ctlCandidate.currentLayout) {
case (.kLeftArrow, .horizontal), (.kUpArrow, .vertical): // Previous Candidate
_ = ctlCandidate.highlightPreviousCandidate()
case (.kRightArrow, .horizontal), (.kDownArrow, .vertical): // Next Candidate
_ = ctlCandidate.highlightNextCandidate()
case (.kUpArrow, .horizontal), (.kLeftArrow, .vertical): // Previous Line
_ = ctlCandidate.showPreviousLine()
case (.kDownArrow, .horizontal), (.kRightArrow, .vertical): // Next Line
_ = ctlCandidate.showNextLine()
default: break handleArrowKey
switch input.commonKeyModifierFlags {
case [.option, .shift] where input.isCursorForward:
if compositor.cursor < compositor.length {
compositor.cursor += 1
if isCursorCuttingChar() { compositor.jumpCursorBySpan(to: .front) }
delegate.switchState(generateStateOfCandidates())
} else {
delegate.callError("D3006C85")
}
return true
case [.option, .shift] where input.isCursorBackward:
if compositor.cursor > 0 {
compositor.cursor -= 1
if isCursorCuttingChar() { compositor.jumpCursorBySpan(to: .rear) }
delegate.switchState(generateStateOfCandidates())
} else {
delegate.callError("DE9DAF0D")
}
return true
case .option where input.isCursorForward:
if compositor.cursor < compositor.length {
compositor.jumpCursorBySpan(to: .front)
delegate.switchState(generateStateOfCandidates())
} else {
delegate.callError("5D9F4819")
}
return true
case .option where input.isCursorBackward:
if compositor.cursor > 0 {
compositor.jumpCursorBySpan(to: .rear)
delegate.switchState(generateStateOfCandidates())
} else {
delegate.callError("34B6322D")
}
return true
default:
handleArrowKey: switch (keyCodeType, ctlCandidate.currentLayout) {
case (.kLeftArrow, .horizontal), (.kUpArrow, .vertical): // Previous Candidate
_ = ctlCandidate.highlightPreviousCandidate()
case (.kRightArrow, .horizontal), (.kDownArrow, .vertical): // Next Candidate
_ = ctlCandidate.highlightNextCandidate()
case (.kUpArrow, .horizontal), (.kLeftArrow, .vertical): // Previous Line
_ = ctlCandidate.showPreviousLine()
case (.kDownArrow, .horizontal), (.kRightArrow, .vertical): // Next Line
_ = ctlCandidate.showNextLine()
default: break handleArrowKey
}
return true
}
case .kHome:
_ =