isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added no_more_x_calls flag to MutterWindow.

Browse Source 
Once the window destruction is initiated, we can still manipulate our
  MutterWindow with clutter API, but we can not longer use any X-based API,
  or MetaWindow API to query it.
This commit is contained in:
Tomas Frydrych 2009-02-18 12:13:36 +00:00
parent 39a3bb2c7d
commit 7afc4310f6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,6 +202,8 @@ struct _MutterWindowPrivate
guint needs_destroy : 1; guint needs_destroy : 1;
guint no_shadow : 1; guint no_shadow : 1;
guint no_more_x_calls : 1;
}; };
enum enum
@ -1027,7 +1029,7 @@ mutter_window_effect_completed (MutterWindow *cw, gulong event)
priv->map_in_progress = 0; priv->map_in_progress = 0;
} }
if (!priv->map_in_progress && priv->window) if (!priv->map_in_progress && priv->window && !priv->no_more_x_calls)
{ {
MetaRectangle rect; MetaRectangle rect;
meta_window_get_outer_rect (priv->window, &rect); meta_window_get_outer_rect (priv->window, &rect);
@ -1061,7 +1063,7 @@ mutter_window_effect_completed (MutterWindow *cw, gulong event)
priv->unmaximize_in_progress = 0; priv->unmaximize_in_progress = 0;
} }
if (!priv->unmaximize_in_progress && priv->window) if (!priv->unmaximize_in_progress && priv->window && !priv->no_more_x_calls)
{ {
MetaRectangle rect; MetaRectangle rect;
meta_window_get_outer_rect (priv->window, &rect); meta_window_get_outer_rect (priv->window, &rect);
@ -1079,7 +1081,7 @@ mutter_window_effect_completed (MutterWindow *cw, gulong event)
priv->maximize_in_progress = 0; priv->maximize_in_progress = 0;
} }
if (!priv->maximize_in_progress && priv->window) if (!priv->maximize_in_progress && priv->window && !priv->no_more_x_calls)
{ {
MetaRectangle rect; MetaRectangle rect;
meta_window_get_outer_rect (priv->window, &rect); meta_window_get_outer_rect (priv->window, &rect);
@ -1215,6 +1217,14 @@ destroy_win (MutterWindow *cw)
*/ */
priv->destroy_in_progress++; priv->destroy_in_progress++;
/*
* Once the window destruction is initiated we can no longer perform any
* furter X-based operations. For example, if we have a Map effect running,
* we cannot query the window geometry once the effect completes. So, flag
* this.
*/
priv->no_more_x_calls = TRUE;
if (!info->plugin_mgr || if (!info->plugin_mgr ||
!mutter_plugin_manager_event_simple (info->plugin_mgr, !mutter_plugin_manager_event_simple (info->plugin_mgr,
cw, cw,