Fix native input when using core input events

* src/gtkutil.c (xg_filter_key): Test for core key press events
correctly.
* src/xterm.c (handle_one_xevent): Also check for KeyRelease
events.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 36ed55bc0397d0ed3c31776ba2582af79b5f8d58..d17a6970b8de7b8523ec29642079524378fbd69e 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -6262,7 +6262,7 @@ xg_widget_key_press_event_cb (GtkWidget *widget, GdkEvent *event,
 bool
 xg_filter_key (struct frame *frame, XEvent *xkey)
 {
-  GdkEvent *xg_event = gdk_event_new ((xkey->type == ButtonPress
+  GdkEvent *xg_event = gdk_event_new ((xkey->type == KeyPress
 #ifdef HAVE_XINPUT2
                                       || (xkey->type == GenericEvent
                                           && xkey->xgeneric.evtype == XI_KeyPress)

diff --git a/src/xterm.c b/src/xterm.c
index 103eb75a4607ce2b0050d91e9616a222bf518700..0e93c992751d1aab8e135d8ab435aa7819e3840d 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8373,6 +8373,7 @@ x_filter_event (struct x_display_info *dpyinfo, XEvent *event)
 #ifdef USE_GTK
     }
   else if (f1 && (event->type == KeyPress
+                 || event->type == KeyRelease
 #ifdef HAVE_XINPUT2
                  || xinput_event
 #endif