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

GNOME: Workaround for GNOME's text input system going into an infinite loop if cursor position is updated in response to a done event

Browse Source 
Fixes #5105
This commit is contained in:
Kovid Goyal
2022-05-23 10:36:58 +05:30
parent ea8bed2a71
commit e7da874b82
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changelog.rst
View File

@@ -72,6 +72,10 @@ Detailed list of changes
- Linux: Load libfontconfig at runtime to allow the binaries to work for
running kittens on servers without FontConfig
- GNOME: Fix for high CPU usage caused by GNOME's text input subsystem going
into an infinite loop when IME cursor position is updated after a done event
(:iss:`5105`)
0.25.0 [2022-04-11]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

3
glfw/glfw3.h vendored
View File

@@ -1216,7 +1216,8 @@ typedef enum {
typedef enum {
GLFW_IME_NONE,
GLFW_IME_PREEDIT_CHANGED,
GLFW_IME_COMMIT_TEXT
GLFW_IME_COMMIT_TEXT,
GLFW_IME_WAYLAND_DONE_EVENT,
} GLFWIMEState;
typedef enum {

4
glfw/wl_text_input.c vendored
View File

@@ -84,7 +84,7 @@ text_input_delete_surrounding_text(
}
static void
text_input_done(void *data UNUSED, struct zwp_text_input_v3 *txt_input UNUSED, uint32_t serial UNUSED) {
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);
if (serial != commit_serial) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: text_input_done serial mismatch, expected=%u got=%u\n", commit_serial, serial);
@@ -95,7 +95,7 @@ text_input_done(void *data UNUSED, struct zwp_text_input_v3 *txt_input UNUSED, u
free(pending_pre_edit); pending_pre_edit = NULL;
} else {
// Clear pre-edit text
send_text(NULL, GLFW_IME_PREEDIT_CHANGED);
send_text(NULL, GLFW_IME_WAYLAND_DONE_EVENT);
}
if (pending_commit) {
send_text(pending_commit, GLFW_IME_COMMIT_TEXT);

3
kitty/glfw-wrapper.h generated
View File

@@ -954,7 +954,8 @@ typedef enum {
typedef enum {
GLFW_IME_NONE,
GLFW_IME_PREEDIT_CHANGED,
GLFW_IME_COMMIT_TEXT
GLFW_IME_COMMIT_TEXT,
GLFW_IME_WAYLAND_DONE_EVENT,
} GLFWIMEState;
typedef enum {

6
kitty/keys.c
View File

@@ -136,6 +136,12 @@ on_key_input(GLFWkeyevent *ev) {
id_type active_window_id = w->id;
switch(ev->ime_state) {
case GLFW_IME_WAYLAND_DONE_EVENT:
// 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
screen_draw_overlay_text(screen, NULL);
debug("handled wayland IME done event");
return;
case GLFW_IME_PREEDIT_CHANGED:
update_ime_position(w, screen);
screen_draw_overlay_text(screen, text);