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

whitespace cleanup; use g_slice in scratch plugin.

Browse Source
This commit is contained in:
Tomas Frydrych 2008-10-16 23:29:24 +01:00
parent 1e59d63e31
commit 30ece059cf
2 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/compositor/mutter/plugins/default.c
View File

@ -41,14 +41,14 @@
#define ACTOR_DATA_KEY "MCCP-Default-actor-data" #define ACTOR_DATA_KEY "MCCP-Default-actor-data"
static GQuark actor_data_quark = 0; static GQuark actor_data_quark = 0;
static gboolean do_init (const char *params); static gboolean do_init (const char *params);
static void minimize (MutterWindow *actor); static void minimize (MutterWindow *actor);
static void map (MutterWindow *actor); static void map (MutterWindow *actor);
static void destroy (MutterWindow *actor); static void destroy (MutterWindow *actor);
static void maximize (MutterWindow *actor, static void maximize (MutterWindow *actor,
gint x, gint y, gint width, gint height); gint x, gint y, gint width, gint height);
static void unmaximize (MutterWindow *actor, static void unmaximize (MutterWindow *actor,
gint x, gint y, gint width, gint height); gint x, gint y, gint width, gint height);
static void switch_workspace (const GList **actors, gint from, gint to, static void switch_workspace (const GList **actors, gint from, gint to,
MetaMotionDirection direction); MetaMotionDirection direction);
@ -175,14 +175,14 @@ static void
on_switch_workspace_effect_complete (ClutterActor *group, gpointer data) on_switch_workspace_effect_complete (ClutterActor *group, gpointer data)
{ {
DefaultPluginState *state = plugin_state; DefaultPluginState *state = plugin_state;
GList *l = *((GList**)data); GList *l = *((GList**)data);
MutterWindow *actor_for_cb = l->data; MutterWindow *actor_for_cb = l->data;
while (l) while (l)
{ {
ClutterActor *a = l->data; ClutterActor *a = l->data;
MutterWindow *mc_window = MUTTER_WINDOW (a); MutterWindow *mc_window = MUTTER_WINDOW (a);
ActorPrivate *priv = get_actor_private (mc_window); ActorPrivate *priv = get_actor_private (mc_window);
if (priv->orig_parent) if (priv->orig_parent)
{ {
@ -210,14 +210,14 @@ static void
switch_workspace (const GList **actors, gint from, gint to, switch_workspace (const GList **actors, gint from, gint to,
MetaMotionDirection direction) MetaMotionDirection direction)
{ {
MutterPlugin *plugin = &mutter_plugin; MutterPlugin *plugin = &mutter_plugin;
DefaultPluginState *state = plugin_state; DefaultPluginState *state = plugin_state;
GList *l; GList *l;
gint n_workspaces; gint n_workspaces;
ClutterActor *workspace0 = clutter_group_new (); ClutterActor *workspace0 = clutter_group_new ();
ClutterActor *workspace1 = clutter_group_new (); ClutterActor *workspace1 = clutter_group_new ();
ClutterActor *stage; ClutterActor *stage;
int screen_width, screen_height; int screen_width, screen_height;
stage = mutter_plugin_get_stage (plugin); stage = mutter_plugin_get_stage (plugin);
@ -250,9 +250,9 @@ switch_workspace (const GList **actors, gint from, gint to,
while (l) while (l)
{ {
MutterWindow *mc_window = l->data; MutterWindow *mc_window = l->data;
ActorPrivate *priv = get_actor_private (mc_window); ActorPrivate *priv = get_actor_private (mc_window);
ClutterActor *window = CLUTTER_ACTOR (mc_window); ClutterActor *window = CLUTTER_ACTOR (mc_window);
gint win_workspace; gint win_workspace;
win_workspace = mutter_window_get_workspace (mc_window); win_workspace = mutter_window_get_workspace (mc_window);
@ -286,7 +286,7 @@ switch_workspace (const GList **actors, gint from, gint to,
l = l->prev; l = l->prev;
} }
state->actors = (GList **)actors; state->actors = (GList **)actors;
state->desktop1 = workspace0; state->desktop1 = workspace0;
state->desktop2 = workspace1; state->desktop2 = workspace1;
@ -314,7 +314,7 @@ on_minimize_effect_complete (ClutterActor *actor, gpointer data)
* Must reverse the effect of the effect; must hide it first to ensure * Must reverse the effect of the effect; must hide it first to ensure
* that the restoration will not be visible. * that the restoration will not be visible.
*/ */
ActorPrivate *apriv; ActorPrivate *apriv;
MutterWindow *mc_window = MUTTER_WINDOW (actor); MutterWindow *mc_window = MUTTER_WINDOW (actor);
apriv = get_actor_private (MUTTER_WINDOW (actor)); apriv = get_actor_private (MUTTER_WINDOW (actor));
@ -342,15 +342,15 @@ on_minimize_effect_complete (ClutterActor *actor, gpointer data)
static void static void
minimize (MutterWindow *mc_window) minimize (MutterWindow *mc_window)
{ {
DefaultPluginState *state = plugin_state; DefaultPluginState *state = plugin_state;
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mc_window); ClutterActor *actor = CLUTTER_ACTOR (mc_window);
type = mutter_window_get_window_type (mc_window); type = mutter_window_get_window_type (mc_window);
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
apriv->is_minimized = TRUE; apriv->is_minimized = TRUE;
@ -369,7 +369,7 @@ minimize (MutterWindow *mc_window)
} }
else else
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window,
MUTTER_PLUGIN_MINIMIZE); MUTTER_PLUGIN_MINIMIZE);
} }
/* /*
@ -383,7 +383,7 @@ on_maximize_effect_complete (ClutterActor *actor, gpointer data)
* Must reverse the effect of the effect. * Must reverse the effect of the effect.
*/ */
MutterWindow *mc_window = MUTTER_WINDOW (actor); MutterWindow *mc_window = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
apriv->tml_maximize = NULL; apriv->tml_maximize = NULL;
@ -412,8 +412,8 @@ static void
maximize (MutterWindow *mc_window, maximize (MutterWindow *mc_window,
gint end_x, gint end_y, gint end_width, gint end_height) gint end_x, gint end_y, gint end_width, gint end_height)
{ {
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mc_window); ClutterActor *actor = CLUTTER_ACTOR (mc_window);
gdouble scale_x = 1.0; gdouble scale_x = 1.0;
gdouble scale_y = 1.0; gdouble scale_y = 1.0;
@ -424,7 +424,7 @@ maximize (MutterWindow *mc_window,
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
guint width, height; guint width, height;
gint x, y; gint x, y;
@ -453,14 +453,14 @@ maximize (MutterWindow *mc_window,
scale_x, scale_x,
scale_y, scale_y,
(ClutterEffectCompleteFunc) (ClutterEffectCompleteFunc)
on_maximize_effect_complete, on_maximize_effect_complete,
NULL); NULL);
return; return;
} }
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window,
MUTTER_PLUGIN_MAXIMIZE); MUTTER_PLUGIN_MAXIMIZE);
} }
/* /*
@ -476,14 +476,14 @@ unmaximize (MutterWindow *mc_window,
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
apriv->is_maximized = FALSE; apriv->is_maximized = FALSE;
} }
/* Do this conditionally, if the effect requires completion callback. */ /* Do this conditionally, if the effect requires completion callback. */
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window,
MUTTER_PLUGIN_UNMAXIMIZE); MUTTER_PLUGIN_UNMAXIMIZE);
} }
static void static void
@ -492,8 +492,8 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
/* /*
* Must reverse the effect of the effect. * Must reverse the effect of the effect.
*/ */
MutterWindow *mc_window = MUTTER_WINDOW (actor); MutterWindow *mc_window = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
apriv->tml_map = NULL; apriv->tml_map = NULL;
@ -504,8 +504,7 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
mutter_plugin.running--; mutter_plugin.running--;
/* Now notify the manager that we are done with this effect */ /* Now notify the manager that we are done with this effect */
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window, MUTTER_PLUGIN_MAP);
MUTTER_PLUGIN_MAP);
} }
/* /*
@ -515,14 +514,14 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
static void static void
map (MutterWindow *mc_window) map (MutterWindow *mc_window)
{ {
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mc_window); ClutterActor *actor = CLUTTER_ACTOR (mc_window);
type = mutter_window_get_window_type (mc_window); type = mutter_window_get_window_type (mc_window);
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
clutter_actor_move_anchor_point_from_gravity (actor, clutter_actor_move_anchor_point_from_gravity (actor,
CLUTTER_GRAVITY_CENTER); CLUTTER_GRAVITY_CENTER);
@ -545,7 +544,7 @@ map (MutterWindow *mc_window)
} }
else else
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window,
MUTTER_PLUGIN_MAP); MUTTER_PLUGIN_MAP);
} }
/* /*
@ -557,8 +556,8 @@ static void
on_destroy_effect_complete (ClutterActor *actor, gpointer data) on_destroy_effect_complete (ClutterActor *actor, gpointer data)
{ {
MutterPlugin *plugin = &mutter_plugin; MutterPlugin *plugin = &mutter_plugin;
MutterWindow *mc_window = MUTTER_WINDOW (actor); MutterWindow *mc_window = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
apriv->tml_destroy = NULL; apriv->tml_destroy = NULL;
@ -581,7 +580,7 @@ destroy (MutterWindow *mc_window)
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mc_window); ActorPrivate *apriv = get_actor_private (mc_window);
clutter_actor_move_anchor_point_from_gravity (actor, clutter_actor_move_anchor_point_from_gravity (actor,
CLUTTER_GRAVITY_CENTER); CLUTTER_GRAVITY_CENTER);
@ -598,15 +597,15 @@ destroy (MutterWindow *mc_window)
} }
else else
mutter_plugin_effect_completed (&mutter_plugin, mc_window, mutter_plugin_effect_completed (&mutter_plugin, mc_window,
MUTTER_PLUGIN_DESTROY); MUTTER_PLUGIN_DESTROY);
} }
static void static void
kill_effect (MutterWindow *mc_window, gulong event) kill_effect (MutterWindow *mc_window, gulong event)
{ {
MutterPlugin *plugin = &mutter_plugin; MutterPlugin *plugin = &mutter_plugin;
ActorPrivate *apriv; ActorPrivate *apriv;
ClutterActor *actor = CLUTTER_ACTOR (mc_window); ClutterActor *actor = CLUTTER_ACTOR (mc_window);
if (!(plugin->features & event)) if (!(plugin->features & event))
{ {
@ -616,7 +615,7 @@ kill_effect (MutterWindow *mc_window, gulong event)
if (event & MUTTER_PLUGIN_SWITCH_WORKSPACE) if (event & MUTTER_PLUGIN_SWITCH_WORKSPACE)
{ {
DefaultPluginState *state = plugin_state; DefaultPluginState *state = plugin_state;
if (state->tml_switch_workspace1) if (state->tml_switch_workspace1)
{ {

191
src/compositor/mutter/plugins/scratch.c
View File

@ -42,27 +42,24 @@
#define PANEL_SLIDE_THRESHOLD 2 #define PANEL_SLIDE_THRESHOLD 2
#define PANEL_HEIGHT 40 #define PANEL_HEIGHT 40
#define ACTOR_DATA_KEY "MCCP-Moblin-actor-data" #define ACTOR_DATA_KEY "MCCP-scratch-actor-data"
static GQuark actor_data_quark = 0;
typedef struct PluginPrivate PluginPrivate; typedef struct PluginPrivate PluginPrivate;
typedef struct ActorPrivate ActorPrivate; typedef struct ActorPrivate ActorPrivate;
static gboolean do_init (const char *params); static gboolean do_init (const char *params);
static void minimize (MutterWindow *actor); static void minimize (MutterWindow *actor);
static void map (MutterWindow *actor); static void map (MutterWindow *actor);
static void destroy (MutterWindow *actor); static void destroy (MutterWindow *actor);
static void maximize (MutterWindow *actor, static void maximize (MutterWindow *actor,
gint x, gint y, gint width, gint height); gint x, gint y, gint width, gint height);
static void unmaximize (MutterWindow *actor, static void unmaximize (MutterWindow *actor,
gint x, gint y, gint width, gint height); gint x, gint y, gint width, gint height);
static void switch_workspace (const GList **actors, gint from, gint to,
static void switch_workspace (const GList **actors, gint from, gint to, MetaMotionDirection direction);
MetaMotionDirection direction); static void kill_effect (MutterWindow *actor, gulong event);
static void kill_effect (MutterWindow *actor, gulong event);
static gboolean xevent_filter (XEvent *xev); static gboolean xevent_filter (XEvent *xev);
static gboolean reload (const char *params); static gboolean reload (const char *params);
/* /*
@ -154,15 +151,28 @@ struct ActorPrivate
/* /*
* Actor private data accessor * Actor private data accessor
*/ */
static void
free_actor_private (gpointer data)
{
if (G_LIKELY (data != NULL))
g_slice_free (ActorPrivate, data);
}
static ActorPrivate * static ActorPrivate *
get_actor_private (MutterWindow *actor) get_actor_private (MutterWindow *actor)
{ {
ActorPrivate * priv = g_object_get_data (G_OBJECT (actor), ACTOR_DATA_KEY); ActorPrivate *priv = g_object_get_qdata (G_OBJECT (actor), actor_data_quark);
if (!priv) if (G_UNLIKELY (actor_data_quark == 0))
actor_data_quark = g_quark_from_static_string (ACTOR_DATA_KEY);
if (G_UNLIKELY (!priv))
{ {
priv = g_new0 (ActorPrivate, 1); priv = g_slice_new0 (ActorPrivate);
g_object_set_data_full (G_OBJECT (actor), ACTOR_DATA_KEY, priv, g_free);
g_object_set_qdata_full (G_OBJECT (actor),
actor_data_quark, priv,
free_actor_private);
} }
return priv; return priv;
@ -178,16 +188,16 @@ get_plugin ()
static void static void
on_switch_workspace_effect_complete (ClutterActor *group, gpointer data) on_switch_workspace_effect_complete (ClutterActor *group, gpointer data)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *ppriv = plugin->plugin_private; PluginPrivate *ppriv = plugin->plugin_private;
GList *l = *((GList**)data); GList *l = *((GList**)data);
MutterWindow *actor_for_cb = l->data; MutterWindow *actor_for_cb = l->data;
while (l) while (l)
{ {
ClutterActor *a = l->data; ClutterActor *a = l->data;
MutterWindow *mcw = MUTTER_WINDOW (a); MutterWindow *mcw = MUTTER_WINDOW (a);
ActorPrivate *priv = get_actor_private (mcw); ActorPrivate *priv = get_actor_private (mcw);
if (priv->orig_parent) if (priv->orig_parent)
{ {
@ -215,15 +225,15 @@ static void
switch_workspace (const GList **actors, gint from, gint to, switch_workspace (const GList **actors, gint from, gint to,
MetaMotionDirection direction) MetaMotionDirection direction)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *ppriv = plugin->plugin_private; PluginPrivate *ppriv = plugin->plugin_private;
GList *l; GList *l;
gint n_workspaces; gint n_workspaces;
ClutterActor *group1 = clutter_group_new (); ClutterActor *group1 = clutter_group_new ();
ClutterActor *group2 = clutter_group_new (); ClutterActor *group2 = clutter_group_new ();
ClutterActor *stage; ClutterActor *stage;
gint screen_width; gint screen_width;
gint screen_height; gint screen_height;
stage = mutter_plugin_get_stage (plugin); stage = mutter_plugin_get_stage (plugin);
@ -243,7 +253,7 @@ switch_workspace (const GList **actors, gint from, gint to,
if (from == to) if (from == to)
{ {
mutter_plugin_effect_completed (plugin, NULL, mutter_plugin_effect_completed (plugin, NULL,
MUTTER_PLUGIN_SWITCH_WORKSPACE); MUTTER_PLUGIN_SWITCH_WORKSPACE);
return; return;
} }
@ -254,9 +264,9 @@ switch_workspace (const GList **actors, gint from, gint to,
while (l) while (l)
{ {
MutterWindow *mcw = l->data; MutterWindow *mcw = l->data;
ActorPrivate *priv = get_actor_private (mcw); ActorPrivate *priv = get_actor_private (mcw);
ClutterActor *a = CLUTTER_ACTOR (mcw); ClutterActor *a = CLUTTER_ACTOR (mcw);
gint workspace; gint workspace;
workspace = mutter_window_get_workspace (mcw); workspace = mutter_window_get_workspace (mcw);
@ -289,7 +299,7 @@ switch_workspace (const GList **actors, gint from, gint to,
l = l->prev; l = l->prev;
} }
ppriv->actors = (GList **)actors; ppriv->actors = (GList **)actors;
ppriv->desktop1 = group1; ppriv->desktop1 = group1;
ppriv->desktop2 = group2; ppriv->desktop2 = group2;
@ -318,7 +328,7 @@ on_minimize_effect_complete (ClutterActor *actor, gpointer data)
* that the restoration will not be visible. * that the restoration will not be visible.
*/ */
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
ActorPrivate *apriv; ActorPrivate *apriv;
MutterWindow *mcw = MUTTER_WINDOW (actor); MutterWindow *mcw = MUTTER_WINDOW (actor);
apriv = get_actor_private (MUTTER_WINDOW (actor)); apriv = get_actor_private (MUTTER_WINDOW (actor));
@ -346,16 +356,16 @@ static void
minimize (MutterWindow *mcw) minimize (MutterWindow *mcw)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *priv = plugin->plugin_private; PluginPrivate *priv = plugin->plugin_private;
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mcw); ClutterActor *actor = CLUTTER_ACTOR (mcw);
type = mutter_window_get_window_type (mcw); type = mutter_window_get_window_type (mcw);
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
apriv->is_minimized = TRUE; apriv->is_minimized = TRUE;
@ -373,8 +383,7 @@ minimize (MutterWindow *mcw)
NULL); NULL);
} }
else else
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_MINIMIZE);
MUTTER_PLUGIN_MINIMIZE);
} }
/* /*
@ -388,8 +397,8 @@ on_maximize_effect_complete (ClutterActor *actor, gpointer data)
* Must reverse the effect of the effect. * Must reverse the effect of the effect.
*/ */
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
MutterWindow *mcw = MUTTER_WINDOW (actor); MutterWindow *mcw = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
apriv->tml_maximize = NULL; apriv->tml_maximize = NULL;
@ -401,8 +410,7 @@ on_maximize_effect_complete (ClutterActor *actor, gpointer data)
plugin->running--; plugin->running--;
/* Now notify the manager that we are done with this effect */ /* Now notify the manager that we are done with this effect */
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_MAXIMIZE);
MUTTER_PLUGIN_MAXIMIZE);
} }
/* /*
@ -417,21 +425,21 @@ static void
maximize (MutterWindow *mcw, maximize (MutterWindow *mcw,
gint end_x, gint end_y, gint end_width, gint end_height) gint end_x, gint end_y, gint end_width, gint end_height)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *priv = plugin->plugin_private; PluginPrivate *priv = plugin->plugin_private;
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mcw); ClutterActor *actor = CLUTTER_ACTOR (mcw);
gdouble scale_x = 1.0; gdouble scale_x = 1.0;
gdouble scale_y = 1.0; gdouble scale_y = 1.0;
gint anchor_x = 0; gint anchor_x = 0;
gint anchor_y = 0; gint anchor_y = 0;
type = mutter_window_get_window_type (mcw); type = mutter_window_get_window_type (mcw);
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
guint width, height; guint width, height;
gint x, y; gint x, y;
@ -465,8 +473,7 @@ maximize (MutterWindow *mcw,
return; return;
} }
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_MAXIMIZE);
MUTTER_PLUGIN_MAXIMIZE);
} }
/* /*
@ -478,21 +485,20 @@ static void
unmaximize (MutterWindow *mcw, unmaximize (MutterWindow *mcw,
gint end_x, gint end_y, gint end_width, gint end_height) gint end_x, gint end_y, gint end_width, gint end_height)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
MetaCompWindowType type; MetaCompWindowType type;
type = mutter_window_get_window_type (mcw); type = mutter_window_get_window_type (mcw);
if (type == META_COMP_WINDOW_NORMAL) if (type == META_COMP_WINDOW_NORMAL)
{ {
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
apriv->is_maximized = FALSE; apriv->is_maximized = FALSE;
} }
/* Do this conditionally, if the effect requires completion callback. */ /* Do this conditionally, if the effect requires completion callback. */
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_UNMAXIMIZE);
MUTTER_PLUGIN_UNMAXIMIZE);
} }
static void static void
@ -502,8 +508,8 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
* Must reverse the effect of the effect. * Must reverse the effect of the effect.
*/ */
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
MutterWindow *mcw = MUTTER_WINDOW (actor); MutterWindow *mcw = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
apriv->tml_map = NULL; apriv->tml_map = NULL;
@ -514,8 +520,7 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
plugin->running--; plugin->running--;
/* Now notify the manager that we are done with this effect */ /* Now notify the manager that we are done with this effect */
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_MAP);
MUTTER_PLUGIN_MAP);
} }
/* /*
@ -525,10 +530,10 @@ on_map_effect_complete (ClutterActor *actor, gpointer data)
static void static void
map (MutterWindow *mcw) map (MutterWindow *mcw)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *priv = plugin->plugin_private; PluginPrivate *priv = plugin->plugin_private;
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mcw); ClutterActor *actor = CLUTTER_ACTOR (mcw);
type = mutter_window_get_window_type (mcw); type = mutter_window_get_window_type (mcw);
@ -556,8 +561,7 @@ map (MutterWindow *mcw)
} }
else else
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_MAP);
MUTTER_PLUGIN_MAP);
} }
/* /*
@ -569,15 +573,14 @@ static void
on_destroy_effect_complete (ClutterActor *actor, gpointer data) on_destroy_effect_complete (ClutterActor *actor, gpointer data)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
MutterWindow *mcw = MUTTER_WINDOW (actor); MutterWindow *mcw = MUTTER_WINDOW (actor);
ActorPrivate *apriv = get_actor_private (mcw); ActorPrivate *apriv = get_actor_private (mcw);
apriv->tml_destroy = NULL; apriv->tml_destroy = NULL;
plugin->running--; plugin->running--;
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_DESTROY);
MUTTER_PLUGIN_DESTROY);
} }
/* /*
@ -586,10 +589,10 @@ on_destroy_effect_complete (ClutterActor *actor, gpointer data)
static void static void
destroy (MutterWindow *mcw) destroy (MutterWindow *mcw)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *priv = plugin->plugin_private; PluginPrivate *priv = plugin->plugin_private;
MetaCompWindowType type; MetaCompWindowType type;
ClutterActor *actor = CLUTTER_ACTOR (mcw); ClutterActor *actor = CLUTTER_ACTOR (mcw);
type = mutter_window_get_window_type (mcw); type = mutter_window_get_window_type (mcw);
@ -611,16 +614,15 @@ destroy (MutterWindow *mcw)
NULL); NULL);
} }
else else
mutter_plugin_effect_completed (plugin, mcw, mutter_plugin_effect_completed (plugin, mcw, MUTTER_PLUGIN_DESTROY);
MUTTER_PLUGIN_DESTROY);
} }
static void static void
on_panel_effect_complete (ClutterActor *panel, gpointer data) on_panel_effect_complete (ClutterActor *panel, gpointer data)
{ {
gboolean reactive = GPOINTER_TO_INT (data); gboolean reactive = GPOINTER_TO_INT (data);
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
PluginPrivate *priv = plugin->plugin_private; PluginPrivate *priv = plugin->plugin_private;
gint screen_width, screen_height; gint screen_width, screen_height;
mutter_plugin_query_screen_size (plugin, &screen_width, &screen_height); mutter_plugin_query_screen_size (plugin, &screen_width, &screen_height);
@ -633,8 +635,7 @@ on_panel_effect_complete (ClutterActor *panel, gpointer data)
else else
{ {
priv->panel_back_in_progress = FALSE; priv->panel_back_in_progress = FALSE;
mutter_plugin_set_stage_input_area (plugin, 0, 0, mutter_plugin_set_stage_input_area (plugin, 0, 0, screen_width, 1);
screen_width, 1);
} }
} }
@ -655,8 +656,8 @@ static void
kill_effect (MutterWindow *mcw, gulong event) kill_effect (MutterWindow *mcw, gulong event)
{ {
MutterPlugin *plugin = get_plugin (); MutterPlugin *plugin = get_plugin ();
ActorPrivate *apriv; ActorPrivate *apriv;
ClutterActor *actor = CLUTTER_ACTOR (mcw); ClutterActor *actor = CLUTTER_ACTOR (mcw);
if (!(plugin->features & event)) if (!(plugin->features & event))
{ {