[gtk/keymap-rework-2] fix shortcuts tests after key event rework

[Matthias Clasen <matthiasc src gnome org>]

commit 9be864f7007a909d639293ebf774dbfad6aa33c5
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 6 08:00:41 2020 -0400

    fix shortcuts tests after key event rework

 testsuite/gtk/shortcuts.c | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/testsuite/gtk/shortcuts.c b/testsuite/gtk/shortcuts.c
index 9049842c87..e9fa23ad85 100644
--- a/testsuite/gtk/shortcuts.c
+++ b/testsuite/gtk/shortcuts.c
@@ -19,15 +19,19 @@ struct _GdkEventAny
   GdkDevice *source_device;
 };
 
+typedef struct {
+  guint keyval;
+  GdkModifierType consumed;
+  guint layout;
+  guint level;
+} GdkTranslatedKey;
+
 struct _GdkEventKey
 {
   GdkEventAny any;
   GdkModifierType state;
   guint32 keycode;
-  guint keyval;
-  GdkModifierType consumed;
-  guint layout;
-  guint level;
+  GdkTranslatedKey translated[2];
 };
 
 
@@ -38,12 +42,10 @@ gdk_event_key_new (GdkEventType     type,
                    GdkDevice       *source_device,
                    guint32          time,
                    guint            keycode,
-                   guint            keyval,
                    GdkModifierType  state,
-                   GdkModifierType  consumed,
-                   guint            layout,
-                   guint            level,
-                   gboolean         is_modifier);
+                   gboolean         is_modifier,
+                   GdkTranslatedKey *translated,
+                   GdkTranslatedKey *no_lock);
 
 static GdkEvent *
 gdk_event_key_new (GdkEventType     type,
@@ -52,12 +54,10 @@ gdk_event_key_new (GdkEventType     type,
                    GdkDevice       *source_device,
                    guint32          time,
                    guint            keycode,
-                   guint            keyval,
                    GdkModifierType  state,
-                   GdkModifierType  consumed,
-                   guint            layout,
-                   guint            level,
-                   gboolean         is_modifier)
+                   gboolean         is_modifier,
+                   GdkTranslatedKey *translated,
+                   GdkTranslatedKey *no_lock)
 {
   GdkEventKey *event;
 
@@ -73,12 +73,10 @@ gdk_event_key_new (GdkEventType     type,
   event->any.device = g_object_ref (device);
   event->any.source_device = g_object_ref (source_device);
   event->keycode = keycode;
-  event->keyval = keyval;
   event->state = state;
-  event->consumed = consumed;
-  event->layout = layout;
-  event->level = level;
   event->any.key_is_modifier = is_modifier;
+  event->translated[0] = *translated;
+  event->translated[1] = *no_lock;
 
   return (GdkEvent *)event;
 }
@@ -371,22 +369,25 @@ test_trigger_trigger (void)
     {
       GdkKeymapKey *keys;
       int n_keys;
+      GdkTranslatedKey translated;
 
       if (!gdk_display_map_keyval (display, tests[i].keyval, &keys, &n_keys))
         continue;
 
+      translated.keyval = tests[i].keyval;
+      translated.consumed = 0;
+      translated.layout = keys[0].group;
+      translated.level = keys[0].level;
       event = gdk_event_key_new (GDK_KEY_PRESS,
                                  surface,
                                  device,
                                  device,
                                  GDK_CURRENT_TIME,
                                  keys[0].keycode,
-                                 tests[i].keyval,
                                  tests[i].state,
-                                 0,
-                                 keys[0].group,
-                                 keys[0].level,
-                                 FALSE);
+                                 FALSE,
+                                 &translated,
+                                 &translated);
       for (j = 0; j < 4; j++)
         {
           g_assert_cmpint (gtk_shortcut_trigger_trigger (trigger[j], event, tests[i].mnemonic), ==, 
tests[i].result[j]);