mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 10:12:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the input context instance from GLFWContentView

Browse Source
This commit is contained in:
pagedown
2022-01-26 18:25:37 +08:00
parent a3aaaa1efb
commit 7f3715cd3e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glfw/cocoa_window.m
View File

@@ -1099,8 +1099,7 @@ is_ascii_control_char(char x) {
#define UPDATE_PRE_EDIT_TEXT glfw_keyevent.text = [[markedText string] UTF8String]; glfw_keyevent.ime_state = GLFW_IME_PREEDIT_CHANGED; _glfwInputKeyboard(window, &glfw_keyevent); #define UPDATE_PRE_EDIT_TEXT glfw_keyevent.text = [[markedText string] UTF8String]; glfw_keyevent.ime_state = GLFW_IME_PREEDIT_CHANGED; _glfwInputKeyboard(window, &glfw_keyevent);
const bool previous_has_marked_text = [self hasMarkedText]; const bool previous_has_marked_text = [self hasMarkedText];
NSTextInputContext *inpctx = [NSTextInputContext currentInputContext]; if (input_context && (!input_source_at_last_key_event || ![input_source_at_last_key_event isEqualToString:input_context.selectedKeyboardInputSource])) {
if (inpctx && (!input_source_at_last_key_event || ![input_source_at_last_key_event isEqualToString:inpctx.selectedKeyboardInputSource])) {
if (input_source_at_last_key_event) { if (input_source_at_last_key_event) {
debug_key("Input source changed, clearing pre-edit text and resetting deadkey state\n"); debug_key("Input source changed, clearing pre-edit text and resetting deadkey state\n");
GLFWkeyevent dummy = {.action = GLFW_RELEASE, .ime_state = GLFW_IME_PREEDIT_CHANGED}; GLFWkeyevent dummy = {.action = GLFW_RELEASE, .ime_state = GLFW_IME_PREEDIT_CHANGED};
@@ -1109,7 +1108,7 @@ is_ascii_control_char(char x) {
[input_source_at_last_key_event release]; [input_source_at_last_key_event release];
input_source_at_last_key_event = nil; input_source_at_last_key_event = nil;
} }
input_source_at_last_key_event = [inpctx.selectedKeyboardInputSource retain]; input_source_at_last_key_event = [input_context.selectedKeyboardInputSource retain];
[self unmarkText]; [self unmarkText];
} }
@@ -1243,11 +1242,10 @@ is_ascii_control_char(char x) {
debug_key("\x1b[33mflagsChanged:\x1b[m modifier: %s native_key: 0x%x (%s) glfw_key: 0x%x %s\n", debug_key("\x1b[33mflagsChanged:\x1b[m modifier: %s native_key: 0x%x (%s) glfw_key: 0x%x %s\n",
mod_name, keycode, safe_name_for_keycode(keycode), key, format_mods(mods)); mod_name, keycode, safe_name_for_keycode(keycode), key, format_mods(mods));
marked_text_cleared_by_insert = false; marked_text_cleared_by_insert = false;
NSTextInputContext *inpctx = [NSTextInputContext currentInputContext]; if (process_text && input_context) {
if (process_text && inpctx) {
// this will call insertText which will fill up _glfw.ns.text // this will call insertText which will fill up _glfw.ns.text
in_key_handler = 2; in_key_handler = 2;
[inpctx handleEvent:event]; [input_context handleEvent:event];
in_key_handler = 0; in_key_handler = 0;
if (marked_text_cleared_by_insert) { if (marked_text_cleared_by_insert) {
debug_key("Clearing pre-edit text because insertText called from flagsChanged\n"); debug_key("Clearing pre-edit text because insertText called from flagsChanged\n");