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

x11: Do not manage a foreign window

Browse Source 
If a Stage has been set to use a foreign Window then Clutter should not
be managing it; calling XWithdrawWindow and XMapWindow should be
reserved to the windows we manage ourselves.
This commit is contained in:
Emmanuele Bassi 2009-12-08 18:24:30 +00:00
parent 28cb2cdab5
commit e957e277b8
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/x11/clutter-stage-x11.c
View File

@ -525,16 +525,21 @@ clutter_stage_x11_set_user_resizable (ClutterStageWindow *stage_window,
static void static void
update_wm_hints (ClutterStageX11 *stage_x11) update_wm_hints (ClutterStageX11 *stage_x11)
{ {
ClutterBackend *backend = clutter_get_default_backend (); ClutterBackend *backend;
ClutterBackendX11 *backend_x11; ClutterBackendX11 *backend_x11;
XWMHints wm_hints; XWMHints wm_hints;
g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend));
backend_x11 = CLUTTER_BACKEND_X11 (backend);
if (stage_x11->wm_state & STAGE_X11_WITHDRAWN) if (stage_x11->wm_state & STAGE_X11_WITHDRAWN)
return; return;
if (stage_x11->is_foreign_xwin)
return;
backend = clutter_get_default_backend ();
g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend));
backend_x11 = CLUTTER_BACKEND_X11 (backend);
wm_hints.flags = StateHint; wm_hints.flags = StateHint;
wm_hints.initial_state = NormalState; wm_hints.initial_state = NormalState;
@ -573,7 +578,7 @@ clutter_stage_x11_show (ClutterStageWindow *stage_window,
if (stage_x11->xwin != None) if (stage_x11->xwin != None)
{ {
if (do_raise) if (do_raise && !stage_x11->is_foreign_xwin)
{ {
CLUTTER_NOTE (BACKEND, "Raising stage[%lu]", CLUTTER_NOTE (BACKEND, "Raising stage[%lu]",
(unsigned long) stage_x11->xwin); (unsigned long) stage_x11->xwin);
@ -599,7 +604,8 @@ clutter_stage_x11_show (ClutterStageWindow *stage_window,
clutter_actor_map (CLUTTER_ACTOR (stage_x11->wrapper)); clutter_actor_map (CLUTTER_ACTOR (stage_x11->wrapper));
XMapWindow (backend_x11->xdpy, stage_x11->xwin); if (!stage_x11->is_foreign_xwin)
XMapWindow (backend_x11->xdpy, stage_x11->xwin);
} }
} }
@ -622,9 +628,8 @@ clutter_stage_x11_hide (ClutterStageWindow *stage_window)
clutter_actor_unmap (CLUTTER_ACTOR (stage_x11->wrapper)); clutter_actor_unmap (CLUTTER_ACTOR (stage_x11->wrapper));
XWithdrawWindow (backend_x11->xdpy, if (!stage_x11->is_foreign_xwin)
stage_x11->xwin, XWithdrawWindow (backend_x11->xdpy, stage_x11->xwin, 0);
0);
} }
} }