From 83ba2b9825ebacb36d224140a82bf38f250c8b23 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 16 Aug 2023 12:51:00 -0700
Subject: [PATCH] apprt/gtk: clean up keyval_unicode usage

---
 src/apprt/gtk.zig | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/apprt/gtk.zig b/src/apprt/gtk.zig
index 8d03c6720..d8b596ecc 100644
--- a/src/apprt/gtk.zig
+++ b/src/apprt/gtk.zig
@@ -1191,6 +1191,7 @@ pub const Surface = struct {
     ) callconv(.C) c.gboolean {
         const self = userdataSelf(ud.?);
         const mods = translateMods(gtk_mods);
+        const keyval_unicode = c.gdk_keyval_to_unicode(keyval);
 
         // We mark that we're in a keypress event. We use this in our
         // IM commit callback to determine if we need to send a char callback
@@ -1233,7 +1234,6 @@ pub const Surface = struct {
             }
 
             // If that doesn't work then we try to translate they kevval..
-            const keyval_unicode = c.gdk_keyval_to_unicode(keyval);
             if (keyval_unicode != 0) {
                 if (std.math.cast(u8, keyval_unicode)) |byte| {
                     if (input.Key.fromASCII(byte)) |key| {
@@ -1279,14 +1279,11 @@ pub const Surface = struct {
         // a text value. We have to do this because GTK will not process
         // "Ctrl+Shift+1" (on US keyboards) as "Ctrl+!" but instead as "".
         // But the keyval is set correctly so we can at least extract that.
-        if (self.im_len == 0) {
-            const keyval_unicode = c.gdk_keyval_to_unicode(keyval);
-            if (keyval_unicode != 0) {
-                if (std.math.cast(u21, keyval_unicode)) |cp| {
-                    if (std.unicode.utf8Encode(cp, &self.im_buf)) |len| {
-                        self.im_len = len;
-                    } else |_| {}
-                }
+        if (self.im_len == 0 and keyval_unicode > 0) {
+            if (std.math.cast(u21, keyval_unicode)) |cp| {
+                if (std.unicode.utf8Encode(cp, &self.im_buf)) |len| {
+                    self.im_len = len;
+                } else |_| {}
             }
         }