callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.)
This commit is contained in:
Owen Taylor
2002-12-10 20:06:02 +00:00
committed by Owen Taylor
parent 2c3fc13ace
commit 329c090ec1
8 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

8
ChangeLog.pre-2-10
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

8
ChangeLog.pre-2-2
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

8
ChangeLog.pre-2-4
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

8
ChangeLog.pre-2-6
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

8
ChangeLog.pre-2-8
View File

@ -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> Tue Dec 10 12:57:00 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments): Fix typo with * gtk/gtkclist.c (adjust_adjustments): Fix typo with

2
gdk/x11/gdkevents-x11.c
View File

@ -1242,11 +1242,11 @@ gdk_event_translate (GdkDisplay *display,
case NotifyNonlinear: case NotifyNonlinear:
case NotifyVirtual: case NotifyVirtual:
case NotifyNonlinearVirtual: case NotifyNonlinearVirtual:
window_impl->has_focus_window = TRUE;
/* We pretend that the focus moves to the grab /* We pretend that the focus moves to the grab
* window, so we pay attention to NotifyGrab * window, so we pay attention to NotifyGrab
* NotifyUngrab, and ignore NotifyWhileGrabbed * NotifyUngrab, and ignore NotifyWhileGrabbed
*/ */
window_impl->has_focus_window = TRUE;
if (xevent->xfocus.mode != NotifyWhileGrabbed) if (xevent->xfocus.mode != NotifyWhileGrabbed)
window_impl->has_focus = TRUE; window_impl->has_focus = TRUE;
break; break;

4
gdk/x11/gdkwindow-x11.h
View File

@ -73,11 +73,11 @@ struct _GdkWindowImplX11
GdkXPositionInfo position_info; 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; 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; guint has_focus : 1;