KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

macOS: Fix the shift key not clearing pre-edit text in IME

Browse Source 
Fixes #4541
This commit is contained in:
Kovid Goyal
2022-01-20 08:00:17 +05:30
parent 16d3e82515
commit b090602fdb
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@@ -127,6 +127,8 @@ Detailed list of changes
- Show number of windows per tab in the :ac:`select_tab` action (:pull:`4523`) - Show number of windows per tab in the :ac:`select_tab` action (:pull:`4523`)
- macOS: Fix the shift key not clearing pre-edit text in IME (:iss:`4541`)
0.24.1 [2022-01-06] 0.24.1 [2022-01-06]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

9
glfw/cocoa_window.m
View File

@@ -752,6 +752,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
NSMutableAttributedString* markedText; NSMutableAttributedString* markedText;
NSRect markedRect; NSRect markedRect;
bool marked_text_cleared_by_insert; bool marked_text_cleared_by_insert;
bool in_key_down;
NSString *input_source_at_last_key_event; NSString *input_source_at_last_key_event;
} }
@@ -1150,12 +1151,14 @@ is_ascii_control_char(char x) {
debug_key("\x1b[31mPress:\x1b[m native_key: 0x%x (%s) glfw_key: 0x%x %schar_count: %lu deadKeyState: %u repeat: %d ", debug_key("\x1b[31mPress:\x1b[m native_key: 0x%x (%s) glfw_key: 0x%x %schar_count: %lu deadKeyState: %u repeat: %d ",
keycode, safe_name_for_keycode(keycode), key, format_mods(mods), char_count, window->ns.deadKeyState, event.ARepeat); keycode, safe_name_for_keycode(keycode), key, format_mods(mods), char_count, window->ns.deadKeyState, event.ARepeat);
marked_text_cleared_by_insert = false; marked_text_cleared_by_insert = false;
in_key_down = true;
if (process_text) { if (process_text) {
// this will call insertText which will fill up _glfw.ns.text // this will call insertText which will fill up _glfw.ns.text
[self interpretKeyEvents:@[event]]; [self interpretKeyEvents:@[event]];
} else { } else {
window->ns.deadKeyState = 0; window->ns.deadKeyState = 0;
} }
in_key_down = false;
if (window->ns.deadKeyState && (char_count == 0 || keycode == 0x75)) { if (window->ns.deadKeyState && (char_count == 0 || keycode == 0x75)) {
// 0x75 is the delete key which needs to be ignored during a compose sequence // 0x75 is the delete key which needs to be ignored during a compose sequence
debug_key("Sending pre-edit text for dead key (text: %s markedText: %s).\n", format_text(_glfw.ns.text), glfw_keyevent.text); debug_key("Sending pre-edit text for dead key (text: %s markedText: %s).\n", format_text(_glfw.ns.text), glfw_keyevent.text);
@@ -1181,6 +1184,7 @@ is_ascii_control_char(char x) {
} }
if (([self hasMarkedText] || previous_has_marked_text) && !_glfw.ns.text[0]) { if (([self hasMarkedText] || previous_has_marked_text) && !_glfw.ns.text[0]) {
// do not pass keys like BACKSPACE while there's pre-edit text, let IME handle it // do not pass keys like BACKSPACE while there's pre-edit text, let IME handle it
UPDATE_PRE_EDIT_TEXT;
debug_key("Ignoring key press as IME is active and it generated no text\n"); debug_key("Ignoring key press as IME is active and it generated no text\n");
return; return;
} }
@@ -1419,6 +1423,11 @@ void _glfwPlatformUpdateIMEState(_GLFWwindow *w, const GLFWIMEUpdateEvent *ev) {
char *s = _glfw.ns.text + strnlen(_glfw.ns.text, sizeof(_glfw.ns.text)); char *s = _glfw.ns.text + strnlen(_glfw.ns.text, sizeof(_glfw.ns.text));
snprintf(s, sizeof(_glfw.ns.text) - (s - _glfw.ns.text), "%s", utf8); snprintf(s, sizeof(_glfw.ns.text) - (s - _glfw.ns.text), "%s", utf8);
_glfw.ns.text[sizeof(_glfw.ns.text) - 1] = 0; _glfw.ns.text[sizeof(_glfw.ns.text) - 1] = 0;
if (!in_key_down && !_glfw.ns.text[0]) {
// is called by cocoa when a modifier is pressed, for example shift
GLFWkeyevent dummy = {.action = GLFW_RELEASE, .ime_state = GLFW_IME_PREEDIT_CHANGED};
_glfwInputKeyboard(window, &dummy);
}
} }
- (void)doCommandBySelector:(SEL)selector - (void)doCommandBySelector:(SEL)selector