mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wayland IME: Fix a bug with handling synthetic keypresses generated by ZMK keyboard + fcitx5

Browse Source 
Fixes #7283
This commit is contained in:
Kovid Goyal
2024-03-31 09:41:04 +05:30
parent 274a9d7759
commit 0c6fa47789
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@@ -64,6 +64,8 @@ Detailed list of changes
- Wayland KDE: Fix mouse cursor hiding not working in Plasma 6 (:iss:`7265`) - Wayland KDE: Fix mouse cursor hiding not working in Plasma 6 (:iss:`7265`)
- Wayland IME: Fix a bug with handling synthetic keypresses generated by ZMK keyboard + fcitx (:pull:`7283`)
- A new option :opt:`terminfo_type` to allow passing the terminfo database embedded into the :envvar:`TERMINFO` env var directly instead of via a file - A new option :opt:`terminfo_type` to allow passing the terminfo database embedded into the :envvar:`TERMINFO` env var directly instead of via a file
- Mouse reporting: Fix drag release event outside the window not being reported in legacy mouse reporting modes (:iss:`7244`) - Mouse reporting: Fix drag release event outside the window not being reported in legacy mouse reporting modes (:iss:`7244`)

12
glfw/wl_text_input.c vendored
View File

@@ -89,11 +89,11 @@ text_input_delete_surrounding_text(
static void static void
text_input_done(void *data UNUSED, struct zwp_text_input_v3 *txt_input UNUSED, uint32_t serial) { text_input_done(void *data UNUSED, struct zwp_text_input_v3 *txt_input UNUSED, uint32_t serial) {
debug("text-input: done event: serial: %u current_commit_serial: %u\n", serial, commit_serial); debug("text-input: done event: serial: %u current_commit_serial: %u\n", serial, commit_serial);
if (serial != commit_serial) { const bool bad_event = serial != commit_serial;
if (serial > commit_serial) _glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: text_input_done serial mismatch, expected=%u got=%u\n", commit_serial, serial); // See https://wayland.app/protocols/text-input-unstable-v3#zwp_text_input_v3:event:done
return; // for handling of bad events. As best as I can tell spec says we perform all client side actions as usual
} // but send nothing back to the compositor, aka no cursor position update.
// See https://github.com/kovidgoyal/kitty/pull/7283 for discussion
if ((pending_pre_edit == NULL && current_pre_edit == NULL) || if ((pending_pre_edit == NULL && current_pre_edit == NULL) ||
(pending_pre_edit && current_pre_edit && strcmp(pending_pre_edit, current_pre_edit) == 0)) { (pending_pre_edit && current_pre_edit && strcmp(pending_pre_edit, current_pre_edit) == 0)) {
free(pending_pre_edit); pending_pre_edit = NULL; free(pending_pre_edit); pending_pre_edit = NULL;
@@ -102,7 +102,7 @@ text_input_done(void *data UNUSED, struct zwp_text_input_v3 *txt_input UNUSED, u
current_pre_edit = pending_pre_edit; current_pre_edit = pending_pre_edit;
pending_pre_edit = NULL; pending_pre_edit = NULL;
if (current_pre_edit) { if (current_pre_edit) {
send_text(current_pre_edit, GLFW_IME_PREEDIT_CHANGED); send_text(current_pre_edit, bad_event ? GLFW_IME_WAYLAND_DONE_EVENT : GLFW_IME_PREEDIT_CHANGED);
} else { } else {
// Clear pre-edit text // Clear pre-edit text
send_text(NULL, GLFW_IME_WAYLAND_DONE_EVENT); send_text(NULL, GLFW_IME_WAYLAND_DONE_EVENT);

3
kitty/keys.c
View File

@@ -165,7 +165,8 @@ on_key_input(GLFWkeyevent *ev) {
case GLFW_IME_WAYLAND_DONE_EVENT: case GLFW_IME_WAYLAND_DONE_EVENT:
// If we update IME position here it sends GNOME's text input system into // If we update IME position here it sends GNOME's text input system into
// an infinite loop. See https://github.com/kovidgoyal/kitty/issues/5105 // an infinite loop. See https://github.com/kovidgoyal/kitty/issues/5105
screen_update_overlay_text(screen, NULL); // and also: https://github.com/kovidgoyal/kitty/pull/7283
screen_update_overlay_text(screen, text);
debug("handled wayland IME done event\n"); debug("handled wayland IME done event\n");
return; return;
case GLFW_IME_PREEDIT_CHANGED: case GLFW_IME_PREEDIT_CHANGED: