From 02bca34852b1f9dd2b3e5364274452d377686f6a Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 19 Feb 2022 09:18:27 +0800 Subject: [PATCH] Utilize new string decoding feature in GTK native input * src/gtkutil.c (xg_im_context_commit): Don't decode strings manually using g_utf8_to_ucs4 but pass unibyte string as the keystroke event arg instead. --- src/gtkutil.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/gtkutil.c b/src/gtkutil.c index 5e41863c0ae..bed983c77e3 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -6095,29 +6095,15 @@ xg_im_context_commit (GtkIMContext *imc, gchar *str, { struct frame *f = user_data; struct input_event ie; - gunichar *ucs4_str; - ucs4_str = g_utf8_to_ucs4_fast (str, -1, NULL); + EVENT_INIT (ie); + ie.kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; + ie.arg = build_unibyte_string (str); + XSETFRAME (ie.frame_or_window, f); + ie.modifiers = 0; + ie.timestamp = 0; - if (!ucs4_str) - return; - - for (gunichar *c = ucs4_str; *c; c++) - { - EVENT_INIT (ie); - ie.kind = (SINGLE_BYTE_CHAR_P (*c) - ? ASCII_KEYSTROKE_EVENT - : MULTIBYTE_CHAR_KEYSTROKE_EVENT); - ie.arg = Qnil; - ie.code = *c; - XSETFRAME (ie.frame_or_window, f); - ie.modifiers = 0; - ie.timestamp = 0; - - kbd_buffer_store_event (&ie); - } - - g_free (ucs4_str); + kbd_buffer_store_event (&ie); } static void -- 2.39.5