isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid confusion when _NET_WM_USER_TIME_WINDOW is in the window stack

Browse Source 
Wine sets _NET_WM_USER_TIME_WINDOW to point to an unmapped toplevel;
this was causing much confusion because both the real window and
the unmapped window were in the window stack and mapped back to the
same MetaWindow.

Debugged by Alban Browaeys
https://bugzilla.gnome.org/show_bug.cgi?id=593887
This commit is contained in:
Owen W. Taylor 2010-09-16 14:45:53 -04:00
parent a7d1053ff5
commit ed9d7f18a6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/stack-tracker.c
View File

@ -23,6 +23,7 @@
#include <string.h> #include <string.h>
#include "frame-private.h"
#include "screen-private.h" #include "screen-private.h"
#include "stack-tracker.h" #include "stack-tracker.h"
#include "util.h" #include "util.h"
@ -682,7 +683,15 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker)
meta_window = meta_display_lookup_x_window (tracker->screen->display, meta_window = meta_display_lookup_x_window (tracker->screen->display,
windows[i]); windows[i]);
if (meta_window) /* When mapping back from xwindow to MetaWindow we have to be a bit careful;
* children of the root could include unmapped windows created by toolkits
* for internal purposes, including ones that we have registered in our
* XID => window table. (Wine uses a toplevel for _NET_WM_USER_TIME_WINDOW;
* see window-prop.c:reload_net_wm_user_time_window() for registration.)
*/
if (meta_window &&
(windows[i] == meta_window->xwindow ||
(meta_window->frame && windows[i] == meta_window->frame->xwindow)))
meta_windows = g_list_prepend (meta_windows, meta_window); meta_windows = g_list_prepend (meta_windows, meta_window);
} }