matchbox/libmatchboxwm2
1
0
Fork 0
mirror of https://git.yoctoproject.org/libmatchboxwm2 synced 2025-11-05 21:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MBWMCompMgrClutter] Implement compositor stack freezing

Browse Source 
Some effects (notably the Unmap one) need to be able to freeze the
compositor stack for duration of the effect, otherwise the animated actor
disappears below the top.
This commit is contained in:
Tomas Frydrych
2010-11-20 07:32:36 +00:00
parent 93a1efc9d6
commit a80132bc4e
1 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
View File

@@ -380,6 +380,10 @@ struct _MBWMCompMgrClutterPrivate
ClutterActor * shadow; ClutterActor * shadow;
Window overlay_window; Window overlay_window;
int freeze_stack;
unsigned int restack_pending : 1;
}; };
static void static void
@@ -743,15 +747,44 @@ mb_wm_comp_mgr_clutter_handle_damage (XDamageNotifyEvent * de,
return False; return False;
} }
static void
mb_wm_comp_mgr_clutter_freeze_stack (MBWMCompMgr *mgr)
{
MB_WM_COMP_MGR_CLUTTER (mgr)->priv->freeze_stack++;
}
static void
mb_wm_comp_mgr_clutter_unfreeze_stack (MBWMCompMgr *mgr)
{
MBWMCompMgrClutterPrivate *priv = MB_WM_COMP_MGR_CLUTTER (mgr)->priv;
priv->freeze_stack--;
if (priv->freeze_stack < 0)
priv->freeze_stack = 0;
if (!priv->freeze_stack && priv->restack_pending)
mb_wm_comp_mgr_clutter_restack_real ((MBWMCompMgr *)mgr);
}
static void static void
mb_wm_comp_mgr_clutter_restack_real (MBWMCompMgr *mgr) mb_wm_comp_mgr_clutter_restack_real (MBWMCompMgr *mgr)
{ {
MBWindowManager * wm = mgr->wm; MBWindowManager *wm = mgr->wm;
MBWMCompMgrClutter * cmgr = MB_WM_COMP_MGR_CLUTTER (mgr); MBWMCompMgrClutter *cmgr = MB_WM_COMP_MGR_CLUTTER (mgr);
MBWMList * l; MBWMCompMgrClutterPrivate *priv = cmgr->priv;
int i = 0; MBWMList *l;
int i = 0;
l = cmgr->priv->desktops; if (priv->freeze_stack)
{
priv->restack_pending = 1;
return;
}
priv->restack_pending = 0;
l = priv->desktops;
if (!mb_wm_stack_empty (wm)) if (!mb_wm_stack_empty (wm))
{ {
@@ -1093,9 +1126,12 @@ static void
mb_wm_comp_mgr_clutter_client_event_completed_hide_cb (ClutterAnimation *anim, mb_wm_comp_mgr_clutter_client_event_completed_hide_cb (ClutterAnimation *anim,
MBWMCompMgrClutterClient *client) MBWMCompMgrClutterClient *client)
{ {
MBWMCompMgrClient *c = MB_WM_COMP_MGR_CLIENT (client);
client->priv->flags &= ~MBWMCompMgrClutterClientEffectRunning; client->priv->flags &= ~MBWMCompMgrClutterClientEffectRunning;
clutter_actor_hide (client->priv->actor); clutter_actor_hide (client->priv->actor);
clutter_actor_set_scale (client->priv->actor, 1.0, 1.0); clutter_actor_set_scale (client->priv->actor, 1.0, 1.0);
mb_wm_comp_mgr_clutter_unfreeze_stack (c->wm->comp_mgr);
/* /*
* Release the extra reference on the CM client that was added for the sake * Release the extra reference on the CM client that was added for the sake
@@ -1133,6 +1169,8 @@ mb_wm_comp_mgr_clutter_client_event_real (MBWMCompMgr * mgr,
switch (event) switch (event)
{ {
case MBWMCompMgrClientEventMinimize: case MBWMCompMgrClientEventMinimize:
mb_wm_comp_mgr_clutter_freeze_stack (mgr);
mb_wm_object_ref (MB_WM_OBJECT (cclient)); mb_wm_object_ref (MB_WM_OBJECT (cclient));
cclient->priv->flags |= MBWMCompMgrClutterClientEffectRunning; cclient->priv->flags |= MBWMCompMgrClutterClientEffectRunning;
@@ -1147,6 +1185,8 @@ mb_wm_comp_mgr_clutter_client_event_real (MBWMCompMgr * mgr,
cclient); cclient);
break; break;
case MBWMCompMgrClientEventUnmap: case MBWMCompMgrClientEventUnmap:
mb_wm_comp_mgr_clutter_freeze_stack (mgr);
mb_wm_object_ref (MB_WM_OBJECT (cclient)); mb_wm_object_ref (MB_WM_OBJECT (cclient));
cclient->priv->flags |= MBWMCompMgrClutterClientEffectRunning; cclient->priv->flags |= MBWMCompMgrClutterClientEffectRunning;