CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-28 04:13:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

macOS: Fix caps_lock not clearing pre-edit text when using IME

Browse source
This commit is contained in:
pagedown 2022-01-23 18:50:55 +08:00
parent 195fc1a270
commit 57e2866b68
No known key found for this signature in database
GPG key ID: E921CF18AC8FF6EB
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
glfw/cocoa_window.m
View file

@ -1379,8 +1379,8 @@ is_ascii_control_char(char x) {
if (string == nil || !s[0]) {
bool had_marked_text = [self hasMarkedText];
[self unmarkText];
if (had_marked_text && !in_key_handler) {
debug_key("Clearing pre-edit because setMarkedText called from event loop\n");
if (had_marked_text && (!in_key_handler || in_key_handler == 2)) {
debug_key("Clearing pre-edit because setMarkedText called from event loop or flagsChanged\n");
GLFWkeyevent glfw_keyevent = {.ime_state = GLFW_IME_PREEDIT_CHANGED};
_glfwInputKeyboard(window, &glfw_keyevent);
_glfw.ns.text[0] = 0;
@ -1396,8 +1396,8 @@ is_ascii_control_char(char x) {
[markedText release];
markedText = [[NSMutableAttributedString alloc] initWithString:string];
}
if (!in_key_handler) {
debug_key("Updating IME text in kitty from setMarkedText called from event loop: %s\n", _glfw.ns.text);
if (!in_key_handler || in_key_handler == 2) {
debug_key("Updating IME text in kitty from setMarkedText called from event loop or flagsChanged: %s\n", _glfw.ns.text);
GLFWkeyevent glfw_keyevent = {.text=[[markedText string] UTF8String], .ime_state = GLFW_IME_PREEDIT_CHANGED};
_glfwInputKeyboard(window, &glfw_keyevent);
_glfw.ns.text[0] = 0;
@ -1477,7 +1477,7 @@ void _glfwPlatformUpdateIMEState(_GLFWwindow *w, const GLFWIMEUpdateEvent *ev) {
snprintf(s, sizeof(_glfw.ns.text) - (s - _glfw.ns.text), "%s", utf8);
_glfw.ns.text[sizeof(_glfw.ns.text) - 1] = 0;
if ((!in_key_handler || in_key_handler == 2) && _glfw.ns.text[0]) {
debug_key("Sending text to kitty from insertText called from event loop: %s\n", _glfw.ns.text);
debug_key("Sending text to kitty from insertText called from called from event loop or flagsChanged: %s\n", _glfw.ns.text);
GLFWkeyevent glfw_keyevent = {.text=_glfw.ns.text, .ime_state=GLFW_IME_COMMIT_TEXT};
_glfwInputKeyboard(window, &glfw_keyevent);
_glfw.ns.text[0] = 0;