diff options
author | Benjamin Otte <otte@redhat.com> | 2018-07-30 20:15:16 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2018-07-30 20:15:16 +0200 |
commit | 7e919aaaa511d4a7d8620838769a4980285d3c78 (patch) | |
tree | 257978e2e6b7766632a46461c280c38dddd7d84d /gdk/quartz | |
parent | 03a6420c3769151f1d469eace5fe12c1c62831c6 (diff) | |
download | gtk+-7e919aaaa511d4a7d8620838769a4980285d3c78.tar.gz |
gdk: Fix Windows and OS X backend for keyevent.string removal
Diffstat (limited to 'gdk/quartz')
-rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 151e9ff0be..4bd50478eb 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1113,8 +1113,6 @@ fill_key_event (GdkSurface *window, { GdkEventPrivate *priv; GdkQuartzDeviceManagerCore *device_manager; - gchar buf[7]; - gunichar c = 0; priv = (GdkEventPrivate *) event; priv->windowing_data = [nsevent retain]; @@ -1189,44 +1187,6 @@ fill_key_event (GdkSurface *window, gdk_keymap_add_virtual_modifiers (gdk_display_get_keymap (_gdk_display), &event->key.state); - event->key.string = NULL; - - /* Fill in ->string since apps depend on it, taken from the x11 backend. */ - if (event->key.keyval != GDK_KEY_VoidSymbol) - c = gdk_keyval_to_unicode (event->key.keyval); - - if (c) - { - gsize bytes_written; - gint len; - - len = g_unichar_to_utf8 (c, buf); - buf[len] = '\0'; - - event->key.string = g_locale_from_utf8 (buf, len, - NULL, &bytes_written, - NULL); - if (event->key.string) - event->key.length = bytes_written; - } - else if (event->key.keyval == GDK_KEY_Escape) - { - event->key.length = 1; - event->key.string = g_strdup ("\033"); - } - else if (event->key.keyval == GDK_KEY_Return || - event->key.keyval == GDK_KEY_KP_Enter) - { - event->key.length = 1; - event->key.string = g_strdup ("\r"); - } - - if (!event->key.string) - { - event->key.length = 0; - event->key.string = g_strdup (""); - } - GDK_NOTE(EVENTS, g_message ("key %s:\t\twindow: %p key: %12s %d", type == GDK_KEY_PRESS ? "press" : "release", |