Merge branch 'master' into msvc-support-master

README.in

@@ -289,6 +289,12 @@ features).
 Release Notes for Clutter 1.10
 -------------------------------------------------------------------------------
 
+• The "default stage" has been deprecated; since the 1.0 release, the default
+  stage creation was deferred to the call to clutter_stage_get_default(), and
+  the preferred way for getting a ClutterStage was calling clutter_stage_new()
+  instead. On platforms that do not support multiple stages, attempting to
+  create more than one stage will lead to an error, and Clutter will abort.
+
 • Clutter can support multiple backends in the same shared library. Only one
   windowing or input backend can be used at run time. As a result of this
   change, the shared library name used by Clutter has changed from:

clutter/cally/cally-actor.c

@@ -551,14 +551,12 @@ cally_actor_ref_state_set (AtkObject *obj)
       atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE);
 
       stage = CLUTTER_STAGE (clutter_actor_get_stage (actor));
-      /* If for any reason this actor doesn't have a stage
+      if (stage != NULL)
-         associated, we try the default one as fallback */
+        {
-      if (stage == NULL)
+          focus_actor = clutter_stage_get_key_focus (stage);
-          stage = CLUTTER_STAGE (clutter_stage_get_default ());
+          if (focus_actor == actor)
-
+            atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
-      focus_actor = clutter_stage_get_key_focus (stage);
+        }
-      if (focus_actor == actor)
-        atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
     }
 
   return state_set;

clutter/clutter-actor.c

@@ -12575,7 +12575,7 @@ _clutter_actor_foreach_child (ClutterActor *self,
 /* For debugging purposes this gives us a simple way to print out
  * the scenegraph e.g in gdb using:
  * [|
- *   _clutter_actor_traverse (clutter_stage_get_default (),
+ *   _clutter_actor_traverse (stage,
  *                            0,
  *                            _clutter_debug_print_actor_cb,
  *                            NULL,

clutter/clutter-backend.c

@@ -684,14 +684,11 @@ _clutter_backend_create_stage (ClutterBackend  *backend,
                                GError         **error)
 {
   ClutterBackendClass *klass;
-  ClutterStageManager *stage_manager;
   ClutterStageWindow *stage_window;
 
   g_assert (CLUTTER_IS_BACKEND (backend));
   g_assert (CLUTTER_IS_STAGE (wrapper));
 
-  stage_manager = clutter_stage_manager_get_default ();
-
   klass = CLUTTER_BACKEND_GET_CLASS (backend);
   if (klass->create_stage != NULL)
     stage_window = klass->create_stage (backend, wrapper, error);
@@ -702,8 +699,6 @@ _clutter_backend_create_stage (ClutterBackend  *backend,
     return NULL;
 
   g_assert (CLUTTER_IS_STAGE_WINDOW (stage_window));
-  _clutter_stage_set_window (wrapper, stage_window);
-  _clutter_stage_manager_add_stage (stage_manager, wrapper);
 
   return stage_window;
 }

clutter/clutter-deform-effect.c

@@ -766,5 +766,5 @@ clutter_deform_effect_invalidate (ClutterDeformEffect *effect)
 
   actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
   if (actor != NULL)
-    clutter_actor_queue_redraw (actor);
+    clutter_effect_queue_repaint (CLUTTER_EFFECT (effect));
 }

clutter/clutter-script-parser.c

@@ -43,6 +43,8 @@
 #include "clutter-script-private.h"
 #include "clutter-scriptable.h"
 
+#include "clutter-stage-manager.h"
+
 #include "clutter-private.h"
 
 static void clutter_script_parser_object_end (JsonParser *parser,
@@ -1966,7 +1968,9 @@ _clutter_script_construct_object (ClutterScript *script,
 
   if (oinfo->is_stage && oinfo->is_stage_default)
     {
+      ClutterStageManager *manager = clutter_stage_manager_get_default ();
       GList *properties = oinfo->properties;
+      ClutterStage *default_stage;
 
       /* the default stage is a complex beast: we cannot create it using
        * g_object_newv() but we need clutter_script_construct_parameters()
@@ -1981,7 +1985,8 @@ _clutter_script_construct_object (ClutterScript *script,
                                              properties,
                                              &params);
 
-      oinfo->object = G_OBJECT (clutter_stage_get_default ());
+      default_stage = clutter_stage_manager_get_default_stage (manager);
+      oinfo->object = G_OBJECT (default_stage);
 
       for (i = 0; i < params->len; i++)
         {

clutter/clutter-stage-manager.c

@@ -203,7 +203,7 @@ clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
 {
 }
 
-/*
+/*< private >
  * _clutter_stage_manager_set_default_stage:
  * @stage_manager: a #ClutterStageManager
  * @stage: a #ClutterStage
@@ -211,10 +211,6 @@ clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
  * Sets @stage as the default stage
  *
  * A no-op if there already is a default stage
- *
- * This is called by clutter_stage_get_default() and should be removed
- * along with #ClutterStageManager:default-stage when we stop having
- * the default stage
  */
 void
 _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
@@ -224,6 +220,9 @@ _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
     {
       default_stage = stage;
 
+      /* the default stage is immediately realized */
+      clutter_actor_realize (CLUTTER_ACTOR (stage));
+
       g_object_notify (G_OBJECT (stage_manager), "default-stage");
     }
 }
@@ -312,10 +311,9 @@ _clutter_stage_manager_remove_stage (ClutterStageManager *stage_manager,
 
   stage_manager->stages = g_slist_remove (stage_manager->stages, stage);
 
-  /* if it's the default stage, get the first available from the list */
+  /* if the default stage is being destroyed then we unset the pointer */
   if (default_stage == stage)
-    default_stage = stage_manager->stages ? stage_manager->stages->data
+    default_stage = NULL;
-                                          : NULL;
 
   g_signal_emit (stage_manager, manager_signals[STAGE_REMOVED], 0, stage);
 

clutter/clutter-stage.c

@@ -30,11 +30,6 @@
  * #ClutterStage is a top level 'window' on which child actors are placed
  * and manipulated.
  *
- * Clutter creates a default stage upon initialization, which can be retrieved
- * using clutter_stage_get_default(). Clutter always provides the default
- * stage, unless the backend is unable to create one. The stage returned
- * by clutter_stage_get_default() is guaranteed to always be the same.
- *
  * Backends might provide support for multiple stages. The support for this
  * feature can be checked at run-time using the clutter_feature_available()
  * function and the %CLUTTER_FEATURE_STAGE_MULTIPLE flag. If the backend used
@@ -281,6 +276,23 @@ queue_full_redraw (ClutterStage *stage)
   _clutter_stage_window_add_redraw_clip (stage_window, NULL);
 }
 
+static gboolean
+stage_is_default (ClutterStage *stage)
+{
+  ClutterStageManager *stage_manager;
+  ClutterStageWindow *impl;
+
+  stage_manager = clutter_stage_manager_get_default ();
+  if (stage != clutter_stage_manager_get_default_stage (stage_manager))
+    return FALSE;
+
+  impl = _clutter_stage_get_window (stage);
+  if (impl != _clutter_stage_get_default_window ())
+    return FALSE;
+
+  return TRUE;
+}
+
 static void
 clutter_stage_allocate (ClutterActor           *self,
                         const ClutterActorBox  *box,
@@ -1477,7 +1489,7 @@ static gboolean
 clutter_stage_real_delete_event (ClutterStage *stage,
                                  ClutterEvent *event)
 {
-  if (clutter_stage_is_default (stage))
+  if (stage_is_default (stage))
     clutter_main_quit ();
   else
     clutter_actor_destroy (CLUTTER_ACTOR (stage));
@@ -1497,6 +1509,39 @@ clutter_stage_real_apply_transform (ClutterActor *stage,
   cogl_matrix_multiply (matrix, matrix, &priv->view);
 }
 
+static void
+clutter_stage_constructed (GObject *gobject)
+{
+  ClutterStage *self = CLUTTER_STAGE (gobject);
+  ClutterStageManager *stage_manager;
+
+  stage_manager = clutter_stage_manager_get_default ();
+
+  /* this will take care to sinking the floating reference */
+  _clutter_stage_manager_add_stage (stage_manager, self);
+
+  /* if this stage has been created on a backend that does not
+   * support multiple stages then it becomes the default stage
+   * as well; any other attempt at creating a ClutterStage will
+   * fail.
+   */
+  if (!clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
+    {
+      if (G_UNLIKELY (clutter_stage_manager_get_default_stage (stage_manager) != NULL))
+        {
+          g_error ("Unable to create another stage: the backend of "
+                   "type '%s' does not support multiple stages. Use "
+                   "clutter_stage_manager_get_default_stage() instead "
+                   "to access the stage singleton.",
+                   G_OBJECT_TYPE_NAME (clutter_get_default_backend ()));
+        }
+
+      _clutter_stage_manager_set_default_stage (stage_manager, self);
+    }
+
+  G_OBJECT_CLASS (clutter_stage_parent_class)->constructed (gobject);
+}
+
 static void
 clutter_stage_set_property (GObject      *object,
 			    guint         prop_id,
@@ -1647,6 +1692,10 @@ clutter_stage_dispose (GObject *object)
 
   clutter_actor_hide (CLUTTER_ACTOR (object));
 
+  /* remove_stage() will unref() the stage instance, so we need to
+   * add a reference here to keep it temporarily alive
+   */
+  g_object_ref (object);
   stage_manager = clutter_stage_manager_get_default ();
   _clutter_stage_manager_remove_stage (stage_manager, stage);
 
@@ -1696,6 +1745,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   GParamSpec *pspec;
 
+  gobject_class->constructed = clutter_stage_constructed;
   gobject_class->set_property = clutter_stage_set_property;
   gobject_class->get_property = clutter_stage_get_property;
   gobject_class->dispose = clutter_stage_dispose;
@@ -2036,9 +2086,11 @@ clutter_stage_notify_min_size (ClutterStage *self)
 static void
 clutter_stage_init (ClutterStage *self)
 {
+  cairo_rectangle_int_t geom = { 0, };
   ClutterStagePrivate *priv;
+  ClutterStageWindow *impl;
   ClutterBackend *backend;
-  cairo_rectangle_int_t geom;
+  GError *error;
 
   /* a stage is a top-level object */
   CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IS_TOPLEVEL);
@@ -2047,25 +2099,35 @@ clutter_stage_init (ClutterStage *self)
 
   CLUTTER_NOTE (BACKEND, "Creating stage from the default backend");
   backend = clutter_get_default_backend ();
-  priv->impl = _clutter_backend_create_stage (backend, self, NULL);
-  if (!priv->impl)
-    {
-      g_warning ("Unable to create a new stage, falling back to the "
-                 "default stage.");
-      priv->impl = _clutter_stage_get_default_window ();
 
-      /* at this point we must have a default stage, or we're screwed */
+  error = NULL;
-      g_assert (priv->impl != NULL);
+  impl = _clutter_backend_create_stage (backend, self, &error);
+
+  if (G_LIKELY (impl != NULL))
+    {
+      _clutter_stage_set_window (self, impl);
+      _clutter_stage_window_get_geometry (priv->impl, &geom);
+    }
+  else
+    {
+      if (error != NULL)
+        {
+          g_critical ("Unable to create a new stage implementation: %s",
+                      error->message);
+          g_error_free (error);
+        }
+      else
+        g_critical ("Unable to create a new stage implementation.");
     }
 
   priv->event_queue = g_queue_new ();
 
-  priv->is_fullscreen          = FALSE;
+  priv->is_fullscreen = FALSE;
-  priv->is_user_resizable      = FALSE;
+  priv->is_user_resizable = FALSE;
-  priv->is_cursor_visible      = TRUE;
+  priv->is_cursor_visible = TRUE;
-  priv->use_fog                = FALSE;
+  priv->use_fog = FALSE;
   priv->throttle_motion_events = TRUE;
-  priv->min_size_changed       = FALSE;
+  priv->min_size_changed = FALSE;
 
   /* XXX - we need to keep the invariant that calling
    * clutter_set_motion_event_enabled() before the stage creation
@@ -2077,10 +2139,8 @@ clutter_stage_init (ClutterStage *self)
 
   priv->color = default_stage_color;
 
-  _clutter_stage_window_get_geometry (priv->impl, &geom);
-
   priv->perspective.fovy   = 60.0; /* 60 Degrees */
-  priv->perspective.aspect = (float)geom.width / (float)geom.height;
+  priv->perspective.aspect = (float) geom.width / (float) geom.height;
   priv->perspective.z_near = 0.1;
   priv->perspective.z_far  = 100.0;
 
@@ -2133,16 +2193,29 @@ clutter_stage_init (ClutterStage *self)
 /**
  * clutter_stage_get_default:
  *
- * Returns the main stage. The default #ClutterStage is a singleton,
+ * Retrieves a #ClutterStage singleton.
- * so the stage will be created the first time this function is
- * called (typically, inside clutter_init()); all the subsequent
- * calls to clutter_stage_get_default() will return the same instance.
  *
- * Clutter guarantess the existence of the default stage.
+ * This function is not as useful as it sounds, and will most likely
+ * by deprecated in the future. Application code should only create
+ * a #ClutterStage instance using clutter_stage_new(), and manage the
+ * lifetime of the stage manually.
+ *
+ * The default stage singleton has a platform-specific behaviour: on
+ * platforms without the %CLUTTER_FEATURE_STAGE_MULTIPLE feature flag
+ * set, the first #ClutterStage instance will also be set to be the
+ * default stage instance, and this function will always return a
+ * pointer to it.
+ *
+ * On platforms with the %CLUTTER_FEATURE_STAGE_MULTIPLE feature flag
+ * set, the default stage will be created by the first call to this
+ * function, and every following call will return the same pointer to
+ * it.
  *
  * Return value: (transfer none) (type Clutter.Stage): the main
- *   #ClutterStage.  You should never destroy or unref the returned
+ *   #ClutterStage. You should never destroy or unref the returned
  *   actor.
+ *
+ * Deprecated: 1.10: Use clutter_stage_new() instead.
  */
 ClutterActor *
 clutter_stage_get_default (void)
@@ -3149,16 +3222,6 @@ G_DEFINE_BOXED_TYPE (ClutterFog, clutter_fog, clutter_fog_copy, clutter_fog_free
 ClutterActor *
 clutter_stage_new (void)
 {
-  if (!clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
-    {
-      g_warning ("Unable to create a new stage: the %s backend does not "
-                 "support multiple stages.",
-                 CLUTTER_FLAVOUR);
-      return NULL;
-    }
-
-  /* The stage manager will grab the floating reference when the stage
-     is added to it in the constructor */
   return g_object_new (CLUTTER_TYPE_STAGE, NULL);
 }
 
@@ -3430,10 +3493,9 @@ clutter_stage_ensure_redraw (ClutterStage *stage)
  * <note>Applications should call clutter_actor_queue_redraw() and not
  * this function.</note>
  *
- * <note>This function is just a wrapper for clutter_actor_queue_redraw()
- * and should probably go away.</note>
- *
  * Since: 0.8
+ *
+ * Deprecated: 1.10: Use clutter_actor_queue_redraw() instead.
  */
 void
 clutter_stage_queue_redraw (ClutterStage *stage)
@@ -3453,24 +3515,17 @@ clutter_stage_queue_redraw (ClutterStage *stage)
  * Return value: %TRUE if the passed stage is the default one
  *
  * Since: 0.8
+ *
+ * Deprecated: 1.10: Track the stage pointer inside your application
+ *   code, or use clutter_actor_get_stage() to retrieve the stage for
+ *   a given actor.
  */
 gboolean
 clutter_stage_is_default (ClutterStage *stage)
 {
-  ClutterStageManager *stage_manager;
-  ClutterStageWindow *impl;
-
   g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
 
-  stage_manager = clutter_stage_manager_get_default ();
+  return stage_is_default (stage);
-  if (stage != clutter_stage_manager_get_default_stage (stage_manager))
-    return FALSE;
-
-  impl = _clutter_stage_get_window (stage);
-  if (impl != _clutter_stage_get_default_window ())
-    return FALSE;
-
-  return TRUE;
 }
 
 void
@@ -3480,7 +3535,7 @@ _clutter_stage_set_window (ClutterStage       *stage,
   g_return_if_fail (CLUTTER_IS_STAGE (stage));
   g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (stage_window));
 
-  if (stage->priv->impl)
+  if (stage->priv->impl != NULL)
     g_object_unref (stage->priv->impl);
 
   stage->priv->impl = stage_window;
@@ -3497,9 +3552,14 @@ _clutter_stage_get_window (ClutterStage *stage)
 ClutterStageWindow *
 _clutter_stage_get_default_window (void)
 {
-  ClutterActor *stage = clutter_stage_get_default ();
+  ClutterStageManager *manager = clutter_stage_manager_get_default ();
+  ClutterStage *stage;
 
-  return _clutter_stage_get_window (CLUTTER_STAGE (stage));
+  stage = clutter_stage_manager_get_default_stage (manager);
+  if (stage == NULL)
+    return NULL;
+
+  return _clutter_stage_get_window (stage);
 }
 
 /**

clutter/clutter-stage.h

@@ -146,7 +146,6 @@ GType         clutter_perspective_get_type    (void) G_GNUC_CONST;
 GType         clutter_fog_get_type            (void) G_GNUC_CONST;
 GType         clutter_stage_get_type          (void) G_GNUC_CONST;
 
-ClutterActor *clutter_stage_get_default       (void);
 ClutterActor *clutter_stage_new               (void);
 
 void          clutter_stage_set_color         (ClutterStage       *stage,
@@ -193,8 +192,6 @@ void                  clutter_stage_set_key_focus      (ClutterStage *stage,
                                                         ClutterActor *actor);
 ClutterActor *        clutter_stage_get_key_focus      (ClutterStage *stage);
 void                  clutter_stage_ensure_current     (ClutterStage *stage);
-void                  clutter_stage_queue_redraw       (ClutterStage *stage);
-gboolean              clutter_stage_is_default         (ClutterStage *stage);
 void                  clutter_stage_ensure_viewport    (ClutterStage *stage);
 void                  clutter_stage_ensure_redraw      (ClutterStage *stage);
 

clutter/deprecated/clutter-stage.h

@@ -40,6 +40,15 @@ G_BEGIN_DECLS
 
 #endif /* CLUTTER_DISABLE_DEPRECATED */
 
+CLUTTER_DEPRECATED_FOR(clutter_stage_new)
+ClutterActor *  clutter_stage_get_default       (void);
+
+CLUTTER_DEPRECATED
+gboolean        clutter_stage_is_default        (ClutterStage *stage);
+
+CLUTTER_DEPRECATED_FOR(clutter_actor_queue_redraw)
+void            clutter_stage_queue_redraw      (ClutterStage *stage);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_STAGE_DEPRECATED_H__ */

clutter/evdev/clutter-device-manager-evdev.c

@@ -44,6 +44,7 @@
 #include "clutter-input-device-evdev.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
+#include "clutter-stage-manager.h"
 #include "clutter-xkb-utils.h"
 
 #include "clutter-device-manager-evdev.h"
@@ -268,9 +269,14 @@ clutter_event_dispatch (GSource     *g_source,
   ClutterEvent *event;
   gint len, i, dx = 0, dy = 0;
   uint32_t _time;
+  ClutterStageManager *stage_manager;
+  ClutterStage *default_stage;
 
   clutter_threads_enter ();
 
+  stage_manager = clutter_stage_manager_get_default ();
+  default_stage = clutter_stage_manager_get_default_stage (stage_manager);
+
   /* Don't queue more events if we haven't finished handling the previous batch
    */
   if (!clutter_events_pending ())
@@ -303,6 +309,10 @@ clutter_event_dispatch (GSource     *g_source,
          goto out;
        }
 
+       /* Drop events if we don't have any stage to forward them to */
+       if (!default_stage)
+         goto out;
+
        for (i = 0; i < len / sizeof (ev[0]); i++)
          {
            struct input_event *e = &ev[i];
@@ -530,7 +540,6 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
   ClutterDeviceManager *manager = (ClutterDeviceManager *) manager_evdev;
   ClutterInputDeviceType type = CLUTTER_EXTENSION_DEVICE;
   ClutterInputDevice *device;
-  ClutterActor *stage;
   const gchar *device_file, *sysfs_path, *device_name;
 
   device_file = g_udev_device_get_device_file (udev_device);
@@ -573,10 +582,6 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
                          "enabled", TRUE,
                          NULL);
 
-  /* Always associate the device to the default stage */
-  stage = clutter_stage_get_default ();
-  _clutter_input_device_set_stage (device, CLUTTER_STAGE (stage));
-
   _clutter_device_manager_add_device (manager, device);
 
   CLUTTER_NOTE (EVENT, "Added device %s, type %d, sysfs %s",

doc/cookbook/examples/animations-looping-animator.c

@@ -29,7 +29,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 300, 200);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-looping-implicit.c

@@ -39,7 +39,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 300, 200);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-looping-state.c

@@ -40,7 +40,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 300, 200);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-moving-animator.c

@@ -79,7 +79,7 @@ if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
   state->animator = clutter_animator_new ();
   clutter_animator_set_duration (state->animator, 500);
 
-  state->stage = clutter_stage_get_default ();
+  state->stage = clutter_stage_new ();
   clutter_actor_set_size (state->stage, 400, 350);
   clutter_stage_set_color (CLUTTER_STAGE (state->stage), &stage_color);
   g_signal_connect (state->stage,

doc/cookbook/examples/animations-moving-implicit.c

@@ -47,7 +47,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 500, 500);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-moving-state.c

@@ -30,7 +30,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 650, 500);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-rotating.c

@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   texture = clutter_texture_new ();

doc/cookbook/examples/animations-scaling-zoom.c

@@ -109,7 +109,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, STAGE_SIDE, STAGE_SIDE);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/animations-scaling.c

@@ -117,7 +117,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 350, 350);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/events-buttons-click.c

@@ -26,7 +26,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/events-buttons-lasso.c

@@ -125,7 +125,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 320, 240);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/events-buttons.c

@@ -60,7 +60,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/events-mouse-scroll.c

@@ -78,8 +78,9 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* the scrollable actor */
   texture = clutter_texture_new ();

doc/cookbook/examples/events-pointer-motion-crossing.c

@@ -37,7 +37,7 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_stage_set_title (CLUTTER_STAGE (stage), "btn");
 

doc/cookbook/examples/events-pointer-motion-scribbler.c

@@ -115,9 +115,10 @@ main (int argc, char *argv[])
   cogl_path_new ();
   context->cogl_path = cogl_get_path ();
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   rect = clutter_rectangle_new_with_color (&actor_color);
   clutter_actor_set_size (rect, 300, 300);

doc/cookbook/examples/events-pointer-motion-stacked.c

@@ -53,9 +53,10 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 300, 300);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   r1 = clutter_rectangle_new_with_color (&red);
   clutter_actor_set_size (r1, 150, 150);

doc/cookbook/examples/events-pointer-motion.c

@@ -32,9 +32,10 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   rectangle = clutter_rectangle_new_with_color (&rectangle_color);
   clutter_actor_set_size (rectangle, 300, 300);

doc/cookbook/examples/layouts-bind-constraint-allocation.c

@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/layouts-box-menu.c

@@ -91,7 +91,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/layouts-box-property-effects.c

@@ -322,7 +322,7 @@ main (int   argc,
   state->expand = FALSE;
   state->x_align = CLUTTER_BOX_ALIGNMENT_START;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, STAGE_SIDE, STAGE_SIDE);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/layouts-box.c

@@ -21,7 +21,7 @@ main (int   argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);

doc/cookbook/examples/layouts-stacking-diff-sized-actors.c

@@ -17,8 +17,9 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_START,
                                    CLUTTER_BIN_ALIGNMENT_START);

doc/cookbook/examples/layouts-stacking.c

@@ -28,8 +28,9 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, STAGE_SIDE, STAGE_SIDE);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
                                    CLUTTER_BIN_ALIGNMENT_CENTER);

doc/cookbook/examples/textures-crossfade-cogl.c

@@ -149,7 +149,7 @@ main (int argc, char *argv[])
    * assign the material we created earlier to the Texture for painting
    * it
    */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "cross-fade");
   clutter_actor_set_size (stage, 400, 300);
   clutter_actor_show (stage);

doc/cookbook/examples/textures-crossfade-slideshow.c

@@ -125,7 +125,7 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
   clutter_stage_set_title (CLUTTER_STAGE (stage), "cross-fade");
   clutter_actor_set_size (stage, stage_side, stage_side);

doc/cookbook/examples/textures-crossfade.c

@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "cross-fade");
   clutter_actor_set_size (stage, 400, 300);
   clutter_actor_show (stage);

doc/cookbook/examples/textures-split-go.c

@@ -117,9 +117,10 @@ main (int    argc,
   if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_get_size (stage, &stage_width, &stage_height);
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Animate sub-textures");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Load smiley.png, creating a new ClutterTexture, get its size and the
    * Cogl texture handle */

doc/cookbook/examples/textures-sub-texture.c

@@ -12,8 +12,9 @@ main (int argc, char **argv)
     return 1;
 
   /* Get the default stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Sub-texture");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Create a new ClutterTexture that shows smiley.png */
   image = clutter_texture_new_from_file ("smiley.png", NULL);

doc/reference/clutter/clutter-animation-tutorial.xml

@@ -302,7 +302,8 @@ main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   actor = clutter_texture_new_from_file ("ohpowers.png", NULL);
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);

tests/accessibility/cally-atkcomponent-example.c

@@ -45,11 +45,14 @@ main (int argc, char *argv[])
 
   cally_util_a11y_init (&argc, &argv);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkComponent Test");
   clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White);
   clutter_actor_set_size (stage, WIDTH, HEIGHT);
 
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   button1 = clutter_rectangle_new_with_color (CLUTTER_COLOR_Yellow);
   clutter_actor_set_size (button1, SIZE, SIZE);
 

tests/accessibility/cally-atkeditabletext-example.c

@@ -148,15 +148,14 @@ _create_button (const gchar *text)
   ClutterActor *button     = NULL;
   ClutterActor *rectangle  = NULL;
   ClutterActor *label      = NULL;
-  ClutterColor  color_rect = { 0x00, 0xff, 0xff, 0xff };
-  ClutterColor  color_label = { 0x00, 0x00, 0x00, 0xff };
 
   button = clutter_group_new ();
-  rectangle = clutter_rectangle_new_with_color (&color_rect);
+  rectangle = clutter_rectangle_new_with_color (CLUTTER_COLOR_Magenta);
   clutter_actor_set_size (rectangle, 375, 35);
 
   label = clutter_text_new_full ("Sans Bold 32px",
-                                 text, &color_label);
+                                 text,
+                                 CLUTTER_COLOR_Black);
   clutter_container_add_actor (CLUTTER_CONTAINER (button), rectangle);
   clutter_container_add_actor (CLUTTER_CONTAINER (button), label);
   clutter_actor_set_reactive (button, TRUE);
@@ -164,33 +163,30 @@ _create_button (const gchar *text)
   return button;
 }
 
-
 static void
 make_ui (ClutterActor *stage)
 {
-  ClutterColor  color_stage = { 0x00, 0x00, 0x00, 0xff };
-  ClutterColor  color_text  = { 0xff, 0x00, 0x00, 0xff };
-  ClutterColor  color_sel   = { 0x00, 0xff, 0x00, 0x55 };
   ClutterActor *button      = NULL;
 
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &color_stage);
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkEditable Test");
+  clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White);
   clutter_actor_set_size (stage, WIDTH, HEIGHT);
 
   /* text */
   text_actor = clutter_text_new_full ("Sans Bold 32px",
                                       "Lorem ipsum dolor sit amet",
-                                      &color_text);
+                                      CLUTTER_COLOR_Red);
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_actor);
 
   /* text_editable */
   text_editable_actor = clutter_text_new_full ("Sans Bold 32px",
                                                "consectetur adipisicing elit",
-                                               &color_text);
+                                               CLUTTER_COLOR_Red);
   clutter_actor_set_position (text_editable_actor, 0, 100);
   clutter_text_set_editable (CLUTTER_TEXT (text_editable_actor), TRUE);
   clutter_text_set_selectable (CLUTTER_TEXT (text_editable_actor), TRUE);
   clutter_text_set_selection_color (CLUTTER_TEXT (text_editable_actor),
-                                    &color_sel);
+                                    CLUTTER_COLOR_Green);
   clutter_text_set_activatable (CLUTTER_TEXT (text_editable_actor),
                                 TRUE);
   clutter_text_set_line_wrap (CLUTTER_TEXT (text_editable_actor), TRUE);
@@ -256,7 +252,8 @@ main (int argc, char *argv[])
 
   cally_util_a11y_init (&argc, &argv);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   make_ui (stage);
 

tests/accessibility/cally-atkevents-example.c

@@ -88,7 +88,6 @@ make_ui (ClutterActor *stage)
   ClutterActor    *editable      = NULL;
   ClutterActor    *rectangle     = NULL;
   ClutterActor    *label         = NULL;
-  ClutterColor     color_text    = { 0xff, 0x00, 0x00, 0xff };
   ClutterColor     color_sel     = { 0x00, 0xff, 0x00, 0x55 };
   ClutterColor     color_label   = { 0x00, 0xff, 0x55, 0xff };
   ClutterColor     color_rect    = { 0x00, 0xff, 0xff, 0x55 };
@@ -111,7 +110,7 @@ make_ui (ClutterActor *stage)
       /* editable */
       editable = clutter_text_new_full ("Sans Bold 32px",
                                         "ddd",
-                                        &color_text);
+                                        CLUTTER_COLOR_Red);
       clutter_actor_set_position (editable, 150, editable_geom_y);
       clutter_actor_set_size (editable, 500, 75);
       clutter_text_set_editable (CLUTTER_TEXT (editable), TRUE);
@@ -138,8 +137,8 @@ make_ui (ClutterActor *stage)
 int
 main (int argc, char *argv[])
 {
-  ClutterActor *stage         = NULL;
+  ClutterActor *stage, *stage_main;
-  Data data1, data2,data3;
+  Data data1, data2, data3;
   guint id_2 = 0;
 
   g_set_application_name ("AtkText");
@@ -171,14 +170,19 @@ main (int argc, char *argv[])
   atk_add_global_event_listener (window_event_listener, "Atk:AtkWindow:activate");
   atk_add_global_event_listener (window_event_listener, "Atk:AtkWindow:deactivate");
 
-  stage = clutter_stage_get_default ();
+  stage_main = clutter_stage_new ();
-  make_ui (stage);
+  clutter_stage_set_title (CLUTTER_STAGE (stage_main), "Cally - AtkEvents/1");
+  g_signal_connect (stage_main, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+  make_ui (stage_main);
 
-  clutter_actor_show_all (stage);
+  clutter_actor_show_all (stage_main);
 
   if (clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
     {
       stage = clutter_stage_new ();
+      clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkEvents/2");
+      g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
       make_ui (stage);
       clutter_actor_show_all (stage);
     }

tests/accessibility/cally-atktext-example.c

@@ -237,13 +237,12 @@ make_ui (ClutterActor *stage)
                           G_CALLBACK (button_press_cb), NULL);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
-
 }
 
 int
 main (int argc, char *argv[])
 {
-  ClutterActor *stage         = NULL;
+  ClutterActor *stage;
 
   g_set_application_name ("AtkText");
 
@@ -252,7 +251,9 @@ main (int argc, char *argv[])
 
   cally_util_a11y_init (&argc, &argv);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkText Test");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   make_ui (stage);
 

tests/accessibility/cally-clone-example.c

@@ -93,7 +93,7 @@ make_ui (ClutterActor *stage)
 int
 main (int argc, char *argv[])
 {
-  ClutterActor *stage         = NULL;
+  ClutterActor *stage;
 
   g_set_application_name ("Clone Example");
 
@@ -102,7 +102,10 @@ main (int argc, char *argv[])
 
   cally_util_a11y_init (&argc, &argv);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - Clone Test");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   make_ui (stage);
 
   clutter_actor_show_all (stage);

tests/conform/test-actor-invariants.c

@@ -44,7 +44,7 @@ test_realized (TestConformSimpleFixture *fixture,
   ClutterActor *actor;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   actor = clutter_rectangle_new ();
 
@@ -60,7 +60,7 @@ test_realized (TestConformSimpleFixture *fixture,
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
   g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
 
-  clutter_actor_destroy (actor);
+  clutter_actor_destroy (stage);
 }
 
 void
@@ -70,7 +70,7 @@ test_mapped (TestConformSimpleFixture *fixture,
   ClutterActor *actor;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_show (stage);
 
   actor = clutter_rectangle_new ();
@@ -85,8 +85,7 @@ test_mapped (TestConformSimpleFixture *fixture,
   g_assert (CLUTTER_ACTOR_IS_MAPPED (actor));
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
 
-  clutter_actor_destroy (actor);
+  clutter_actor_destroy (stage);
-  clutter_actor_hide (stage);
 }
 
 void
@@ -96,7 +95,7 @@ test_realize_not_recursive (TestConformSimpleFixture *fixture,
   ClutterActor *actor, *group;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_show (stage);
 
   group = clutter_group_new ();
@@ -126,8 +125,7 @@ test_realize_not_recursive (TestConformSimpleFixture *fixture,
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
   g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
 
-  clutter_actor_destroy (group);
+  clutter_actor_destroy (stage);
-  clutter_actor_hide (stage);
 }
 
 void
@@ -137,7 +135,7 @@ test_map_recursive (TestConformSimpleFixture *fixture,
   ClutterActor *actor, *group;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_show (stage);
 
   group = clutter_group_new ();
@@ -177,8 +175,7 @@ test_map_recursive (TestConformSimpleFixture *fixture,
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (group));
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
 
-  clutter_actor_destroy (group);
+  clutter_actor_destroy (stage);
-  clutter_actor_hide (stage);
 }
 
 void
@@ -189,7 +186,7 @@ test_show_on_set_parent (TestConformSimpleFixture *fixture,
   gboolean show_on_set_parent;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   group = clutter_group_new ();
 
@@ -227,6 +224,7 @@ test_show_on_set_parent (TestConformSimpleFixture *fixture,
 
   clutter_actor_destroy (actor);
   clutter_actor_destroy (group);
+  clutter_actor_destroy (stage);
 }
 
 void
@@ -238,7 +236,7 @@ test_clone_no_map (TestConformSimpleFixture *fixture,
   ClutterActor *actor;
   ClutterActor *clone;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_show (stage);
 
   group = clutter_group_new ();
@@ -262,8 +260,7 @@ test_clone_no_map (TestConformSimpleFixture *fixture,
 
   clutter_actor_destroy (CLUTTER_ACTOR (clone));
   clutter_actor_destroy (CLUTTER_ACTOR (group));
-
+  clutter_actor_destroy (stage);
-  clutter_actor_hide (stage);
 }
 
 void
@@ -331,3 +328,20 @@ test_contains (TestConformSimpleFixture *fixture,
                        ==,
                        expected_results[x * 10 + y]);
 }
+
+void
+default_stage (TestConformSimpleFixture *fixture,
+               gconstpointer             data)
+{
+  ClutterActor *stage, *def_stage;
+
+  stage = clutter_stage_new ();
+  def_stage = clutter_stage_get_default ();
+
+  if (clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
+    g_assert (stage != def_stage);
+  else
+    g_assert (stage == def_stage);
+
+  g_assert (CLUTTER_ACTOR_IS_REALIZED (def_stage));
+}

tests/conform/test-anchors.c

@@ -677,7 +677,7 @@ actor_anchors (void)
   TestState state;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   state.rect = clutter_rectangle_new ();
   clutter_container_add (CLUTTER_CONTAINER (stage), state.rect, NULL);
@@ -699,6 +699,6 @@ actor_anchors (void)
 
   g_idle_remove_by_data (&state);
 
-  clutter_actor_destroy (state.rect);
+  clutter_actor_destroy (stage);
 }
 

tests/conform/test-cally-text.c

@@ -279,7 +279,7 @@ cally_text (void)
 
   memset (&data, 0, sizeof (data));
 
-  data.stage = clutter_stage_get_default ();
+  data.stage = clutter_stage_new ();
 
   data.default_attributes = default_attributes;
   data.run_attributes = build_attribute_set ("fg-color", "0,0,0", NULL);
@@ -294,9 +294,8 @@ cally_text (void)
   data.extents_height = 17;
   clutter_actor_set_position (data.label, 20, 100);
 
-
   memset (&data1, 0, sizeof (data1));
-  data1.stage = clutter_stage_get_default ();
+  data1.stage = data.stage;
   data1.default_attributes = default_attributes;
   data1.run_attributes = build_attribute_set ("bg-color", "0,65535,0",
                                               "fg-color", "65535,65535,0",
@@ -314,11 +313,12 @@ cally_text (void)
   clutter_actor_set_position (data1.label, 20, 200);
   data.next = &data1;
 
-
   clutter_actor_show (data.stage);
   clutter_threads_add_idle ((GSourceFunc) do_tests, &data);
   clutter_main ();
 
+  clutter_actor_destroy (data.stage);
+
   if (g_test_verbose ())
     g_print ("\nOverall result: ");
 

tests/conform/test-clutter-cairo-texture.c

@@ -169,7 +169,7 @@ test_clutter_cairo_texture (TestConformSimpleFixture *fixture,
   unsigned int paint_handler;
 
   state.frame = 0;
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
   state.progress = TEST_BEFORE_DRAW_FIRST_FRAME;
 
   state.ct = clutter_cairo_texture_new (BLOCK_SIZE * 2, BLOCK_SIZE);
@@ -192,5 +192,7 @@ test_clutter_cairo_texture (TestConformSimpleFixture *fixture,
 
   if (g_test_verbose ())
     g_print ("OK\n");
+
+  clutter_actor_destroy (state.stage);
 }
 

tests/conform/test-clutter-texture.c

@@ -33,7 +33,7 @@ test_texture_pick_with_alpha (TestConformSimpleFixture *fixture,
                               gconstpointer data)
 {
   ClutterTexture *tex = CLUTTER_TEXTURE (clutter_texture_new ());
-  ClutterStage *stage = CLUTTER_STAGE (clutter_stage_get_default ());
+  ClutterStage *stage = CLUTTER_STAGE (clutter_stage_new ());
   ClutterActor *actor;
 
   clutter_texture_set_cogl_texture (tex, make_texture ());
@@ -81,7 +81,7 @@ test_texture_pick_with_alpha (TestConformSimpleFixture *fixture,
     g_print ("actor @ (10, 10) = %p\n", actor);
   g_assert (actor == CLUTTER_ACTOR (tex));
 
-  clutter_actor_destroy (CLUTTER_ACTOR (tex));
+  clutter_actor_destroy (CLUTTER_ACTOR (stage));
 
   if (g_test_verbose ())
     g_print ("OK\n");

tests/conform/test-cogl-backface-culling.c

@@ -298,7 +298,7 @@ test_cogl_backface_culling (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_get_size (stage, &stage_width, &stage_height);
 
   state.offscreen = COGL_INVALID_HANDLE;
@@ -333,7 +333,8 @@ test_cogl_backface_culling (TestConformSimpleFixture *fixture,
   cogl_handle_unref (state.offscreen_tex);
   cogl_handle_unref (state.texture);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-blend-strings.c

@@ -405,7 +405,7 @@ test_cogl_blend_strings (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -426,7 +426,8 @@ test_cogl_blend_strings (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-depth-test.c

@@ -308,7 +308,7 @@ test_cogl_depth_test (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -329,7 +329,8 @@ test_cogl_depth_test (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-just-vertex-shader.c

@@ -112,11 +112,11 @@ test_cogl_just_vertex_shader (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   guint paint_handler;
 
-  stage = clutter_stage_get_default ();
-
   /* If shaders aren't supported then we can't run the test */
   if (cogl_features_available (COGL_FEATURE_SHADERS_GLSL))
     {
+      stage = clutter_stage_new ();
+
       clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
       paint_handler = g_signal_connect_after (stage, "paint",
@@ -128,10 +128,11 @@ test_cogl_just_vertex_shader (TestConformSimpleFixture *fixture,
 
       g_signal_handler_disconnect (stage, paint_handler);
 
+      clutter_actor_destroy (stage);
+
       if (g_test_verbose ())
         g_print ("OK\n");
     }
   else if (g_test_verbose ())
     g_print ("Skipping\n");
 }
-

tests/conform/test-cogl-materials.c

@@ -333,7 +333,7 @@ test_cogl_materials (TestConformSimpleFixture *fixture,
 
   test_conform_get_gl_functions (&gl_functions);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -354,7 +354,8 @@ test_cogl_materials (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-multitexture.c

@@ -181,7 +181,7 @@ test_cogl_multitexture (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
@@ -201,6 +201,8 @@ test_cogl_multitexture (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-cogl-npot-texture.c

@@ -32,15 +32,18 @@ static const ClutterColor corner_colors[PARTS * PARTS] =
 
 typedef struct _TestState
 {
+  ClutterActor *stage;
   guint frame;
   CoglHandle texture;
 } TestState;
 
 static gboolean
-validate_part (int xnum, int ynum, const ClutterColor *color)
+validate_part (ClutterActor *stage,
+               int xnum,
+               int ynum,
+               const ClutterColor *color)
 {
   guchar *pixels, *p;
-  ClutterActor *stage = clutter_stage_get_default ();
   gboolean ret = TRUE;
 
   /* Read the appropriate part but skip out a few pixels around the
@@ -75,10 +78,10 @@ validate_result (TestState *state)
 {
   /* Validate that all four corners of the texture are drawn in the
      right color */
-  g_assert (validate_part (0, 0, corner_colors + 0));
+  g_assert (validate_part (state->stage, 0, 0, corner_colors + 0));
-  g_assert (validate_part (1, 0, corner_colors + 1));
+  g_assert (validate_part (state->stage, 1, 0, corner_colors + 1));
-  g_assert (validate_part (0, 1, corner_colors + 2));
+  g_assert (validate_part (state->stage, 0, 1, corner_colors + 2));
-  g_assert (validate_part (1, 1, corner_colors + 3));
+  g_assert (validate_part (state->stage, 1, 1, corner_colors + 3));
 
   /* Comment this out if you want visual feedback of what this test
    * paints.
@@ -208,7 +211,7 @@ test_cogl_npot_texture (TestConformSimpleFixture *fixture,
 
   state.texture = make_texture ();
 
-  stage = clutter_stage_get_default ();
+  state.stage = stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
@@ -230,7 +233,8 @@ test_cogl_npot_texture (TestConformSimpleFixture *fixture,
 
   cogl_handle_unref (state.texture);
 
+  clutter_actor_destroy (state.stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-offscreen.c

@@ -142,7 +142,7 @@ test_cogl_offscreen (TestConformSimpleFixture *fixture,
   guint idle_source;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
   /* We force continuous redrawing of the stage, since we need to skip
@@ -156,12 +156,8 @@ test_cogl_offscreen (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
-  /* Remove all of the actors from the stage */
+  clutter_actor_destroy (stage);
-  clutter_container_foreach (CLUTTER_CONTAINER (stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-path.c

@@ -212,7 +212,7 @@ test_cogl_path (TestConformSimpleFixture *fixture,
   unsigned int paint_handler;
 
   state.frame = 0;
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
 
   /* We force continuous redrawing of the stage, since we need to skip
@@ -228,7 +228,8 @@ test_cogl_path (TestConformSimpleFixture *fixture,
   g_signal_handler_disconnect (state.stage, paint_handler);
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (state.stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-pipeline-user-matrix.c

@@ -119,7 +119,7 @@ test_cogl_pipeline_user_matrix (TestConformSimpleFixture *fixture,
   guint idle_source;
   guint paint_handler;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
@@ -139,6 +139,8 @@ test_cogl_pipeline_user_matrix (TestConformSimpleFixture *fixture,
   g_source_remove (idle_source);
   g_signal_handler_disconnect (stage, paint_handler);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-cogl-pixel-buffer.c

@@ -286,7 +286,7 @@ test_cogl_pixel_array (TestConformSimpleFixture *fixture,
 
   state.frame = 0;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
 
   create_map_tile (&tiles[TILE_MAP]);
 #if 0
@@ -319,12 +319,8 @@ test_cogl_pixel_array (TestConformSimpleFixture *fixture,
       cogl_handle_unref (state.tiles[i].texture);
     }
 
-  /* Remove all of the actors from the stage */
+  clutter_actor_destroy (state.stage);
-  clutter_container_foreach (CLUTTER_CONTAINER (state.stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-premult.c

@@ -340,7 +340,7 @@ test_cogl_premult (TestConformSimpleFixture *fixture,
   cogl_material_set_layer_combine (state.passthrough_material, 0,
                                    "RGBA = REPLACE (TEXTURE)", NULL);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -361,7 +361,8 @@ test_cogl_premult (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-primitive.c

@@ -211,7 +211,7 @@ test_cogl_primitive (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   guint paint_handler;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
@@ -224,7 +224,8 @@ test_cogl_primitive (TestConformSimpleFixture *fixture,
 
   g_signal_handler_disconnect (stage, paint_handler);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-readpixels.c

@@ -153,7 +153,7 @@ test_cogl_readpixels (TestConformSimpleFixture *fixture,
   guint idle_source;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
   /* We force continuous redrawing of the stage, since we need to skip
@@ -167,12 +167,8 @@ test_cogl_readpixels (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
-  /* Remove all of the actors from the stage */
+  clutter_actor_destroy (stage);
-  clutter_container_foreach (CLUTTER_CONTAINER (stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-sub-texture.c

@@ -339,7 +339,7 @@ test_cogl_sub_texture (TestConformSimpleFixture *fixture,
 
   state.frame = 0;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
   state.tex = create_source ();
 
   clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
@@ -361,12 +361,8 @@ test_cogl_sub_texture (TestConformSimpleFixture *fixture,
 
   cogl_handle_unref (state.tex);
 
-  /* Remove all of the actors from the stage */
+  clutter_actor_destroy (state.stage);
-  clutter_container_foreach (CLUTTER_CONTAINER (state.stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-texture-3d.c

@@ -204,12 +204,11 @@ test_cogl_texture_3d (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   guint paint_handler;
 
-  stage = clutter_stage_get_default ();
-
   /* Check whether GL supports the rectangle extension. If not we'll
      just assume the test passes */
   if (cogl_features_available (COGL_FEATURE_TEXTURE_3D))
     {
+      stage = clutter_stage_new ();
       clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
       paint_handler = g_signal_connect_after (stage, "paint",
@@ -221,10 +220,11 @@ test_cogl_texture_3d (TestConformSimpleFixture *fixture,
 
       g_signal_handler_disconnect (stage, paint_handler);
 
+      clutter_actor_destroy (stage);
+
       if (g_test_verbose ())
         g_print ("OK\n");
     }
   else if (g_test_verbose ())
     g_print ("Skipping\n");
 }
-

tests/conform/test-cogl-texture-get-set-data.c

@@ -150,7 +150,7 @@ test_cogl_texture_get_set_data (TestConformSimpleFixture *fixture,
   /* We create a stage even though we don't usually need it so that if
      the draw-and-read texture fallback is needed then it will have
      something to draw to */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   paint_handler = g_signal_connect_after (stage, "paint",
                                           G_CALLBACK (paint_cb), NULL);
@@ -161,6 +161,8 @@ test_cogl_texture_get_set_data (TestConformSimpleFixture *fixture,
 
   g_signal_handler_disconnect (stage, paint_handler);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-cogl-texture-mipmaps.c

@@ -111,8 +111,7 @@ test_cogl_texture_mipmaps (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
-
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
   group = clutter_group_new ();
@@ -131,6 +130,8 @@ test_cogl_texture_mipmaps (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-cogl-texture-pixmap-x11.c

@@ -202,44 +202,44 @@ test_cogl_texture_pixmap_x11 (TestConformSimpleFixture *fixture,
                               gconstpointer data)
 {
 #ifdef CLUTTER_WINDOWING_X11
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    {
+      TestState state;
+      guint idle_handler;
+      guint paint_handler;
 
-  TestState state;
+      state.frame_count = 0;
-  guint idle_handler;
+      state.stage = clutter_stage_new ();
-  guint paint_handler;
 
-  state.frame_count = 0;
+      state.display = clutter_x11_get_default_display ();
-  state.stage = clutter_stage_get_default ();
 
-  state.display = clutter_x11_get_default_display ();
+      state.pixmap = create_pixmap (&state);
+      state.tfp = cogl_texture_pixmap_x11_new (state.pixmap, TRUE);
 
-  state.pixmap = create_pixmap (&state);
+      clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
-  state.tfp = cogl_texture_pixmap_x11_new (state.pixmap, TRUE);
 
-  clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
+      paint_handler = g_signal_connect_after (state.stage, "paint",
+                                              G_CALLBACK (on_paint), &state);
 
-  paint_handler = g_signal_connect_after (state.stage, "paint",
+      idle_handler = g_idle_add (queue_redraw, state.stage);
-                                          G_CALLBACK (on_paint), &state);
 
-  idle_handler = g_idle_add (queue_redraw, state.stage);
+      clutter_actor_show_all (state.stage);
 
-  clutter_actor_show_all (state.stage);
+      clutter_main ();
 
-  clutter_main ();
+      g_signal_handler_disconnect (state.stage, paint_handler);
 
-  g_signal_handler_disconnect (state.stage, paint_handler);
+      g_source_remove (idle_handler);
 
-  g_source_remove (idle_handler);
+      XFreePixmap (state.display, state.pixmap);
 
-  XFreePixmap (state.display, state.pixmap);
+      clutter_actor_destroy (state.stage);
 
+      if (g_test_verbose ())
+        g_print ("OK\n");
+    }
+  else
+#endif
   if (g_test_verbose ())
-    g_print ("OK\n");
+    g_print ("Skipping\n");
-
-#else /* CLUTTER_WINDOWING_X11 */
-
-  if (g_test_verbose ())
-   g_print ("Skipping\n");
-
-#endif /* CLUTTER_WINDOWING_X11 */
 }
-

tests/conform/test-cogl-texture-rectangle.c

@@ -248,7 +248,7 @@ test_cogl_texture_rectangle (TestConformSimpleFixture *fixture,
   guint idle_source;
   guint paint_handler;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
 
   test_conform_get_gl_functions (&gl_functions);
 
@@ -273,6 +273,8 @@ test_cogl_texture_rectangle (TestConformSimpleFixture *fixture,
       g_source_remove (idle_source);
       g_signal_handler_disconnect (state.stage, paint_handler);
 
+      clutter_actor_destroy (state.stage);
+
       if (g_test_verbose ())
         g_print ("OK\n");
     }

tests/conform/test-cogl-vertex-buffer-contiguous.c

@@ -167,7 +167,7 @@ test_cogl_vertex_buffer_contiguous (TestConformSimpleFixture *fixture,
     0x00, 0xff, 0x00, 0xff
   };
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -251,7 +251,8 @@ test_cogl_vertex_buffer_contiguous (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-vertex-buffer-interleved.c

@@ -92,7 +92,7 @@ test_cogl_vertex_buffer_interleved (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -156,7 +156,8 @@ test_cogl_vertex_buffer_interleved (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-vertex-buffer-mutability.c

@@ -135,7 +135,7 @@ test_cogl_vertex_buffer_mutability (TestConformSimpleFixture *fixture,
   ClutterActor *group;
   guint idle_source;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
   clutter_actor_get_geometry (stage, &state.stage_geom);
@@ -192,7 +192,8 @@ test_cogl_vertex_buffer_mutability (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-viewport.c

@@ -391,7 +391,7 @@ test_cogl_viewport (TestConformSimpleFixture *fixture,
   guint idle_source;
   ClutterActor *stage;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
   /* We force continuous redrawing of the stage, since we need to skip
@@ -405,12 +405,8 @@ test_cogl_viewport (TestConformSimpleFixture *fixture,
 
   g_source_remove (idle_source);
 
-  /* Remove all of the actors from the stage */
+  clutter_actor_destroy (stage);
-  clutter_container_foreach (CLUTTER_CONTAINER (stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-cogl-wrap-modes.c

@@ -293,7 +293,7 @@ test_cogl_wrap_modes (TestConformSimpleFixture *fixture,
   guint idle_source;
   guint paint_handler;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
 
@@ -312,6 +312,8 @@ test_cogl_wrap_modes (TestConformSimpleFixture *fixture,
   g_source_remove (idle_source);
   g_signal_handler_disconnect (state.stage, paint_handler);
 
+  clutter_actor_destroy (state.stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-conform-main.c

@@ -145,6 +145,7 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/invariants", test_show_on_set_parent);
   TEST_CONFORM_SIMPLE ("/invariants", test_clone_no_map);
   TEST_CONFORM_SIMPLE ("/invariants", test_contains);
+  TEST_CONFORM_SIMPLE ("/invariants", default_stage);
 
   TEST_CONFORM_SIMPLE ("/opacity", test_label_opacity);
   TEST_CONFORM_SIMPLE ("/opacity", test_rectangle_opacity);

tests/conform/test-offscreen-redirect.c

@@ -301,7 +301,7 @@ test_offscreen_redirect (TestConformSimpleFixture *fixture,
     {
       Data data;
 
-      data.stage = clutter_stage_get_default ();
+      data.stage = clutter_stage_new ();
 
       data.parent_container = clutter_group_new ();
 
@@ -337,6 +337,8 @@ test_offscreen_redirect (TestConformSimpleFixture *fixture,
 
       clutter_main ();
 
+      clutter_actor_destroy (data.stage);
+
       if (g_test_verbose ())
         g_print ("OK\n");
     }

tests/conform/test-paint-opacity.c

@@ -12,7 +12,7 @@ test_label_opacity (TestConformSimpleFixture *fixture,
   ClutterColor label_color = { 255, 0, 0, 128 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   label = clutter_text_new_with_text ("Sans 18px", "Label, 50% opacity");
   clutter_text_set_color (CLUTTER_TEXT (label), &label_color);
@@ -39,7 +39,7 @@ test_label_opacity (TestConformSimpleFixture *fixture,
   clutter_actor_set_opacity (label, 128);
   g_assert (clutter_actor_get_paint_opacity (label) == 128);
 
-  clutter_actor_destroy (label);
+  clutter_actor_destroy (stage);
 }
 
 void
@@ -51,7 +51,7 @@ test_rectangle_opacity (TestConformSimpleFixture *fixture,
   ClutterColor rect_color = { 0, 0, 255, 255 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   rect = clutter_rectangle_new_with_color (&rect_color);
   clutter_actor_set_size (rect, 128, 128);
@@ -73,7 +73,7 @@ test_rectangle_opacity (TestConformSimpleFixture *fixture,
     g_print ("rect 100%%.get_paint_opacity()\n");
   g_assert (clutter_actor_get_paint_opacity (rect) == 255);
 
-  clutter_actor_destroy (rect);
+  clutter_actor_destroy (stage);
 }
 
 void
@@ -86,7 +86,7 @@ test_paint_opacity (TestConformSimpleFixture *fixture,
   ClutterColor rect_color = { 0, 0, 255, 255 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   group1 = clutter_group_new ();
   clutter_actor_set_opacity (group1, 128);
@@ -138,7 +138,5 @@ test_paint_opacity (TestConformSimpleFixture *fixture,
     g_print ("rect 100%%.get_paint_opacity()\n");
   g_assert (clutter_actor_get_paint_opacity (rect) == 128);
 
-  clutter_actor_destroy (rect);
+  clutter_actor_destroy (stage);
-  clutter_actor_destroy (group2);
-  clutter_actor_destroy (group1);
 }

tests/conform/test-pick.c

@@ -240,7 +240,7 @@ actor_picking (void)
   
   state.pass = TRUE;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
 
   state.actor_width = STAGE_WIDTH / ACTORS_X;
   state.actor_height = STAGE_HEIGHT / ACTORS_Y;
@@ -271,9 +271,10 @@ actor_picking (void)
 
   clutter_main ();
 
-
   if (g_test_verbose ())
     g_print ("end result: %s\n", state.pass ? "pass" : "FAIL");
 
   g_assert (state.pass);
+
+  clutter_actor_destroy (state.stage);
 }

tests/conform/test-score.c

@@ -54,8 +54,8 @@ test_score (TestConformSimpleFixture *fixture,
   ClutterTimeline *timeline_5;
   GSList *timelines;
 
-  /* this is necessary to make the master clock spin */
+  /* FIXME - this is necessary to make the master clock spin */
-  (void) clutter_stage_get_default ();
+  ClutterActor *stage = clutter_stage_new ();
 
   timeline_1 = clutter_timeline_new (100);
   g_object_set_data_full (G_OBJECT (timeline_1),
@@ -110,6 +110,8 @@ test_score (TestConformSimpleFixture *fixture,
 
   clutter_score_start (score);
 
+  clutter_actor_destroy (stage);
+
   g_object_unref (timeline_1);
   g_object_unref (timeline_2);
   g_object_unref (timeline_3);

tests/conform/test-shader-effect.c

@@ -239,7 +239,7 @@ test_shader_effect (TestConformSimpleFixture *fixture,
   ClutterActor *stage;
   ClutterActor *rect;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
 
   rect = make_actor (foo_old_shader_effect_get_type ());
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
@@ -262,6 +262,8 @@ test_shader_effect (TestConformSimpleFixture *fixture,
 
   clutter_main ();
 
+  clutter_actor_destroy (stage);
+
   if (g_test_verbose ())
     g_print ("OK\n");
 }

tests/conform/test-text-cache.c

@@ -263,7 +263,7 @@ text_cache (void)
 
   memset (&data, 0, sizeof (data));
 
-  data.stage = clutter_stage_get_default ();
+  data.stage = clutter_stage_new ();
 
   data.label = clutter_text_new_with_text (TEST_FONT, "");
 
@@ -279,6 +279,8 @@ text_cache (void)
 
   clutter_main ();
 
+  clutter_actor_destroy (data.stage);
+
   if (g_test_verbose ())
     g_print ("\nOverall result: ");
 

tests/conform/test-texture-fbo.c

@@ -173,14 +173,12 @@ test_texture_fbo (TestConformSimpleFixture *fixture,
                   gconstpointer data)
 {
   TestState state;
-  guint idle_source;
-  gulong paint_handler;
   ClutterActor *actor;
   int ypos = 0;
 
   state.frame = 0;
 
-  state.stage = clutter_stage_get_default ();
+  state.stage = clutter_stage_new ();
 
   clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
 
@@ -229,25 +227,15 @@ test_texture_fbo (TestConformSimpleFixture *fixture,
   /* We force continuous redrawing of the stage, since we need to skip
    * the first few frames, and we wont be doing anything else that
    * will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, state.stage);
+  g_idle_add (queue_redraw, state.stage);
-
+  g_signal_connect_after (state.stage, "paint", G_CALLBACK (on_paint), &state);
-  paint_handler = g_signal_connect_after (state.stage, "paint",
-                                          G_CALLBACK (on_paint), &state);
 
   clutter_actor_show_all (state.stage);
 
   clutter_main ();
 
-  g_signal_handler_disconnect (state.stage, paint_handler);
+  clutter_actor_destroy (state.stage);
-
-  g_source_remove (idle_source);
-
-  /* Remove all of the actors from the stage */
-  clutter_container_foreach (CLUTTER_CONTAINER (state.stage),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
 
   if (g_test_verbose ())
     g_print ("OK\n");
 }
-

tests/conform/test-timeline.c

@@ -185,7 +185,6 @@ void
 test_timeline (TestConformSimpleFixture *fixture,
 	       gconstpointer data)
 {
-  ClutterActor *stage G_GNUC_UNUSED;
   ClutterTimeline *timeline_1;
   TimelineData data_1;
   ClutterTimeline *timeline_2;
@@ -198,7 +197,7 @@ test_timeline (TestConformSimpleFixture *fixture,
 
   /* NB: We have to ensure a stage is instantiated else the master
    * clock wont run... */
-  stage = clutter_stage_get_default ();
+  ClutterActor *stage = clutter_stage_new ();
 
   timeline_data_init (&data_1, 1);
   timeline_1 = clutter_timeline_new (FRAME_COUNT * 1000 / FPS);
@@ -316,4 +315,6 @@ test_timeline (TestConformSimpleFixture *fixture,
   timeline_data_destroy (&data_3);
 
   g_source_remove (delay_tag);
+
+  clutter_actor_destroy (stage);
 }

tests/interactive/test-actor-clone.c

@@ -10,10 +10,11 @@
 
 typedef struct SuperOH
 {
-  ClutterActor **hand, *bgtex;
+  ClutterActor **hand;
-  ClutterActor  *real_hand;
+  ClutterActor *bgtex;
-  ClutterActor  *group;
+  ClutterActor *real_hand;
-  ClutterActor  *stage;
+  ClutterActor *group;
+  ClutterActor *stage;
 
   gint stage_width;
   gint stage_height;
@@ -22,6 +23,8 @@ typedef struct SuperOH
   ClutterBehaviour *scaler_1;
   ClutterBehaviour *scaler_2;
   ClutterTimeline *timeline;
+
+  guint frame_id;
 } SuperOH;
 
 static gint n_hands = NHANDS;
@@ -36,6 +39,15 @@ static GOptionEntry super_oh_entries[] = {
   { NULL }
 };
 
+static void
+clean_and_quit (ClutterActor *actor,
+                SuperOH      *oh)
+{
+  g_signal_handler_disconnect (oh->timeline, oh->frame_id);
+
+  clutter_main_quit ();
+}
+
 static gboolean
 on_button_press_event (ClutterActor *actor,
                        ClutterEvent *event,
@@ -155,20 +167,23 @@ test_actor_clone_main (int argc, char *argv[])
       return EXIT_FAILURE;
     }
 
-  stage = clutter_stage_get_default ();
+  oh = g_new (SuperOH, 1);
+
+  oh->stage = stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 800, 600);
 
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Clone Test");
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
-  oh = g_new (SuperOH, 1);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clean_and_quit), oh);
 
   /* Create a timeline to manage animation */
   oh->timeline = clutter_timeline_new (6000);
   clutter_timeline_set_loop (oh->timeline, TRUE);
 
   /* fire a callback for frame change */
-  g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
+  oh->frame_id =
+    g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
 
   /* Set up some behaviours to handle scaling  */
   alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
@@ -207,7 +222,7 @@ test_actor_clone_main (int argc, char *argv[])
   clutter_actor_hide (real_hand);
 
   /* create a new group to hold multiple actors in a group */
-  oh->group = clutter_group_new();
+  oh->group = clutter_group_new ();
 
   oh->hand = g_new (ClutterActor*, n_hands);
 
@@ -274,11 +289,12 @@ test_actor_clone_main (int argc, char *argv[])
 
   clutter_main ();
 
-  /* clean up */
   g_object_unref (oh->scaler_1);
   g_object_unref (oh->scaler_2);
   g_object_unref (oh->timeline);
+
   g_free (oh->hand);
+
   g_free (oh);
 
   return EXIT_SUCCESS;

tests/interactive/test-animation.c

@@ -84,15 +84,16 @@ G_MODULE_EXPORT int
 test_animation_main (int argc, char *argv[])
 {
   ClutterActor *stage, *rect;
-  ClutterColor stage_color = { 0x66, 0x66, 0xdd, 0xff };
   ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff };
   ClutterAction *action;
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+  clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_LightSkyBlue);
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Animation");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   rect = clutter_rectangle_new_with_color (&rect_color);
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);

tests/interactive/test-animator.c

@@ -55,18 +55,20 @@ test_animator_main (gint    argc,
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Animator");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
-  for (i=0; i<COUNT; i++)
+  for (i = 0; i < COUNT; i++)
     {
-      rects[i]=new_rect (255 *(i * 1.0/COUNT), 50, 160, 255);
+      rects[i] = new_rect (255 * (i * 1.0 / COUNT), 50, 160, 255);
       clutter_container_add_actor (CLUTTER_CONTAINER (stage), rects[i]);
       clutter_actor_set_anchor_point (rects[i], 64, 64);
       clutter_actor_set_position (rects[i], 320.0, 240.0);
       clutter_actor_set_opacity (rects[i], 0x70);
     }
 
-  g_timeout_add (10000, nuke_one, rects[2]);
+  clutter_threads_add_timeout (10000, nuke_one, rects[2]);
 
   animator = clutter_animator_new ();
 
@@ -129,6 +131,7 @@ test_animator_main (gint    argc,
   g_signal_connect (clutter_animator_start (animator),
                     "completed", G_CALLBACK (reverse_timeline), NULL);
   clutter_main ();
+
   g_object_unref (animator);
 
   return EXIT_SUCCESS;

tests/interactive/test-bin-layout.c

@@ -163,10 +163,11 @@ test_bin_layout_main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Box test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "BinLayout");
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
   clutter_actor_set_size (stage, 640, 480);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
                                    CLUTTER_BIN_ALIGNMENT_CENTER);
@@ -269,3 +270,9 @@ test_bin_layout_main (int argc, char *argv[])
 
   return EXIT_SUCCESS;
 }
+
+G_MODULE_EXPORT const char *
+test_bin_layout_describe (void)
+{
+  return "BinLayout layout manager example";
+}

tests/interactive/test-binding-pool.c

@@ -250,10 +250,11 @@ test_binding_pool_main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   g_signal_connect (stage,
                     "button-press-event", G_CALLBACK (clutter_main_quit),
                     NULL);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   key_group = g_object_new (TYPE_KEY_GROUP, NULL);
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), key_group);
@@ -308,3 +309,9 @@ test_binding_pool_main (int argc, char *argv[])
 
   return EXIT_SUCCESS;
 }
+
+G_MODULE_EXPORT const char *
+test_binding_pool_describe (void)
+{
+  return "Binding pools example";
+}

tests/interactive/test-box-layout.c

@@ -242,10 +242,11 @@ test_box_layout_main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Box Layout");
   clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
   clutter_actor_set_size (stage, 640, 480);
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   layout = clutter_box_layout_new ();
 
@@ -273,3 +274,9 @@ test_box_layout_main (int argc, char *argv[])
 
   return EXIT_SUCCESS;
 }
+
+G_MODULE_EXPORT const char *
+test_box_layout_describe (void)
+{
+  return "BoxLayout layout manager example";
+}

tests/interactive/test-cairo-flowers.c

@@ -23,7 +23,9 @@ typedef struct Flower
 }
 Flower;
 
-ClutterActor*
+static ClutterActor *stage = NULL;
+
+static ClutterActor *
 make_flower_actor (void)
 {
   /* No science here, just a hack from toying */
@@ -141,17 +143,14 @@ tick (ClutterTimeline *timeline,
       gint             msecs,
       gpointer         data)
 {
-  Flower **flowers = (Flower**)data;
+  Flower **flowers = data;
   gint i = 0;
 
   for (i = 0; i < N_FLOWERS; i++)
     {
-      ClutterActor *stage;
-
       flowers[i]->y   += flowers[i]->v;
       flowers[i]->rot += flowers[i]->rv;
 
-      stage = clutter_stage_get_default ();
       if (flowers[i]->y > (gint) clutter_actor_get_height (stage))
         flowers[i]->y = -clutter_actor_get_height (flowers[i]->ctex);
 
@@ -167,23 +166,35 @@ tick (ClutterTimeline *timeline,
     }
 }
 
-int
+static void
+stop_and_quit (ClutterActor    *actor,
+               ClutterTimeline *timeline)
+{
+  clutter_timeline_stop (timeline);
+  clutter_main_quit ();
+}
+
+G_MODULE_EXPORT int
 test_cairo_flowers_main (int argc, char **argv)
 {
-  int              i;
+  Flower *flowers[N_FLOWERS];
-  ClutterActor    *stage;
-  ClutterColor     stage_color = { 0x0, 0x0, 0x0, 0xff };
   ClutterTimeline *timeline;
-  Flower          *flowers[N_FLOWERS];
+  int i;
 
   srand (time (NULL));
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  /* Create a timeline to manage animation */
+  timeline = clutter_timeline_new (6000);
+  clutter_timeline_set_loop (timeline, TRUE);
 
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
+  stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cairo Flowers");
+  g_signal_connect (stage, "destroy", G_CALLBACK (stop_and_quit), timeline);
+
+  clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black);
 
   for (i=0; i< N_FLOWERS; i++)
     {
@@ -201,10 +212,6 @@ test_cairo_flowers_main (int argc, char **argv)
 				  flowers[i]->x, flowers[i]->y);
     }
 
-  /* Create a timeline to manage animation */
-  timeline = clutter_timeline_new (6000);
-  clutter_timeline_set_loop (timeline, TRUE);
-
   /* fire a callback for frame change */
   g_signal_connect (timeline, "new-frame", G_CALLBACK (tick), flowers);
 
@@ -218,6 +225,13 @@ test_cairo_flowers_main (int argc, char **argv)
 
   clutter_main();
 
+  g_object_unref (timeline);
+
   return EXIT_SUCCESS;
 }
 
+G_MODULE_EXPORT const char *
+test_cairo_flowers_describe (void)
+{
+  return "Drawing pretty flowers with Cairo";
+}

tests/interactive/test-clip.c

@@ -325,7 +325,9 @@ test_clip_main (int argc, char **argv)
   data.current_clip.type = CLIP_NONE;
   data.clips = NULL;
 
-  data.stage = clutter_stage_get_default ();
+  data.stage = clutter_stage_new ();
+  clutter_stage_set_title (CLUTTER_STAGE (data.stage), "Clipping");
+  g_signal_connect (data.stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   stub_actor = clutter_rectangle_new ();
   clutter_container_add (CLUTTER_CONTAINER (data.stage), stub_actor, NULL);
@@ -366,3 +368,9 @@ test_clip_main (int argc, char **argv)
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_clip_describe (void)
+{
+  return "Actor clipping with various techniques";
+}

tests/interactive/test-cogl-multitexture.c

@@ -102,7 +102,7 @@ test_cogl_multitexture_main (int argc, char *argv[])
   ClutterActor	    *stage;
   ClutterColor       stage_color = { 0x61, 0x56, 0x56, 0xff };
   TestMultiLayerMaterialState *state = g_new0 (TestMultiLayerMaterialState, 1);
-  ClutterGeometry    geom;
+  gfloat             stage_w, stage_h;
   gchar            **files;
   gfloat             tex_coords[] =
     {
@@ -115,17 +115,20 @@ test_cogl_multitexture_main (int argc, char *argv[])
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
-  clutter_actor_get_geometry (stage, &geom);
+  clutter_actor_get_size (stage, &stage_w, &stage_h);
 
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl: Multi-texturing");
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   /* We create a non-descript actor that we know doesn't have a
    * default paint handler, so that we can easily control
    * painting in a paint signal handler, without having to
    * sub-class anything etc. */
   state->group = clutter_group_new ();
-  clutter_actor_set_position (state->group, geom.width/2, geom.height/2);
+  clutter_actor_set_position (state->group, stage_w / 2, stage_h / 2);
   g_signal_connect (state->group, "paint",
 		    G_CALLBACK(material_rectangle_paint), state);
 
@@ -227,3 +230,9 @@ test_cogl_multitexture_main (int argc, char *argv[])
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_multitexture_describe (void)
+{
+  return "Multi-texturing support in Cogl.";
+}

tests/interactive/test-cogl-offscreen.c

@@ -225,37 +225,20 @@ setup_viewport (unsigned int width,
 }
 
 static void
-test_coglbox_init (TestCoglbox *self)
+test_coglbox_map (ClutterActor *actor)
 {
+  TestCoglboxPrivate *priv = TEST_COGLBOX_GET_PRIVATE (actor);
   ClutterActor *stage;
-  TestCoglboxPrivate *priv;
-  gchar *file;
   ClutterPerspective perspective;
   float stage_width;
   float stage_height;
 
-  self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
+  CLUTTER_ACTOR_CLASS (test_coglbox_parent_class)->map (actor);
-
-  printf ("Loading redhand.png\n");
-  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
-  priv->texhand_id = cogl_texture_new_from_file (file,
-                                                 COGL_TEXTURE_NONE,
-						 COGL_PIXEL_FORMAT_ANY,
-                                                 NULL);
-  g_free (file);
-
-  printf ("Creating texture with size\n");
-  priv->texture_id = cogl_texture_new_with_size (200, 200,
-                                                 COGL_TEXTURE_NONE,
-						 COGL_PIXEL_FORMAT_RGB_888);
-
-  if (priv->texture_id == COGL_INVALID_HANDLE)
-    printf ("Failed creating texture with size!\n");
 
   printf ("Creating offscreen\n");
   priv->offscreen_id = cogl_offscreen_new_to_texture (priv->texture_id);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_actor_get_stage (actor);
   clutter_stage_get_perspective (CLUTTER_STAGE (stage), &perspective);
   clutter_actor_get_size (stage, &stage_width, &stage_height);
 
@@ -273,6 +256,31 @@ test_coglbox_init (TestCoglbox *self)
     printf ("Failed creating offscreen to texture!\n");
 }
 
+static void
+test_coglbox_init (TestCoglbox *self)
+{
+  TestCoglboxPrivate *priv;
+  gchar *file;
+
+  self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
+
+  printf ("Loading redhand.png\n");
+  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
+  priv->texhand_id = cogl_texture_new_from_file (file,
+                                                 COGL_TEXTURE_NONE,
+						 COGL_PIXEL_FORMAT_ANY,
+                                                 NULL);
+  g_free (file);
+
+  printf ("Creating texture with size\n");
+  priv->texture_id = cogl_texture_new_with_size (200, 200,
+                                                 COGL_TEXTURE_NONE,
+						 COGL_PIXEL_FORMAT_RGB_888);
+
+  if (priv->texture_id == COGL_INVALID_HANDLE)
+    printf ("Failed creating texture with size!\n");
+}
+
 static void
 test_coglbox_class_init (TestCoglboxClass *klass)
 {
@@ -281,6 +289,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
 
   gobject_class->finalize     = test_coglbox_finalize;
   gobject_class->dispose      = test_coglbox_dispose;
+
+  actor_class->map            = test_coglbox_map;
   actor_class->paint          = test_coglbox_paint;
 
   g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
@@ -295,16 +305,17 @@ test_coglbox_new (void)
 G_MODULE_EXPORT int
 test_cogl_offscreen_main (int argc, char *argv[])
 {
-  ClutterActor     *stage;
+  ClutterActor *stage;
-  ClutterActor     *coglbox;
+  ClutterActor *coglbox;
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
     return 1;
 
   /* Stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Offscreen Buffers");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Cogl Box */
   coglbox = test_coglbox_new ();
@@ -316,3 +327,9 @@ test_cogl_offscreen_main (int argc, char *argv[])
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_offscreen_describe (void)
+{
+  return "Offscreen buffer support in Cogl.";
+}

tests/interactive/test-cogl-point-sprites.c

@@ -219,7 +219,6 @@ idle_cb (gpointer data)
 G_MODULE_EXPORT int
 test_cogl_point_sprites_main (int argc, char *argv[])
 {
-  static const ClutterColor black = { 0, 0, 0, 255 };
   ClutterActor *stage;
   CoglHandle tex;
   Data data;
@@ -260,9 +259,10 @@ test_cogl_point_sprites_main (int argc, char *argv[])
       data.sparks[i].y = 2.0f;
     }
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &black);
+  clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black);
-
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Point Sprites");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
   g_signal_connect_after (stage, "paint", G_CALLBACK (paint_cb), &data);
 
   clutter_actor_show (stage);
@@ -279,3 +279,9 @@ test_cogl_point_sprites_main (int argc, char *argv[])
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_point_sprites_describe (void)
+{
+  return "Point sprites support in Cogl.";
+}

tests/interactive/test-cogl-primitives.c

@@ -114,9 +114,10 @@ test_cogl_primitives_main (int argc, char *argv[])
   clutter_timeline_set_loop (tl, TRUE);
   clutter_timeline_start (tl);
 
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Path Primitives");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   coglbox = clutter_group_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
@@ -136,3 +137,9 @@ test_cogl_primitives_main (int argc, char *argv[])
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_primitives (void)
+{
+  return "2D Path primitives support in Cogl.";
+}

tests/interactive/test-cogl-tex-convert.c

@@ -202,10 +202,11 @@ test_cogl_tex_convert_main (int argc, char *argv[])
     return 1;
   
   /* Stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Conversion");
-  
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   /* Cogl Box */
   coglbox = test_coglbox_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
@@ -216,3 +217,9 @@ test_cogl_tex_convert_main (int argc, char *argv[])
   
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_tex_convert_describe (void)
+{
+  return "Pixel format conversion of Cogl textures.";
+}

tests/interactive/test-cogl-tex-foreign.c

@@ -226,10 +226,11 @@ test_cogl_tex_foreign_main (int argc, char *argv[])
     return 1;
   
   /* Stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Foreign Textures");
-  
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   /* Cogl Box */
   coglbox = test_coglbox_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
@@ -240,3 +241,9 @@ test_cogl_tex_foreign_main (int argc, char *argv[])
   
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_tex_foreign_describe (void)
+{
+  return "Foreign textures support in Cogl.";
+}

tests/interactive/test-cogl-tex-getset.c

@@ -249,10 +249,11 @@ test_cogl_tex_getset_main (int argc, char *argv[])
     return 1;
   
   /* Stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_actor_set_size (stage, 400, 400);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Readback");
-  
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+
   /* Cogl Box */
   coglbox = test_coglbox_new ();
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox);
@@ -263,3 +264,9 @@ test_cogl_tex_getset_main (int argc, char *argv[])
   
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_tex_getset_describe (void)
+{
+  return "Texture region readback and update in Cogl.";
+}

tests/interactive/test-cogl-tex-polygon.c

@@ -365,10 +365,11 @@ test_cogl_tex_polygon_main (int argc, char *argv[])
     return 1;
 
   /* Stage */
-  stage = clutter_stage_get_default ();
+  stage = clutter_stage_new ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &blue);
   clutter_actor_set_size (stage, 640, 480);
-  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Test");
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Polygon");
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
 
   /* Cogl Box */
   coglbox = test_coglbox_new ();
@@ -412,3 +413,9 @@ test_cogl_tex_polygon_main (int argc, char *argv[])
 
   return 0;
 }
+
+G_MODULE_EXPORT const char *
+test_cogl_tex_polygon_describe (void)
+{
+  return "Texture polygon primitive.";
+}