Fix menu window persistence and entry/leave events on Lucid on XI2

* src/xmenu.c (x_activate_menubar): Always clear the XI2 grab on
Xt.
* src/xterm.c (handle_one_xevent): On XI2, ignore LeaveNotify
events coming from the shell widget and use `x_window_to_frame'
to find the frame when handling XI_Leave events.

2 files changed, 17 insertions, 5 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 9b0353f133f..f3b7c45ffff 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -448,11 +448,11 @@ x_activate_menubar (struct frame *f)
   XPutBackEvent (f->output_data.x->display_info->display,
                  f->output_data.x->saved_menu_event);
 #else
-#ifdef USE_MOTIF
-#ifdef HAVE_XINPUT2
+#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2
   struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
-  /* Clear the XI2 grab so Motif can set a core grab.  Otherwise some
-     versions of Motif will emit a warning and hang.  */
+  /* Clear the XI2 grab so Motif or lwlib can set a core grab.
+     Otherwise some versions of Motif will emit a warning and hang,
+     and lwlib will fail to destroy the menu window.  */
 
   if (dpyinfo->num_devices)
     {
@@ -461,7 +461,6 @@ x_activate_menubar (struct frame *f)
                         CurrentTime);
     }
 #endif
-#endif
   XtDispatchEvent (f->output_data.x->saved_menu_event);
 #endif
   unblock_input ();
diff --git a/src/xterm.c b/src/xterm.c
index 4ca68848d2e..9a4f5d39e2e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9388,6 +9388,13 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       x_detect_focus_change (dpyinfo, any, event, &inev.ie);
 
       f = x_top_window_to_frame (dpyinfo, event->xcrossing.window);
+#if defined HAVE_X_TOOLKIT && defined HAVE_XINPUT2
+      /* The XI2 event mask is set on the frame widget, so this event
+         likely originates from the shell widget, which we aren't
+         interested in.  */
+      if (dpyinfo->supports_xi2)
+        f = NULL;
+#endif
       if (f)
         {
           if (f == hlinfo->mouse_face_mouse_frame)
@@ -10052,7 +10059,13 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             x_display_set_last_user_time (dpyinfo, xi_event->time);
             x_detect_focus_change (dpyinfo, any, event, &inev.ie);
 
+#ifndef USE_X_TOOLKIT
             f = x_top_window_to_frame (dpyinfo, leave->event);
+#else
+            /* On Xt builds that have XI2, the enter and leave event
+               masks are set on the frame widget's window.  */
+            f = x_window_to_frame (dpyinfo, leave->event);
+#endif
             if (f)
               {
                 if (f == hlinfo->mouse_face_mouse_frame)