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

ctlIME // +updateModifierFlags.

This commit is contained in:
ShikiSuen 2022-03-26 18:52:21 +08:00
parent 538fa8dc9f
commit 163b3e46c7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Modules/IMEModules/ctlInputMethod.swift
View File

@ -73,6 +73,16 @@ class ctlInputMethod: IMKInputController {
client.overrideKeyboard(withKeyboardNamed: isfunctionKeyboardLayout ? mgrPrefs.functionKeyboardLayout : mgrPrefs.basisKeyboardLayout) client.overrideKeyboard(withKeyboardNamed: isfunctionKeyboardLayout ? mgrPrefs.functionKeyboardLayout : mgrPrefs.basisKeyboardLayout)
} }
func updateModifierFlags(_ event: NSEvent!) {
// 這裡不會列出全部的 modifier flags，只會列出可能會影響符號輸入的 flags、主要用於 AppleKeyboardConverter。
IME.isShiftPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.shift)
IME.isOptionPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.option)
IME.isCapsLockOn = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.capsLock)
IME.isCommandPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.command)
IME.isNumericPad = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.numericPad)
IME.isFunction = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.function)
}
// MARK: - IMKInputController methods // MARK: - IMKInputController methods
override init!(server: IMKServer!, delegate: Any!, client inputClient: Any!) { override init!(server: IMKServer!, delegate: Any!, client inputClient: Any!) {
@ -207,6 +217,8 @@ class ctlInputMethod: IMKInputController {
} }
override func handle(_ event: NSEvent!, client: Any!) -> Bool { override func handle(_ event: NSEvent!, client: Any!) -> Bool {
// 更新全局共用狀態開關的參數。
updateModifierFlags(event)
if mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout { if mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout {
// 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。 // 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。