ctlIME // Use InputSignalProtocol.

This commit is contained in:
ShikiSuen 2022-09-01 14:16:24 +08:00
parent ee6b77001a
commit e039e8cadc
2 changed files with 4 additions and 8 deletions

View File

@ -51,19 +51,16 @@ extension ctlInputMethod {
// //
ctlInputMethod.areWeNerfing = event.modifierFlags.contains([.shift, .command]) ctlInputMethod.areWeNerfing = event.modifierFlags.contains([.shift, .command])
var input = InputSignal(event: event, isVerticalTyping: isVerticalTyping)
input.isASCIIModeInput = isASCIIMode
// //
// KeyHandler // KeyHandler
if !input.charCode.isPrintable { if !event.charCode.isPrintable {
return false return false
} }
/// 調 /// 調
/// result bool IMK /// result bool IMK
/// keyHandler.handleCandidate() /// keyHandler.handleCandidate()
let result = keyHandler.handle(input: input, state: state) { newState in let result = keyHandler.handle(input: event, state: state) { newState in
self.handle(state: newState) self.handle(state: newState)
} errorCallback: { } errorCallback: {
clsSFX.beep() clsSFX.beep()

View File

@ -219,11 +219,10 @@ class ctlInputMethod: IMKInputController {
proc: if let ctlCandidateCurrent = ctlInputMethod.ctlCandidateCurrent as? ctlCandidateIMK { proc: if let ctlCandidateCurrent = ctlInputMethod.ctlCandidateCurrent as? ctlCandidateIMK {
guard ctlCandidateCurrent.visible else { break proc } guard ctlCandidateCurrent.visible else { break proc }
let event: NSEvent = ctlCandidateIMK.replaceNumPadKeyCodes(target: event) ?? event let event: NSEvent = ctlCandidateIMK.replaceNumPadKeyCodes(target: event) ?? event
let input = InputSignal(event: event)
// Shift+Enter delegate keyHandler // Shift+Enter delegate keyHandler
// Shift Flags // Shift Flags
if input.isShiftHold, input.isEnter { if event.isShiftHold, event.isEnter {
guard guard
let newEvent = NSEvent.keyEvent( let newEvent = NSEvent.keyEvent(
with: event.type, with: event.type,
@ -246,7 +245,7 @@ class ctlInputMethod: IMKInputController {
} }
// //
if let newChar = ctlCandidateIMK.defaultIMKSelectionKey[event.keyCode], input.isShiftHold, if let newChar = ctlCandidateIMK.defaultIMKSelectionKey[event.keyCode], event.isShiftHold,
isAssociatedPhrasesState isAssociatedPhrasesState
{ {
let newEvent = NSEvent.keyEvent( let newEvent = NSEvent.keyEvent(