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

InputHandler // Also allow Cmd+Shift+Ctrl+[].

This commit is contained in:
ShikiSuen 2023-06-14 00:03:25 +08:00
parent ffd7db4bca
commit f140471995
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Modules/InputHandler_HandleCandidate.swift
View File

@ -22,7 +22,7 @@ extension InputHandler {
guard let delegate = delegate else { return false }
guard var ctlCandidate = delegate.candidateController() else { return false }
let state = delegate.state
guard !state.candidates.isEmpty else { return false }
guard state.isCandidateContainer, !state.candidates.isEmpty else { return false }
// MARK: 選字窗內使用熱鍵升權、降權、刪詞。
@ -211,8 +211,9 @@ extension InputHandler {
// MARK: - Flipping pages by using modified bracket keys (when they are not occupied).
// Shift+Command+[] 被 Chrome 系瀏覽器佔用，所以改用 Ctrl。
revolveCandidateWithBrackets: if input.modifierFlags == [.control, .command] {
if !state.isCandidateContainer { break revolveCandidateWithBrackets }
let ctrlCMD: Bool = input.modifierFlags == [.control, .command]
let ctrlShiftCMD: Bool = input.modifierFlags == [.control, .command, .shift]
if ctrlShiftCMD || ctrlCMD {
// 此處 JIS 鍵盤判定無法用於螢幕鍵盤。所以，螢幕鍵盤的場合，系統會依照 US 鍵盤的判定方案。
let isJIS: Bool = KBGetLayoutType(Int16(LMGetKbdType())) == kKeyboardJIS
switch (input.keyCode, isJIS) {

7
Source/Modules/InputHandler_HandleEvent.swift
View File

@ -26,7 +26,7 @@ extension InputHandler {
/// - Parameter event: 由 IMK 選字窗接收的裝置操作輸入事件。
/// - Returns: 回「`true`」以將該按鍵已攔截處理的訊息傳遞給 IMK；回「`false`」則放行、不作處理。
private func imkCandidatesEventPreHandler(event eventToDeal: NSEvent) -> Bool? {
guard let delegate = delegate else { return false }
guard let delegate = delegate, delegate.state.isCandidateContainer else { return nil }
// IMK 選字窗處理，當且僅當啟用了 IMK 選字窗的時候才會生效。
// 這樣可以讓 interpretKeyEvents() 函式自行判斷：
@ -133,8 +133,9 @@ extension InputHandler {
}
// Shift+Command+[] 被 Chrome 系瀏覽器佔用，所以改用 Ctrl。
revolveCandidateWithBrackets: if event.modifierFlags == [.control, .command] {
if !delegate.state.isCandidateContainer { break revolveCandidateWithBrackets }
let ctrlCMD: Bool = event.modifierFlags == [.control, .command]
let ctrlShiftCMD: Bool = event.modifierFlags == [.control, .command, .shift]
if ctrlShiftCMD || ctrlCMD {
// 此處 JIS 鍵盤判定無法用於螢幕鍵盤。所以，螢幕鍵盤的場合，系統會依照 US 鍵盤的判定方案。
let isJIS: Bool = KBGetLayoutType(Int16(LMGetKbdType())) == kKeyboardJIS
switch (event.keyCode, isJIS) {

4
Source/Modules/InputHandler_TriageInput.swift
View File

@ -158,7 +158,9 @@ extension InputHandler {
// Ctrl+Command+[] 輪替候選字。
// Shift+Command+[] 被 Chrome 系瀏覽器佔用，所以改用 Ctrl。
revolveCandidateWithBrackets: if input.modifierFlags == [.control, .command] {
let ctrlCMD: Bool = input.modifierFlags == [.control, .command]
let ctrlShiftCMD: Bool = input.modifierFlags == [.control, .command, .shift]
revolveCandidateWithBrackets: if ctrlShiftCMD || ctrlCMD {
if state.type != .ofInputting { break revolveCandidateWithBrackets }
// 此處 JIS 鍵盤判定無法用於螢幕鍵盤。所以，螢幕鍵盤的場合，系統會依照 US 鍵盤的判定方案。
let isJIS: Bool = KBGetLayoutType(Int16(LMGetKbdType())) == kKeyboardJIS