]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't drop touch events we're not interested in on GTK3
authorPo Lu <luangruo@yahoo.com>
Tue, 21 Dec 2021 02:01:37 +0000 (10:01 +0800)
committerPo Lu <luangruo@yahoo.com>
Tue, 21 Dec 2021 02:01:37 +0000 (10:01 +0800)
* src/xterm.c (handle_one_xevent): Allow GTK to handle
unwanted TouchBegin events.

src/xterm.c

index cd135056a2c62ac0b2f7f77293c46bc27a0ef518..1dc68220f08ec62bcae4b48450b0d152dea360b4 100644 (file)
@@ -10891,7 +10891,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
              f = x_any_window_to_frame (dpyinfo, xev->event);
 
 #ifdef HAVE_GTK3
-             menu_bar_p = (FRAME_X_OUTPUT (f)->menubar_widget
+             menu_bar_p = (f && FRAME_X_OUTPUT (f)->menubar_widget
                            && xg_event_is_for_menubar (f, event));
 #endif
 
@@ -10917,6 +10917,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                        }
                      x_uncatch_errors_after_check ();
                    }
+#ifndef HAVE_GTK3
                  else
                    {
                      x_catch_errors (dpyinfo->display);
@@ -10924,7 +10925,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                          xev->detail, xev->event, XIRejectTouch);
                      x_uncatch_errors ();
                    }
-
+#endif
                }
              else
                {