brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed how windows are added to avoid duplication.

Browse Source
This commit is contained in:
Tomas Frydrych 2008-10-22 17:12:15 +01:00
parent 275cccb136
commit 3cc7b2c74d
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/compositor/mutter/compositor-mutter.c
View File

@ -1334,7 +1334,9 @@ process_create (Mutter *compositor,
XCreateWindowEvent *event, XCreateWindowEvent *event,
MetaWindow *window) MetaWindow *window)
{ {
MetaScreen *screen; MetaScreen *screen;
MutterWindow *cw;
Window xwindow = event->window;
screen = meta_display_screen_for_root (compositor->display, event->parent); screen = meta_display_screen_for_root (compositor->display, event->parent);
@ -1345,8 +1347,21 @@ process_create (Mutter *compositor,
* This is quite silly as we end up creating windows as then immediatly * This is quite silly as we end up creating windows as then immediatly
* destroying them as they (likely) become framed and thus reparented. * destroying them as they (likely) become framed and thus reparented.
*/ */
if (!find_window_in_display (compositor->display, event->window)) cw = find_window_for_screen (screen, event->window);
add_win (screen, window, event->window);
if (!cw && window)
{
xwindow = meta_window_get_xwindow (window);
cw = find_window_for_screen (screen, xwindow);
}
if (cw)
{
destroy_win (compositor->display, xwindow);
}
add_win (screen, window, event->window);
} }
static void static void
@ -1356,6 +1371,7 @@ process_reparent (Mutter *compositor,
{ {
MetaScreen *screen; MetaScreen *screen;
MutterWindow *mw; MutterWindow *mw;
Window xwindow = event->window;
screen = meta_display_screen_for_root (compositor->display, event->parent); screen = meta_display_screen_for_root (compositor->display, event->parent);
@ -1364,11 +1380,19 @@ process_reparent (Mutter *compositor,
mw = find_window_for_screen (screen, event->window); mw = find_window_for_screen (screen, event->window);
if (!mw && window)
{
xwindow = meta_window_get_xwindow (window);
mw = find_window_for_screen (screen, xwindow);
}
if (mw) if (mw)
{ {
meta_verbose ("reparent: destroying a window 0%x\n", meta_verbose ("reparent: destroying a window 0%x\n",
(guint)event->window); (guint)event->window);
destroy_win (compositor->display, event->window); destroy_win (compositor->display, xwindow);
} }
add_win (screen, window, event->window); add_win (screen, window, event->window);