summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkevents-x11.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-03-02 20:37:07 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-03-02 20:37:07 +0000
commitb54e5f4ca17d56f4844caa9485989f65b18babda (patch)
tree951f60c1491f4e7c62c9ead4e18a76c72833f35a /gdk/x11/gdkevents-x11.c
parentdfe5724765acc217ce43b4f96cc0d6dc2d73016c (diff)
downloadgdk-pixbuf-b54e5f4ca17d56f4844caa9485989f65b18babda.tar.gz
Robustify tracking of pointer grab window.
Fri Mar 1 18:39:44 2002 Owen Taylor <otaylor@redhat.com> * gdk/x11/{gdkevents-x11.c,gdkmain-x11.c,gdkprivate-x11.h, gdkwindow-x11.c}: Robustify tracking of pointer grab window. * gdk/x11/gdkmain-x11.c: Keep track of current keyboard grab window. * gdk/x11/gdkmain-x11.c (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only): Private libgtk => libgtk API for finding out current grab information. * gtk/gtkmain.c (rewrite_event_for_grabs): Rewrite events so that the effective behavior of owner_events = TRUE is changed to "deliver events to same window group normally" instead of "deliver events to same application normally. #69934 * gtk/gtkrange.c: Use an explicit gtk_grab_add() so that it works within the GtkList combo, where there is a owner_events = FALSE gdk_pointer_grab() already in effect. (#65006, reported by Damon Chaplin)
Diffstat (limited to 'gdk/x11/gdkevents-x11.c')
-rw-r--r--gdk/x11/gdkevents-x11.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 2d1e14bd5..babd7e35c 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1262,9 +1262,8 @@ gdk_event_translate (GdkEvent *event,
gdk_synthesize_window_state (window,
0,
GDK_WINDOW_STATE_ICONIFIED);
-
- if (_gdk_xgrab_window == window_private)
- _gdk_xgrab_window = NULL;
+
+ _gdk_xgrab_check_unmap (window, xevent->xany.serial);
break;