Separate out tracking of the X server focus window from tracking our idea

Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkevents-x11.c (gdk_event_translate)
          gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
          focus window from tracking our idea of what the focus window is,
          because the PointerRoot code needs to know the real pointer
          window. (Mostly accidentally committed a bit earlier.)

8 files changed, 51 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e074e393a..6b955edb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e074e393a..6b955edb6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e074e393a..6b955edb6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e074e393a..6b955edb6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e074e393a..6b955edb6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e074e393a..6b955edb6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Dec 10 14:37:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate)
+	  gdk/x11/gdkwindow-x11.h: Separate out tracking of the X server
+	  focus window from tracking our idea of what the focus window is,
+	  because the PointerRoot code needs to know the real pointer
+	  window. (Mostly accidentally committed a bit earlier.)
+
 Tue Dec 10 12:57:00 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkclist.c (adjust_adjustments): Fix typo with
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 9cce1afc4..f0e44e8b0 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1242,11 +1242,11 @@ gdk_event_translate (GdkDisplay *display,
 	    case NotifyNonlinear:
 	    case NotifyVirtual:
 	    case NotifyNonlinearVirtual:
+	      window_impl->has_focus_window = TRUE;
 	      /* We pretend that the focus moves to the grab
 	       * window, so we pay attention to NotifyGrab
 	       * NotifyUngrab, and ignore NotifyWhileGrabbed
 	       */
-	      window_impl->has_focus_window = TRUE;
 	      if (xevent->xfocus.mode != NotifyWhileGrabbed)
 		window_impl->has_focus = TRUE;
 	      break;
diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index ccf10dde9..72246ebf2 100644
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -73,11 +73,11 @@ struct _GdkWindowImplX11
   
   GdkXPositionInfo position_info;
 
-  /* Set if the window, or any descendent of it, is the focus window
+  /* Set if the window, or any descendent of it, is the server's focus window
    */
   guint has_focus_window : 1;
 
-  /* Set if has_focus_window and the focus isn't grabbed elsewhere.
+  /* Set if window->has_focus_window and the focus isn't grabbed elsewhere.
    */
   guint has_focus : 1;