ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wayland: Fix infinite loop causing bad performance when using IME via fcitx5 due to a change in fcitx5

Browse source 
Fix #7396
This commit is contained in:
Kovid Goyal 2024-04-28 11:30:48 +05:30
parent cc5e4e95d3
commit aecf07bcba
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog.rst
View file

@ -60,6 +60,8 @@ Detailed list of changes
- :ac:`focus_visible_window`: Fix selecting with mouse click leaving keyboard in unusable state (:iss:`7390`) - :ac:`focus_visible_window`: Fix selecting with mouse click leaving keyboard in unusable state (:iss:`7390`)
- Wayland: Fix infinite loop causing bad performance when using IME via fcitx5 due to a change in fcitx5 (:iss:`7396`)
0.34.1 [2024-04-19] 0.34.1 [2024-04-19]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

7
glfw/wl_text_input.c vendored
View file

@ -17,6 +17,7 @@ static struct zwp_text_input_manager_v3* text_input_manager;
static char *pending_pre_edit = NULL; static char *pending_pre_edit = NULL;
static char *current_pre_edit = NULL; static char *current_pre_edit = NULL;
static char *pending_commit = NULL; static char *pending_commit = NULL;
static bool ime_focused = false;
static int last_cursor_left = 0, last_cursor_top = 0, last_cursor_width = 0, last_cursor_height = 0; static int last_cursor_left = 0, last_cursor_top = 0, last_cursor_width = 0, last_cursor_height = 0;
uint32_t commit_serial = 0; uint32_t commit_serial = 0;
@ -31,6 +32,7 @@ static void
text_input_enter(void *data UNUSED, struct zwp_text_input_v3 *txt_input, struct wl_surface *surface UNUSED) { text_input_enter(void *data UNUSED, struct zwp_text_input_v3 *txt_input, struct wl_surface *surface UNUSED) {
debug("text-input: enter event\n"); debug("text-input: enter event\n");
if (txt_input) { if (txt_input) {
ime_focused = true;
zwp_text_input_v3_enable(txt_input); zwp_text_input_v3_enable(txt_input);
zwp_text_input_v3_set_content_type(txt_input, ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE, ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL); zwp_text_input_v3_set_content_type(txt_input, ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE, ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL);
commit(); commit();
@ -41,6 +43,7 @@ static void
text_input_leave(void *data UNUSED, struct zwp_text_input_v3 *txt_input, struct wl_surface *surface UNUSED) { text_input_leave(void *data UNUSED, struct zwp_text_input_v3 *txt_input, struct wl_surface *surface UNUSED) {
debug("text-input: leave event\n"); debug("text-input: leave event\n");
if (txt_input) { if (txt_input) {
ime_focused = false;
zwp_text_input_v3_disable(txt_input); zwp_text_input_v3_disable(txt_input);
commit(); commit();
} }
@ -150,8 +153,8 @@ _glfwPlatformUpdateIMEState(_GLFWwindow *w, const GLFWIMEUpdateEvent *ev) {
if (!text_input) return; if (!text_input) return;
switch(ev->type) { switch(ev->type) {
case GLFW_IME_UPDATE_FOCUS: case GLFW_IME_UPDATE_FOCUS:
debug("\ntext-input: updating IME focus state, focused: %d\n", ev->focused); debug("\ntext-input: updating IME focus state, ime_focused: %d ev->focused: %d\n", ime_focused, ev->focused);
if (ev->focused) { if (ime_focused) {
zwp_text_input_v3_enable(text_input); zwp_text_input_v3_enable(text_input);
zwp_text_input_v3_set_content_type(text_input, ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE, ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL); zwp_text_input_v3_set_content_type(text_input, ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE, ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_TERMINAL);
} else { } else {