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

KeyHandler // +upperCaseLetterKeyBehavior.

This commit is contained in:
ShikiSuen 2022-08-09 11:59:02 +08:00
parent aeed63a20a
commit 58a68c51fc
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
View File

@ -359,9 +359,36 @@ extension KeyHandler {
return true
}
// MARK: 全形/半形空白 (Full-Width / Half-Width Space)
/// 該功能僅可在當前組字區沒有任何內容的時候使用。
if state is InputState.Empty {
if input.isSpace, !input.isOptionHold, !input.isControlHold, !input.isCommandHold {
stateCallback(InputState.Committing(textToCommit: input.isShiftHold ? "　" : " "))
stateCallback(InputState.Empty())
return true
}
}
// MARK: 摁住 Shift+字母鍵 的處理 (Shift+Letter Processing)
// 這裡不使用小麥注音 2.2 版的組字區處理方式，而是直接由詞庫負責。
if input.isUpperCaseASCIILetterKey {
let letter: String! = String(format: "%@%c", "_letter_", charCode.isPrintableASCII ? CChar(charCode) : inputText)
if input.isUpperCaseASCIILetterKey, !input.isCommandHold, !input.isControlHold {
if input.isShiftHold { // 這裡先不要判斷 isOptionHold。
switch mgrPrefs.upperCaseLetterKeyBehavior {
case 1:
stateCallback(InputState.Empty())
stateCallback(InputState.Committing(textToCommit: inputText.lowercased()))
stateCallback(InputState.Empty())
return true
case 2:
stateCallback(InputState.Empty())
stateCallback(InputState.Committing(textToCommit: inputText.uppercased()))
stateCallback(InputState.Empty())
return true
default: // 包括 case 0，直接塞給組字區。
let letter: String! = String(
format: "%@%c", "_letter_", charCode.isPrintableASCII ? CChar(charCode) : inputText)
if handlePunctuation(
letter,
state: state,
@ -372,15 +399,6 @@ extension KeyHandler {
return true
}
}
// MARK: 全形/半形空白 (Full-Width / Half-Width Space)
/// 該功能僅可在當前組字區沒有任何內容的時候使用。
if state is InputState.Empty {
if input.isSpace, !input.isOptionHold, !input.isControlHold, !input.isCommandHold {
stateCallback(InputState.Committing(textToCommit: input.isShiftHold ? "　" : " "))
stateCallback(InputState.Empty())
return true
}
}