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

SessionCtl // Add isServingIMEItself(). 

- Also monitoring activateServer() in console.
This commit is contained in:
ShikiSuen 2022-11-29 09:30:32 +08:00
parent 5db19f854e
commit 0e98eb0d2c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Modules/SessionCtl_Core.swift
View File

@ -40,6 +40,9 @@ public class SessionCtl: IMKInputController {
/// 用來標記當前副本是否已處於活動狀態。 /// 用來標記當前副本是否已處於活動狀態。
public var isActivated = false public var isActivated = false
/// 當前副本的客體是否是輸入法本體？
public var isServingIMEItself: Bool = false
// MARK: - // MARK: -
/// 當前 Caps Lock 按鍵是否被摁下。 /// 當前 Caps Lock 按鍵是否被摁下。
@ -165,9 +168,7 @@ public class SessionCtl: IMKInputController {
extension SessionCtl { extension SessionCtl {
/// 強制重設當前鍵盤佈局、使其與偏好設定同步。 /// 強制重設當前鍵盤佈局、使其與偏好設定同步。
public func setKeyLayout() { public func setKeyLayout() {
guard let client = client(), let myID = Bundle.main.bundleIdentifier, !myID.isEmpty, guard let client = client(), !isServingIMEItself else { return }
clientBundleIdentifier != myID
else { return }
DispatchQueue.main.async { [self] in DispatchQueue.main.async { [self] in
if isASCIIMode, IMKHelper.isDynamicBasicKeyboardLayoutEnabled { if isASCIIMode, IMKHelper.isDynamicBasicKeyboardLayoutEnabled {
@ -198,12 +199,13 @@ extension SessionCtl {
extension SessionCtl { extension SessionCtl {
/// 啟用輸入法時，會觸發該函式。 /// 啟用輸入法時，會觸發該函式。
/// - Parameter sender: 呼叫了該函式的客體（無須使用）。 /// - Parameter sender: 呼叫了該函式的客體。
public override func activateServer(_ sender: Any!) { public override func activateServer(_ sender: Any!) {
_ = sender // 防止格式整理工具毀掉與此對應的參數。 _ = sender // 防止格式整理工具毀掉與此對應的參數。
DispatchQueue.main.async { DispatchQueue.main.async { [self] in
if let senderBundleID: String = (sender as? IMKTextInput)?.bundleIdentifier() { if let senderBundleID: String = (sender as? IMKTextInput)?.bundleIdentifier() {
vCLog("activateServer(\(senderBundleID))") vCLog("activateServer(\(senderBundleID))")
isServingIMEItself = Bundle.main.bundleIdentifier == senderBundleID
} }
} }
DispatchQueue.main.async { [self] in DispatchQueue.main.async { [self] in

4
Source/Modules/SessionCtl_HandleStates.swift
View File

@ -121,7 +121,7 @@ extension SessionCtl {
if buffer.isEmpty { if buffer.isEmpty {
return return
} }
if let myID = Bundle.main.bundleIdentifier, let clientID = client.bundleIdentifier(), myID == clientID { if isServingIMEItself {
DispatchQueue.main.async { DispatchQueue.main.async {
client.insertText( client.insertText(
buffer, replacementRange: NSRange(location: NSNotFound, length: NSNotFound) buffer, replacementRange: NSRange(location: NSNotFound, length: NSNotFound)
@ -137,7 +137,7 @@ extension SessionCtl {
/// 把 setMarkedText 包裝一下，按需啟用 GCD。 /// 把 setMarkedText 包裝一下，按需啟用 GCD。
public func doSetMarkedText(_ string: Any!, selectionRange: NSRange, replacementRange: NSRange) { public func doSetMarkedText(_ string: Any!, selectionRange: NSRange, replacementRange: NSRange) {
guard isActivated, let client = client() else { return } guard isActivated, let client = client() else { return }
if let myID = Bundle.main.bundleIdentifier, let clientID = client.bundleIdentifier(), myID == clientID { if isServingIMEItself {
DispatchQueue.main.async { DispatchQueue.main.async {
client.setMarkedText(string, selectionRange: selectionRange, replacementRange: replacementRange) client.setMarkedText(string, selectionRange: selectionRange, replacementRange: replacementRange)
} }