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

x11: Fix window manager change detection

Browse Source 
Since the wmspec_check_window doesn't have a corresponding GdkWindow we can't
rely on the get_event_window() return value to get the XID from. Just use the
XID from the XEvent directly.

https://bugzilla.gnome.org/show_bug.cgi?id=662953
This commit is contained in:
Rui Matos
2011-11-05 01:36:52 -04:00
committed by Matthias Clasen
parent 8318515cd8
commit 8067f6b886
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/x11/gdkdisplay-x11.c
View File

@ -385,7 +385,6 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
GdkToplevelX11 *toplevel = NULL; GdkToplevelX11 *toplevel = NULL;
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display); GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
gboolean return_val; gboolean return_val;
Window xwindow = None;
/* Find the GdkWindow that this event relates to. /* Find the GdkWindow that this event relates to.
* Basically this means substructure events * Basically this means substructure events
@ -405,7 +404,6 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
x11_screen = GDK_X11_SCREEN (screen); x11_screen = GDK_X11_SCREEN (screen);
toplevel = _gdk_x11_window_get_toplevel (window); toplevel = _gdk_x11_window_get_toplevel (window);
window_impl = GDK_WINDOW_IMPL_X11 (window->impl); window_impl = GDK_WINDOW_IMPL_X11 (window->impl);
xwindow = GDK_WINDOW_XID (window);
g_object_ref (window); g_object_ref (window);
} }
@ -432,7 +430,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
screen = gdk_display_get_screen (display, i); screen = gdk_display_get_screen (display, i);
x11_screen = GDK_X11_SCREEN (screen); x11_screen = GDK_X11_SCREEN (screen);
if (x11_screen->wmspec_check_window == xwindow) if (x11_screen->wmspec_check_window == xevent->xdestroywindow.window)
{ {
x11_screen->wmspec_check_window = None; x11_screen->wmspec_check_window = None;
x11_screen->last_wmspec_check_time = 0; x11_screen->last_wmspec_check_time = 0;