Take focus mode into account when tracking FocusIn/Out events, so we don't

Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
        focus mode into account when tracking FocusIn/Out events,
        so we don't get confused by focus changes while a
        keyboard grab is in effect. (Probably fixes #90563)

ChangeLog

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

ChangeLog.pre-2-10

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

ChangeLog.pre-2-2

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

ChangeLog.pre-2-4

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

ChangeLog.pre-2-6

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

ChangeLog.pre-2-8

@@ -1,3 +1,10 @@
+Tue Sep 10 09:29:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
+	focus mode into account when tracking FocusIn/Out events,
+	so we don't get confused by focus changes while a 
+	keyboard grab is in effect. (Probably fixes #90563)
+
 Mon Sep  9 16:16:25 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
 
 	* gtk/gtktextview.c (gtk_text_view_drag_motion): If the end iter

gdk/x11/gdkevents-x11.c

@@ -1072,10 +1072,20 @@ gdk_event_translate (GdkDisplay *display,
 	    case NotifyNonlinear:
 	    case NotifyVirtual:
 	    case NotifyNonlinearVirtual:
-	      window_impl->has_focus = TRUE;
+	      /* We pretend that the focus moves to the grab
+	       * window, so we pay attention to NotifyGrab
+	       * NotifyUngrab, and ignore NotifyWhileGrabbed
+	       */
+	      if (xevent->xfocus.mode != NotifyWhileGrabbed)
+		window_impl->has_focus = TRUE;
 	      break;
 	    case NotifyPointer:
-	      window_impl->has_pointer_focus = TRUE;
+	      /* The X server sends NotifyPointer/NotifyGrab,
+	       * but the pointer focus is ignored while a
+	       * grab is in effect
+	       */
+	      if (xevent->xfocus.mode != NotifyGrab)
+		window_impl->has_pointer_focus = TRUE;
 	      break;
 	    case NotifyInferior:
 	    case NotifyPointerRoot:
@@ -1101,10 +1111,12 @@ gdk_event_translate (GdkDisplay *display,
 	    case NotifyNonlinear:
 	    case NotifyVirtual:
 	    case NotifyNonlinearVirtual:
-	      window_impl->has_focus = FALSE;
+	      if (xevent->xfocus.mode != NotifyWhileGrabbed)
+		window_impl->has_focus = FALSE;
 	      break;
 	    case NotifyPointer:
-	      window_impl->has_pointer_focus = FALSE;
+	      if (xevent->xfocus.mode != NotifyUngrab)
+		window_impl->has_pointer_focus = FALSE;
 	    break;
 	    case NotifyInferior:
 	    case NotifyPointerRoot: