Merge branch 'master' into msvc-support-master

clutter/clutter-actor.c

@@ -222,13 +222,22 @@
  *
  * Evaluates to %TRUE if the %CLUTTER_ACTOR_MAPPED flag is set.
  *
- * Means "the actor will be painted if the stage is mapped."
+ * The mapped state is set when the actor is visible and all its parents up
+ * to a top-level (e.g. a #ClutterStage) are visible, realized, and mapped.
  *
- * %TRUE if the actor is visible; and all parents with possible exception
+ * This check can be used to see if an actor is going to be painted, as only
- * of the stage are visible; and an ancestor of the actor is a toplevel.
+ * actors with the %CLUTTER_ACTOR_MAPPED flag set are going to be painted.
  *
- * Clutter auto-maintains the mapped flag whenever actors are
+ * The %CLUTTER_ACTOR_MAPPED flag is managed by Clutter itself, and it should
- * reparented or shown/hidden.
+ * not be checked directly; instead, the recommended usage is to connect a
+ * handler on the #GObject::notify signal for the #ClutterActor:mapped
+ * property of #ClutterActor, and check the presence of
+ * the %CLUTTER_ACTOR_MAPPED flag on state changes.
+ *
+ * It is also important to note that Clutter may delay the changes of
+ * the %CLUTTER_ACTOR_MAPPED flag on top-levels due to backend-specific
+ * limitations, or during the reparenting of an actor, to optimize
+ * unnecessary (and potentially expensive) state changes.
  *
  * Since: 0.2
  */
@@ -243,7 +252,7 @@
  * actor wants to delay allocating resources until it is attached to a
  * stage, it may use the realize state to do so. However it is
  * perfectly acceptable for an actor to allocate Cogl resources before
- * being realized because there is only one GL context used by Clutter
+ * being realized because there is only one drawing context used by Clutter
  * so any resources will work on any stage.  If an actor is mapped it
  * must also be realized, but an actor can be realized and unmapped
  * (this is so hiding an actor temporarily doesn't do an expensive
@@ -264,7 +273,7 @@
  *
  * Note that an actor is only painted onscreen if it's mapped, which
  * means it's visible, and all its parents are visible, and one of the
- * parents is a toplevel stage.
+ * parents is a toplevel stage; see also %CLUTTER_ACTOR_IS_MAPPED.
  *
  * Since: 0.2
  */

clutter/clutter-main.c

@@ -216,9 +216,9 @@ clutter_threads_init_default (void)
   g_mutex_init (&clutter_threads_mutex);
 
 #ifndef CLUTTER_WINDOWING_WIN32
-  /* we don't need nor want locking functions on Windows.here
+  /* we don't need nor want locking functions on Windows.here
-  * as Windows GUI system assumes multithreadedness
+  * as Windows GUI system assumes multithreadedness
-  * see bug: https://bugzilla.gnome.org/show_bug.cgi?id=662071
+  * see bug: https://bugzilla.gnome.org/show_bug.cgi?id=662071
   */
   if (clutter_threads_lock == NULL)
     clutter_threads_lock = clutter_threads_impl_lock;
@@ -1820,6 +1820,10 @@ clutter_get_option_group_without_init (void)
  * error message will be placed inside @error instead of being
  * printed on the display.
  *
+ * Just like clutter_init(), if this function returns an error code then
+ * any subsequent call to any other Clutter API will result in undefined
+ * behaviour - including segmentation faults.
+ *
  * Return value: %CLUTTER_INIT_SUCCESS if Clutter has been successfully
  *   initialised, or other values or #ClutterInitError in case of
  *   error.
@@ -1957,6 +1961,11 @@ clutter_parse_args (int      *argc,
  * yourself, you can use clutter_init_with_args(), which takes a #GError
  * pointer.</note>
  *
+ * If this function fails, and returns an error code, any subsequent
+ * Clutter API will have undefined behaviour - including segmentation
+ * faults and assertion failures. Make sure to handle the returned
+ * #ClutterInitError enumeration value.
+ *
  * Return value: a #ClutterInitError value
  */
 ClutterInitError