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

Double buffer pre-edit and commit events

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-25 14:59:58 +05:30
parent d28caf15b2
commit 7b130dc220
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glfw/wl_text_input.c vendored
View File

@ -8,10 +8,13 @@
#include "wl_text_input.h" #include "wl_text_input.h"
#include "internal.h" #include "internal.h"
#include "wayland-text-input-unstable-v3-client-protocol.h" #include "wayland-text-input-unstable-v3-client-protocol.h"
#include <stdlib.h>
#define debug(...) if (_glfw.hints.init.debugKeyboard) printf(__VA_ARGS__); #define debug(...) if (_glfw.hints.init.debugKeyboard) printf(__VA_ARGS__);
static struct zwp_text_input_v3* text_input; static struct zwp_text_input_v3* text_input;
static struct zwp_text_input_manager_v3* text_input_manager; static struct zwp_text_input_manager_v3* text_input_manager;
static char *pending_pre_edit = NULL;
static char *pending_commit = NULL;
static void commit(void) { if (text_input) zwp_text_input_v3_commit (text_input); } static void commit(void) { if (text_input) zwp_text_input_v3_commit (text_input); }
@ -54,13 +57,15 @@ text_input_preedit_string(
int32_t cursor_end int32_t cursor_end
) { ) {
debug("text-input: preedit_string event: text: %s cursor_begin: %d cursor_end: %d\n", text, cursor_begin, cursor_end); debug("text-input: preedit_string event: text: %s cursor_begin: %d cursor_end: %d\n", text, cursor_begin, cursor_end);
send_text(text, GLFW_IME_PREEDIT_CHANGED); free(pending_pre_edit);
pending_pre_edit = text ? _glfw_strdup(text) : NULL;
} }
static void static void
text_input_commit_string(void *data UNUSED, struct zwp_text_input_v3 *text_input UNUSED, const char *text) { text_input_commit_string(void *data UNUSED, struct zwp_text_input_v3 *text_input UNUSED, const char *text) {
debug("text-input: commit_string event: text: %s\n", text); debug("text-input: commit_string event: text: %s\n", text);
send_text(text, GLFW_IME_COMMIT_TEXT); free(pending_commit);
pending_commit = text ? _glfw_strdup(text) : NULL;
} }
static void static void
@ -75,6 +80,14 @@ text_input_delete_surrounding_text(
static void static void
text_input_done(void *data UNUSED, struct zwp_text_input_v3 *zwp_text_input_v3 UNUSED, uint32_t serial UNUSED) { text_input_done(void *data UNUSED, struct zwp_text_input_v3 *zwp_text_input_v3 UNUSED, uint32_t serial UNUSED) {
debug("text-input: done event: serial: %u\n", serial); debug("text-input: done event: serial: %u\n", serial);
if (pending_pre_edit) {
send_text(pending_pre_edit, GLFW_IME_PREEDIT_CHANGED);
free(pending_pre_edit); pending_pre_edit = NULL;
}
if (pending_commit) {
send_text(pending_commit, GLFW_IME_COMMIT_TEXT);
free(pending_commit); pending_commit = NULL;
}
} }
void void
@ -106,6 +119,8 @@ _glfwWaylandDestroyTextInput(void) {
if (text_input) zwp_text_input_v3_destroy(text_input); if (text_input) zwp_text_input_v3_destroy(text_input);
if (text_input_manager) zwp_text_input_manager_v3_destroy(text_input_manager); if (text_input_manager) zwp_text_input_manager_v3_destroy(text_input_manager);
text_input = NULL; text_input_manager = NULL; text_input = NULL; text_input_manager = NULL;
free(pending_pre_edit); pending_pre_edit = NULL;
free(pending_commit); pending_commit = NULL;
} }
void void