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

Merge branch 'master' into msvc-support-master

Browse Source
This commit is contained in:
Chun-wei Fan 2011-10-18 15:48:17 +08:00
commit e33a6219d8
15 changed files with 125 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-actor.c
View File

@ -4832,23 +4832,25 @@ clutter_actor_class_init (ClutterActorClass *klass)
* The default implementation for #ClutterActor chains up to the * The default implementation for #ClutterActor chains up to the
* parent actor and queues a redraw on the parent, thus "bubbling" * parent actor and queues a redraw on the parent, thus "bubbling"
* the redraw queue up through the actor graph. The default * the redraw queue up through the actor graph. The default
* implementation for #ClutterStage queues a clutter_redraw() in a * implementation for #ClutterStage queues a clutter_stage_ensure_redraw()
* main loop idle handler. * in a main loop idle handler.
* *
* Note that the @origin actor may be the stage, or a container; it * Note that the @origin actor may be the stage, or a container; it
* does not have to be a leaf node in the actor graph. * does not have to be a leaf node in the actor graph.
* *
* Toolkits embedding a #ClutterStage which require a redraw and * Toolkits embedding a #ClutterStage which require a redraw and
* relayout cycle can stop the emission of this signal using the * relayout cycle can stop the emission of this signal using the
* GSignal API, redraw the UI and then call clutter_redraw() * GSignal API, redraw the UI and then call clutter_stage_ensure_redraw()
* themselves, like: * themselves, like:
* *
* |[ * |[
* static void * static void
* on_redraw_complete (void) * on_redraw_complete (gpointer data)
* { * {
* ClutterStage *stage = data;
*
* /* execute the Clutter drawing pipeline */ * /* execute the Clutter drawing pipeline */
* clutter_redraw (); * clutter_stage_ensure_redraw (stage);
* } * }
* *
* static void * static void
@ -4860,7 +4862,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
* /* queue a redraw with the host toolkit and call * /* queue a redraw with the host toolkit and call
* * a function when the redraw has been completed * * a function when the redraw has been completed
* */ * */
* queue_a_redraw (G_CALLBACK (on_redraw_complete)); * queue_a_redraw (G_CALLBACK (on_redraw_complete), stage);
* } * }
* ]| * ]|
* *

6
clutter/clutter-backend.c
View File

@ -465,7 +465,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
{ {
new_stage = NULL; new_stage = NULL;
CLUTTER_NOTE (MULTISTAGE, CLUTTER_NOTE (BACKEND,
"Stage [%p] is not realized, unsetting the stage", "Stage [%p] is not realized, unsetting the stage",
stage); stage);
} }
@ -473,7 +473,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
{ {
new_stage = stage; new_stage = stage;
CLUTTER_NOTE (MULTISTAGE, CLUTTER_NOTE (BACKEND,
"Setting the new stage [%p]", "Setting the new stage [%p]",
new_stage); new_stage);
} }
@ -515,7 +515,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
current_context_stage = new_stage; current_context_stage = new_stage;
} }
else else
CLUTTER_NOTE (MULTISTAGE, "Stage is the same"); CLUTTER_NOTE (BACKEND, "Stage is the same");
} }

2
clutter/clutter-bezier.c
View File

@ -180,7 +180,7 @@ _clutter_bezier_advance (const ClutterBezier *b, gint L, ClutterKnot * knot)
knot->x = _clutter_bezier_t2x (b, t); knot->x = _clutter_bezier_t2x (b, t);
knot->y = _clutter_bezier_t2y (b, t); knot->y = _clutter_bezier_t2y (b, t);
CLUTTER_NOTE (BEHAVIOUR, "advancing to relative pt %f: t %f, {%d,%d}", CLUTTER_NOTE (MISC, "advancing to relative pt %f: t %f, {%d,%d}",
(double) L / (double) CBZ_T_ONE, (double) L / (double) CBZ_T_ONE,
(double) t / (double) CBZ_T_ONE, (double) t / (double) CBZ_T_ONE,
knot->x, knot->y); knot->x, knot->y);

27
clutter/clutter-debug.h
View File

@ -13,21 +13,18 @@ typedef enum {
CLUTTER_DEBUG_TEXTURE = 1 << 2, CLUTTER_DEBUG_TEXTURE = 1 << 2,
CLUTTER_DEBUG_EVENT = 1 << 3, CLUTTER_DEBUG_EVENT = 1 << 3,
CLUTTER_DEBUG_PAINT = 1 << 4, CLUTTER_DEBUG_PAINT = 1 << 4,
CLUTTER_DEBUG_GL = 1 << 5, CLUTTER_DEBUG_PANGO = 1 << 5,
CLUTTER_DEBUG_ALPHA = 1 << 6, CLUTTER_DEBUG_BACKEND = 1 << 6,
CLUTTER_DEBUG_BEHAVIOUR = 1 << 7, CLUTTER_DEBUG_SCHEDULER = 1 << 7,
CLUTTER_DEBUG_PANGO = 1 << 8, CLUTTER_DEBUG_SCRIPT = 1 << 8,
CLUTTER_DEBUG_BACKEND = 1 << 9, CLUTTER_DEBUG_SHADER = 1 << 9,
CLUTTER_DEBUG_SCHEDULER = 1 << 10, CLUTTER_DEBUG_MULTISTAGE = 1 << 10,
CLUTTER_DEBUG_SCRIPT = 1 << 11, CLUTTER_DEBUG_ANIMATION = 1 << 11,
CLUTTER_DEBUG_SHADER = 1 << 12, CLUTTER_DEBUG_LAYOUT = 1 << 12,
CLUTTER_DEBUG_MULTISTAGE = 1 << 13, CLUTTER_DEBUG_PICK = 1 << 13,
CLUTTER_DEBUG_ANIMATION = 1 << 14, CLUTTER_DEBUG_EVENTLOOP = 1 << 14,
CLUTTER_DEBUG_LAYOUT = 1 << 15, CLUTTER_DEBUG_CLIPPING = 1 << 15,
CLUTTER_DEBUG_PICK = 1 << 16, CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 16
CLUTTER_DEBUG_EVENTLOOP = 1 << 17,
CLUTTER_DEBUG_CLIPPING = 1 << 18,
CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19
} ClutterDebugFlag; } ClutterDebugFlag;
typedef enum { typedef enum {

103
clutter/clutter-layout-manager.c
View File

@ -75,38 +75,10 @@
* <function>set_container()</function> virtual function. The layout manager * <function>set_container()</function> virtual function. The layout manager
* should not hold a real reference (i.e. call g_object_ref()) on the * should not hold a real reference (i.e. call g_object_ref()) on the
* container actor, to avoid reference cycles.</para> * container actor, to avoid reference cycles.</para>
* <para>If the layout manager has properties affecting the layout * <para>If a layout manager has properties affecting the layout
* policies then it should emit the #ClutterLayoutManager::layout-changed * policies then it should emit the #ClutterLayoutManager::layout-changed
* signal on itself by using the clutter_layout_manager_layout_changed() * signal on itself by using the clutter_layout_manager_layout_changed()
* function whenever one of these properties changes.</para> * function whenever one of these properties changes.</para>
* <para>If the layout manager has layout properties, that is properties that
* should exist only as the result of the presence of a specific (layout
* manager, container actor, child actor) combination, and it wishes to store
* those properties inside a #ClutterLayoutMeta then it should override the
* <structname>ClutterLayoutManager</structname>::get_child_meta_type()
* virtual function to return the #GType of the #ClutterLayoutMeta sub-class
* used to store the layout properties; optionally, the #ClutterLayoutManager
* sub-class might also override the
* <structname>ClutterLayoutManager</structname>::create_child_meta() virtual
* function to control how the #ClutterLayoutMeta instance is created,
* otherwise the default implementation will be equivalent to:</para>
* <informalexample><programlisting>
* ClutterLayoutManagerClass *klass;
* GType meta_type;
*
* klass = CLUTTER_LAYOUT_MANAGER_GET_CLASS (manager);
* meta_type = klass->get_child_meta_type (manager);
*
* return g_object_new (meta_type,
* "manager", manager,
* "container", container,
* "actor", actor,
* NULL);
* </programlisting></informalexample>
* <para>Where <varname>manager</varname> is the #ClutterLayoutManager,
* <varname>container</varname> is the #ClutterContainer using the
* #ClutterLayoutManager and <varname>actor</varname> is the #ClutterActor
* child of the #ClutterContainer.</para>
* </refsect2> * </refsect2>
* *
* <refsect2 id="ClutterLayoutManager-animation"> * <refsect2 id="ClutterLayoutManager-animation">
@ -279,6 +251,79 @@
* <varname>orientation</varname> layout property of a layout manager.</para> * <varname>orientation</varname> layout property of a layout manager.</para>
* </refsect2> * </refsect2>
* *
* <refsect2 id="clutter-layout-properties">
* <title>Layout Properties</title>
* <para>If a layout manager has layout properties, that is properties that
* should exist only as the result of the presence of a specific (layout
* manager, container actor, child actor) combination, and it wishes to store
* those properties inside a #ClutterLayoutMeta, then it should override the
* <structname>ClutterLayoutManager</structname>::get_child_meta_type()
* virtual function to return the #GType of the #ClutterLayoutMeta sub-class
* used to store the layout properties; optionally, the #ClutterLayoutManager
* sub-class might also override the
* <structname>ClutterLayoutManager</structname>::create_child_meta() virtual
* function to control how the #ClutterLayoutMeta instance is created,
* otherwise the default implementation will be equivalent to:</para>
* <informalexample><programlisting>
* ClutterLayoutManagerClass *klass;
* GType meta_type;
*
* klass = CLUTTER_LAYOUT_MANAGER_GET_CLASS (manager);
* meta_type = klass->get_child_meta_type (manager);
*
* return g_object_new (meta_type,
* "manager", manager,
* "container", container,
* "actor", actor,
* NULL);
* </programlisting></informalexample>
* <para>Where <varname>manager</varname> is the #ClutterLayoutManager,
* <varname>container</varname> is the #ClutterContainer using the
* #ClutterLayoutManager and <varname>actor</varname> is the #ClutterActor
* child of the #ClutterContainer.</para>
* </refsect2>
*
* <refsect2 id="clutter-layout-script">
* <title>Using ClutterLayoutManager with ClutterScript</title>
* <para>#ClutterLayoutManager instance can be created in the same way
* as other objects in #ClutterScript; properties can be set using the
* common syntax.</para>
* <para>Layout properties can be set on children of a container with
* a #ClutterLayoutManager using the <emphasis>layout::</emphasis>
* modifier on the property name, for instance:</para>
* <informalexample><programlisting>
* {
* "type" : "ClutterBox",
* "layout-manager" : { "type" : "ClutterTableLayout" },
* "children" : [
* {
* "type" : "ClutterTexture",
* "filename" : "image-00.png",
*
* "layout::row" : 0,
* "layout::column" : 0,
* "layout::x-align" : "left",
* "layout::y-align" : "center",
* "layout::x-expand" : true,
* "layout::y-expand" : true
* },
* {
* "type" : "ClutterTexture",
* "filename" : "image-01.png",
*
* "layout::row" : 0,
* "layout::column" : 1,
* "layout::x-align" : "right",
* "layout::y-align" : "center",
* "layout::x-expand" : true,
* "layout::y-expand" : true
* }
* ]
* }
* </programlisting></informalexample>
*
* </refsect2>
*
* #ClutterLayoutManager is available since Clutter 1.2 * #ClutterLayoutManager is available since Clutter 1.2
*/ */

6
clutter/clutter-main.c
View File

@ -163,15 +163,11 @@ static const GDebugKey clutter_debug_keys[] = {
{ "event", CLUTTER_DEBUG_EVENT }, { "event", CLUTTER_DEBUG_EVENT },
{ "paint", CLUTTER_DEBUG_PAINT }, { "paint", CLUTTER_DEBUG_PAINT },
{ "pick", CLUTTER_DEBUG_PICK }, { "pick", CLUTTER_DEBUG_PICK },
{ "gl", CLUTTER_DEBUG_GL },
{ "alpha", CLUTTER_DEBUG_ALPHA },
{ "behaviour", CLUTTER_DEBUG_BEHAVIOUR },
{ "pango", CLUTTER_DEBUG_PANGO }, { "pango", CLUTTER_DEBUG_PANGO },
{ "backend", CLUTTER_DEBUG_BACKEND }, { "backend", CLUTTER_DEBUG_BACKEND },
{ "scheduler", CLUTTER_DEBUG_SCHEDULER }, { "scheduler", CLUTTER_DEBUG_SCHEDULER },
{ "script", CLUTTER_DEBUG_SCRIPT }, { "script", CLUTTER_DEBUG_SCRIPT },
{ "shader", CLUTTER_DEBUG_SHADER }, { "shader", CLUTTER_DEBUG_SHADER },
{ "multistage", CLUTTER_DEBUG_MULTISTAGE },
{ "animation", CLUTTER_DEBUG_ANIMATION }, { "animation", CLUTTER_DEBUG_ANIMATION },
{ "layout", CLUTTER_DEBUG_LAYOUT }, { "layout", CLUTTER_DEBUG_LAYOUT },
{ "clipping", CLUTTER_DEBUG_CLIPPING }, { "clipping", CLUTTER_DEBUG_CLIPPING },
@ -3333,7 +3329,7 @@ clutter_threads_add_repaint_func (GSourceFunc func,
* Executes the repaint functions added using the * Executes the repaint functions added using the
* clutter_threads_add_repaint_func() function. * clutter_threads_add_repaint_func() function.
* *
* Must be called before calling clutter_redraw() and * Must be called before calling _clutter_stage_do_paint() and
* with the Clutter thread lock held. * with the Clutter thread lock held.
*/ */
void void

4
clutter/clutter-master-clock.c
View File

@ -532,8 +532,8 @@ _clutter_master_clock_start_running (ClutterMasterClock *master_clock)
* @master_clock: a #ClutterMasterClock * @master_clock: a #ClutterMasterClock
* *
* Advances all the timelines held by the master clock. This function * Advances all the timelines held by the master clock. This function
* should be called before calling clutter_redraw() to make sure that * should be called before calling _clutter_stage_do_update() to
* all the timelines are advanced and the scene is updated. * make sure that all the timelines are advanced and the scene is updated.
*/ */
void void
_clutter_master_clock_advance (ClutterMasterClock *master_clock) _clutter_master_clock_advance (ClutterMasterClock *master_clock)

2
clutter/deprecated/clutter-behaviour-depth.c
View File

@ -91,7 +91,7 @@ clutter_behaviour_depth_alpha_notify (ClutterBehaviour *behaviour,
depth = (alpha_value * (priv->depth_end - priv->depth_start)) depth = (alpha_value * (priv->depth_end - priv->depth_start))
+ priv->depth_start; + priv->depth_start;
CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, depth: %d", alpha_value, depth); CLUTTER_NOTE (ANIMATION, "alpha: %.4f, depth: %d", alpha_value, depth);
clutter_behaviour_actors_foreach (behaviour, clutter_behaviour_actors_foreach (behaviour,
alpha_notify_foreach, alpha_notify_foreach,

2
clutter/deprecated/clutter-behaviour-ellipse.c
View File

@ -176,7 +176,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
knot->y = y; knot->y = y;
knot->z = z; knot->z = z;
CLUTTER_NOTE (BEHAVIOUR, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)", CLUTTER_NOTE (ANIMATION, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)",
angle, angle,
knot->x, knot->y, knot->x, knot->y,
priv->a, priv->b); priv->a, priv->b);

2
clutter/deprecated/clutter-behaviour-opacity.c
View File

@ -97,7 +97,7 @@ clutter_behaviour_alpha_notify (ClutterBehaviour *behave,
* (priv->opacity_end - priv->opacity_start) * (priv->opacity_end - priv->opacity_start)
+ priv->opacity_start; + priv->opacity_start;
CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, opacity: %u", CLUTTER_NOTE (ANIMATION, "alpha: %.4f, opacity: %u",
alpha_value, alpha_value,
opacity); opacity);

2
clutter/deprecated/clutter-behaviour-path.c
View File

@ -128,7 +128,7 @@ actor_apply_knot_foreach (ClutterBehaviour *behaviour,
{ {
ClutterKnot *knot = data; ClutterKnot *knot = data;
CLUTTER_NOTE (BEHAVIOUR, "Setting actor to %ix%i", knot->x, knot->y); CLUTTER_NOTE (ANIMATION, "Setting actor to %ix%i", knot->x, knot->y);
clutter_actor_set_position (actor, knot->x, knot->y); clutter_actor_set_position (actor, knot->x, knot->y);
} }

12
clutter/deprecated/clutter-behaviour.c
View File

@ -518,17 +518,17 @@ notify_cb (GObject *object,
klass = CLUTTER_BEHAVIOUR_GET_CLASS (behave); klass = CLUTTER_BEHAVIOUR_GET_CLASS (behave);
CLUTTER_NOTE (BEHAVIOUR, "notify::alpha"); CLUTTER_NOTE (ANIMATION, "notify::alpha");
/* no actors, we can stop right here */ /* no actors, we can stop right here */
if (behave->priv->actors == NULL) if (behave->priv->actors == NULL)
return; return;
if (klass->alpha_notify) if (klass->alpha_notify != NULL)
{ {
gdouble alpha_value = clutter_alpha_get_alpha (behave->priv->alpha); gdouble alpha_value = clutter_alpha_get_alpha (behave->priv->alpha);
CLUTTER_NOTE (BEHAVIOUR, "calling %s::alpha_notify (%p, %.4f)", CLUTTER_NOTE (ANIMATION, "calling %s::alpha_notify (%p, %.4f)",
g_type_name (G_TYPE_FROM_CLASS (klass)), g_type_name (G_TYPE_FROM_CLASS (klass)),
behave, alpha_value); behave, alpha_value);
@ -571,7 +571,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
if (priv->notify_id) if (priv->notify_id)
{ {
CLUTTER_NOTE (BEHAVIOUR, "removing previous notify-id (%d)", CLUTTER_NOTE (ANIMATION, "removing previous notify-id (%d)",
priv->notify_id); priv->notify_id);
g_signal_handler_disconnect (priv->alpha, priv->notify_id); g_signal_handler_disconnect (priv->alpha, priv->notify_id);
@ -580,7 +580,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
if (priv->alpha != NULL) if (priv->alpha != NULL)
{ {
CLUTTER_NOTE (BEHAVIOUR, "removing previous alpha object"); CLUTTER_NOTE (ANIMATION, "removing previous alpha object");
g_object_unref (priv->alpha); g_object_unref (priv->alpha);
priv->alpha = NULL; priv->alpha = NULL;
@ -594,7 +594,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
G_CALLBACK(notify_cb), G_CALLBACK(notify_cb),
behave); behave);
CLUTTER_NOTE (BEHAVIOUR, "setting new alpha object (%p, notify:%d)", CLUTTER_NOTE (ANIMATION, "setting new alpha object (%p, notify:%d)",
priv->alpha, priv->notify_id); priv->alpha, priv->notify_id);
} }

2
clutter/wayland/clutter-backend-wayland.c
View File

@ -401,7 +401,7 @@ try_create_context (ClutterBackend *backend,
goto fail; goto fail;
} }
CLUTTER_NOTE (GL, "Created EGL Context"); CLUTTER_NOTE (BACKEND, "Created EGL Context");
} }
if (!eglMakeCurrent (backend_wayland->edpy, if (!eglMakeCurrent (backend_wayland->edpy,

4
clutter/win32/clutter-event-win32.c
View File

@ -440,8 +440,8 @@ clutter_win32_handle_event (const MSG *msg)
break; break;
case WM_PAINT: case WM_PAINT:
CLUTTER_NOTE (MULTISTAGE, "expose for stage:%p, redrawing", stage); CLUTTER_NOTE (BACKEND, "expose for stage:%p, redrawing", stage);
clutter_redraw (stage); clutter_stage_ensure_redraw (stage);
break; break;
case WM_DESTROY: case WM_DESTROY:

20
doc/reference/clutter/running-clutter.xml
View File

@ -60,13 +60,20 @@
<varlistentry> <varlistentry>
<term>CLUTTER_DEBUG</term> <term>CLUTTER_DEBUG</term>
<listitem> <listitem>
<para>Enables debugging modes for Clutter.</para> <para>Enables debugging modes for Clutter; debugging modes are
used to print debugging messages on the console. Clutter must be
compiled with the --enable-debug configuration switch for these
messages to be printed out. Multiple debugging modes can be
enabled by separating them using a colon (":") or a comma
(",").</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>COGL_DEBUG</term> <term>CLUTTER_PAINT</term>
<listitem> <listitem>
<para>Enables debugging modes for Cogl.</para> <para>Enables paint debugging modes for Clutter; the modes change
the way Clutter paints a scene and are useful for debugging the
behaviour of the paint cycle.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -177,7 +184,7 @@
<para>The debugging flags can be used for the CLUTTER_DEBUG environment <para>The debugging flags can be used for the CLUTTER_DEBUG environment
variable and the --clutter-debug command line switch. Multiple flags can variable and the --clutter-debug command line switch. Multiple flags can
be separated by a colon (:).</para> be separated by a colon (:) or a comma (,).</para>
<!-- <!--
keep in sync with the list of Clutter debug keys inside clutter-main.c keep in sync with the list of Clutter debug keys inside clutter-main.c
@ -196,11 +203,6 @@
<listitem><para>Backend-related notes, including initialization of <listitem><para>Backend-related notes, including initialization of
the backend features and GL context creation</para></listitem> the backend features and GL context creation</para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>behaviour</term>
<listitem><para>#ClutterBehaviour notes</para></listitem>
</varlistentry>
<varlistentry>
<term>event</term> <term>event</term>
<listitem><para>Event handling notes</para></listitem> <listitem><para>Event handling notes</para></listitem>
</varlistentry> </varlistentry>