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

InputSignal // Add symbol menu key "_" for JIS keyboard.

This commit is contained in:
ShikiSuen 2022-07-24 22:55:52 +08:00
parent d5b36c762d
commit ff015d80d3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Modules/ControllerModules/InputSignal.swift
View File

@ -34,7 +34,7 @@ enum KeyCode: UInt16 {
case kCarriageReturn = 36 // Renamed from "kReturn" to avoid nomenclatural confusions. case kCarriageReturn = 36 // Renamed from "kReturn" to avoid nomenclatural confusions.
case kTab = 48 case kTab = 48
case kSpace = 49 case kSpace = 49
case kSymbolMenuPhysicalKey = 50 // vChewing Specific case kSymbolMenuPhysicalKeyIntl = 50 // vChewing Specific (Non-JIS)
case kBackSpace = 51 // Renamed from "kDelete" to avoid nomenclatural confusions. case kBackSpace = 51 // Renamed from "kDelete" to avoid nomenclatural confusions.
case kEscape = 53 case kEscape = 53
case kCommand = 55 case kCommand = 55
@ -54,6 +54,7 @@ enum KeyCode: UInt16 {
case kF18 = 79 case kF18 = 79
case kF19 = 80 case kF19 = 80
case kF20 = 90 case kF20 = 90
case kSymbolMenuPhysicalKeyJIS = 94 // vChewing Specific (JIS)
case kF5 = 96 case kF5 = 96
case kF6 = 97 case kF6 = 97
case kF7 = 98 case kF7 = 98
@ -344,7 +345,7 @@ struct InputSignal: CustomStringConvertible {
var isSymbolMenuPhysicalKey: Bool { var isSymbolMenuPhysicalKey: Bool {
// 這裡必須用 KeyCode，這樣才不會受隨 macOS 版本更動的 Apple 動態注音鍵盤排列內容的影響。 // 這裡必須用 KeyCode，這樣才不會受隨 macOS 版本更動的 Apple 動態注音鍵盤排列內容的影響。
// 只是必須得與 ![input isShift] 搭配使用才可以（也就是僅判定 Shift 沒被摁下的情形）。 // 只是必須得與 ![input isShift] 搭配使用才可以（也就是僅判定 Shift 沒被摁下的情形）。
KeyCode(rawValue: keyCode) == KeyCode.kSymbolMenuPhysicalKey [KeyCode.kSymbolMenuPhysicalKeyIntl, KeyCode.kSymbolMenuPhysicalKeyJIS].contains(KeyCode(rawValue: keyCode))
} }
} }

4
vChewingTests/KeyHandlerTestsNormalCHS.swift
View File

@ -337,7 +337,7 @@ class KeyHandlerTestsNormalCHS: XCTestCase {
let enabled = mgrPrefs.halfWidthPunctuationEnabled let enabled = mgrPrefs.halfWidthPunctuationEnabled
mgrPrefs.halfWidthPunctuationEnabled = false mgrPrefs.halfWidthPunctuationEnabled = false
let input = InputSignal( let input = InputSignal(
inputText: " ", keyCode: KeyCode.kSymbolMenuPhysicalKey.rawValue, charCode: 0, flags: [], inputText: " ", keyCode: KeyCode.kSymbolMenuPhysicalKeyIntl.rawValue, charCode: 0, flags: [],
isVerticalTyping: false isVerticalTyping: false
) )
var state: InputStateProtocol = InputState.Empty() var state: InputStateProtocol = InputState.Empty()
@ -354,7 +354,7 @@ class KeyHandlerTestsNormalCHS: XCTestCase {
let enabled = mgrPrefs.halfWidthPunctuationEnabled let enabled = mgrPrefs.halfWidthPunctuationEnabled
mgrPrefs.halfWidthPunctuationEnabled = false mgrPrefs.halfWidthPunctuationEnabled = false
let input = InputSignal( let input = InputSignal(
inputText: " ", keyCode: KeyCode.kSymbolMenuPhysicalKey.rawValue, charCode: 0, flags: .option, inputText: " ", keyCode: KeyCode.kSymbolMenuPhysicalKeyIntl.rawValue, charCode: 0, flags: .option,
isVerticalTyping: false isVerticalTyping: false
) )
var state: InputStateProtocol = InputState.Empty() var state: InputStateProtocol = InputState.Empty()

2
vChewingTests/KeyHandlerTestsSCPCCHT.swift
View File

@ -75,7 +75,7 @@ class KeyHandlerTestsSCPCCHT: XCTestCase {
func testPunctuationTable() { func testPunctuationTable() {
let input = InputSignal( let input = InputSignal(
inputText: "`", keyCode: KeyCode.kSymbolMenuPhysicalKey.rawValue, charCode: 0, flags: .option inputText: "`", keyCode: KeyCode.kSymbolMenuPhysicalKeyIntl.rawValue, charCode: 0, flags: .option
) )
var state: InputStateProtocol = InputState.Empty() var state: InputStateProtocol = InputState.Empty()
_ = handler.handle(input: input, state: state) { newState in _ = handler.handle(input: input, state: state) { newState in