Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

apprt/gtk: clean up keyval_unicode usage

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-08-16 12:51:00 -07:00
parent 1a918bc64b
commit 83ba2b9825
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apprt/gtk.zig
View File

@ -1191,6 +1191,7 @@ pub const Surface = struct {
) callconv(.C) c.gboolean { ) callconv(.C) c.gboolean {
const self = userdataSelf(ud.?); const self = userdataSelf(ud.?);
const mods = translateMods(gtk_mods); 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 // 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 // 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.. // 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 (keyval_unicode != 0) {
if (std.math.cast(u8, keyval_unicode)) |byte| { if (std.math.cast(u8, keyval_unicode)) |byte| {
if (input.Key.fromASCII(byte)) |key| { 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 // a text value. We have to do this because GTK will not process
// "Ctrl+Shift+1" (on US keyboards) as "Ctrl+!" but instead as "". // "Ctrl+Shift+1" (on US keyboards) as "Ctrl+!" but instead as "".
// But the keyval is set correctly so we can at least extract that. // But the keyval is set correctly so we can at least extract that.
if (self.im_len == 0) { if (self.im_len == 0 and keyval_unicode > 0) {
const keyval_unicode = c.gdk_keyval_to_unicode(keyval); if (std.math.cast(u21, keyval_unicode)) |cp| {
if (keyval_unicode != 0) { if (std.unicode.utf8Encode(cp, &self.im_buf)) |len| {
if (std.math.cast(u21, keyval_unicode)) |cp| { self.im_len = len;
if (std.unicode.utf8Encode(cp, &self.im_buf)) |len| { } else |_| {}
self.im_len = len;
} else |_| {}
}
} }
} }