From 8fc862714b95158980a8b59327fb0436386c07c3 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 18 Apr 2022 18:25:44 +0800 Subject: [PATCH] KeyParser // Rebranding to InputHandler. - This change will solve the nomenclatural doubts brought by the previous name change. --- .../{KeyParser.swift => InputHandler.swift} | 2 +- Source/Modules/ControllerModules/KeyHandler.h | 2 +- .../ControllerModules/KeyHandler_HandleCandidate.swift | 2 +- .../ControllerModules/KeyHandler_HandleInput.swift | 2 +- Source/Modules/ControllerModules/KeyHandler_States.swift | 6 +++--- Source/Modules/IMEModules/ctlInputMethod.swift | 8 ++++---- vChewing.xcodeproj/project.pbxproj | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) rename Source/Modules/ControllerModules/{KeyParser.swift => InputHandler.swift} (99%) diff --git a/Source/Modules/ControllerModules/KeyParser.swift b/Source/Modules/ControllerModules/InputHandler.swift similarity index 99% rename from Source/Modules/ControllerModules/KeyParser.swift rename to Source/Modules/ControllerModules/InputHandler.swift index d08547db..51085d84 100644 --- a/Source/Modules/ControllerModules/KeyParser.swift +++ b/Source/Modules/ControllerModules/InputHandler.swift @@ -90,7 +90,7 @@ enum CharCode: UInt /* 16 */ { // ... but only focuses on which physical key is pressed. } -class keyParser: NSObject { +class InputHandler: NSObject { @objc private(set) var useVerticalMode: Bool @objc private(set) var inputText: String? @objc private(set) var inputTextIgnoringModifiers: String? diff --git a/Source/Modules/ControllerModules/KeyHandler.h b/Source/Modules/ControllerModules/KeyHandler.h index 7bbbc40e..787f8e86 100644 --- a/Source/Modules/ControllerModules/KeyHandler.h +++ b/Source/Modules/ControllerModules/KeyHandler.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #import -@class keyParser; +@class InputHandler; @class InputState; NS_ASSUME_NONNULL_BEGIN diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift index e05efa6c..ac892219 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift @@ -31,7 +31,7 @@ import Cocoa @objc extension KeyHandler { func _handleCandidateState( _ state: InputState, - input: keyParser, + input: InputHandler, stateCallback: @escaping (InputState) -> Void, errorCallback: @escaping () -> Void ) -> Bool { diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift index 3c51542c..2d60b22a 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift @@ -30,7 +30,7 @@ import Cocoa @objc extension KeyHandler { func handle( - input: keyParser, + input: InputHandler, state: InputState, stateCallback: @escaping (InputState) -> Void, errorCallback: @escaping () -> Void diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift index 15fe7a65..488d05ef 100644 --- a/Source/Modules/ControllerModules/KeyHandler_States.swift +++ b/Source/Modules/ControllerModules/KeyHandler_States.swift @@ -84,7 +84,7 @@ import Cocoa func _handleMarkingState( _ state: InputState.Marking, - input: keyParser, + input: InputHandler, stateCallback: @escaping (InputState) -> Void, errorCallback: @escaping () -> Void ) -> Bool { @@ -455,7 +455,7 @@ import Cocoa func _handleForwardWithState( _ state: InputState, - input: keyParser, + input: InputHandler, stateCallback: @escaping (InputState) -> Void, errorCallback: @escaping () -> Void ) -> Bool { @@ -506,7 +506,7 @@ import Cocoa func _handleBackwardWithState( _ state: InputState, - input: keyParser, + input: InputHandler, stateCallback: @escaping (InputState) -> Void, errorCallback: @escaping () -> Void ) -> Bool { diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift index 206aa51a..bdc3d9c6 100644 --- a/Source/Modules/IMEModules/ctlInputMethod.swift +++ b/Source/Modules/IMEModules/ctlInputMethod.swift @@ -53,10 +53,10 @@ class ctlInputMethod: IMKInputController { private var keyHandler: KeyHandler = .init() private var state: InputState = .Empty() - // 想讓 keyHandler 能夠被外界調查狀態與參數的話，就得對 keyHandler 做常態處理。 + // 想讓 KeyHandler 能夠被外界調查狀態與參數的話，就得對 KeyHandler 做常態處理。 // 這樣 InputState 可以藉由這個 ctlInputMethod 了解到當前的輸入模式是簡體中文還是繁體中文。 - // 然而，要是直接對 keyHandler 做常態處理的話，反而會導致 keyParser 無法協同處理。 - // 所以才需要「currentKeyHandler」這個假 keyHandler。 + // 然而，要是直接對 keyHandler 做常態處理的話，反而會導致 InputHandler 無法協同處理。 + // 所以才需要「currentKeyHandler」這個假 KeyHandler。 // 這個「currentKeyHandler」僅用來讓其他模組知道當前的輸入模式是什麼模式，除此之外別無屌用。 static var currentKeyHandler: KeyHandler = .init() @objc static var currentInputMode = mgrPrefs.mostRecentInputMode @@ -178,7 +178,7 @@ class ctlInputMethod: IMKInputController { IME.areWeUsingOurOwnPhraseEditor = false } - let input = keyParser(event: event, isVerticalMode: useVerticalMode) + let input = InputHandler(event: event, isVerticalMode: useVerticalMode) let result = keyHandler.handle(input: input, state: state) { newState in self.handle(state: newState, client: client) diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index 9e67238c..96c6d9b3 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -97,7 +97,7 @@ D41355DE278EA3ED005E5CBD /* UserPhrasesLM.mm in Sources */ = {isa = PBXBuildFile; fileRef = D41355DC278EA3ED005E5CBD /* UserPhrasesLM.mm */; }; D427F76C278CA2B0004A2160 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D427F76B278CA1BA004A2160 /* AppDelegate.swift */; }; D44FB74D2792189A003C80A6 /* PhraseReplacementMap.mm in Sources */ = {isa = PBXBuildFile; fileRef = D44FB74B2792189A003C80A6 /* PhraseReplacementMap.mm */; }; - D456576E279E4F7B00DF6BC9 /* KeyParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D456576D279E4F7B00DF6BC9 /* KeyParser.swift */; }; + D456576E279E4F7B00DF6BC9 /* InputHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D456576D279E4F7B00DF6BC9 /* InputHandler.swift */; }; D461B792279DAC010070E734 /* InputState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D461B791279DAC010070E734 /* InputState.swift */; }; D47B92C027972AD100458394 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D47B92BF27972AC800458394 /* main.swift */; }; D47D73AC27A6CAE600255A50 /* AssociatedPhrases.mm in Sources */ = {isa = PBXBuildFile; fileRef = D47D73AA27A6CAE600255A50 /* AssociatedPhrases.mm */; }; @@ -318,7 +318,7 @@ D427F76B278CA1BA004A2160 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = ""; tabWidth = 2; usesTabs = 1; }; D44FB74B2792189A003C80A6 /* PhraseReplacementMap.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = PhraseReplacementMap.mm; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; D44FB74C2792189A003C80A6 /* PhraseReplacementMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PhraseReplacementMap.h; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; - D456576D279E4F7B00DF6BC9 /* KeyParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = KeyParser.swift; sourceTree = ""; tabWidth = 2; usesTabs = 1; }; + D456576D279E4F7B00DF6BC9 /* InputHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = InputHandler.swift; sourceTree = ""; tabWidth = 2; usesTabs = 1; }; D461B791279DAC010070E734 /* InputState.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = InputState.swift; sourceTree = ""; tabWidth = 2; usesTabs = 1; }; D47B92BF27972AC800458394 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = main.swift; sourceTree = ""; tabWidth = 2; usesTabs = 1; }; D47D73AA27A6CAE600255A50 /* AssociatedPhrases.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = AssociatedPhrases.mm; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; @@ -429,13 +429,13 @@ children = ( 5B11328827B94CFB00E58451 /* AppleKeyboardConverter.swift */, D461B791279DAC010070E734 /* InputState.swift */, + D456576D279E4F7B00DF6BC9 /* InputHandler.swift */, D4E569DA27A34CC100AC2CEF /* KeyHandler.h */, D4E569DB27A34CC100AC2CEF /* KeyHandler.mm */, 5B7F225C2808501000DDD3CB /* KeyHandler_HandleInput.swift */, 5B782EC3280C243C007276DE /* KeyHandler_HandleCandidate.swift */, 5B61B0C9280BEFD4002E3CFA /* KeyHandler_Misc.swift */, 5B3133BE280B229700A4A505 /* KeyHandler_States.swift */, - D456576D279E4F7B00DF6BC9 /* KeyParser.swift */, 6ACC3D3E27914F2400F1B140 /* KeyValueBlobReader.cpp */, 6ACC3D3C27914AAB00F1B140 /* KeyValueBlobReader.h */, 5B62A33727AE79CD00A19448 /* NSStringUtils.swift */, @@ -1087,7 +1087,7 @@ D47F7DD0278C0897002F9DD7 /* ctlNonModalAlertWindow.swift in Sources */, 5B62A32F27AE78B000A19448 /* CoreLM.mm in Sources */, 5BE78BE027B38804005EA1BE /* LMConsolidator.mm in Sources */, - D456576E279E4F7B00DF6BC9 /* KeyParser.swift in Sources */, + D456576E279E4F7B00DF6BC9 /* InputHandler.swift in Sources */, 5BA9FD1027FEDB6B002DE248 /* suiPrefPaneKeyboard.swift in Sources */, 5B3133BF280B229700A4A505 /* KeyHandler_States.swift in Sources */, 5BA9FD4327FEF3C8002DE248 /* Preferences.swift in Sources */,