SHOW,
HIDE,
DESTROY,
+ PARENT_SET,
LAST_SIGNAL
};
g_type_class_add_private (klass, sizeof (ClutterActorPrivate));
- g_object_class_install_property (object_class, PROP_X,
- g_param_spec_int ("x",
- "X co-ord",
- "X co-ord of actor",
- 0,
- G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class, PROP_Y,
- g_param_spec_int ("y",
- "Y co-ord",
- "Y co-ord of actor",
- 0,
- G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class, PROP_WIDTH,
- g_param_spec_int ("width",
- "Width",
- "Width of actor in pixels",
- 0,
- G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class, PROP_HEIGHT,
- g_param_spec_int ("height",
- "Height",
- "Height of actor in pixels",
- 0,
- G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class, PROP_OPACITY,
- g_param_spec_uchar ("opacity",
- "Opacity",
- "Opacity of actor",
- 0,
- 0xff,
- 0xff,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
-
- g_object_class_install_property (object_class, PROP_VISIBLE,
- g_param_spec_boolean ("visible",
- "Visible",
- "Whether the actor is visible or not",
- FALSE,
- G_PARAM_READWRITE));
- g_object_class_install_property (object_class, PROP_HAS_CLIP,
- g_param_spec_boolean ("has-clip",
- "Has Clip",
- "Whether the actor has a clip set or not",
- FALSE,
- G_PARAM_READABLE));
- g_object_class_install_property (object_class, PROP_CLIP,
- g_param_spec_boxed ("clip",
- "Clip",
- "The clip region for the actor",
- CLUTTER_TYPE_GEOMETRY,
- G_PARAM_READWRITE));
+ /**
+ * ClutterActor:x:
+ *
+ * X coordinate of the actor.
+ */
+ g_object_class_install_property (object_class,
+ PROP_X,
+ g_param_spec_int ("x",
+ "X co-ord",
+ "X co-ord of actor",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:y:
+ *
+ * Y coordinate of the actor.
+ */
+ g_object_class_install_property (object_class,
+ PROP_Y,
+ g_param_spec_int ("y",
+ "Y co-ord",
+ "Y co-ord of actor",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:width:
+ *
+ * Width of the actor (in pixels).
+ */
+ g_object_class_install_property (object_class,
+ PROP_WIDTH,
+ g_param_spec_int ("width",
+ "Width",
+ "Width of actor in pixels",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:height:
+ *
+ * Height of the actor (in pixels).
+ */
+ g_object_class_install_property (object_class,
+ PROP_HEIGHT,
+ g_param_spec_int ("height",
+ "Height",
+ "Height of actor in pixels",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:opacity:
+ *
+ * Opacity of the actor.
+ */
+ g_object_class_install_property (object_class,
+ PROP_OPACITY,
+ g_param_spec_uchar ("opacity",
+ "Opacity",
+ "Opacity of actor",
+ 0, 0xff,
+ 0xff,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+ /**
+ * ClutterActor:visible:
+ *
+ * Whether the actor is visible or not.
+ */
+ g_object_class_install_property (object_class,
+ PROP_VISIBLE,
+ g_param_spec_boolean ("visible",
+ "Visible",
+ "Whether the actor is visible or not",
+ FALSE,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:has-clip:
+ *
+ * Whether the actor has the clip property set or not.
+ */
+ g_object_class_install_property (object_class,
+ PROP_HAS_CLIP,
+ g_param_spec_boolean ("has-clip",
+ "Has Clip",
+ "Whether the actor has a clip set or not",
+ FALSE,
+ G_PARAM_READABLE));
+ /**
+ * ClutterActor:clip:
+ *
+ * The clip region for the actor.
+ */
+ g_object_class_install_property (object_class,
+ PROP_CLIP,
+ g_param_spec_boxed ("clip",
+ "Clip",
+ "The clip region for the actor",
+ CLUTTER_TYPE_GEOMETRY,
+ G_PARAM_READWRITE));
+ /**
+ * ClutterActor:name:
+ *
+ * The name of the actor.
+ *
+ * Since: 0.2
+ */
+ g_object_class_install_property (object_class,
+ PROP_NAME,
+ g_param_spec_string ("name",
+ "Name",
+ "Name of the actor",
+ NULL,
+ G_PARAM_READWRITE));
/**
* ClutterActor::destroy:
* either by direct invocation of clutter_actor_destroy() or
* when the #ClutterGroup that contains the actor is destroyed.
*
- * Since: 0.1.1
+ * Since: 0.2
*/
actor_signals[DESTROY] =
g_signal_new ("destroy",
*
* The ::show signal is emitted when an actor becomes visible.
*
- * Since: 0.1.1
+ * Since: 0.2
*/
actor_signals[SHOW] =
g_signal_new ("show",
*
* The ::hide signal is emitted when an actor is no longer visible.
*
- * Since: 0.1.1
+ * Since: 0.2
*/
actor_signals[HIDE] =
g_signal_new ("hide",
G_STRUCT_OFFSET (ClutterActorClass, hide),
NULL, NULL,
clutter_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
+ /**
+ * ClutterActor::parent-set:
+ * @actor: the object which received the signal
+ * @old_parent: the previous parent of the actor, or %NULL
+ *
+ * This signal is emitted when the parent of the actor changes.
+ *
+ * Since: 0.2
+ */
+ actor_signals[PARENT_SET] =
+ g_signal_new ("parent-set",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ClutterActorClass, parent_set),
+ NULL, NULL,
+ clutter_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ CLUTTER_TYPE_ACTOR);
}
static void
*/
void
clutter_actor_get_coords (ClutterActor *self,
- gint *x1,
- gint *y1,
- gint *x2,
- gint *y2)
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
ClutterActorBox box;
clutter_actor_allocate_coords (self, &box);
- if (x1) *x1 = box.x1;
- if (y1) *y1 = box.y1;
- if (x2) *x2 = box.x2;
- if (y2) *y2 = box.y2;
+ if (x1)
+ *x1 = box.x1;
+
+ if (y1)
+ *y1 = box.y1;
+
+ if (x2)
+ *x2 = box.x2;
+
+ if (y2)
+ *y2 = box.y2;
}
/**
*/
void
clutter_actor_set_position (ClutterActor *self,
- gint x,
- gint y)
+ gint x,
+ gint y)
{
ClutterActorBox box;
*/
void
clutter_actor_set_size (ClutterActor *self,
- gint width,
- gint height)
+ gint width,
+ gint height)
{
ClutterActorBox box;
g_return_if_fail (CLUTTER_IS_ACTOR (self));
if (width)
- *width = clutter_actor_get_width(self);
+ *width = clutter_actor_get_width (self);
+
if (height)
- *height = clutter_actor_get_height(self);
+ *height = clutter_actor_get_height (self);
}
/**
/* FIXME: must be nicer way to get 0,0 for stage ? */
if (parent)
{
- ClutterFixed parent_scale_x, parent_scale_y, fx, fy;
+ ClutterFixed parent_scale_x, parent_scale_y;
+ ClutterFixed fx, fy;
- clutter_actor_get_scalex(parent, &parent_scale_x, &parent_scale_y);
+ clutter_actor_get_scalex (parent,
+ &parent_scale_x,
+ &parent_scale_y);
- if (parent_scale_x != CFX_ONE || parent_scale_y != CFX_ONE)
+ if (parent_scale_x != CFX_ONE ||
+ parent_scale_y != CFX_ONE)
{
- fx = CLUTTER_FIXED_MUL(CLUTTER_INT_TO_FIXED(box.x1),parent_scale_x);
- fy = CLUTTER_FIXED_MUL(CLUTTER_INT_TO_FIXED(box.y1),parent_scale_y);
+ fx = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (box.x1),
+ parent_scale_x);
+ fy = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (box.y1),
+ parent_scale_y);
- box.x1 = CLUTTER_FIXED_INT(fx);
- box.y1 = CLUTTER_FIXED_INT(fy);
+ box.x1 = CLUTTER_FIXED_INT (fx);
+ box.y1 = CLUTTER_FIXED_INT (fy);
}
if (!CLUTTER_IS_STAGE (parent))
if (width)
*width = box.x2 - box.x1;
+
if (height)
*height = box.y2 - box.y1;
do
{
- if (parent->priv->scale_x != CFX_ONE || parent->priv->scale_y != CFX_ONE)
+ if (parent->priv->scale_x != CFX_ONE ||
+ parent->priv->scale_y != CFX_ONE)
{
ClutterFixed fx, fy;
if (width)
{
- fx = CLUTTER_FIXED_MUL(CLUTTER_INT_TO_FIXED(*width),
+ fx = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (*width),
parent->priv->scale_x);
- *width = CLUTTER_FIXED_INT(fx);
+ *width = CLUTTER_FIXED_INT (fx);
}
if (height)
{
- fy = CLUTTER_FIXED_MUL(CLUTTER_INT_TO_FIXED(*height),
+ fy = CLUTTER_FIXED_MUL (CLUTTER_INT_TO_FIXED (*height),
parent->priv->scale_x);
- *height = CLUTTER_FIXED_INT(fy);
+ *height = CLUTTER_FIXED_INT (fy);
}
}
}
- while ((parent = clutter_actor_get_parent(parent)) != NULL);
+ while ((parent = clutter_actor_get_parent (parent)) != NULL);
}
*/
void
clutter_actor_get_scale (ClutterActor *self,
- double *scale_x,
- double *scale_y)
+ gdouble *scale_x,
+ gdouble *scale_y)
{
if (scale_x)
- *scale_x = CLUTTER_FIXED_TO_FLOAT(self->priv->scale_x);
+ *scale_x = CLUTTER_FIXED_TO_FLOAT (self->priv->scale_x);
if (scale_y)
- *scale_y = CLUTTER_FIXED_TO_FLOAT(self->priv->scale_y);
+ *scale_y = CLUTTER_FIXED_TO_FLOAT (self->priv->scale_y);
}
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
+ g_object_ref (self);
+
g_free (self->priv->name);
- if (name || name[0] != '\0')
- {
- self->priv->name = g_strdup(name);
- }
+ if (name && name[0] != '\0')
+ self->priv->name = g_strdup(name);
+
+ g_object_notify (G_OBJECT (self), "name");
+ g_object_unref (self);
}
/**
*/
void
clutter_actor_set_depth (ClutterActor *self,
- gint depth)
+ gint depth)
{
/* Sets Z value. - FIXME: should invert ?*/
self->priv->z = depth;
* Rotates actor around the Z axis.
*/
void
-clutter_actor_rotate_z (ClutterActor *self,
- gfloat angle,
- gint x,
- gint y)
+clutter_actor_rotate_z (ClutterActor *self,
+ gfloat angle,
+ gint x,
+ gint y)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
* Rotates actor around the X axis.
*/
void
-clutter_actor_rotate_x (ClutterActor *self,
- gfloat angle,
- gint y,
- gint z)
+clutter_actor_rotate_x (ClutterActor *self,
+ gfloat angle,
+ gint y,
+ gint z)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
* Rotates actor around the X axis.
*/
void
-clutter_actor_rotate_y (ClutterActor *self,
- gfloat angle,
- gint x,
- gint z)
+clutter_actor_rotate_y (ClutterActor *self,
+ gfloat angle,
+ gint x,
+ gint z)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
g_object_ref_sink (self);
self->priv->parent_actor = parent;
+ g_signal_emit (self, actor_signals[PARENT_SET], 0, NULL);
+
+ if (CLUTTER_ACTOR_IS_REALIZED (self->priv->parent_actor))
+ clutter_actor_realize (self);
if (CLUTTER_ACTOR_IS_VISIBLE (self->priv->parent_actor) &&
CLUTTER_ACTOR_IS_VISIBLE (self))
- clutter_actor_queue_redraw (self);
+ {
+ clutter_actor_queue_redraw (self);
+ }
}
/**
void
clutter_actor_unparent (ClutterActor *self)
{
+ ClutterActor *old_parent;
+
g_return_if_fail (CLUTTER_IS_ACTOR (self));
if (self->priv->parent_actor == NULL)
clutter_actor_unrealize (self);
}
+ old_parent = self->priv->parent_actor;
self->priv->parent_actor = NULL;
+ g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);
+
g_object_unref (self);
}
* logically equivalent to calling clutter_actory_unparent()
* and clutter_actor_set_parent().
*
- * Since: 0.1.1
+ * Since: 0.2
*/
void
clutter_actor_reparent (ClutterActor *self,
if (self->priv->parent_actor != new_parent)
{
+ ClutterActor *old_parent;
+
/* if the actor and the parent have already been realized,
* mark the actor as reparenting, so that clutter_actor_unparent()
* just hides the actor instead of unrealize it.
CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_REPARENT);
}
+ old_parent = self->priv->parent_actor;
+
g_object_ref (self);
clutter_group_remove (CLUTTER_GROUP (self->priv->parent_actor), self);
clutter_group_add (CLUTTER_GROUP (new_parent), self);
* Both actors must have the same parent.
*/
void
-clutter_actor_raise (ClutterActor *self, ClutterActor *below)
+clutter_actor_raise (ClutterActor *self,
+ ClutterActor *below)
{
- g_return_if_fail (CLUTTER_IS_ACTOR(self));
- g_return_if_fail (clutter_actor_get_parent (self) != NULL);
+ ClutterActor *parent;
- clutter_group_raise (CLUTTER_GROUP(clutter_actor_get_parent (self)),
- self,
- below);
+ g_return_if_fail (CLUTTER_IS_ACTOR (self));
+
+ parent = clutter_actor_get_parent (self);
+ if (!parent)
+ {
+ g_warning ("Actor of type %s is not inside a group",
+ g_type_name (G_OBJECT_TYPE (self)));
+ return;
+ }
+
+ if (below)
+ {
+ if (parent != clutter_actor_get_parent (below))
+ {
+ g_warning ("Actor of type %s is not in the same "
+ "group of actor of type %s",
+ g_type_name (G_OBJECT_TYPE (self)),
+ g_type_name (G_OBJECT_TYPE (below)));
+ return;
+ }
+ }
+
+ clutter_group_raise (CLUTTER_GROUP (parent), self, below);
}
/**
* Both actors must have the same parent.
*/
void
-clutter_actor_lower (ClutterActor *self, ClutterActor *above)
+clutter_actor_lower (ClutterActor *self,
+ ClutterActor *above)
{
+ ClutterActor *parent;
+
g_return_if_fail (CLUTTER_IS_ACTOR(self));
- g_return_if_fail (clutter_actor_get_parent (self) != NULL);
- if (above != NULL)
+ parent = clutter_actor_get_parent (self);
+ if (!parent)
{
- g_return_if_fail
- (clutter_actor_get_parent (self)
- != clutter_actor_get_parent (above));
+ g_warning ("Actor of type %s is not inside a group",
+ g_type_name (G_OBJECT_TYPE (self)));
+ return;
+ }
+
+ if (above)
+ {
+ if (parent != clutter_actor_get_parent (above))
+ {
+ g_warning ("Actor of type %s is not in the same "
+ "group of actor of type %s",
+ g_type_name (G_OBJECT_TYPE (self)),
+ g_type_name (G_OBJECT_TYPE (above)));
+ return;
+ }
}
/* FIXME: group_lower should be an overidable method ? */
- clutter_group_lower (CLUTTER_GROUP(clutter_actor_get_parent (self)),
- self,
- above);
+ clutter_group_lower (CLUTTER_GROUP (parent), self, above);
}
/**
-AC_PREREQ(2.53)
-
# clutter package version number, (as distinct from shared library version)
# An odd micro number indicates in-progress development, (eg. from CVS)
# An even micro number indicates a released version.
-m4_define(clutter_version_major, 0)
-m4_define(clutter_version_minor, 1)
-m4_define(clutter_version_micro, 1)
+m4_define([clutter_major_version], [0])
+m4_define([clutter_minor_version], [1])
+m4_define([clutter_micro_version], [1])
+
+m4_define([clutter_version],
+ [clutter_major_version.clutter_minor_version.clutter_micro_version])
+
+m4_define([clutter_api_version],
+ [clutter_major_version.clutter_minor_version])
+
+# increase the interface age for each release; if the API changes, set to 0
+m4_define([clutter_interface_age], [0])
+m4_define([clutter_binary_age],
+ [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
+
+AC_PREREQ(2.53)
AC_INIT([clutter],
- clutter_version_major.clutter_version_minor.clutter_version_micro,
+ [clutter_version],
[http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter])
AC_CONFIG_SRCDIR([clutter/clutter.h])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([1.7])
-CLUTTER_MAJORMINOR=clutter_version_major.clutter_version_minor
+CLUTTER_MAJOR_VERSION=clutter_major_version
+CLUTTER_MINOR_VERSION=clutter_minor_version
+CLUTTER_MICRO_VERSION=clutter_micro_version
+CLUTTER_VERSION=clutter_version
+CLUTTER_MAJORMINOR=clutter_api_version
+AC_SUBST(CLUTTER_MAJOR_VERSION)
+AC_SUBST(CLUTTER_MINOR_VERSION)
+AC_SUBST(CLUTTER_MICRO_VERSION)
+AC_SUBST(CLUTTER_VERSION)
AC_SUBST(CLUTTER_MAJORMINOR)
-# CURRENT, REVISION, AGE
-# - library source changed -> increment REVISION
-# - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
-# - interfaces added -> increment AGE
-# - interfaces removed -> AGE = 0
-CLUTTER_LT_CURRENT=1
-CLUTTER_LT_REV=0
-CLUTTER_LT_AGE=1
+m4_define([lt_current],
+ [m4_eval(100 * clutter_minor_version + clutter_micro_version - clutter_interface_age)])
+m4_define([lt_revision], [clutter_interface_age])
+m4_define([lt_age], [m4_eval(clutter_binary_age - clutter_interface_age)])
+CLUTTER_LT_CURRENT=lt_current
+CLUTTER_LT_REV=lt_revision
+CLUTTER_LT_AGE=lt_age
CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE"
CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION"
GCC_FLAGS="-g -Wall"
fi
+dnl = Enable debug level ===================================================
+
+m4_define([debug_default],
+ m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum]))
+
+AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
+ [turn on debugging @<:@default=debug_default@:>@]),
+,
+ enable_debug=debug_default)
+
+if test "x$enable_debug" = "xyes"; then
+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
+ CLUTTER_DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
+else
+ if test "x$enable_debug" = "xno"; then
+ CLUTTER_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST
+_CHECKS"
+ else
+ CLUTTER_DEBUG_CFLAGS="-DG_DISABLE_CAST_CHECKS"
+ fi
+fi
+
+AC_SUBST(CLUTTER_DEBUG_CFLAGS)
+
dnl ========================================================================
-GTK_DOC_CHECK([1.0])
+dnl = GTK Doc check ========================================================
+
+GTK_DOC_CHECK([1.4])
dnl ========================================================================
AC_SUBST(CLUTTER_CFLAGS)
AC_SUBST(CLUTTER_LIBS)
-AC_OUTPUT([Makefile
-clutter/pango/Makefile
-clutter/Makefile
-gtk/Makefile
-gtk/gtk-clutter.pc
-examples/Makefile
-doc/Makefile
-doc/reference/Makefile
-doc/reference/version.xml
-clutter.pc
+AC_CONFIG_FILES([
+ Makefile
+ clutter/pango/Makefile
+ clutter/Makefile
+ clutter/clutter-version.h
+ gtk/Makefile
+ gtk/gtk-clutter.pc
+ examples/Makefile
+ doc/Makefile
+ doc/reference/Makefile
+ doc/reference/version.xml
+ clutter.pc
])
+AC_OUTPUT
+
dnl ========================================================================
echo ""
echo " prefix: ${prefix}"
echo ""
echo " GTK+ Widget: ${enable_gtk}"
+echo " Debug level: ${enable_debug}"
echo " Documentation: ${enable_gtk_doc}"
echo ""
projects / profile / ivi / clutter.git / commitdiff