[clutter/clutter-1.99: 2/2] [1.99] Remove all deprecated API and functionality
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.99: 2/2] [1.99] Remove all deprecated API and functionality
- Date: Tue, 28 Feb 2012 11:27:37 +0000 (UTC)
commit 1e0ba5ab503ce6d9d831aa30626dc6a4b63c4e5e
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Tue Feb 28 11:20:55 2012 +0000
[1.99] Remove all deprecated API and functionality
clutter/Makefile.am | 109 +--
clutter/cally/cally-group.c | 151 --
clutter/cally/cally-group.h | 85 -
clutter/cally/cally-rectangle.c | 94 -
clutter/cally/cally-rectangle.h | 82 -
clutter/cally/cally-stage.c | 2 +-
clutter/cally/cally-stage.h | 6 +-
clutter/cally/cally.c | 6 -
clutter/cally/cally.h | 2 -
clutter/clutter-actor.c | 630 +-------
clutter/clutter-actor.h | 47 +-
clutter/clutter-animatable.c | 74 -
clutter/clutter-animatable.h | 9 -
clutter/clutter-animation.c | 188 --
clutter/clutter-backend.c | 184 --
clutter/clutter-bin-layout.c | 7 +-
clutter/clutter-box-layout.c | 5 +-
clutter/clutter-cairo-texture.c | 127 --
clutter/clutter-container.c | 725 +--------
clutter/clutter-container.h | 22 -
clutter/clutter-deprecated.h | 29 -
clutter/clutter-event.h | 1 -
clutter/clutter-flow-layout.c | 3 -
clutter/clutter-group.h | 95 -
clutter/clutter-input-device.h | 3 -
clutter/clutter-interval.c | 16 -
clutter/clutter-macros.h | 138 +--
clutter/clutter-main.c | 449 -----
clutter/clutter-offscreen-effect.h | 5 -
clutter/clutter-script-parser.c | 7 +-
clutter/clutter-script.c | 68 +-
clutter/clutter-script.h | 1 -
clutter/clutter-settings.c | 24 -
clutter/clutter-stage-manager.c | 17 -
clutter/clutter-stage.c | 444 +-----
clutter/clutter-stage.h | 27 +-
clutter/clutter-table-layout.c | 5 +-
clutter/clutter-text-buffer.h | 13 -
clutter/clutter-text.h | 4 -
clutter/clutter-texture.c | 663 -------
clutter/clutter-timeline.c | 122 --
clutter/clutter-timeline.h | 11 -
clutter/clutter-types.h | 1 -
clutter/clutter-util.c | 22 -
clutter/clutter-version.h.in | 66 +-
clutter/clutter.h | 1 -
clutter/cogl/clutter-stage-cogl.c | 1 -
clutter/cogl/clutter-stage-cogl.h | 4 +-
clutter/deprecated/clutter-actor-deprecated.c | 318 ----
clutter/deprecated/clutter-actor.h | 88 -
clutter/deprecated/clutter-animatable.h | 47 -
clutter/deprecated/clutter-animation.h | 57 -
clutter/deprecated/clutter-backend.h | 64 -
clutter/deprecated/clutter-behaviour-depth.c | 307 ----
clutter/deprecated/clutter-behaviour-depth.h | 100 -
clutter/deprecated/clutter-behaviour-ellipse.c | 1066 -----------
clutter/deprecated/clutter-behaviour-ellipse.h | 158 --
clutter/deprecated/clutter-behaviour-opacity.c | 321 ----
clutter/deprecated/clutter-behaviour-opacity.h | 114 --
clutter/deprecated/clutter-behaviour-path.c | 476 -----
clutter/deprecated/clutter-behaviour-path.h | 134 --
clutter/deprecated/clutter-behaviour-rotate.c | 695 -------
clutter/deprecated/clutter-behaviour-rotate.h | 118 --
clutter/deprecated/clutter-behaviour-scale.c | 441 -----
clutter/deprecated/clutter-behaviour-scale.h | 106 --
clutter/deprecated/clutter-behaviour.c | 668 -------
clutter/deprecated/clutter-behaviour.h | 169 --
clutter/deprecated/clutter-box.c | 737 --------
clutter/deprecated/clutter-box.h | 142 --
clutter/deprecated/clutter-cairo-texture.h | 51 -
clutter/deprecated/clutter-container.h | 93 -
clutter/deprecated/clutter-fixed.c | 205 ---
clutter/deprecated/clutter-fixed.h | 97 -
clutter/deprecated/clutter-frame-source.c | 265 ---
clutter/deprecated/clutter-frame-source.h | 49 -
clutter/deprecated/clutter-group.c | 564 ------
clutter/deprecated/clutter-group.h | 62 -
clutter/deprecated/clutter-keysyms.h | 2302 ------------------------
clutter/deprecated/clutter-main.h | 90 -
clutter/deprecated/clutter-rectangle.c | 558 ------
clutter/deprecated/clutter-rectangle.h | 116 --
clutter/deprecated/clutter-score.c | 1148 ------------
clutter/deprecated/clutter-score.h | 143 --
clutter/deprecated/clutter-shader.c | 942 ----------
clutter/deprecated/clutter-shader.h | 179 --
clutter/deprecated/clutter-stage-manager.h | 42 -
clutter/deprecated/clutter-stage.h | 102 --
clutter/deprecated/clutter-texture.h | 48 -
clutter/deprecated/clutter-timeline.h | 41 -
clutter/deprecated/clutter-timeout-interval.c | 142 --
clutter/deprecated/clutter-timeout-interval.h | 58 -
clutter/deprecated/clutter-timeout-pool.c | 499 -----
clutter/deprecated/clutter-timeout-pool.h | 69 -
clutter/deprecated/clutter-util.h | 40 -
clutter/gdk/clutter-stage-gdk.h | 3 +-
clutter/osx/clutter-stage-osx.h | 4 +-
clutter/win32/clutter-stage-win32.h | 3 +-
clutter/x11/clutter-glx-texture-pixmap.c | 158 --
clutter/x11/clutter-glx-texture-pixmap.h | 92 -
clutter/x11/clutter-glx.h | 36 -
clutter/x11/clutter-stage-x11.h | 3 +-
101 files changed, 57 insertions(+), 19268 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 4c942ef..d084261 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -86,7 +86,6 @@ source_h = \
$(srcdir)/clutter-fixed-layout.h \
$(srcdir)/clutter-flow-layout.h \
$(srcdir)/clutter-gesture-action.h \
- $(srcdir)/clutter-group.h \
$(srcdir)/clutter-input-device.h \
$(srcdir)/clutter-interval.h \
$(srcdir)/clutter-keysyms.h \
@@ -230,64 +229,18 @@ source_c_priv = \
# deprecated installed headers
deprecated_h = \
- $(srcdir)/deprecated/clutter-actor.h \
- $(srcdir)/deprecated/clutter-animatable.h \
- $(srcdir)/deprecated/clutter-animation.h \
- $(srcdir)/deprecated/clutter-backend.h \
- $(srcdir)/deprecated/clutter-behaviour.h \
- $(srcdir)/deprecated/clutter-behaviour-depth.h \
- $(srcdir)/deprecated/clutter-behaviour-ellipse.h \
- $(srcdir)/deprecated/clutter-behaviour-opacity.h \
- $(srcdir)/deprecated/clutter-behaviour-path.h \
- $(srcdir)/deprecated/clutter-behaviour-rotate.h \
- $(srcdir)/deprecated/clutter-behaviour-scale.h \
- $(srcdir)/deprecated/clutter-box.h \
- $(srcdir)/deprecated/clutter-cairo-texture.h \
- $(srcdir)/deprecated/clutter-container.h \
- $(srcdir)/deprecated/clutter-fixed.h \
- $(srcdir)/deprecated/clutter-frame-source.h \
- $(srcdir)/deprecated/clutter-group.h \
- $(srcdir)/deprecated/clutter-keysyms.h \
- $(srcdir)/deprecated/clutter-main.h \
- $(srcdir)/deprecated/clutter-rectangle.h \
- $(srcdir)/deprecated/clutter-score.h \
- $(srcdir)/deprecated/clutter-shader.h \
- $(srcdir)/deprecated/clutter-stage-manager.h \
- $(srcdir)/deprecated/clutter-stage.h \
- $(srcdir)/deprecated/clutter-texture.h \
- $(srcdir)/deprecated/clutter-timeline.h \
- $(srcdir)/deprecated/clutter-timeout-pool.h \
- $(srcdir)/deprecated/clutter-util.h \
$(NULL)
# deprecated source code
deprecated_c = \
- $(srcdir)/deprecated/clutter-actor-deprecated.c \
- $(srcdir)/deprecated/clutter-behaviour.c \
- $(srcdir)/deprecated/clutter-behaviour-depth.c \
- $(srcdir)/deprecated/clutter-behaviour-ellipse.c \
- $(srcdir)/deprecated/clutter-behaviour-opacity.c \
- $(srcdir)/deprecated/clutter-behaviour-path.c \
- $(srcdir)/deprecated/clutter-behaviour-rotate.c \
- $(srcdir)/deprecated/clutter-behaviour-scale.c \
- $(srcdir)/deprecated/clutter-box.c \
- $(srcdir)/deprecated/clutter-fixed.c \
- $(srcdir)/deprecated/clutter-frame-source.c \
- $(srcdir)/deprecated/clutter-group.c \
- $(srcdir)/deprecated/clutter-rectangle.c \
- $(srcdir)/deprecated/clutter-score.c \
- $(srcdir)/deprecated/clutter-shader.c \
- $(srcdir)/deprecated/clutter-timeout-pool.c \
$(NULL)
# deprecated private headers; these should not be installed
deprecated_h_priv = \
- $(srcdir)/deprecated/clutter-timeout-interval.h \
$(NULL)
# deprecated private source code; these should not be introspected
deprecated_c_priv = \
- $(srcdir)/deprecated/clutter-timeout-interval.c \
$(NULL)
# built sources
@@ -315,13 +268,6 @@ EXTRA_DIST += clutter-keysyms-update.pl
pc_files += clutter-$(CLUTTER_API_VERSION).pc
-# in order to be compatible with Clutter < 1.10, when we shipped a single
-# shared library whose name was determined by the single backend it
-# supported, we need to install symbolic links so that existing applications
-# using Clutter won't break in the Brave New World of multi-backend support
-# in the same shared object.
-compat_libs =
-
# backends source listings
#
# backend_source_c := source code
@@ -424,31 +370,6 @@ clutter-cogl-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc
pc_files += clutter-cogl-$(CLUTTER_API_VERSION).pc
endif
-# For compatibility with the old GLX backend
-#
-# Note: there wasn't actually anything GLX specific so we can add
-# the compatibility if clutter supports x11
-glx_source_c = $(srcdir)/x11/clutter-glx-texture-pixmap.c
-glx_source_h = $(srcdir)/x11/clutter-glx-texture-pixmap.h \
- $(srcdir)/x11/clutter-glx.h
-
-if SUPPORT_X11
-backend_source_h += $(glx_source_h)
-backend_source_c += $(glx_source_c)
-
-clutterglx_includedir = $(clutter_includedir)/glx
-clutterglx_include_HEADERS = $(glx_source_h)
-
-clutter-glx-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc
- $(QUIET_GEN)cp -f $< $(@F)
-
-pc_files += clutter-glx-$(CLUTTER_API_VERSION).pc
-
-compat_libs += \
- libclutter-glx-$(CLUTTER_API_VERSION).so \
- $(NULL)
-endif
-
# GDK backend rules
gdk_source_c = \
$(srcdir)/gdk/clutter-backend-gdk.c \
@@ -579,10 +500,6 @@ clutter-cex100-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc
$(QUIET_GEN)cp -f $< $(@F)
pc_files += clutter-cex100-$(CLUTTER_API_VERSION).pc
-
-compat_libs += \
- libclutter-cex100-$(CLUTTER_API_VERSION).so \
- $(NULL)
endif # SUPPORT_CEX100
# EGL backend rules
@@ -689,10 +606,8 @@ cally_sources_h = \
$(srcdir)/cally/cally-actor.h \
$(srcdir)/cally/cally-clone.h \
$(srcdir)/cally/cally-factory.h \
- $(srcdir)/cally/cally-group.h \
$(srcdir)/cally/cally.h \
$(srcdir)/cally/cally-main.h \
- $(srcdir)/cally/cally-rectangle.h \
$(srcdir)/cally/cally-root.h \
$(srcdir)/cally/cally-stage.h \
$(srcdir)/cally/cally-text.h \
@@ -704,8 +619,6 @@ cally_sources_c = \
$(srcdir)/cally/cally-actor.c \
$(srcdir)/cally/cally.c \
$(srcdir)/cally/cally-clone.c \
- $(srcdir)/cally/cally-group.c \
- $(srcdir)/cally/cally-rectangle.c \
$(srcdir)/cally/cally-root.c \
$(srcdir)/cally/cally-stage.c \
$(srcdir)/cally/cally-text.c \
@@ -828,7 +741,7 @@ clutter.vsenums_h:
echo 'perl %1\bin\glib-mkenums --template ../../clutter/clutter-enum-types.h.in ' >vsenums_h.temp1
for F in `echo $(source_h) $(backend_source_h) $(srcdir)/win32/clutter-win32.h`; do \
case $$F in \
- *-x11*.h|*-wayland*.h|*-gdk*.h|*-glx*.h|*-cex*.h|*-egl*.h|*-osx*.h) ;; \
+ *-x11*.h|*-wayland*.h|*-gdk*.h|*-cex*.h|*-egl*.h|*-osx*.h) ;; \
*.h) echo '../../clutter'$$F' ' \
;; \
esac; \
@@ -843,7 +756,7 @@ clutter.vsenums_c:
echo 'perl %1\bin\glib-mkenums --template ../../clutter/clutter-enum-types.c.in ' >vsenums_c.temp1
for F in `echo $(source_h) $(backend_source_h) $(srcdir)/win32/clutter-win32.h`; do \
case $$F in \
- *-x11*.h|*-wayland*.h|*-gdk*.h|*-glx*.h|*-cex*.h|*-egl*.h|*-osx*.h) ;; \
+ *-x11*.h|*-wayland*.h|*-gdk*.h|*-cex*.h|*-egl*.h|*-osx*.h) ;; \
*.h) echo '../../clutter'$$F' ' \
;; \
esac; \
@@ -874,24 +787,6 @@ EXTRA_DIST += \
# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
DISTCLEANFILES += ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters ../build/win32/gen-enums.bat
-install-exec-local:
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- for lib in `echo $(compat_libs)`; do \
- (cd $(DESTDIR)$(libdir) && \
- rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
- ) ; \
- (cd $(DESTDIR)$(libdir) && \
- { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
- { rm -f $$lib.0 && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
- } \
- ) ; \
- (cd $(DESTDIR)$(libdir) && \
- { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
- { rm -f $$lib && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
- } \
- ) ; \
- done
-
# gobject-introspection rules
-include $(INTROSPECTION_MAKEFILE)
diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c
index 62e637e..1462a01 100644
--- a/clutter/cally/cally-stage.c
+++ b/clutter/cally/cally-stage.c
@@ -58,7 +58,7 @@ static void cally_stage_deactivate_cb (ClutterStage *stage,
G_DEFINE_TYPE_WITH_CODE (CallyStage,
cally_stage,
- CALLY_TYPE_GROUP,
+ CALLY_TYPE_ACTOR,
G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
cally_stage_window_interface_init));
diff --git a/clutter/cally/cally-stage.h b/clutter/cally/cally-stage.h
index 7ce4bb2..ad7fcaf 100644
--- a/clutter/cally/cally-stage.h
+++ b/clutter/cally/cally-stage.h
@@ -25,7 +25,7 @@
#ifndef __CALLY_STAGE_H__
#define __CALLY_STAGE_H__
-#include <cally/cally-group.h>
+#include <cally/cally-actor.h>
#include <clutter/clutter.h>
G_BEGIN_DECLS
@@ -52,7 +52,7 @@ typedef struct _CallyStagePrivate CallyStagePrivate;
struct _CallyStage
{
/*< private >*/
- CallyGroup parent;
+ CallyActor parent;
CallyStagePrivate *priv;
};
@@ -68,7 +68,7 @@ struct _CallyStage
struct _CallyStageClass
{
/*< private >*/
- CallyGroupClass parent_class;
+ CallyActorClass parent_class;
/* padding for future expansion */
gpointer _padding_dummy[16];
diff --git a/clutter/cally/cally.c b/clutter/cally/cally.c
index ea016c5..fa0477a 100644
--- a/clutter/cally/cally.c
+++ b/clutter/cally/cally.c
@@ -36,11 +36,9 @@
#include "cally.h"
#include "cally-actor.h"
-#include "cally-group.h"
#include "cally-stage.h"
#include "cally-text.h"
#include "cally-texture.h"
-#include "cally-rectangle.h"
#include "cally-clone.h"
#include "cally-factory.h"
@@ -55,11 +53,9 @@ static int cally_initialized = FALSE;
/* factories initialization*/
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_STAGE, cally_stage, cally_stage_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXTURE, cally_texture, cally_texture_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_RECTANGLE, cally_rectangle, cally_rectangle_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new)
/**
@@ -82,11 +78,9 @@ cally_accessibility_init (void)
/* setting the factories */
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_ACTOR, cally_actor);
- CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_STAGE, cally_stage);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXTURE, cally_texture);
- CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_RECTANGLE, cally_rectangle);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone);
/* Initialize the CallyUtility class */
diff --git a/clutter/cally/cally.h b/clutter/cally/cally.h
index 11fa9fc..bf22841 100644
--- a/clutter/cally/cally.h
+++ b/clutter/cally/cally.h
@@ -26,9 +26,7 @@
#include "cally-actor.h"
#include "cally-clone.h"
#include "cally-factory.h"
-#include "cally-group.h"
#include "cally-main.h"
-#include "cally-rectangle.h"
#include "cally-root.h"
#include "cally-stage.h"
#include "cally-text.h"
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index ebc1fe2..2e58bdc 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -322,7 +322,6 @@
#include "cogl/cogl.h"
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#define CLUTTER_ENABLE_EXPERIMENTAL_API
#include "clutter-actor-private.h"
@@ -350,9 +349,6 @@
#include "clutter-stage-private.h"
#include "clutter-units.h"
-#include "deprecated/clutter-behaviour.h"
-#include "deprecated/clutter-container.h"
-
#define CLUTTER_ACTOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_ACTOR, ClutterActorPrivate))
@@ -723,7 +719,6 @@ static void on_layout_manager_changed (ClutterLayoutManager *manager,
{ _transform; } \
cogl_matrix_translate ((m), -_tx, -_ty, -_tz); } G_STMT_END
-static GQuark quark_shader_data = 0;
static GQuark quark_actor_layout_info = 0;
static GQuark quark_actor_transform_info = 0;
@@ -1346,28 +1341,6 @@ clutter_actor_show (ClutterActor *self)
g_object_thaw_notify (G_OBJECT (self));
}
-/**
- * clutter_actor_show_all:
- * @self: a #ClutterActor
- *
- * Calls clutter_actor_show() on all children of an actor (if any).
- *
- * Since: 0.2
- *
- * Deprecated: 1.10: Actors are visible by default
- */
-void
-clutter_actor_show_all (ClutterActor *self)
-{
- ClutterActorClass *klass;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- klass = CLUTTER_ACTOR_GET_CLASS (self);
- if (klass->show_all)
- klass->show_all (self);
-}
-
static void
clutter_actor_real_hide (ClutterActor *self)
{
@@ -1442,29 +1415,6 @@ clutter_actor_hide (ClutterActor *self)
}
/**
- * clutter_actor_hide_all:
- * @self: a #ClutterActor
- *
- * Calls clutter_actor_hide() on all child actors (if any).
- *
- * Since: 0.2
- *
- * Deprecated: 1.10: Using clutter_actor_hide() on the actor will
- * prevent its children from being painted as well.
- */
-void
-clutter_actor_hide_all (ClutterActor *self)
-{
- ClutterActorClass *klass;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- klass = CLUTTER_ACTOR_GET_CLASS (self);
- if (klass->hide_all)
- klass->hide_all (self);
-}
-
-/**
* clutter_actor_realize:
* @self: A #ClutterActor
*
@@ -2918,12 +2868,6 @@ _clutter_actor_update_last_paint_volume (ClutterActor *self)
priv->last_paint_volume_valid = TRUE;
}
-static inline gboolean
-actor_has_shader_data (ClutterActor *self)
-{
- return g_object_get_qdata (G_OBJECT (self), quark_shader_data) != NULL;
-}
-
guint32
_clutter_actor_get_pick_id (ClutterActor *self)
{
@@ -3094,7 +3038,6 @@ clutter_actor_paint (ClutterActor *self)
ClutterActorPrivate *priv;
ClutterPickMode pick_mode;
gboolean clip_set = FALSE;
- gboolean shader_applied = FALSE;
CLUTTER_STATIC_COUNTER (actor_paint_counter,
"Actor real-paint counter",
@@ -3273,13 +3216,6 @@ clutter_actor_paint (ClutterActor *self)
if (priv->effects == NULL)
{
- if (pick_mode == CLUTTER_PICK_NONE &&
- actor_has_shader_data (self))
- {
- _clutter_actor_shader_pre_paint (self, FALSE);
- shader_applied = TRUE;
- }
-
priv->next_effect_to_paint = NULL;
}
else
@@ -3288,9 +3224,6 @@ clutter_actor_paint (ClutterActor *self)
clutter_actor_continue_paint (self);
- if (shader_applied)
- _clutter_actor_shader_post_paint (self);
-
if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_VOLUMES &&
pick_mode == CLUTTER_PICK_NONE))
_clutter_actor_draw_paint_volume (self);
@@ -4575,17 +4508,12 @@ clutter_actor_dispose (GObject *object)
{
ClutterActor *parent = priv->parent;
- /* go through the Container implementation unless this
- * is an internal child and has been marked as such.
- *
+ /*
* removing the actor from its parent will reset the
* realized and mapped states.
*/
- if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
- clutter_container_remove_actor (CLUTTER_CONTAINER (parent), self);
- else
- clutter_actor_remove_child_internal (parent, self,
- REMOVE_CHILD_LEGACY_FLAGS);
+ clutter_actor_remove_child_internal (parent, self,
+ REMOVE_CHILD_LEGACY_FLAGS);
}
/* parent must be gone at this point */
@@ -4890,7 +4818,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- quark_shader_data = g_quark_from_static_string ("-clutter-actor-shader-data");
quark_actor_layout_info = g_quark_from_static_string ("-clutter-actor-layout-info");
quark_actor_transform_info = g_quark_from_static_string ("-clutter-actor-transform-info");
@@ -4901,9 +4828,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
object_class->finalize = clutter_actor_finalize;
klass->show = clutter_actor_real_show;
- klass->show_all = clutter_actor_show;
klass->hide = clutter_actor_real_hide;
- klass->hide_all = clutter_actor_hide;
klass->map = clutter_actor_real_map;
klass->unmap = clutter_actor_real_unmap;
klass->unrealize = clutter_actor_real_unrealize;
@@ -5915,12 +5840,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
* This signal might result in the finalization of the #ClutterActor
* if all references are released.
*
- * Composite actors and actors implementing the #ClutterContainer
- * interface should override the default implementation of the
- * class handler of this signal and call clutter_actor_destroy() on
- * their children. When overriding the default class handler, it is
- * required to chain up to the parent's implementation.
- *
* Since: 0.2
*/
actor_signals[DESTROY] =
@@ -7983,63 +7902,6 @@ clutter_actor_set_allocation (ClutterActor *self,
}
/**
- * clutter_actor_set_geometry:
- * @self: A #ClutterActor
- * @geometry: A #ClutterGeometry
- *
- * Sets the actor's fixed position and forces its minimum and natural
- * size, in pixels. This means the untransformed actor will have the
- * given geometry. This is the same as calling clutter_actor_set_position()
- * and clutter_actor_set_size().
- *
- * Deprecated: 1.10: Use clutter_actor_set_position() and
- * clutter_actor_set_size() instead.
- */
-void
-clutter_actor_set_geometry (ClutterActor *self,
- const ClutterGeometry *geometry)
-{
- g_object_freeze_notify (G_OBJECT (self));
-
- clutter_actor_set_position (self, geometry->x, geometry->y);
- clutter_actor_set_size (self, geometry->width, geometry->height);
-
- g_object_thaw_notify (G_OBJECT (self));
-}
-
-/**
- * clutter_actor_get_geometry:
- * @self: A #ClutterActor
- * @geometry: (out caller-allocates): A location to store actors #ClutterGeometry
- *
- * Gets the size and position of an actor relative to its parent
- * actor. This is the same as calling clutter_actor_get_position() and
- * clutter_actor_get_size(). It tries to "do what you mean" and get the
- * requested size and position if the actor's allocation is invalid.
- *
- * Deprecated: 1.10: Use clutter_actor_get_position() and
- * clutter_actor_get_size(), or clutter_actor_get_allocation_geometry()
- * instead.
- */
-void
-clutter_actor_get_geometry (ClutterActor *self,
- ClutterGeometry *geometry)
-{
- gfloat x, y, width, height;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
- g_return_if_fail (geometry != NULL);
-
- clutter_actor_get_position (self, &x, &y);
- clutter_actor_get_size (self, &width, &height);
-
- geometry->x = (int) x;
- geometry->y = (int) y;
- geometry->width = (int) width;
- geometry->height = (int) height;
-}
-
-/**
* clutter_actor_set_position:
* @self: A #ClutterActor
* @x: New left position of actor in pixels.
@@ -9510,26 +9372,6 @@ clutter_actor_get_name (ClutterActor *self)
}
/**
- * clutter_actor_get_gid:
- * @self: A #ClutterActor
- *
- * Retrieves the unique id for @self.
- *
- * Return value: Globally unique value for this object instance.
- *
- * Since: 0.6
- *
- * Deprecated: 1.8: The id is not used any longer.
- */
-guint32
-clutter_actor_get_gid (ClutterActor *self)
-{
- g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
-
- return self->priv->id;
-}
-
-/**
* clutter_actor_set_depth:
* @self: a #ClutterActor
* @depth: Z co-ord
@@ -9556,11 +9398,6 @@ clutter_actor_set_depth (ClutterActor *self,
priv->transform_valid = FALSE;
- /* FIXME - remove this crap; sadly, there are still containers
- * in Clutter that depend on this utter brain damage
- */
- clutter_container_sort_depth_order (CLUTTER_CONTAINER (self));
-
clutter_actor_queue_redraw (self);
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DEPTH]);
@@ -10441,43 +10278,6 @@ clutter_actor_insert_child_below (ClutterActor *self,
}
/**
- * clutter_actor_set_parent:
- * @self: A #ClutterActor
- * @parent: A new #ClutterActor parent
- *
- * Sets the parent of @self to @parent.
- *
- * This function will result in @parent acquiring a reference on @self,
- * eventually by sinking its floating reference first. The reference
- * will be released by clutter_actor_unparent().
- *
- * This function should only be called by legacy #ClutterActor<!-- -->s
- * implementing the #ClutterContainer interface.
- *
- * Deprecated: 1.10: Use clutter_actor_add_child() instead.
- */
-void
-clutter_actor_set_parent (ClutterActor *self,
- ClutterActor *parent)
-{
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
- g_return_if_fail (CLUTTER_IS_ACTOR (parent));
- g_return_if_fail (self != parent);
- g_return_if_fail (self->priv->parent == NULL);
-
- /* as this function will be called inside ClutterContainer::add
- * implementations or when building up a composite actor, we have
- * to preserve the old behaviour, and not create child meta or
- * emit the ::actor-added signal, to avoid recursion or double
- * emissions
- */
- clutter_actor_add_child_internal (parent, self,
- ADD_CHILD_LEGACY_FLAGS,
- insert_child_at_depth,
- NULL);
-}
-
-/**
* clutter_actor_get_parent:
* @self: A #ClutterActor
*
@@ -10707,134 +10507,6 @@ clutter_actor_replace_child (ClutterActor *self,
}
/**
- * clutter_actor_unparent:
- * @self: a #ClutterActor
- *
- * Removes the parent of @self.
- *
- * This will cause the parent of @self to release the reference
- * acquired when calling clutter_actor_set_parent(), so if you
- * want to keep @self you will have to acquire a reference of
- * your own, through g_object_ref().
- *
- * This function should only be called by legacy #ClutterActor<!-- -->s
- * implementing the #ClutterContainer interface.
- *
- * Since: 0.1.1
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
- */
-void
-clutter_actor_unparent (ClutterActor *self)
-{
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- if (self->priv->parent == NULL)
- return;
-
- clutter_actor_remove_child_internal (self->priv->parent, self,
- REMOVE_CHILD_LEGACY_FLAGS);
-}
-
-/**
- * clutter_actor_reparent:
- * @self: a #ClutterActor
- * @new_parent: the new #ClutterActor parent
- *
- * Resets the parent actor of @self.
- *
- * This function is logically equivalent to calling clutter_actor_unparent()
- * and clutter_actor_set_parent(), but more efficiently implemented, as it
- * ensures the child is not finalized when unparented, and emits the
- * #ClutterActor::parent-set signal only once.
- *
- * In reality, calling this function is less useful than it sounds, as some
- * application code may rely on changes in the intermediate state between
- * removal and addition of the actor from its old parent to the @new_parent.
- * Thus, it is strongly encouraged to avoid using this function in application
- * code.
- *
- * Since: 0.2
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() and
- * clutter_actor_add_child() instead; remember to take a reference on
- * the actor being removed before calling clutter_actor_remove_child()
- * to avoid the reference count dropping to zero and the actor being
- * destroyed.
- */
-void
-clutter_actor_reparent (ClutterActor *self,
- ClutterActor *new_parent)
-{
- ClutterActorPrivate *priv;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
- g_return_if_fail (CLUTTER_IS_ACTOR (new_parent));
- g_return_if_fail (self != new_parent);
-
- if (CLUTTER_ACTOR_IS_TOPLEVEL (self))
- {
- g_warning ("Cannot set a parent on a toplevel actor");
- return;
- }
-
- if (CLUTTER_ACTOR_IN_DESTRUCTION (self))
- {
- g_warning ("Cannot set a parent currently being destroyed");
- return;
- }
-
- priv = self->priv;
-
- if (priv->parent != new_parent)
- {
- ClutterActor *old_parent;
-
- CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IN_REPARENT);
-
- old_parent = priv->parent;
-
- g_object_ref (self);
-
- if (old_parent != NULL)
- {
- /* go through the Container implementation if this is a regular
- * child and not an internal one
- */
- if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
- {
- ClutterContainer *parent = CLUTTER_CONTAINER (old_parent);
-
- /* this will have to call unparent() */
- clutter_container_remove_actor (parent, self);
- }
- else
- clutter_actor_remove_child_internal (old_parent, self,
- REMOVE_CHILD_LEGACY_FLAGS);
- }
-
- /* Note, will call set_parent() */
- if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
- clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self);
- else
- clutter_actor_add_child_internal (new_parent, self,
- ADD_CHILD_LEGACY_FLAGS,
- insert_child_at_depth,
- NULL);
-
- /* we emit the ::parent-set signal once */
- g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);
-
- CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_REPARENT);
-
- /* the IN_REPARENT flag suspends state updates */
- clutter_actor_update_map_state (self, MAP_STATE_CHECK);
-
- g_object_unref (self);
- }
-}
-
-/**
* clutter_actor_contains:
* @self: A #ClutterActor
* @descendant: A #ClutterActor, possibly contained in @self
@@ -10984,134 +10656,6 @@ clutter_actor_set_child_at_index (ClutterActor *self,
clutter_actor_queue_relayout (self);
}
-/**
- * clutter_actor_raise:
- * @self: A #ClutterActor
- * @below: (allow-none): A #ClutterActor to raise above.
- *
- * Puts @self above @below.
- *
- * Both actors must have the same parent, and the parent must implement
- * the #ClutterContainer interface
- *
- * This function calls clutter_container_raise_child() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() instead.
- */
-void
-clutter_actor_raise (ClutterActor *self,
- ClutterActor *below)
-{
- ClutterActor *parent;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- parent = clutter_actor_get_parent (self);
- if (parent == NULL)
- {
- g_warning ("%s: Actor '%s' is not inside a container",
- G_STRFUNC,
- _clutter_actor_get_debug_name (self));
- return;
- }
-
- if (below != NULL)
- {
- if (parent != clutter_actor_get_parent (below))
- {
- g_warning ("%s Actor '%s' is not in the same container as "
- "actor '%s'",
- G_STRFUNC,
- _clutter_actor_get_debug_name (self),
- _clutter_actor_get_debug_name (below));
- return;
- }
- }
-
- clutter_container_raise_child (CLUTTER_CONTAINER (parent), self, below);
-}
-
-/**
- * clutter_actor_lower:
- * @self: A #ClutterActor
- * @above: (allow-none): A #ClutterActor to lower below
- *
- * Puts @self below @above.
- *
- * Both actors must have the same parent, and the parent must implement
- * the #ClutterContainer interface.
- *
- * This function calls clutter_container_lower_child() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() instead.
- */
-void
-clutter_actor_lower (ClutterActor *self,
- ClutterActor *above)
-{
- ClutterActor *parent;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- parent = clutter_actor_get_parent (self);
- if (parent == NULL)
- {
- g_warning ("%s: Actor of type %s is not inside a container",
- G_STRFUNC,
- _clutter_actor_get_debug_name (self));
- return;
- }
-
- if (above)
- {
- if (parent != clutter_actor_get_parent (above))
- {
- g_warning ("%s: Actor '%s' is not in the same container as "
- "actor '%s'",
- G_STRFUNC,
- _clutter_actor_get_debug_name (self),
- _clutter_actor_get_debug_name (above));
- return;
- }
- }
-
- clutter_container_lower_child (CLUTTER_CONTAINER (parent), self, above);
-}
-
-/**
- * clutter_actor_raise_top:
- * @self: A #ClutterActor
- *
- * Raises @self to the top.
- *
- * This function calls clutter_actor_raise() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() with
- * a %NULL sibling, instead.
- */
-void
-clutter_actor_raise_top (ClutterActor *self)
-{
- clutter_actor_raise (self, NULL);
-}
-
-/**
- * clutter_actor_lower_bottom:
- * @self: A #ClutterActor
- *
- * Lowers @self to the bottom.
- *
- * This function calls clutter_actor_lower() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() with
- * a %NULL sibling, instead.
- */
-void
-clutter_actor_lower_bottom (ClutterActor *self)
-{
- clutter_actor_lower (self, NULL);
-}
-
/*
* Event handling
*/
@@ -11757,40 +11301,6 @@ parse_actor_metas (ClutterScript *script,
return g_slist_reverse (retval);
}
-static GSList *
-parse_behaviours (ClutterScript *script,
- ClutterActor *actor,
- JsonNode *node)
-{
- GList *elements, *l;
- GSList *retval = NULL;
-
- if (!JSON_NODE_HOLDS_ARRAY (node))
- return NULL;
-
- elements = json_array_get_elements (json_node_get_array (node));
-
- for (l = elements; l != NULL; l = l->next)
- {
- JsonNode *element = l->data;
- const gchar *id_ = _clutter_script_get_id_from_node (element);
- GObject *behaviour;
-
- if (id_ == NULL || *id_ == '\0')
- continue;
-
- behaviour = clutter_script_get_object (script, id_);
- if (behaviour == NULL)
- continue;
-
- retval = g_slist_prepend (retval, behaviour);
- }
-
- g_list_free (elements);
-
- return g_slist_reverse (retval);
-}
-
static gboolean
clutter_actor_parse_custom_node (ClutterScriptable *scriptable,
ClutterScript *script,
@@ -11849,24 +11359,6 @@ clutter_actor_parse_custom_node (ClutterScriptable *scriptable,
else
g_slice_free (RotationInfo, info);
}
- else if (strcmp (name, "behaviours") == 0)
- {
- GSList *l;
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- _clutter_diagnostic_message ("The 'behaviours' key is deprecated "
- "and it should not be used in newly "
- "written ClutterScript definitions.");
-#endif
-
- l = parse_behaviours (script, actor, node);
-
- g_value_init (value, G_TYPE_POINTER);
- g_value_set_pointer (value, l);
-
- retval = TRUE;
- }
else if (strcmp (name, "actions") == 0 ||
strcmp (name, "constraints") == 0 ||
strcmp (name, "effects") == 0)
@@ -11926,26 +11418,6 @@ clutter_actor_set_custom_property (ClutterScriptable *scriptable,
return;
}
- if (strcmp (name, "behaviours") == 0)
- {
- GSList *behaviours, *l;
-
- if (!G_VALUE_HOLDS (value, G_TYPE_POINTER))
- return;
-
- behaviours = g_value_get_pointer (value);
- for (l = behaviours; l != NULL; l = l->next)
- {
- ClutterBehaviour *behaviour = l->data;
-
- clutter_behaviour_apply (behaviour, actor);
- }
-
- g_slist_free (behaviours);
-
- return;
- }
-
if (strcmp (name, "actions") == 0 ||
strcmp (name, "constraints") == 0 ||
strcmp (name, "effects") == 0)
@@ -13539,102 +13011,6 @@ clutter_actor_get_text_direction (ClutterActor *self)
}
/**
- * clutter_actor_push_internal:
- * @self: a #ClutterActor
- *
- * Should be used by actors implementing the #ClutterContainer and with
- * internal children added through clutter_actor_set_parent(), for instance:
- *
- * |[
- * static void
- * my_actor_init (MyActor *self)
- * {
- * self->priv = SELF_ACTOR_GET_PRIVATE (self);
- *
- * clutter_actor_push_internal (CLUTTER_ACTOR (self));
- *
- * /* calling clutter_actor_set_parent() now will result in
- * * the internal flag being set on a child of MyActor
- * */
- *
- * /* internal child - a background texture */
- * self->priv->background_tex = clutter_texture_new ();
- * clutter_actor_set_parent (self->priv->background_tex,
- * CLUTTER_ACTOR (self));
- *
- * /* internal child - a label */
- * self->priv->label = clutter_text_new ();
- * clutter_actor_set_parent (self->priv->label,
- * CLUTTER_ACTOR (self));
- *
- * clutter_actor_pop_internal (CLUTTER_ACTOR (self));
- *
- * /* calling clutter_actor_set_parent() now will not result in
- * * the internal flag being set on a child of MyActor
- * */
- * }
- * ]|
- *
- * This function will be used by Clutter to toggle an "internal child"
- * flag whenever clutter_actor_set_parent() is called; internal children
- * are handled differently by Clutter, specifically when destroying their
- * parent.
- *
- * Call clutter_actor_pop_internal() when you finished adding internal
- * children.
- *
- * Nested calls to clutter_actor_push_internal() are allowed, but each
- * one must by followed by a clutter_actor_pop_internal() call.
- *
- * Since: 1.2
- *
- * Deprecated: 1.10: All children of an actor are accessible through
- * the #ClutterActor API, and #ClutterActor implements the
- * #ClutterContainer interface, so this function is only useful
- * for legacy containers overriding the default implementation.
- */
-void
-clutter_actor_push_internal (ClutterActor *self)
-{
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- self->priv->internal_child += 1;
-}
-
-/**
- * clutter_actor_pop_internal:
- * @self: a #ClutterActor
- *
- * Disables the effects of clutter_actor_push_internal().
- *
- * Since: 1.2
- *
- * Deprecated: 1.10: All children of an actor are accessible through
- * the #ClutterActor API. This function is only useful for legacy
- * containers overriding the default implementation of the
- * #ClutterContainer interface.
- */
-void
-clutter_actor_pop_internal (ClutterActor *self)
-{
- ClutterActorPrivate *priv;
-
- g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
- priv = self->priv;
-
- if (priv->internal_child == 0)
- {
- g_warning ("Mismatched %s: you need to call "
- "clutter_actor_push_composite() at least once before "
- "calling this function", G_STRFUNC);
- return;
- }
-
- priv->internal_child -= 1;
-}
-
-/**
* clutter_actor_has_pointer:
* @self: a #ClutterActor
*
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index de932d5..18bfd8c 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -189,9 +189,7 @@ struct _ClutterActorClass
/*< public >*/
void (* show) (ClutterActor *self);
- void (* show_all) (ClutterActor *self);
void (* hide) (ClutterActor *self);
- void (* hide_all) (ClutterActor *self);
void (* realize) (ClutterActor *self);
void (* unrealize) (ClutterActor *self);
void (* map) (ClutterActor *self);
@@ -260,7 +258,7 @@ struct _ClutterActorClass
/*< private >*/
/* padding for future expansion */
- gpointer _padding_dummy[28];
+ gpointer _padding_dummy[32];
};
/**
@@ -302,7 +300,6 @@ void clutter_actor_unmap
void clutter_actor_paint (ClutterActor *self);
void clutter_actor_continue_paint (ClutterActor *self);
void clutter_actor_queue_redraw (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_queue_redraw_with_clip (ClutterActor *self,
const cairo_rectangle_int_t *clip);
void clutter_actor_queue_relayout (ClutterActor *self);
@@ -393,45 +390,29 @@ void clutter_actor_set_y
void clutter_actor_set_depth (ClutterActor *self,
gfloat depth);
gfloat clutter_actor_get_depth (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_layout_manager (ClutterActor *self,
ClutterLayoutManager *manager);
-CLUTTER_AVAILABLE_IN_1_10
ClutterLayoutManager * clutter_actor_get_layout_manager (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_x_align (ClutterActor *self,
ClutterActorAlign x_align);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActorAlign clutter_actor_get_x_align (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_y_align (ClutterActor *self,
ClutterActorAlign y_align);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActorAlign clutter_actor_get_y_align (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_top (ClutterActor *self,
gfloat margin);
-CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_top (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_bottom (ClutterActor *self,
gfloat margin);
-CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_bottom (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_left (ClutterActor *self,
gfloat margin);
-CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_left (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_right (ClutterActor *self,
gfloat margin);
-CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_right (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin (ClutterActor *self,
const ClutterMargin *margin);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_get_margin (ClutterActor *self,
ClutterMargin *margin);
@@ -464,16 +445,13 @@ gboolean clutter_actor_is_in_clone_paint
gboolean clutter_actor_get_paint_box (ClutterActor *self,
ClutterActorBox *box);
gboolean clutter_actor_has_overlaps (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_background_color (ClutterActor *self,
const ClutterColor *color);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_get_background_color (ClutterActor *self,
ClutterColor *color);
const ClutterPaintVolume * clutter_actor_get_paint_volume (ClutterActor *self);
const ClutterPaintVolume * clutter_actor_get_transformed_paint_volume (ClutterActor *self,
ClutterActor *relative_to_ancestor);
-CLUTTER_AVAILABLE_IN_1_10
const ClutterPaintVolume * clutter_actor_get_default_paint_volume (ClutterActor *self);
/* Events */
@@ -497,75 +475,52 @@ void clutter_actor_set_text_direction
ClutterTextDirection clutter_actor_get_text_direction (ClutterActor *self);
/* Actor hierarchy */
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_add_child (ClutterActor *self,
ClutterActor *child);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_at_index (ClutterActor *self,
ClutterActor *child,
gint index_);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_above (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_below (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_replace_child (ClutterActor *self,
ClutterActor *old_child,
ClutterActor *new_child);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_remove_child (ClutterActor *self,
ClutterActor *child);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_remove_all_children (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_destroy_all_children (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
GList * clutter_actor_get_children (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
gint clutter_actor_get_n_children (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_child_at_index (ClutterActor *self,
gint index_);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_previous_sibling (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_next_sibling (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_first_child (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_last_child (ClutterActor *self);
ClutterActor * clutter_actor_get_parent (ClutterActor *self);
gboolean clutter_actor_contains (ClutterActor *self,
ClutterActor *descendant);
ClutterActor* clutter_actor_get_stage (ClutterActor *actor);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_below_sibling (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_above_sibling (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_at_index (ClutterActor *self,
ClutterActor *child,
gint index_);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_init (ClutterActorIter *iter,
ClutterActor *root);
-CLUTTER_AVAILABLE_IN_1_10
gboolean clutter_actor_iter_next (ClutterActorIter *iter,
ClutterActor **child);
-CLUTTER_AVAILABLE_IN_1_10
gboolean clutter_actor_iter_prev (ClutterActorIter *iter,
ClutterActor **child);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_remove (ClutterActorIter *iter);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_destroy (ClutterActorIter *iter);
/* Transformations */
diff --git a/clutter/clutter-animatable.c b/clutter/clutter-animatable.c
index f4b9a1d..1c5cc00 100644
--- a/clutter/clutter-animatable.c
+++ b/clutter/clutter-animatable.c
@@ -63,80 +63,6 @@ clutter_animatable_default_init (ClutterAnimatableInterface *iface)
}
/**
- * clutter_animatable_animate_property:
- * @animatable: a #ClutterAnimatable
- * @animation: a #ClutterAnimation
- * @property_name: the name of the animated property
- * @initial_value: the initial value of the animation interval
- * @final_value: the final value of the animation interval
- * @progress: the progress factor
- * @value: return location for the animation value
- *
- * Calls the animate_property() virtual function for @animatable.
- *
- * The @initial_value and @final_value #GValue<!-- -->s must contain
- * the same type; @value must have been initialized to the same
- * type of @initial_value and @final_value.
- *
- * All implementation of the #ClutterAnimatable interface must
- * implement this function.
- *
- * Return value: %TRUE if the value has been validated and can
- * be applied to the #ClutterAnimatable, and %FALSE otherwise
- *
- * Since: 1.0
- *
- * Deprecated: 1.8: Use clutter_animatable_interpolate_value()
- * instead
- */
-gboolean
-clutter_animatable_animate_property (ClutterAnimatable *animatable,
- ClutterAnimation *animation,
- const gchar *property_name,
- const GValue *initial_value,
- const GValue *final_value,
- gdouble progress,
- GValue *value)
-{
- ClutterAnimatableIface *iface;
- gboolean res;
-
- g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
- g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), FALSE);
- g_return_val_if_fail (property_name != NULL, FALSE);
- g_return_val_if_fail (initial_value != NULL && final_value != NULL, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (initial_value) != G_TYPE_INVALID, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (final_value) != G_TYPE_INVALID, FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
- g_return_val_if_fail (G_VALUE_TYPE (value) == G_VALUE_TYPE (initial_value) &&
- G_VALUE_TYPE (value) == G_VALUE_TYPE (final_value),
- FALSE);
-
- iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
- if (iface->animate_property == NULL)
- {
- ClutterInterval *interval;
-
- interval = clutter_animation_get_interval (animation, property_name);
- if (interval == NULL)
- return FALSE;
-
- res = clutter_animatable_interpolate_value (animatable, property_name,
- interval,
- progress,
- value);
- }
- else
- res = iface->animate_property (animatable, animation,
- property_name,
- initial_value, final_value,
- progress,
- value);
-
- return res;
-}
-
-/**
* clutter_animatable_find_property:
* @animatable: a #ClutterAnimatable
* @property_name: the name of the animatable property to find
diff --git a/clutter/clutter-animatable.h b/clutter/clutter-animatable.h
index 945431b..2462502 100644
--- a/clutter/clutter-animatable.h
+++ b/clutter/clutter-animatable.h
@@ -51,8 +51,6 @@ typedef struct _ClutterAnimatableIface ClutterAnimatableIface;
/**
* ClutterAnimatableIface:
- * @animate_property: virtual function for custom interpolation of a
- * property. This virtual function is deprecated
* @find_property: virtual function for retrieving the #GParamSpec of
* an animatable property
* @get_initial_state: virtual function for retrieving the initial
@@ -73,13 +71,6 @@ struct _ClutterAnimatableIface
GTypeInterface parent_iface;
/*< public >*/
- gboolean (* animate_property) (ClutterAnimatable *animatable,
- ClutterAnimation *animation,
- const gchar *property_name,
- const GValue *initial_value,
- const GValue *final_value,
- gdouble progress,
- GValue *value);
GParamSpec *(* find_property) (ClutterAnimatable *animatable,
const gchar *property_name);
void (* get_initial_state) (ClutterAnimatable *animatable,
diff --git a/clutter/clutter-animation.c b/clutter/clutter-animation.c
index aaef03c..cbcf861 100644
--- a/clutter/clutter-animation.c
+++ b/clutter/clutter-animation.c
@@ -567,27 +567,6 @@ clutter_animation_class_init (ClutterAnimationClass *klass)
CLUTTER_PARAM_READWRITE);
/**
- * ClutterAnimation:alpha:
- *
- * The #ClutterAlpha used by the animation.
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use the #ClutterAnimation:timeline property and
- * the #ClutterTimeline:progress-mode property instead.
- */
- obj_props[PROP_ALPHA] =
- g_param_spec_object ("alpha",
- P_("Alpha"),
- P_("The alpha used by the animation"),
- CLUTTER_TYPE_ALPHA,
- CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
-
- g_object_class_install_properties (gobject_class,
- PROP_LAST,
- obj_props);
-
- /**
* ClutterAnimation::started:
* @animation: the animation that emitted the signal
*
@@ -1668,52 +1647,6 @@ clutter_animation_get_timeline (ClutterAnimation *animation)
}
/**
- * clutter_animation_set_alpha:
- * @animation: a #ClutterAnimation
- * @alpha: a #ClutterAlpha, or %NULL to unset the current #ClutterAlpha
- *
- * Sets @alpha as the #ClutterAlpha used by @animation.
- *
- * If @alpha is not %NULL, the #ClutterAnimation will take ownership
- * of the #ClutterAlpha instance.
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_animation_get_timeline() and
- * clutter_timeline_set_progress_mode() instead.
- */
-void
-clutter_animation_set_alpha (ClutterAnimation *animation,
- ClutterAlpha *alpha)
-{
- g_return_if_fail (CLUTTER_IS_ANIMATION (animation));
- g_return_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha));
-
- clutter_animation_set_alpha_internal (animation, alpha);
-}
-
-/**
- * clutter_animation_get_alpha:
- * @animation: a #ClutterAnimation
- *
- * Retrieves the #ClutterAlpha used by @animation.
- *
- * Return value: (transfer none): the alpha object used by the animation
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_animation_get_timeline() and
- * clutter_timeline_get_progress_mode() instead.
- */
-ClutterAlpha *
-clutter_animation_get_alpha (ClutterAnimation *animation)
-{
- g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-
- return clutter_animation_get_alpha_internal (animation);
-}
-
-/**
* clutter_animation_completed:
* @animation: a #ClutterAnimation
*
@@ -2069,64 +2002,6 @@ animation_create_for_actor (ClutterActor *actor)
}
/**
- * clutter_actor_animate_with_alpha:
- * @actor: a #ClutterActor
- * @alpha: a #ClutterAlpha
- * @first_property_name: the name of a property
- * @...: a %NULL terminated list of property names and
- * property values
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite behaviour given by the passed @alpha.
- *
- * See clutter_actor_animate() for further details.
- *
- * This function is useful if you want to use an existing #ClutterAlpha
- * to animate @actor.
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is owned by the
- * #ClutterActor and should not be unreferenced with g_object_unref()
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_actor_animate_with_timeline() instead
- */
-ClutterAnimation *
-clutter_actor_animate_with_alpha (ClutterActor *actor,
- ClutterAlpha *alpha,
- const gchar *first_property_name,
- ...)
-{
- ClutterAnimation *animation;
- ClutterTimeline *timeline;
- va_list args;
-
- g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
- g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), NULL);
- g_return_val_if_fail (first_property_name != NULL, NULL);
-
- timeline = clutter_alpha_get_timeline (alpha);
- if (timeline == NULL)
- {
- g_warning ("The passed ClutterAlpha does not have an "
- "associated ClutterTimeline.");
- return NULL;
- }
-
- animation = animation_create_for_actor (actor);
- clutter_animation_set_alpha_internal (animation, alpha);
-
- va_start (args, first_property_name);
- clutter_animation_setup_valist (animation, first_property_name, args);
- va_end (args);
-
- clutter_animation_start (animation);
-
- return animation;
-}
-
-/**
* clutter_actor_animate_with_timeline:
* @actor: a #ClutterActor
* @mode: an animation mode logical id
@@ -2472,69 +2347,6 @@ clutter_actor_animate_with_timelinev (ClutterActor *actor,
}
/**
- * clutter_actor_animate_with_alphav:
- * @actor: a #ClutterActor
- * @alpha: a #ClutterAlpha
- * @n_properties: number of property names and values
- * @properties: (array length=n_properties) (element-type utf8): a vector
- * containing the property names to set
- * @values: (array length=n_properties): a vector containing the
- * property values to set
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite behaviour given by the passed @alpha.
- *
- * See clutter_actor_animate() for further details.
- *
- * This function is useful if you want to use an existing #ClutterAlpha
- * to animate @actor.
- *
- * This is the vector-based variant of clutter_actor_animate_with_alpha(),
- * useful for language bindings.
- *
- * <warning>Unlike clutter_actor_animate_with_alpha(), this function will
- * not allow you to specify "signal::" names and callbacks.</warning>
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is owned by the
- * #ClutterActor and should not be unreferenced with g_object_unref()
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_actor_animate_with_timelinev() instead
- */
-ClutterAnimation *
-clutter_actor_animate_with_alphav (ClutterActor *actor,
- ClutterAlpha *alpha,
- gint n_properties,
- const gchar * const properties[],
- const GValue *values)
-{
- ClutterAnimation *animation;
- ClutterTimeline *timeline;
-
- g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
- g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), NULL);
- g_return_val_if_fail (properties != NULL, NULL);
- g_return_val_if_fail (values != NULL, NULL);
-
- timeline = clutter_alpha_get_timeline (alpha);
- if (timeline == NULL)
- {
- g_warning ("The passed ClutterAlpha does not have an "
- "associated ClutterTimeline.");
- return NULL;
- }
-
- animation = animation_create_for_actor (actor);
- clutter_animation_set_alpha_internal (animation, alpha);
- clutter_animation_setupv (animation, n_properties, properties, values);
- clutter_animation_start (animation);
-
- return animation;
-}
-
-/**
* clutter_actor_get_animation:
* @actor: a #ClutterActor
*
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 849365b..33d3a85 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -93,8 +93,6 @@ struct _ClutterBackendPrivate
{
cairo_font_options_t *font_options;
- gchar *font_name;
-
gfloat units_per_em;
gint32 units_serial;
@@ -144,7 +142,6 @@ clutter_backend_finalize (GObject *gobject)
g_source_destroy (backend->cogl_source);
- g_free (backend->priv->font_name);
clutter_backend_set_font_options (backend, NULL);
G_OBJECT_CLASS (clutter_backend_parent_class)->finalize (gobject);
@@ -927,129 +924,6 @@ clutter_get_default_backend (void)
}
/**
- * clutter_backend_set_double_click_time:
- * @backend: a #ClutterBackend
- * @msec: milliseconds between two button press events
- *
- * Sets the maximum time between two button press events, used to
- * verify whether it's a double click event or not.
- *
- * Since: 0.4
- *
- * Deprecated: 1.4: Use #ClutterSettings:double-click-time instead
- */
-void
-clutter_backend_set_double_click_time (ClutterBackend *backend,
- guint msec)
-{
- ClutterSettings *settings = clutter_settings_get_default ();
-
- g_object_set (settings, "double-click-time", msec, NULL);
-}
-
-/**
- * clutter_backend_get_double_click_time:
- * @backend: a #ClutterBackend
- *
- * Gets the maximum time between two button press events, as set
- * by clutter_backend_set_double_click_time().
- *
- * Return value: a time in milliseconds
- *
- * Since: 0.4
- *
- * Deprecated: 1.4: Use #ClutterSettings:double-click-time instead
- */
-guint
-clutter_backend_get_double_click_time (ClutterBackend *backend)
-{
- ClutterSettings *settings = clutter_settings_get_default ();
- gint retval;
-
- g_object_get (settings, "double-click-time", &retval, NULL);
-
- return retval;
-}
-
-/**
- * clutter_backend_set_double_click_distance:
- * @backend: a #ClutterBackend
- * @distance: a distance, in pixels
- *
- * Sets the maximum distance used to verify a double click event.
- *
- * Since: 0.4
- *
- * Deprecated: 1.4: Use #ClutterSettings:double-click-distance instead
- */
-void
-clutter_backend_set_double_click_distance (ClutterBackend *backend,
- guint distance)
-{
- ClutterSettings *settings = clutter_settings_get_default ();
-
- g_object_set (settings, "double-click-distance", distance, NULL);
-}
-
-/**
- * clutter_backend_get_double_click_distance:
- * @backend: a #ClutterBackend
- *
- * Retrieves the distance used to verify a double click event
- *
- * Return value: a distance, in pixels.
- *
- * Since: 0.4
- *
- * Deprecated: 1.4: Use #ClutterSettings:double-click-distance instead
- */
-guint
-clutter_backend_get_double_click_distance (ClutterBackend *backend)
-{
- ClutterSettings *settings = clutter_settings_get_default ();
- gint retval;
-
- g_object_get (settings, "double-click-distance", &retval, NULL);
-
- return retval;
-}
-
-/**
- * clutter_backend_set_resolution:
- * @backend: a #ClutterBackend
- * @dpi: the resolution in "dots per inch" (Physical inches aren't
- * actually involved; the terminology is conventional).
- *
- * Sets the resolution for font handling on the screen. This is a
- * scale factor between points specified in a #PangoFontDescription
- * and cairo units. The default value is 96, meaning that a 10 point
- * font will be 13 units high. (10 * 96. / 72. = 13.3).
- *
- * Applications should never need to call this function.
- *
- * Since: 0.4
- *
- * Deprecated: 1.4: Use #ClutterSettings:font-dpi instead
- */
-void
-clutter_backend_set_resolution (ClutterBackend *backend,
- gdouble dpi)
-{
- ClutterSettings *settings;
- gint resolution;
-
- g_return_if_fail (CLUTTER_IS_BACKEND (backend));
-
- if (dpi < 0)
- resolution = -1;
- else
- resolution = dpi * 1024;
-
- settings = clutter_settings_get_default ();
- g_object_set (settings, "font-dpi", resolution, NULL);
-}
-
-/**
* clutter_backend_get_resolution:
* @backend: a #ClutterBackend
*
@@ -1165,64 +1039,6 @@ clutter_backend_get_font_options (ClutterBackend *backend)
return priv->font_options;
}
-/**
- * clutter_backend_set_font_name:
- * @backend: a #ClutterBackend
- * @font_name: the name of the font
- *
- * Sets the default font to be used by Clutter. The @font_name string
- * must either be %NULL, which means that the font name from the
- * default #ClutterBackend will be used; or be something that can
- * be parsed by the pango_font_description_from_string() function.
- *
- * Since: 1.0
- *
- * Deprecated: 1.4: Use #ClutterSettings:font-name instead
- */
-void
-clutter_backend_set_font_name (ClutterBackend *backend,
- const gchar *font_name)
-{
- ClutterSettings *settings = clutter_settings_get_default ();
-
- g_object_set (settings, "font-name", font_name, NULL);
-}
-
-/**
- * clutter_backend_get_font_name:
- * @backend: a #ClutterBackend
- *
- * Retrieves the default font name as set by
- * clutter_backend_set_font_name().
- *
- * Return value: the font name for the backend. The returned string is
- * owned by the #ClutterBackend and should never be modified or freed
- *
- * Since: 1.0
- *
- * Deprecated: 1.4: Use #ClutterSettings:font-name instead
- */
-const gchar *
-clutter_backend_get_font_name (ClutterBackend *backend)
-{
- ClutterBackendPrivate *priv;
- ClutterSettings *settings;
-
- g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL);
-
- priv = backend->priv;
-
- settings = clutter_settings_get_default ();
-
- /* XXX yuck. but we return a const pointer, so we need to
- * store it in the backend
- */
- g_free (priv->font_name);
- g_object_get (settings, "font-name", &priv->font_name, NULL);
-
- return priv->font_name;
-}
-
gint32
_clutter_backend_get_units_serial (ClutterBackend *backend)
{
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index d09da6b..5e7749b 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -93,9 +93,6 @@
#include <math.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-actor.h"
#include "clutter-animatable.h"
#include "clutter-bin-layout.h"
@@ -785,7 +782,7 @@ clutter_bin_layout_get_alignment (ClutterBinLayout *self,
* Adds a #ClutterActor to the container using @self and
* sets the alignment policies for it
*
- * This function is equivalent to clutter_container_add_actor()
+ * This function is equivalent to clutter_actor_add_child()
* and clutter_layout_manager_child_set_property() but it does not
* require a pointer to the #ClutterContainer associated to the
* #ClutterBinLayout
@@ -815,7 +812,7 @@ clutter_bin_layout_add (ClutterBinLayout *self,
return;
}
- clutter_container_add_actor (priv->container, child);
+ clutter_actor_add_child (CLUTTER_ACTOR (priv->container), child);
manager = CLUTTER_LAYOUT_MANAGER (self);
meta = clutter_layout_manager_get_child_meta (manager,
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index 4d18585..f57df7a 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -75,9 +75,6 @@
#include <math.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-box-layout.h"
#include "clutter-actor-private.h"
@@ -1731,7 +1728,7 @@ clutter_box_layout_pack (ClutterBoxLayout *layout,
return;
}
- clutter_container_add_actor (priv->container, actor);
+ clutter_actor_add_child (CLUTTER_ACTOR (priv->container), actor);
manager = CLUTTER_LAYOUT_MANAGER (layout);
meta = clutter_layout_manager_get_child_meta (manager,
diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c
index 100a6a1..4ea1917 100644
--- a/clutter/clutter-cairo-texture.c
+++ b/clutter/clutter-cairo-texture.c
@@ -764,101 +764,6 @@ intersect_rectangles (cairo_rectangle_int_t *a,
}
}
-static cairo_t *
-clutter_cairo_texture_create_region_internal (ClutterCairoTexture *self,
- gint x_offset,
- gint y_offset,
- gint width,
- gint height)
-{
- ClutterCairoTexturePrivate *priv = self->priv;
- cairo_rectangle_int_t region, area, inter;
- cairo_surface_t *surface;
- DrawContext *ctxt;
- cairo_t *cr;
-
- if (width < 0)
- width = priv->surface_width;
-
- if (height < 0)
- height = priv->surface_height;
-
- if (width == 0 || height == 0)
- {
- g_warning ("Unable to create a context for an image surface of "
- "width %d and height %d. Set the surface size to be "
- "at least 1 pixel by 1 pixel.",
- width, height);
- return NULL;
- }
-
- surface = get_surface (self);
-
- ctxt = draw_context_create (self);
-
- region.x = x_offset;
- region.y = y_offset;
- region.width = width;
- region.height = height;
-
- area.x = 0;
- area.y = 0;
- area.width = priv->surface_width;
- area.height = priv->surface_height;
-
- /* Limit the region to the visible rectangle */
- intersect_rectangles (&area, ®ion, &inter);
-
- ctxt->rect = inter;
-
- cr = cairo_create (surface);
- cairo_set_user_data (cr, &clutter_cairo_texture_context_key,
- ctxt,
- clutter_cairo_texture_context_destroy);
-
- return cr;
-}
-
-/**
- * clutter_cairo_texture_create_region:
- * @self: a #ClutterCairoTexture
- * @x_offset: offset of the region on the X axis
- * @y_offset: offset of the region on the Y axis
- * @width: width of the region, or -1 for the full surface width
- * @height: height of the region, or -1 for the full surface height
- *
- * Creates a new Cairo context that will updat the region defined
- * by @x_offset, @y_offset, @width and @height.
- *
- * <warning><para>Do not call this function within the paint virtual
- * function or from a callback to the #ClutterActor::paint
- * signal.</para></warning>
- *
- * Return value: a newly created Cairo context. Use cairo_destroy()
- * to upload the contents of the context when done drawing
- *
- * Since: 1.0
- *
- * Deprecated: 1.8: Use the #ClutterCairoTexture::draw signal and
- * clutter_cairo_texture_invalidate_rectangle() to obtain a
- * clipped Cairo context for 2D drawing.
- */
-cairo_t *
-clutter_cairo_texture_create_region (ClutterCairoTexture *self,
- gint x_offset,
- gint y_offset,
- gint width,
- gint height)
-{
- g_return_val_if_fail (CLUTTER_IS_CAIRO_TEXTURE (self), NULL);
-
- clutter_warn_if_paint_fail (self);
-
- return clutter_cairo_texture_create_region_internal (self,
- x_offset, y_offset,
- width, height);
-}
-
/**
* clutter_cairo_texture_invalidate_rectangle:
* @self: a #ClutterCairoTexture
@@ -942,38 +847,6 @@ clutter_cairo_texture_invalidate (ClutterCairoTexture *self)
}
/**
- * clutter_cairo_texture_create:
- * @self: a #ClutterCairoTexture
- *
- * Creates a new Cairo context for the @cairo texture. It is
- * similar to using clutter_cairo_texture_create_region() with @x_offset
- * and @y_offset of 0, @width equal to the @cairo texture surface width
- * and @height equal to the @cairo texture surface height.
- *
- * <warning><para>Do not call this function within the paint virtual
- * function or from a callback to the #ClutterActor::paint
- * signal.</para></warning>
- *
- * Return value: a newly created Cairo context. Use cairo_destroy()
- * to upload the contents of the context when done drawing
- *
- * Since: 1.0
- *
- * Deprecated: 1.8: Use the #ClutterCairoTexture::draw signal and
- * the clutter_cairo_texture_invalidate() function to obtain a
- * Cairo context for 2D drawing.
- */
-cairo_t *
-clutter_cairo_texture_create (ClutterCairoTexture *self)
-{
- g_return_val_if_fail (CLUTTER_IS_CAIRO_TEXTURE (self), NULL);
-
- clutter_warn_if_paint_fail (self);
-
- return clutter_cairo_texture_create_region_internal (self, 0, 0, -1, -1);
-}
-
-/**
* clutter_cairo_set_source_color:
* @cr: a Cairo context
* @color: a #ClutterColor
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index 49c8282..46266ab 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -34,9 +34,6 @@
#include <glib-object.h>
#include <gobject/gvaluecollector.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-actor-private.h"
#include "clutter-child-meta.h"
#include "clutter-debug.h"
@@ -45,24 +42,6 @@
#include "clutter-private.h"
#include "clutter-enum-types.h"
-#define CLUTTER_CONTAINER_WARN_NOT_IMPLEMENTED(container,vfunc) \
- G_STMT_START { \
- g_warning ("Container of type '%s' does not implement " \
- "the required ClutterContainer::%s virtual " \
- "function.", \
- G_OBJECT_TYPE_NAME ((container)), \
- (vfunc)); \
- } G_STMT_END
-
-#define CLUTTER_CONTAINER_NOTE_NOT_IMPLEMENTED(container,vfunc) \
- G_STMT_START { \
- CLUTTER_NOTE (ACTOR, "Container of type '%s' does not " \
- "implement the ClutterContainer::%s " \
- "virtual function.", \
- G_OBJECT_TYPE_NAME ((container)), \
- (vfunc)); \
- } G_STMT_END
-
/**
* SECTION:clutter-container
* @short_description: An interface for container actors
@@ -107,76 +86,6 @@ typedef ClutterContainerIface ClutterContainerInterface;
G_DEFINE_INTERFACE (ClutterContainer, clutter_container, G_TYPE_OBJECT);
static void
-container_real_add (ClutterContainer *container,
- ClutterActor *actor)
-{
- clutter_actor_add_child (CLUTTER_ACTOR (container), actor);
-}
-
-static void
-container_real_remove (ClutterContainer *container,
- ClutterActor *actor)
-{
- clutter_actor_remove_child (CLUTTER_ACTOR (container), actor);
-}
-
-typedef struct {
- ClutterCallback callback;
- gpointer data;
-} ForeachClosure;
-
-static gboolean
-foreach_cb (ClutterActor *actor,
- gpointer data)
-{
- ForeachClosure *clos = data;
-
- clos->callback (actor, clos->data);
-
- return TRUE;
-}
-
-static void
-container_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
-{
- ForeachClosure clos;
-
- clos.callback = callback;
- clos.data = user_data;
-
- _clutter_actor_foreach_child (CLUTTER_ACTOR (container),
- foreach_cb,
- &clos);
-}
-
-static void
-container_real_raise (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- ClutterActor *self = CLUTTER_ACTOR (container);
-
- clutter_actor_set_child_above_sibling (self, child, sibling);
-}
-
-static void
-container_real_lower (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- ClutterActor *self = CLUTTER_ACTOR (container);
-
- clutter_actor_set_child_below_sibling (self, child, sibling);
-}
-
-static void
-container_real_sort_depth_order (ClutterContainer *container)
-{
-}
-
-static void
clutter_container_default_init (ClutterContainerInterface *iface)
{
GType iface_type = G_TYPE_FROM_INTERFACE (iface);
@@ -245,13 +154,6 @@ clutter_container_default_init (ClutterContainerInterface *iface)
G_TYPE_NONE, 2,
CLUTTER_TYPE_ACTOR, G_TYPE_PARAM);
- iface->add = container_real_add;
- iface->remove = container_real_remove;
- iface->foreach = container_real_foreach;
- iface->raise = container_real_raise;
- iface->lower = container_real_lower;
- iface->sort_depth_order = container_real_sort_depth_order;
-
iface->child_meta_type = G_TYPE_INVALID;
iface->create_child_meta = create_child_meta;
iface->destroy_child_meta = destroy_child_meta;
@@ -259,596 +161,6 @@ clutter_container_default_init (ClutterContainerInterface *iface)
iface->child_notify = child_notify;
}
-static inline void
-container_add_actor (ClutterContainer *container,
- ClutterActor *actor)
-{
- ClutterActor *parent;
-
- parent = clutter_actor_get_parent (actor);
- if (G_UNLIKELY (parent != NULL))
- {
- g_warning ("Attempting to add actor of type '%s' to a "
- "container of type '%s', but the actor has "
- "already a parent of type '%s'.",
- g_type_name (G_OBJECT_TYPE (actor)),
- g_type_name (G_OBJECT_TYPE (container)),
- g_type_name (G_OBJECT_TYPE (parent)));
- return;
- }
-
- clutter_container_create_child_meta (container, actor);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- ClutterContainerIface *iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
- if (iface->add != container_real_add)
- _clutter_diagnostic_message ("The ClutterContainer::add() virtual "
- "function has been deprecated and it "
- "should not be overridden by newly "
- "written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- CLUTTER_CONTAINER_GET_IFACE (container)->add (container, actor);
-}
-
-static inline void
-container_remove_actor (ClutterContainer *container,
- ClutterActor *actor)
-{
- ClutterActor *parent;
-
- parent = clutter_actor_get_parent (actor);
- if (parent != CLUTTER_ACTOR (container))
- {
- g_warning ("Attempting to remove actor of type '%s' from "
- "group of class '%s', but the container is not "
- "the actor's parent.",
- g_type_name (G_OBJECT_TYPE (actor)),
- g_type_name (G_OBJECT_TYPE (container)));
- return;
- }
-
- clutter_container_destroy_child_meta (container, actor);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- ClutterContainerIface *iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
- if (iface->remove != container_real_remove)
- _clutter_diagnostic_message ("The ClutterContainer::remove() virtual "
- "function has been deprecated and it "
- "should not be overridden by newly "
- "written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- CLUTTER_CONTAINER_GET_IFACE (container)->remove (container, actor);
-}
-
-static inline void
-container_add_valist (ClutterContainer *container,
- ClutterActor *first_actor,
- va_list args)
-{
- ClutterActor *actor = first_actor;
-
- while (actor != NULL)
- {
- container_add_actor (container, actor);
- actor = va_arg (args, ClutterActor *);
- }
-}
-
-static inline void
-container_remove_valist (ClutterContainer *container,
- ClutterActor *first_actor,
- va_list args)
-{
- ClutterActor *actor = first_actor;
-
- while (actor != NULL)
- {
- container_remove_actor (container, actor);
- actor = va_arg (args, ClutterActor *);
- }
-}
-
-/**
- * clutter_container_add: (skip)
- * @container: a #ClutterContainer
- * @first_actor: the first #ClutterActor to add
- * @...: %NULL terminated list of actors to add
- *
- * Adds a list of #ClutterActor<!-- -->s to @container. Each time and
- * actor is added, the "actor-added" signal is emitted. Each actor should
- * be parented to @container, which takes a reference on the actor. You
- * cannot add a #ClutterActor to more than one #ClutterContainer.
- *
- * This function will call #ClutterContainerIface.add(), which is a
- * deprecated virtual function. The default implementation will
- * call clutter_actor_add_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_add_child() instead.
- */
-void
-clutter_container_add (ClutterContainer *container,
- ClutterActor *first_actor,
- ...)
-{
- va_list args;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
- va_start (args, first_actor);
- container_add_valist (container, first_actor, args);
- va_end (args);
-}
-
-/**
- * clutter_container_add_actor:
- * @container: a #ClutterContainer
- * @actor: the first #ClutterActor to add
- *
- * Adds a #ClutterActor to @container. This function will emit the
- * "actor-added" signal. The actor should be parented to
- * @container. You cannot add a #ClutterActor to more than one
- * #ClutterContainer.
- *
- * This function will call #ClutterContainerIface.add(), which is a
- * deprecated virtual function. The default implementation will
- * call clutter_actor_add_child().
- *
- * Virtual: add
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_add_child() instead.
- */
-void
-clutter_container_add_actor (ClutterContainer *container,
- ClutterActor *actor)
-{
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-
- container_add_actor (container, actor);
-}
-
-/**
- * clutter_container_add_valist: (skip)
- * @container: a #ClutterContainer
- * @first_actor: the first #ClutterActor to add
- * @var_args: list of actors to add, followed by %NULL
- *
- * Alternative va_list version of clutter_container_add().
- *
- * This function will call #ClutterContainerIface.add(), which is a
- * deprecated virtual function. The default implementation will
- * call clutter_actor_add_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_add_child() instead.
- */
-void
-clutter_container_add_valist (ClutterContainer *container,
- ClutterActor *first_actor,
- va_list var_args)
-{
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
- container_add_valist (container, first_actor, var_args);
-}
-
-/**
- * clutter_container_remove: (skip)
- * @container: a #ClutterContainer
- * @first_actor: first #ClutterActor to remove
- * @...: a %NULL-terminated list of actors to remove
- *
- * Removes a %NULL terminated list of #ClutterActor<!-- -->s from
- * @container. Each actor should be unparented, so if you want to keep it
- * around you must hold a reference to it yourself, using g_object_ref().
- * Each time an actor is removed, the "actor-removed" signal is
- * emitted by @container.
- *
- * This function will call #ClutterContainerIface.remove(), which is a
- * deprecated virtual function. The default implementation will call
- * clutter_actor_remove_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
- */
-void
-clutter_container_remove (ClutterContainer *container,
- ClutterActor *first_actor,
- ...)
-{
- va_list var_args;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
- va_start (var_args, first_actor);
- container_remove_valist (container, first_actor, var_args);
- va_end (var_args);
-}
-
-/**
- * clutter_container_remove_actor:
- * @container: a #ClutterContainer
- * @actor: a #ClutterActor
- *
- * Removes @actor from @container. The actor should be unparented, so
- * if you want to keep it around you must hold a reference to it
- * yourself, using g_object_ref(). When the actor has been removed,
- * the "actor-removed" signal is emitted by @container.
- *
- * This function will call #ClutterContainerIface.remove(), which is a
- * deprecated virtual function. The default implementation will call
- * clutter_actor_remove_child().
- *
- * Virtual: remove
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
- */
-void
-clutter_container_remove_actor (ClutterContainer *container,
- ClutterActor *actor)
-{
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-
- container_remove_actor (container, actor);
-}
-
-/**
- * clutter_container_remove_valist: (skip)
- * @container: a #ClutterContainer
- * @first_actor: the first #ClutterActor to add
- * @var_args: list of actors to remove, followed by %NULL
- *
- * Alternative va_list version of clutter_container_remove().
- *
- * This function will call #ClutterContainerIface.remove(), which is a
- * deprecated virtual function. The default implementation will call
- * clutter_actor_remove_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
- */
-void
-clutter_container_remove_valist (ClutterContainer *container,
- ClutterActor *first_actor,
- va_list var_args)
-{
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
- container_remove_valist (container, first_actor, var_args);
-}
-
-static void
-get_children_cb (ClutterActor *child,
- gpointer data)
-{
- GList **children = data;
-
- *children = g_list_prepend (*children, child);
-}
-
-/**
- * clutter_container_get_children:
- * @container: a #ClutterContainer
- *
- * Retrieves all the children of @container.
- *
- * Return value: (element-type Clutter.Actor) (transfer container): a list
- * of #ClutterActor<!-- -->s. Use g_list_free() on the returned
- * list when done.
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_get_children() instead.
- */
-GList *
-clutter_container_get_children (ClutterContainer *container)
-{
- GList *retval;
-
- g_return_val_if_fail (CLUTTER_IS_CONTAINER (container), NULL);
-
- retval = NULL;
- clutter_container_foreach (container, get_children_cb, &retval);
-
- return g_list_reverse (retval);
-}
-
-/**
- * clutter_container_foreach:
- * @container: a #ClutterContainer
- * @callback: (scope call): a function to be called for each child
- * @user_data: data to be passed to the function, or %NULL
- *
- * Calls @callback for each child of @container that was added
- * by the application (with clutter_container_add_actor()). Does
- * not iterate over "internal" children that are part of the
- * container's own implementation, if any.
- *
- * This function calls the #ClutterContainerIface.foreach()
- * virtual function, which has been deprecated.
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_get_first_child() or
- * clutter_actor_get_last_child() to retrieve the beginning of
- * the list of children, and clutter_actor_get_next_sibling()
- * and clutter_actor_get_previous_sibling() to iterate over it;
- * alternatively, use the #ClutterActorIter API.
- */
-void
-clutter_container_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
-{
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (callback != NULL);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- ClutterContainerIface *iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
- if (iface->foreach != container_real_foreach)
- _clutter_diagnostic_message ("The ClutterContainer::foreach() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- CLUTTER_CONTAINER_GET_IFACE (container)->foreach (container,
- callback,
- user_data);
-}
-
-/**
- * clutter_container_foreach_with_internals:
- * @container: a #ClutterContainer
- * @callback: (scope call): a function to be called for each child
- * @user_data: data to be passed to the function, or %NULL
- *
- * Calls @callback for each child of @container, including "internal"
- * children built in to the container itself that were never added
- * by the application.
- *
- * This function calls the #ClutterContainerIface.foreach_with_internals()
- * virtual function, which has been deprecated.
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: See clutter_container_foreach().
- */
-void
-clutter_container_foreach_with_internals (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
-{
- ClutterContainerIface *iface;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (callback != NULL);
-
- iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- if (iface->foreach_with_internals != NULL)
- _clutter_diagnostic_message ("The ClutterContainer::foreach_with_internals() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- if (iface->foreach_with_internals != NULL)
- iface->foreach_with_internals (container, callback, user_data);
- else
- iface->foreach (container, callback, user_data);
-}
-
-/**
- * clutter_container_raise_child:
- * @container: a #ClutterContainer
- * @actor: the actor to raise
- * @sibling: (allow-none): the sibling to raise to, or %NULL to raise
- * to the top
- *
- * Raises @actor to @sibling level, in the depth ordering.
- *
- * This function calls the #ClutterContainerIface.raise() virtual function,
- * which has been deprecated. The default implementation will call
- * clutter_actor_set_child_above_sibling().
- *
- * Virtual: raise
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() instead.
- */
-void
-clutter_container_raise_child (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
-{
- ClutterContainerIface *iface;
- ClutterActor *self;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (actor));
- g_return_if_fail (sibling == NULL || CLUTTER_IS_ACTOR (sibling));
-
- if (actor == sibling)
- return;
-
- self = CLUTTER_ACTOR (container);
-
- if (clutter_actor_get_parent (actor) != self)
- {
- g_warning ("Actor of type '%s' is not a child of the container "
- "of type '%s'",
- g_type_name (G_OBJECT_TYPE (actor)),
- g_type_name (G_OBJECT_TYPE (container)));
- return;
- }
-
- if (sibling != NULL &&
- clutter_actor_get_parent (sibling) != self)
- {
- g_warning ("Actor of type '%s' is not a child of the container "
- "of type '%s'",
- g_type_name (G_OBJECT_TYPE (sibling)),
- g_type_name (G_OBJECT_TYPE (container)));
- return;
- }
-
- iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- if (iface->raise != container_real_raise)
- _clutter_diagnostic_message ("The ClutterContainer::raise() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- iface->raise (container, actor, sibling);
-}
-
-/**
- * clutter_container_lower_child:
- * @container: a #ClutterContainer
- * @actor: the actor to raise
- * @sibling: (allow-none): the sibling to lower to, or %NULL to lower
- * to the bottom
- *
- * Lowers @actor to @sibling level, in the depth ordering.
- *
- * This function calls the #ClutterContainerIface.lower() virtual function,
- * which has been deprecated. The default implementation will call
- * clutter_actor_set_child_below_sibling().
- *
- * Virtual: lower
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() instead.
- */
-void
-clutter_container_lower_child (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
-{
- ClutterContainerIface *iface;
- ClutterActor *self;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
- g_return_if_fail (CLUTTER_IS_ACTOR (actor));
- g_return_if_fail (sibling == NULL || CLUTTER_IS_ACTOR (sibling));
-
- if (actor == sibling)
- return;
-
- self = CLUTTER_ACTOR (container);
-
- if (clutter_actor_get_parent (actor) != self)
- {
- g_warning ("Actor of type '%s' is not a child of the container "
- "of type '%s'",
- g_type_name (G_OBJECT_TYPE (actor)),
- g_type_name (G_OBJECT_TYPE (container)));
- return;
- }
-
- if (sibling != NULL&&
- clutter_actor_get_parent (sibling) != self)
- {
- g_warning ("Actor of type '%s' is not a child of the container "
- "of type '%s'",
- g_type_name (G_OBJECT_TYPE (sibling)),
- g_type_name (G_OBJECT_TYPE (container)));
- return;
- }
-
- iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- if (iface->lower != container_real_lower)
- _clutter_diagnostic_message ("The ClutterContainer::lower() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- iface->lower (container, actor, sibling);
-}
-
-/**
- * clutter_container_sort_depth_order:
- * @container: a #ClutterContainer
- *
- * Sorts a container's children using their depth. This function should not
- * be normally used by applications.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: The #ClutterContainerIface.sort_depth_order() virtual
- * function should not be used any more; the default implementation in
- * #ClutterContainer does not do anything.
- */
-void
-clutter_container_sort_depth_order (ClutterContainer *container)
-{
- ClutterContainerIface *iface;
-
- g_return_if_fail (CLUTTER_IS_CONTAINER (container));
-
- iface = CLUTTER_CONTAINER_GET_IFACE (container);
-
-#ifdef CLUTTER_ENABLE_DEBUG
- if (G_UNLIKELY (_clutter_diagnostic_enabled ()))
- {
- if (iface->sort_depth_order != container_real_sort_depth_order)
- _clutter_diagnostic_message ("The ClutterContainer::sort_depth_order() "
- "virtual function has been deprecated "
- "and it should not be overridden by "
- "newly written code");
- }
-#endif /* CLUTTER_ENABLE_DEBUG */
-
- iface->sort_depth_order (container);
-}
-
/**
* clutter_container_find_child_by_name:
* @container: a #ClutterContainer
@@ -866,42 +178,33 @@ ClutterActor *
clutter_container_find_child_by_name (ClutterContainer *container,
const gchar *child_name)
{
- GList *children;
- GList *iter;
- ClutterActor *actor = NULL;
+ ClutterActor *retval = NULL;
+ ClutterActor *iter;
g_return_val_if_fail (CLUTTER_IS_CONTAINER (container), NULL);
g_return_val_if_fail (child_name != NULL, NULL);
- children = clutter_container_get_children (container);
-
- for (iter = children; iter; iter = g_list_next (iter))
+ for (iter = clutter_actor_get_first_child (CLUTTER_ACTOR (container));
+ iter != NULL;
+ iter = clutter_actor_get_next_sibling (iter))
{
- ClutterActor *a;
- const gchar *iter_name;
+ const gchar *iter_name;
- a = CLUTTER_ACTOR (iter->data);
- iter_name = clutter_actor_get_name (a);
+ iter_name = clutter_actor_get_name (iter);
- if (iter_name && !strcmp (iter_name, child_name))
+ if (g_strcmp0 (iter_name, child_name) == 0)
{
- actor = a;
+ retval = iter;
break;
}
- if (CLUTTER_IS_CONTAINER (a))
- {
- ClutterContainer *c = CLUTTER_CONTAINER (a);
-
- actor = clutter_container_find_child_by_name (c, child_name);
- if (actor)
- break;
- }
+ retval = clutter_container_find_child_by_name (CLUTTER_CONTAINER (iter),
+ child_name);
+ if (retval != NULL)
+ break;
}
- g_list_free (children);
-
- return actor;
+ return retval;
}
static ClutterChildMeta *
diff --git a/clutter/clutter-container.h b/clutter/clutter-container.h
index b7e3f2b..0823f03 100644
--- a/clutter/clutter-container.h
+++ b/clutter/clutter-container.h
@@ -99,28 +99,6 @@ struct _ClutterContainerIface
/*< private >*/
GTypeInterface g_iface;
- /*< public >*/
- void (* add) (ClutterContainer *container,
- ClutterActor *actor);
- void (* remove) (ClutterContainer *container,
- ClutterActor *actor);
- void (* foreach) (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data);
-
- void (* foreach_with_internals) (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data);
-
- /* child stacking */
- void (* raise) (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling);
- void (* lower) (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling);
- void (* sort_depth_order) (ClutterContainer *container);
-
/* ClutterChildMeta management */
GType child_meta_type;
void (* create_child_meta) (ClutterContainer *container,
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 44c5274..2ddd4f3 100644
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -3,35 +3,6 @@
#define __CLUTTER_DEPRECATED_H_INSIDE__
-#include "deprecated/clutter-actor.h"
-#include "deprecated/clutter-animatable.h"
-#include "deprecated/clutter-animation.h"
-#include "deprecated/clutter-backend.h"
-#include "deprecated/clutter-behaviour.h"
-#include "deprecated/clutter-behaviour-depth.h"
-#include "deprecated/clutter-behaviour-ellipse.h"
-#include "deprecated/clutter-behaviour-opacity.h"
-#include "deprecated/clutter-behaviour-path.h"
-#include "deprecated/clutter-behaviour-rotate.h"
-#include "deprecated/clutter-behaviour-scale.h"
-#include "deprecated/clutter-box.h"
-#include "deprecated/clutter-cairo-texture.h"
-#include "deprecated/clutter-container.h"
-#include "deprecated/clutter-fixed.h"
-#include "deprecated/clutter-frame-source.h"
-#include "deprecated/clutter-group.h"
-#include "deprecated/clutter-keysyms.h"
-#include "deprecated/clutter-main.h"
-#include "deprecated/clutter-rectangle.h"
-#include "deprecated/clutter-score.h"
-#include "deprecated/clutter-shader.h"
-#include "deprecated/clutter-stage-manager.h"
-#include "deprecated/clutter-stage.h"
-#include "deprecated/clutter-texture.h"
-#include "deprecated/clutter-timeline.h"
-#include "deprecated/clutter-timeout-pool.h"
-#include "deprecated/clutter-util.h"
-
#undef __CLUTTER_DEPRECATED_H_INSIDE__
#endif /* __CLUTTER_DEPRECATED_H__ */
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 487f131..11df471 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -422,7 +422,6 @@ void clutter_event_set_scroll_direction (ClutterEvent
ClutterScrollDirection clutter_event_get_scroll_direction (const ClutterEvent *event);
guint32 clutter_keysym_to_unicode (guint keyval);
-CLUTTER_AVAILABLE_IN_1_10
guint clutter_unicode_to_keysym (guint32 wc);
guint32 clutter_get_current_event_time (void);
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index dd5919a..db12745 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -73,9 +73,6 @@
#include <math.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-actor.h"
#include "clutter-animatable.h"
#include "clutter-child-meta.h"
diff --git a/clutter/clutter-input-device.h b/clutter/clutter-input-device.h
index a2950f8..437a2cc 100644
--- a/clutter/clutter-input-device.h
+++ b/clutter/clutter-input-device.h
@@ -89,12 +89,9 @@ void clutter_input_device_update_from_event (ClutterInputDev
ClutterEvent *event,
gboolean update_stage);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_input_device_grab (ClutterInputDevice *device,
ClutterActor *actor);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_input_device_ungrab (ClutterInputDevice *device);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_input_device_get_grabbed_actor (ClutterInputDevice *device);
G_END_DECLS
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index c151231..600e5e7 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -58,7 +58,6 @@
#include <gobject/gvaluecollector.h>
#include "clutter-color.h"
-#include "clutter-fixed.h"
#include "clutter-interval.h"
#include "clutter-private.h"
#include "clutter-units.h"
@@ -108,21 +107,6 @@ clutter_interval_real_validate (ClutterInterval *interval,
{
GType pspec_gtype = G_PARAM_SPEC_VALUE_TYPE (pspec);
- /* check the GTypes we provide first */
- if (pspec_gtype == COGL_TYPE_FIXED)
- {
- ClutterParamSpecFixed *pspec_fixed = CLUTTER_PARAM_SPEC_FIXED (pspec);
- CoglFixed a, b;
-
- a = b = 0;
- clutter_interval_get_interval (interval, &a, &b);
- if ((a >= pspec_fixed->minimum && a <= pspec_fixed->maximum) &&
- (b >= pspec_fixed->minimum && b <= pspec_fixed->maximum))
- return TRUE;
- else
- return FALSE;
- }
-
/* then check the fundamental types */
switch (G_TYPE_FUNDAMENTAL (pspec_gtype))
{
diff --git a/clutter/clutter-macros.h b/clutter/clutter-macros.h
index 2e70a6b..11be353 100644
--- a/clutter/clutter-macros.h
+++ b/clutter/clutter-macros.h
@@ -28,58 +28,6 @@
#include <clutter/clutter-version.h>
-/**
- * CLUTTER_FLAVOUR:
- *
- * GL Windowing system used
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: The macro evaluates to "deprecated" as Clutter can be
- * compiled with multiple windowing system backends. Use the various
- * CLUTTER_WINDOWING_* macros to detect the windowing system that Clutter
- * is being compiled against, and the type check macros for the
- * #ClutterBackend for a run-time check.
- */
-#define CLUTTER_FLAVOUR "deprecated"
-
-/**
- * CLUTTER_COGL
- *
- * Cogl (internal GL abstraction utility library) backend. Can be "gl" or
- * "gles" currently
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: The macro evaluates to "deprecated" as Cogl can be
- * compiled against multiple GL implementations.
- */
-#define CLUTTER_COGL "deprecated"
-
-/**
- * CLUTTER_STAGE_TYPE:
- *
- * The default GObject type for the Clutter stage.
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: The macro evaluates to "deprecated" as Clutter can
- * be compiled against multiple windowing systems. You can use the
- * CLUTTER_WINDOWING_* macros for compile-time checks, and the type
- * check macros for run-time checks.
- */
-#define CLUTTER_STAGE_TYPE "deprecated"
-
-/**
- * CLUTTER_NO_FPU:
- *
- * Set to 1 if Clutter was built without FPU (i.e fixed math), 0 otherwise
- *
- * @Deprecated: 0.6: This macro is no longer defined (identical code is used
- * regardless the presence of FPU).
- */
-#define CLUTTER_NO_FPU (0)
-
/* some structures are meant to be opaque and still be allocated on the stack;
* in order to avoid people poking at their internals, we use this macro to
* ensure that users don't accidentally access a struct private members.
@@ -164,88 +112,18 @@
/* XXX: Every new stable minor release should add a set of macros here */
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_0
-# define CLUTTER_DEPRECATED_IN_1_0 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_0_FOR(f) CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_0
-# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_0
-# define CLUTTER_AVAILABLE_IN_1_0 CLUTTER_UNAVAILABLE(1, 0)
-#else
-# define CLUTTER_AVAILABLE_IN_1_0
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_2
-# define CLUTTER_DEPRECATED_IN_1_2 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_2_FOR(f) CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_2
-# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_2
-# define CLUTTER_AVAILABLE_IN_1_2 CLUTTER_UNAVAILABLE(1, 2)
-#else
-# define CLUTTER_AVAILABLE_IN_1_2
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_4
-# define CLUTTER_DEPRECATED_IN_1_4 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_4_FOR(f) CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_4
-# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_4
-# define CLUTTER_AVAILABLE_IN_1_4 CLUTTER_UNAVAILABLE(1, 4)
-#else
-# define CLUTTER_AVAILABLE_IN_1_4
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_6
-# define CLUTTER_DEPRECATED_IN_1_6 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_6_FOR(f) CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_6
-# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_6
-# define CLUTTER_AVAILABLE_IN_1_6 CLUTTER_UNAVAILABLE(1, 6)
-#else
-# define CLUTTER_AVAILABLE_IN_1_6
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_8
-# define CLUTTER_DEPRECATED_IN_1_8 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_8_FOR(f) CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_8
-# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_8
-# define CLUTTER_AVAILABLE_IN_1_8 CLUTTER_UNAVAILABLE(1, 8)
-#else
-# define CLUTTER_AVAILABLE_IN_1_8
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_10
-# define CLUTTER_DEPRECATED_IN_1_10 CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_10_FOR(f) CLUTTER_DEPRECATED_FOR(f)
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_2_0
+# define CLUTTER_DEPRECATED_IN_2_0 CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_2_0_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
-# define CLUTTER_DEPRECATED_IN_1_10
-# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)
+# define CLUTTER_DEPRECATED_IN_2_0
+# define CLUTTER_DEPRECATED_IN_2_0_FOR(f)
#endif
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_10
-# define CLUTTER_AVAILABLE_IN_1_10 CLUTTER_UNAVAILABLE(1, 10)
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_2_0
+# define CLUTTER_AVAILABLE_IN_2_0 CLUTTER_UNAVAILABLE(2, 0)
#else
-# define CLUTTER_AVAILABLE_IN_1_10
+# define CLUTTER_AVAILABLE_IN_2_0
#endif
#endif /* __CLUTTER_MACROS_H__ */
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 860fa6f..2845e24 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -105,7 +105,6 @@
#include "clutter-device-manager-private.h"
#include "clutter-event.h"
#include "clutter-feature.h"
-#include "clutter-frame-source.h"
#include "clutter-main.h"
#include "clutter-master-clock.h"
#include "clutter-private.h"
@@ -451,28 +450,6 @@ clutter_config_read (void)
g_free (config_path);
}
-/**
- * clutter_get_show_fps:
- *
- * Returns whether Clutter should print out the frames per second on the
- * console. You can enable this setting either using the
- * <literal>CLUTTER_SHOW_FPS</literal> environment variable or passing
- * the <literal>--clutter-show-fps</literal> command line argument. *
- *
- * Return value: %TRUE if Clutter should show the FPS.
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: This function does not do anything. Use the environment
- * variable or the configuration file to determine whether Clutter should
- * print out the FPS counter on the console.
- */
-gboolean
-clutter_get_show_fps (void)
-{
- return FALSE;
-}
-
gboolean
_clutter_context_get_show_fps (void)
{
@@ -498,88 +475,6 @@ clutter_get_accessibility_enabled (void)
return cally_get_cally_initialized ();
}
-/**
- * clutter_redraw:
- *
- * Forces a redraw of the entire stage. Applications should never use this
- * function, but queue a redraw using clutter_actor_queue_redraw().
- *
- * This function should only be used by libraries integrating Clutter from
- * within another toolkit.
- *
- * Deprecated: 1.10: Use clutter_stage_ensure_redraw() instead.
- */
-void
-clutter_redraw (ClutterStage *stage)
-{
- g_return_if_fail (CLUTTER_IS_STAGE (stage));
-
- clutter_stage_ensure_redraw (stage);
-}
-
-/**
- * clutter_set_motion_events_enabled:
- * @enable: %TRUE to enable per-actor motion events
- *
- * Sets whether per-actor motion events should be enabled or not on
- * all #ClutterStage<!-- -->s managed by Clutter.
- *
- * If @enable is %FALSE the following events will not work:
- * <itemizedlist>
- * <listitem><para>ClutterActor::motion-event, unless on the
- * #ClutterStage</para></listitem>
- * <listitem><para>ClutterActor::enter-event</para></listitem>
- * <listitem><para>ClutterActor::leave-event</para></listitem>
- * </itemizedlist>
- *
- * Since: 0.6
- *
- * Deprecated: 1.8: Use clutter_stage_set_motion_events_enabled() instead.
- */
-void
-clutter_set_motion_events_enabled (gboolean enable)
-{
- ClutterStageManager *stage_manager;
- ClutterMainContext *context;
- const GSList *l;
-
- enable = !!enable;
-
- context = _clutter_context_get_default ();
- if (context->motion_events_per_actor == enable)
- return;
-
- /* store the flag for later query and for newly created stages */
- context->motion_events_per_actor = enable;
-
- /* propagate the change to all stages */
- stage_manager = clutter_stage_manager_get_default ();
-
- for (l = clutter_stage_manager_peek_stages (stage_manager);
- l != NULL;
- l = l->next)
- {
- clutter_stage_set_motion_events_enabled (l->data, enable);
- }
-}
-
-/**
- * clutter_get_motion_events_enabled:
- *
- * Gets whether the per-actor motion events are enabled.
- *
- * Return value: %TRUE if the motion events are enabled
- *
- * Since: 0.6
- *
- * Deprecated: 1.8: Use clutter_stage_get_motion_events_enabled() instead.
- */
-gboolean
-clutter_get_motion_events_enabled (void)
-{
- return _clutter_context_get_motion_events_enabled ();
-}
-
ClutterActor *
_clutter_get_actor_by_id (ClutterStage *stage,
guint32 actor_id)
@@ -958,29 +853,6 @@ clutter_main (void)
}
/**
- * clutter_threads_init:
- *
- * Initialises the Clutter threading mechanism, so that Clutter API can be
- * called by multiple threads, using clutter_threads_enter() and
- * clutter_threads_leave() to mark the critical sections.
- *
- * You must call g_thread_init() before this function.
- *
- * This function must be called before clutter_init().
- *
- * It is safe to call this function multiple times.
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: This function does not do anything. Threading support
- * is initialized when Clutter is initialized.
- */
-void
-clutter_threads_init (void)
-{
-}
-
-/**
* clutter_threads_set_lock_functions: (skip)
* @enter_fn: function called when aquiring the Clutter main lock
* @leave_fn: function called when releasing the Clutter main lock
@@ -1295,22 +1167,6 @@ clutter_threads_leave (void)
(* clutter_threads_unlock) ();
}
-
-/**
- * clutter_get_debug_enabled:
- *
- * Check if Clutter has debugging enabled.
- *
- * Return value: %FALSE
- *
- * Deprecated: 1.10: This function does not do anything.
- */
-gboolean
-clutter_get_debug_enabled (void)
-{
- return FALSE;
-}
-
void
_clutter_context_lock (void)
{
@@ -1420,36 +1276,6 @@ _clutter_context_get_default (void)
return retval;
}
-/**
- * clutter_get_timestamp:
- *
- * Returns the approximate number of microseconds passed since Clutter was
- * intialised.
- *
- * This function shdould not be used by application code.
- *
- * The output of this function depends on whether Clutter was configured to
- * enable its debugging code paths, so it's less useful than intended.
- *
- * Since Clutter 1.10, this function is an alias to g_get_monotonic_time()
- * if Clutter was configured to enable the debugging code paths.
- *
- * Return value: Number of microseconds since clutter_init() was called, or
- * zero if Clutter was not configured with debugging code paths.
- *
- * Deprecated: 1.10: Use #GTimer or g_get_monotonic_time() for a proper
- * timing source
- */
-gulong
-clutter_get_timestamp (void)
-{
-#ifdef CLUTTER_ENABLE_DEBUG
- return (gulong) g_get_monotonic_time ();
-#else
- return 0L;
-#endif
-}
-
static gboolean
clutter_arg_direction_cb (const char *key,
const char *value,
@@ -2651,25 +2477,6 @@ _clutter_process_event (ClutterEvent *event)
context->current_event = NULL;
}
-/**
- * clutter_get_actor_by_gid:
- * @id_: a #ClutterActor unique id.
- *
- * Retrieves the #ClutterActor with @id_.
- *
- * Return value: (transfer none): the actor with the passed id or %NULL.
- * The returned actor does not have its reference count increased.
- *
- * Since: 0.6
- *
- * Deprecated: 1.8: The id is not used any longer.
- */
-ClutterActor *
-clutter_get_actor_by_gid (guint32 id_)
-{
- return _clutter_get_actor_by_id (NULL, id_);
-}
-
void
clutter_base_init (void)
{
@@ -2709,24 +2516,6 @@ clutter_get_default_frame_rate (void)
return context->frame_rate;
}
-/**
- * clutter_set_default_frame_rate:
- * @frames_per_sec: the new default frame rate
- *
- * Sets the default frame rate. This frame rate will be used to limit
- * the number of frames drawn if Clutter is not able to synchronize
- * with the vertical refresh rate of the display. When synchronization
- * is possible, this value is ignored.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: This function does not do anything any more.
- */
-void
-clutter_set_default_frame_rate (guint frames_per_sec)
-{
-}
-
static void
on_grab_actor_destroy (ClutterActor *actor,
ClutterInputDevice *device)
@@ -2940,54 +2729,6 @@ clutter_input_device_get_grabbed_actor (ClutterInputDevice *device)
}
/**
- * clutter_grab_pointer_for_device:
- * @actor: a #ClutterActor
- * @id_: a device id, or -1
- *
- * Grabs all the pointer events coming from the device @id for @actor.
- *
- * If @id is -1 then this function is equivalent to clutter_grab_pointer().
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: Use clutter_input_device_grab() instead.
- */
-void
-clutter_grab_pointer_for_device (ClutterActor *actor,
- gint id_)
-{
- ClutterDeviceManager *manager;
- ClutterInputDevice *dev;
-
- g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor));
-
- /* essentially a global grab */
- if (id_ == -1)
- {
- if (actor == NULL)
- clutter_ungrab_pointer ();
- else
- clutter_grab_pointer (actor);
-
- return;
- }
-
- manager = clutter_device_manager_get_default ();
- dev = clutter_device_manager_get_device (manager, id_);
- if (dev == NULL)
- return;
-
- if (dev->device_type != CLUTTER_POINTER_DEVICE)
- return;
-
- if (actor == NULL)
- clutter_input_device_ungrab (dev);
- else
- clutter_input_device_grab (dev, actor);
-}
-
-
-/**
* clutter_ungrab_pointer:
*
* Removes an existing grab of the pointer.
@@ -3001,29 +2742,6 @@ clutter_ungrab_pointer (void)
}
/**
- * clutter_ungrab_pointer_for_device:
- * @id_: a device id
- *
- * Removes an existing grab of the pointer events for device @id_.
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: Use clutter_input_device_ungrab() instead.
- */
-void
-clutter_ungrab_pointer_for_device (gint id_)
-{
- ClutterDeviceManager *manager;
- ClutterInputDevice *device;
-
- manager = clutter_device_manager_get_default ();
- device = clutter_device_manager_get_device (manager, id_);
- if (device != NULL)
- clutter_input_device_ungrab (device);
-}
-
-
-/**
* clutter_get_pointer_grab:
*
* Queries the current pointer grab of clutter.
@@ -3123,173 +2841,6 @@ clutter_get_keyboard_grab (void)
}
/**
- * clutter_clear_glyph_cache:
- *
- * Clears the internal cache of glyphs used by the Pango
- * renderer. This will free up some memory and GL texture
- * resources. The cache will be automatically refilled as more text is
- * drawn.
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: Use clutter_get_font_map() and
- * cogl_pango_font_map_clear_glyph_cache() instead.
- */
-void
-clutter_clear_glyph_cache (void)
-{
- CoglPangoFontMap *font_map;
-
- font_map = clutter_context_get_pango_fontmap ();
- cogl_pango_font_map_clear_glyph_cache (font_map);
-}
-
-/**
- * clutter_set_font_flags:
- * @flags: The new flags
- *
- * Sets the font quality options for subsequent text rendering
- * operations.
- *
- * Using mipmapped textures will improve the quality for scaled down
- * text but will use more texture memory.
- *
- * Enabling hinting improves text quality for static text but may
- * introduce some artifacts if the text is animated.
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_backend_set_font_options() and the
- * #cairo_font_option_t API.
- */
-void
-clutter_set_font_flags (ClutterFontFlags flags)
-{
- ClutterMainContext *context = _clutter_context_get_default ();
- CoglPangoFontMap *font_map;
- ClutterFontFlags old_flags, changed_flags;
- const cairo_font_options_t *font_options;
- cairo_font_options_t *new_font_options;
- cairo_hint_style_t hint_style;
- gboolean use_mipmapping;
- ClutterBackend *backend;
-
- backend = clutter_get_default_backend ();
- font_map = clutter_context_get_pango_fontmap ();
- font_options = clutter_backend_get_font_options (backend);
- old_flags = 0;
-
- if (cogl_pango_font_map_get_use_mipmapping (font_map))
- old_flags |= CLUTTER_FONT_MIPMAPPING;
-
- hint_style = cairo_font_options_get_hint_style (font_options);
- if (hint_style != CAIRO_HINT_STYLE_DEFAULT &&
- hint_style != CAIRO_HINT_STYLE_NONE)
- old_flags |= CLUTTER_FONT_HINTING;
-
- if (old_flags == flags)
- return;
-
- new_font_options = cairo_font_options_copy (font_options);
-
- /* Only set the font options that have actually changed so we don't
- override a detailed setting from the backend */
- changed_flags = old_flags ^ flags;
-
- if ((changed_flags & CLUTTER_FONT_MIPMAPPING))
- {
- use_mipmapping = (changed_flags & CLUTTER_FONT_MIPMAPPING) != 0;
-
- cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping);
- }
-
- if ((changed_flags & CLUTTER_FONT_HINTING))
- {
- hint_style = (flags & CLUTTER_FONT_HINTING)
- ? CAIRO_HINT_STYLE_FULL
- : CAIRO_HINT_STYLE_NONE;
-
- cairo_font_options_set_hint_style (new_font_options, hint_style);
- }
-
- clutter_backend_set_font_options (backend, new_font_options);
-
- cairo_font_options_destroy (new_font_options);
-
- /* update the default pango context, if any */
- if (context->pango_context != NULL)
- update_pango_context (backend, context->pango_context);
-}
-
-/**
- * clutter_get_font_flags:
- *
- * Gets the current font flags for rendering text. See
- * clutter_set_font_flags().
- *
- * Return value: The font flags
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_backend_get_font_options() and the
- * #cairo_font_options_t API.
- */
-ClutterFontFlags
-clutter_get_font_flags (void)
-{
- CoglPangoFontMap *font_map = NULL;
- const cairo_font_options_t *font_options;
- ClutterFontFlags flags = 0;
- cairo_hint_style_t hint_style;
-
- font_map = clutter_context_get_pango_fontmap ();
- if (cogl_pango_font_map_get_use_mipmapping (font_map))
- flags |= CLUTTER_FONT_MIPMAPPING;
-
- font_options =
- clutter_backend_get_font_options (clutter_get_default_backend ());
-
- hint_style = cairo_font_options_get_hint_style (font_options);
- if (hint_style != CAIRO_HINT_STYLE_DEFAULT &&
- hint_style != CAIRO_HINT_STYLE_NONE)
- flags |= CLUTTER_FONT_HINTING;
-
- return flags;
-}
-
-/**
- * clutter_get_input_device_for_id:
- * @id_: the unique id for a device
- *
- * Retrieves the #ClutterInputDevice from its @id_. This is a convenience
- * wrapper for clutter_device_manager_get_device() and it is functionally
- * equivalent to:
- *
- * |[
- * ClutterDeviceManager *manager;
- * ClutterInputDevice *device;
- *
- * manager = clutter_device_manager_get_default ();
- * device = clutter_device_manager_get_device (manager, id);
- * ]|
- *
- * Return value: (transfer none): a #ClutterInputDevice, or %NULL
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: Use clutter_device_manager_get_device() instead.
- */
-ClutterInputDevice *
-clutter_get_input_device_for_id (gint id_)
-{
- ClutterDeviceManager *manager;
-
- manager = clutter_device_manager_get_default ();
-
- return clutter_device_manager_get_device (manager, id_);
-}
-
-/**
* clutter_get_font_map:
*
* Retrieves the #PangoFontMap instance used by Clutter.
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter-offscreen-effect.h
index a5987d7..bf17016 100644
--- a/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter-offscreen-effect.h
@@ -51,8 +51,6 @@ typedef struct _ClutterOffscreenEffectClass ClutterOffscreenEffectClass;
*
* The #ClutterOffscreenEffect structure contains only private data
* and should be accessed using the provided API
- *
- * Since: 1.4
*/
struct _ClutterOffscreenEffect
{
@@ -68,8 +66,6 @@ struct _ClutterOffscreenEffect
* @paint_target: virtual function
*
* The #ClutterOffscreenEffectClass structure contains only private data
- *
- * Since: 1.4
*/
struct _ClutterOffscreenEffectClass
{
@@ -96,7 +92,6 @@ GType clutter_offscreen_effect_get_type (void) G_GNUC_CONST;
CoglMaterial * clutter_offscreen_effect_get_target (ClutterOffscreenEffect *effect);
-CLUTTER_AVAILABLE_IN_1_10
CoglHandle clutter_offscreen_effect_get_texture (ClutterOffscreenEffect *effect);
void clutter_offscreen_effect_paint_target (ClutterOffscreenEffect *effect);
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index f2b281b..a02c038 100644
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -34,10 +34,8 @@
#include <glib.h>
#include <gmodule.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-actor.h"
+#include "clutter-container.h"
#include "clutter-debug.h"
#include "clutter-enum-types.h"
@@ -1811,7 +1809,8 @@ add_children (ClutterScript *script,
name,
g_type_name (G_OBJECT_TYPE (container)));
- clutter_container_add_actor (container, CLUTTER_ACTOR (object));
+ clutter_actor_add_child (CLUTTER_ACTOR (container),
+ CLUTTER_ACTOR (object));
}
g_list_foreach (oinfo->children, (GFunc) g_free, NULL);
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 566adc8..2a11e23 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -75,66 +75,6 @@
* packing rules of Clutter still apply, and an actor cannot be packed
* in multiple containers without unparenting it in between).
*
- * Behaviours and timelines can also be defined inside a UI definition
- * buffer:
- *
- * <informalexample><programlisting><![CDATA[
- * {
- * "id" : "rotate-behaviour",
- * "type" : "ClutterBehaviourRotate",
- * "angle-start" : 0.0,
- * "angle-end" : 360.0,
- * "axis" : "z-axis",
- * "alpha" : {
- * "timeline" : { "duration" : 4000, "loop" : true },
- * "mode" : "easeInSine"
- * }
- * }
- * ]]></programlisting></informalexample>
- *
- * And then to apply a defined behaviour to an actor defined inside the
- * definition of an actor, the "behaviour" member can be used:
- *
- * <informalexample><programlisting><![CDATA[
- * {
- * "id" : "my-rotating-actor",
- * "type" : "ClutterTexture",
- * ...
- * "behaviours" : [ "rotate-behaviour" ]
- * }
- * ]]></programlisting></informalexample>
- *
- * A #ClutterAlpha belonging to a #ClutterBehaviour can only be defined
- * implicitly like in the example above, or explicitly by setting the
- * "alpha" property to point to a previously defined #ClutterAlpha, e.g.:
- *
- * <informalexample><programlisting><![CDATA[
- * {
- * "id" : "rotate-behaviour",
- * "type" : "ClutterBehaviourRotate",
- * "angle-start" : 0.0,
- * "angle-end" : 360.0,
- * "axis" : "z-axis",
- * "alpha" : {
- * "id" : "rotate-alpha",
- * "type" : "ClutterAlpha",
- * "timeline" : {
- * "id" : "rotate-timeline",
- * "type : "ClutterTimeline",
- * "duration" : 4000,
- * "loop" : true
- * },
- * "function" : "custom_sine_alpha"
- * }
- * }
- * ]]></programlisting></informalexample>
- *
- * Implicitely defined #ClutterAlpha<!-- -->s and #ClutterTimeline<!-- -->s
- * can omit the <varname>id</varname> member, as well as the
- * <varname>type</varname> member, but will not be available using
- * clutter_script_get_object() (they can, however, be extracted using the
- * #ClutterBehaviour and #ClutterAlpha API respectively).
- *
* Signal handlers can be defined inside a Clutter UI definition file and
* then autoconnected to their respective signals using the
* clutter_script_connect_signals() function:
@@ -211,7 +151,6 @@
* function
* "type_func" := the GType function name, for non-standard classes
* "children" := an array of names or objects to add as children
- * "behaviours" := an array of names or objects to apply to an actor
* "signals" := an array of signal definitions to connect to an object
* "is-default" := a boolean flag used when defining the #ClutterStage;
* if set to "true" the default stage will be used instead
@@ -236,7 +175,6 @@
#include "clutter-actor.h"
#include "clutter-alpha.h"
-#include "clutter-behaviour.h"
#include "clutter-container.h"
#include "clutter-stage.h"
#include "clutter-state.h"
@@ -485,7 +423,7 @@ clutter_script_init (ClutterScript *script)
*
* Creates a new #ClutterScript instance. #ClutterScript can be used
* to load objects definitions for scenegraph elements, like actors,
- * or behavioural elements, like behaviours and timelines. The
+ * or behavioural elements, like states and timelines. The
* definitions must be encoded using the JavaScript Object Notation (JSON)
* language.
*
@@ -823,8 +761,8 @@ construct_each_objects (gpointer key,
if (oinfo->object == NULL)
_clutter_script_construct_object (script, oinfo);
- /* this will take care of setting up properties,
- * adding children and applying behaviours
+ /* this will take care of setting up properties
+ * and adding children
*/
_clutter_script_apply_properties (script, oinfo);
}
diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h
index d690dbc..db33c51 100644
--- a/clutter/clutter-script.h
+++ b/clutter/clutter-script.h
@@ -153,7 +153,6 @@ guint clutter_script_load_from_data (ClutterScript
const gchar *data,
gssize length,
GError **error);
-CLUTTER_AVAILABLE_IN_1_10
guint clutter_script_load_from_resource (ClutterScript *script,
const gchar *resource_path,
GError **error);
diff --git a/clutter/clutter-settings.c b/clutter/clutter-settings.c
index d61620f..6362411 100644
--- a/clutter/clutter-settings.c
+++ b/clutter/clutter-settings.c
@@ -82,8 +82,6 @@ enum
{
PROP_0,
- PROP_BACKEND,
-
PROP_DOUBLE_CLICK_TIME,
PROP_DOUBLE_CLICK_DISTANCE,
@@ -259,10 +257,6 @@ clutter_settings_set_property (GObject *gobject,
switch (prop_id)
{
- case PROP_BACKEND:
- self->backend = g_value_get_object (value);
- break;
-
case PROP_DOUBLE_CLICK_TIME:
self->double_click_time = g_value_get_int (value);
break;
@@ -409,24 +403,6 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
/**
- * ClutterSettings:backend:
- *
- * A back pointer to the #ClutterBackend
- *
- * Since: 1.4
- *
- * Deprecated: 1.10
- */
- obj_props[PROP_BACKEND] =
- g_param_spec_object ("backend",
- "Backend",
- "A pointer to the backend",
- CLUTTER_TYPE_BACKEND,
- CLUTTER_PARAM_WRITABLE |
- G_PARAM_DEPRECATED |
- G_PARAM_CONSTRUCT_ONLY);
-
- /**
* ClutterSettings:double-click-time:
*
* The time, in milliseconds, that should elapse between button-press
diff --git a/clutter/clutter-stage-manager.c b/clutter/clutter-stage-manager.c
index a600594..3f76ed1 100644
--- a/clutter/clutter-stage-manager.c
+++ b/clutter/clutter-stage-manager.c
@@ -186,23 +186,6 @@ clutter_stage_manager_get_default (void)
return context->stage_manager;
}
-/**
- * clutter_stage_manager_set_default_stage:
- * @stage_manager: a #ClutterStageManager
- * @stage: a #ClutterStage
- *
- * Sets @stage as the default stage.
- *
- * Since: 0.8
- *
- * Deprecated: 1.2: Calling this function has no effect
- */
-void
-clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
- ClutterStage *stage)
-{
-}
-
/*< private >
* _clutter_stage_manager_set_default_stage:
* @stage_manager: a #ClutterStageManager
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index a9ab25a..6bd18a2 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -51,11 +51,7 @@
#include <math.h>
#include <cairo.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
#include "clutter-stage.h"
-#include "deprecated/clutter-stage.h"
-#include "deprecated/clutter-container.h"
#include "clutter-actor-private.h"
#include "clutter-backend-private.h"
@@ -75,20 +71,14 @@
#include "clutter-profile.h"
#include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h"
-#include "clutter-util.h"
#include "clutter-version.h" /* For flavour */
#include "clutter-private.h"
#include "cogl/cogl.h"
-static void clutter_container_iface_init (ClutterContainerIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_GROUP,
- G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
- clutter_container_iface_init))
+G_DEFINE_TYPE (ClutterStage, clutter_stage, CLUTTER_TYPE_ACTOR)
-#define CLUTTER_STAGE_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_STAGE, ClutterStagePrivate))
+#define CLUTTER_STAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_STAGE, ClutterStagePrivate))
/* <private>
* ClutterStageHint:
@@ -127,8 +117,6 @@ struct _ClutterStagePrivate
CoglMatrix view;
float viewport[4];
- ClutterFog fog;
-
gchar *title;
ClutterActor *key_focused_actor;
@@ -166,7 +154,6 @@ struct _ClutterStagePrivate
guint is_fullscreen : 1;
guint is_cursor_visible : 1;
guint is_user_resizable : 1;
- guint use_fog : 1;
guint throttle_motion_events : 1;
guint use_alpha : 1;
guint min_size_changed : 1;
@@ -215,70 +202,6 @@ static const ClutterColor default_stage_color = { 255, 255, 255, 255 };
static void _clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
static void
-clutter_stage_real_add (ClutterContainer *container,
- ClutterActor *child)
-{
- clutter_actor_add_child (CLUTTER_ACTOR (container), child);
-}
-
-static void
-clutter_stage_real_remove (ClutterContainer *container,
- ClutterActor *child)
-{
- clutter_actor_remove_child (CLUTTER_ACTOR (container), child);
-}
-
-static void
-clutter_stage_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
-{
- ClutterActorIter iter;
- ClutterActor *child;
-
- clutter_actor_iter_init (&iter, CLUTTER_ACTOR (container));
-
- while (clutter_actor_iter_next (&iter, &child))
- callback (child, user_data);
-}
-
-static void
-clutter_stage_real_raise (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- clutter_actor_set_child_above_sibling (CLUTTER_ACTOR (container),
- child,
- sibling);
-}
-
-static void
-clutter_stage_real_lower (ClutterContainer *container,
- ClutterActor *child,
- ClutterActor *sibling)
-{
- clutter_actor_set_child_below_sibling (CLUTTER_ACTOR (container),
- child,
- sibling);
-}
-
-static void
-clutter_stage_real_sort_depth_order (ClutterContainer *container)
-{
-}
-
-static void
-clutter_container_iface_init (ClutterContainerIface *iface)
-{
- iface->add = clutter_stage_real_add;
- iface->remove = clutter_stage_real_remove;
- iface->foreach = clutter_stage_real_foreach;
- iface->raise = clutter_stage_real_raise;
- iface->lower = clutter_stage_real_lower;
- iface->sort_depth_order = clutter_stage_real_sort_depth_order;
-}
-
-static void
clutter_stage_get_preferred_width (ClutterActor *self,
gfloat for_height,
gfloat *min_width_p,
@@ -1656,14 +1579,6 @@ clutter_stage_set_property (GObject *object,
clutter_stage_set_user_resizable (stage, g_value_get_boolean (value));
break;
- case PROP_USE_FOG:
- clutter_stage_set_use_fog (stage, g_value_get_boolean (value));
- break;
-
- case PROP_FOG:
- clutter_stage_set_fog (stage, g_value_get_boxed (value));
- break;
-
case PROP_USE_ALPHA:
clutter_stage_set_use_alpha (stage, g_value_get_boolean (value));
break;
@@ -1730,14 +1645,6 @@ clutter_stage_get_property (GObject *gobject,
g_value_set_boolean (value, priv->is_user_resizable);
break;
- case PROP_USE_FOG:
- g_value_set_boolean (value, priv->use_fog);
- break;
-
- case PROP_FOG:
- g_value_set_boxed (value, &priv->fog);
- break;
-
case PROP_USE_ALPHA:
g_value_set_boolean (value, priv->use_alpha);
break;
@@ -1871,21 +1778,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
PROP_FULLSCREEN_SET,
pspec);
/**
- * ClutterStage:offscreen:
- *
- * Whether the stage should be rendered in an offscreen buffer.
- *
- * Deprecated: 1.10: This property does not do anything.
- */
- pspec = g_param_spec_boolean ("offscreen",
- P_("Offscreen"),
- P_("Whether the main stage should be rendered offscreen"),
- FALSE,
- CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
- g_object_class_install_property (gobject_class,
- PROP_OFFSCREEN,
- pspec);
- /**
* ClutterStage:cursor-visible:
*
* Whether the mouse pointer should be visible
@@ -1914,22 +1806,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
PROP_USER_RESIZABLE,
pspec);
/**
- * ClutterStage:color:
- *
- * The background color of the main stage.
- *
- * Deprecated: 1.10: Use the #ClutterActor:background-color property of
- * #ClutterActor instead.
- */
- pspec = clutter_param_spec_color ("color",
- P_("Color"),
- P_("The color of the stage"),
- &default_stage_color,
- CLUTTER_PARAM_READWRITE |
- G_PARAM_DEPRECATED);
- g_object_class_install_property (gobject_class, PROP_COLOR, pspec);
-
- /**
* ClutterStage:perspective:
*
* The parameters used for the perspective projection from 3D
@@ -1961,41 +1837,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
g_object_class_install_property (gobject_class, PROP_TITLE, pspec);
/**
- * ClutterStage:use-fog:
- *
- * Whether the stage should use a linear GL "fog" in creating the
- * depth-cueing effect, to enhance the perception of depth by fading
- * actors farther from the viewpoint.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: This property does not do anything.
- */
- pspec = g_param_spec_boolean ("use-fog",
- P_("Use Fog"),
- P_("Whether to enable depth cueing"),
- FALSE,
- CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
- g_object_class_install_property (gobject_class, PROP_USE_FOG, pspec);
-
- /**
- * ClutterStage:fog:
- *
- * The settings for the GL "fog", used only if #ClutterStage:use-fog
- * is set to %TRUE
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: This property does not do anything.
- */
- pspec = g_param_spec_boxed ("fog",
- P_("Fog"),
- P_("Settings for the depth cueing"),
- CLUTTER_TYPE_FOG,
- CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
- g_object_class_install_property (gobject_class, PROP_FOG, pspec);
-
- /**
* ClutterStage:use-alpha:
*
* Whether the #ClutterStage should honour the alpha component of the
@@ -2215,7 +2056,6 @@ clutter_stage_init (ClutterStage *self)
priv->is_fullscreen = FALSE;
priv->is_user_resizable = FALSE;
priv->is_cursor_visible = TRUE;
- priv->use_fog = FALSE;
priv->throttle_motion_events = TRUE;
priv->min_size_changed = FALSE;
@@ -2253,10 +2093,6 @@ clutter_stage_init (ClutterStage *self)
geom.height);
- /* FIXME - remove for 2.0 */
- priv->fog.z_near = 1.0;
- priv->fog.z_far = 2.0;
-
priv->relayout_pending = TRUE;
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
@@ -2281,90 +2117,6 @@ clutter_stage_init (ClutterStage *self)
priv->pick_id_pool = _clutter_id_pool_new (256);
}
-/**
- * clutter_stage_get_default:
- *
- * Retrieves a #ClutterStage singleton.
- *
- * 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
- * actor.
- *
- * Deprecated: 1.10: Use clutter_stage_new() instead.
- */
-ClutterActor *
-clutter_stage_get_default (void)
-{
- ClutterStageManager *stage_manager = clutter_stage_manager_get_default ();
- ClutterStage *stage;
-
- stage = clutter_stage_manager_get_default_stage (stage_manager);
- if (G_UNLIKELY (stage == NULL))
- {
- /* This will take care of automatically adding the stage to the
- * stage manager and setting it as the default. Its floating
- * reference will be claimed by the stage manager.
- */
- stage = g_object_new (CLUTTER_TYPE_STAGE, NULL);
- _clutter_stage_manager_set_default_stage (stage_manager, stage);
-
- /* the default stage is realized by default */
- clutter_actor_realize (CLUTTER_ACTOR (stage));
- }
-
- return CLUTTER_ACTOR (stage);
-}
-
-/**
- * clutter_stage_set_color:
- * @stage: A #ClutterStage
- * @color: A #ClutterColor
- *
- * Sets the stage color.
- *
- * Deprecated: 1.10: Use clutter_actor_set_background_color() instead.
- */
-void
-clutter_stage_set_color (ClutterStage *stage,
- const ClutterColor *color)
-{
- clutter_actor_set_background_color (CLUTTER_ACTOR (stage), color);
-
- g_object_notify (G_OBJECT (stage), "color");
-}
-
-/**
- * clutter_stage_get_color:
- * @stage: A #ClutterStage
- * @color: (out caller-allocates): return location for a #ClutterColor
- *
- * Retrieves the stage color.
- *
- * Deprecated: 1.10: Use clutter_actor_get_background_color() instead.
- */
-void
-clutter_stage_get_color (ClutterStage *stage,
- ClutterColor *color)
-{
- clutter_actor_get_background_color (CLUTTER_ACTOR (stage), color);
-}
-
static void
clutter_stage_set_perspective_internal (ClutterStage *stage,
ClutterPerspective *perspective)
@@ -3079,136 +2831,6 @@ clutter_stage_get_key_focus (ClutterStage *stage)
return CLUTTER_ACTOR (stage);
}
-/**
- * clutter_stage_get_use_fog:
- * @stage: the #ClutterStage
- *
- * Gets whether the depth cueing effect is enabled on @stage.
- *
- * Return value: %TRUE if the depth cueing effect is enabled
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: This function will always return %FALSE
- */
-gboolean
-clutter_stage_get_use_fog (ClutterStage *stage)
-{
- g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
-
- return stage->priv->use_fog;
-}
-
-/**
- * clutter_stage_set_use_fog:
- * @stage: the #ClutterStage
- * @fog: %TRUE for enabling the depth cueing effect
- *
- * Sets whether the depth cueing effect on the stage should be enabled
- * or not.
- *
- * Depth cueing is a 3D effect that makes actors farther away from the
- * viewing point less opaque, by fading them with the stage color.
-
- * The parameters of the GL fog used can be changed using the
- * clutter_stage_set_fog() function.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: Calling this function produces no visible effect
- */
-void
-clutter_stage_set_use_fog (ClutterStage *stage,
- gboolean fog)
-{
-}
-
-/**
- * clutter_stage_set_fog:
- * @stage: the #ClutterStage
- * @fog: a #ClutterFog structure
- *
- * Sets the fog (also known as "depth cueing") settings for the @stage.
- *
- * A #ClutterStage will only use a linear fog progression, which
- * depends solely on the distance from the viewer. The cogl_set_fog()
- * function in COGL exposes more of the underlying implementation,
- * and allows changing the for progression function. It can be directly
- * used by disabling the #ClutterStage:use-fog property and connecting
- * a signal handler to the #ClutterActor::paint signal on the @stage,
- * like:
- *
- * |[
- * clutter_stage_set_use_fog (stage, FALSE);
- * g_signal_connect (stage, "paint", G_CALLBACK (on_stage_paint), NULL);
- * ]|
- *
- * The paint signal handler will call cogl_set_fog() with the
- * desired settings:
- *
- * |[
- * static void
- * on_stage_paint (ClutterActor *actor)
- * {
- * ClutterColor stage_color = { 0, };
- * CoglColor fog_color = { 0, };
- *
- * /* set the fog color to the stage background color */
- * clutter_stage_get_color (CLUTTER_STAGE (actor), &stage_color);
- * cogl_color_init_from_4ub (&fog_color,
- * stage_color.red,
- * stage_color.green,
- * stage_color.blue,
- * stage_color.alpha);
- *
- * /* enable fog */
- * cogl_set_fog (&fog_color,
- * COGL_FOG_MODE_EXPONENTIAL, /* mode */
- * 0.5, /* density */
- * 5.0, 30.0); /* z_near and z_far */
- * }
- * ]|
- *
- * <note>The fogging functions only work correctly when the visible actors use
- * unmultiplied alpha colors. By default Cogl will premultiply textures and
- * cogl_set_source_color() will premultiply colors, so unless you explicitly
- * load your textures requesting an unmultiplied internal format and use
- * cogl_material_set_color() you can only use fogging with fully opaque actors.
- * Support for premultiplied colors will improve in the future when we can
- * depend on fragment shaders.</note>
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: Fog settings are ignored.
- */
-void
-clutter_stage_set_fog (ClutterStage *stage,
- ClutterFog *fog)
-{
-}
-
-/**
- * clutter_stage_get_fog:
- * @stage: the #ClutterStage
- * @fog: (out): return location for a #ClutterFog structure
- *
- * Retrieves the current depth cueing settings from the stage.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: This function will always return the default
- * values of #ClutterFog
- */
-void
-clutter_stage_get_fog (ClutterStage *stage,
- ClutterFog *fog)
-{
- g_return_if_fail (CLUTTER_IS_STAGE (stage));
- g_return_if_fail (fog != NULL);
-
- *fog = stage->priv->fog;
-}
-
/*** Perspective boxed type ******/
static gpointer
@@ -3231,24 +2853,6 @@ G_DEFINE_BOXED_TYPE (ClutterPerspective, clutter_perspective,
clutter_perspective_copy,
clutter_perspective_free);
-static gpointer
-clutter_fog_copy (gpointer data)
-{
- if (G_LIKELY (data))
- return g_slice_dup (ClutterFog, data);
-
- return NULL;
-}
-
-static void
-clutter_fog_free (gpointer data)
-{
- if (G_LIKELY (data))
- g_slice_free (ClutterFog, data);
-}
-
-G_DEFINE_BOXED_TYPE (ClutterFog, clutter_fog, clutter_fog_copy, clutter_fog_free);
-
/**
* clutter_stage_new:
*
@@ -3534,50 +3138,6 @@ clutter_stage_ensure_redraw (ClutterStage *stage)
_clutter_master_clock_start_running (master_clock);
}
-/**
- * clutter_stage_queue_redraw:
- * @stage: the #ClutterStage
- *
- * Queues a redraw for the passed stage.
- *
- * <note>Applications should call clutter_actor_queue_redraw() and not
- * this function.</note>
- *
- * Since: 0.8
- *
- * Deprecated: 1.10: Use clutter_actor_queue_redraw() instead.
- */
-void
-clutter_stage_queue_redraw (ClutterStage *stage)
-{
- g_return_if_fail (CLUTTER_IS_STAGE (stage));
-
- clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-}
-
-/**
- * clutter_stage_is_default:
- * @stage: a #ClutterStage
- *
- * Checks if @stage is the default stage, or an instance created using
- * clutter_stage_new() but internally using the same implementation.
- *
- * 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)
-{
- g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
-
- return stage_is_default (stage);
-}
-
void
_clutter_stage_set_window (ClutterStage *stage,
ClutterStageWindow *stage_window)
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index e3c1d7e..79377c1 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -29,7 +29,7 @@
#define __CLUTTER_STAGE_H__
#include <clutter/clutter-types.h>
-#include <clutter/clutter-group.h>
+#include <clutter/clutter-actor.h>
G_BEGIN_DECLS
@@ -55,7 +55,7 @@ typedef struct _ClutterStagePrivate ClutterStagePrivate;
struct _ClutterStage
{
/*< private >*/
- ClutterGroup parent_instance;
+ ClutterActor parent_instance;
ClutterStagePrivate *priv;
};
@@ -75,7 +75,7 @@ struct _ClutterStage
struct _ClutterStageClass
{
/*< private >*/
- ClutterGroupClass parent_class;
+ ClutterActorClass parent_class;
/*< public >*/
/* signals */
@@ -115,28 +115,7 @@ struct _ClutterPerspective
gfloat z_far;
};
-/**
- * ClutterFog:
- * @z_near: starting distance from the viewer to the near clipping
- * plane (always positive)
- * @z_far: final distance from the viewer to the far clipping
- * plane (always positive)
- *
- * Fog settings used to create the depth cueing effect.
- *
- * Since: 0.6
- *
- * Deprecated: 1.10: The fog-related API in #ClutterStage has been
- * deprecated as well.
- */
-struct _ClutterFog
-{
- gfloat z_near;
- gfloat z_far;
-};
-
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_new (void);
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index 68cccf5..db33dc8 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -76,9 +76,6 @@
#include <math.h>
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
#include "clutter-table-layout.h"
#include "clutter-debug.h"
@@ -2006,7 +2003,7 @@ clutter_table_layout_pack (ClutterTableLayout *layout,
update_row_col (CLUTTER_TABLE_LAYOUT (layout), priv->container);
- clutter_container_add_actor (priv->container, actor);
+ clutter_actor_add_child (CLUTTER_ACTOR (priv->container), actor);
manager = CLUTTER_LAYOUT_MANAGER (layout);
meta = clutter_layout_manager_get_child_meta (manager,
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter-text-buffer.h
index 9b6f8ce..3f3f8b1 100644
--- a/clutter/clutter-text-buffer.h
+++ b/clutter/clutter-text-buffer.h
@@ -123,46 +123,33 @@ struct _ClutterTextBufferClass
void (*_clutter_reserved8) (void);
};
-CLUTTER_AVAILABLE_IN_1_10
GType clutter_text_buffer_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer* clutter_text_buffer_new (void);
-CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer* clutter_text_buffer_new_with_text (const gchar *text,
gssize text_len);
-CLUTTER_AVAILABLE_IN_1_10
gsize clutter_text_buffer_get_bytes (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_get_length (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
const gchar* clutter_text_buffer_get_text (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_set_text (ClutterTextBuffer *buffer,
const gchar *chars,
gint n_chars);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_set_max_length (ClutterTextBuffer *buffer,
gint max_length);
-CLUTTER_AVAILABLE_IN_1_10
gint clutter_text_buffer_get_max_length (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_insert_text (ClutterTextBuffer *buffer,
guint position,
const gchar *chars,
gint n_chars);
-CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_delete_text (ClutterTextBuffer *buffer,
guint position,
gint n_chars);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_emit_inserted_text (ClutterTextBuffer *buffer,
guint position,
const gchar *chars,
guint n_chars);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_emit_deleted_text (ClutterTextBuffer *buffer,
guint position,
guint n_chars);
diff --git a/clutter/clutter-text.h b/clutter/clutter-text.h
index 22c90a2..7611369 100644
--- a/clutter/clutter-text.h
+++ b/clutter/clutter-text.h
@@ -103,11 +103,8 @@ ClutterActor * clutter_text_new_full (const gchar *f
const ClutterColor *color);
ClutterActor * clutter_text_new_with_text (const gchar *font_name,
const gchar *text);
-CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_text_new_with_buffer (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer * clutter_text_get_buffer (ClutterText *self);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_text_set_buffer (ClutterText *self,
ClutterTextBuffer *buffer);
const gchar * clutter_text_get_text (ClutterText *self);
@@ -213,7 +210,6 @@ void clutter_text_get_selected_text_color (ClutterText
ClutterColor *color);
gboolean clutter_text_activate (ClutterText *self);
-CLUTTER_AVAILABLE_IN_1_10
gint clutter_text_coords_to_position (ClutterText *self,
gfloat x,
gfloat y);
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index c521c80..89ca02a 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -71,9 +71,6 @@
#include "clutter-scriptable.h"
#include "clutter-stage-private.h"
-#include "clutter-shader.h"
-#include "clutter-util.h"
-
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
G_DEFINE_TYPE_WITH_CODE (ClutterTexture,
@@ -93,9 +90,6 @@ struct _ClutterTexturePrivate
CoglPipeline *pipeline;
- ClutterActor *fbo_source;
- CoglHandle fbo_handle;
-
CoglPipeline *pick_pipeline;
gchar *filename;
@@ -187,9 +181,6 @@ static GMutex upload_list_mutex;
static CoglPipeline *texture_template_pipeline = NULL;
-static void
-texture_fbo_free_resources (ClutterTexture *texture);
-
GQuark
clutter_texture_error_quark (void)
{
@@ -242,87 +233,6 @@ texture_free_gl_resources (ClutterTexture *texture)
}
static void
-clutter_texture_unrealize (ClutterActor *actor)
-{
- ClutterTexture *texture;
- ClutterTexturePrivate *priv;
-
- texture = CLUTTER_TEXTURE(actor);
- priv = texture->priv;
-
- if (priv->pipeline == NULL)
- return;
-
- if (priv->fbo_source != NULL)
- {
- /* Free up our fbo handle and texture resources, realize will recreate */
- cogl_object_unref (priv->fbo_handle);
- priv->fbo_handle = NULL;
- texture_free_gl_resources (texture);
- return;
- }
-
- CLUTTER_NOTE (TEXTURE, "Texture unrealized");
-}
-
-static void
-clutter_texture_realize (ClutterActor *actor)
-{
- ClutterTexture *texture;
- ClutterTexturePrivate *priv;
-
- texture = CLUTTER_TEXTURE(actor);
- priv = texture->priv;
-
- if (priv->fbo_source)
- {
- CoglTextureFlags flags = COGL_TEXTURE_NONE;
- CoglHandle tex;
-
- /* Handle FBO's */
-
- if (priv->no_slice)
- flags |= COGL_TEXTURE_NO_SLICING;
-
- tex = cogl_texture_new_with_size (priv->image_width,
- priv->image_height,
- flags,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-
- cogl_pipeline_set_layer_texture (priv->pipeline, 0, tex);
-
- priv->fbo_handle = cogl_offscreen_new_to_texture (tex);
-
- /* The pipeline now has a reference to the texture so it will
- stick around */
- cogl_object_unref (tex);
-
- if (priv->fbo_handle == NULL)
- {
- g_warning ("%s: Offscreen texture creation failed", G_STRLOC);
- CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
- return;
- }
-
- clutter_actor_set_size (actor, priv->image_width, priv->image_height);
-
- return;
- }
-
- /* If the texture is not a FBO, then realization is a no-op but we
- * still want to be in REALIZED state to maintain invariants.
- * ClutterTexture doesn't need to be realized to have a Cogl texture
- * because Clutter assumes that a GL context is always current so
- * there is no need to wait to realization time to create the
- * texture. Although this is slightly odd it would be wasteful to
- * redundantly store a copy of the texture data in local memory just
- * so that we can make a texture during realize.
- */
-
- CLUTTER_NOTE (TEXTURE, "Texture realized");
-}
-
-static void
clutter_texture_get_preferred_width (ClutterActor *self,
gfloat for_height,
gfloat *min_width_p,
@@ -402,24 +312,6 @@ clutter_texture_get_preferred_height (ClutterActor *self,
}
}
-static void
-clutter_texture_allocate (ClutterActor *self,
- const ClutterActorBox *box,
- ClutterAllocationFlags flags)
-{
- ClutterTexturePrivate *priv = CLUTTER_TEXTURE (self)->priv;
-
- /* chain up to set actor->allocation */
- CLUTTER_ACTOR_CLASS (clutter_texture_parent_class)->allocate (self,
- box,
- flags);
-
- /* If we adopted the source fbo then allocate that at its preferred
- size */
- if (priv->fbo_source && clutter_actor_get_parent (priv->fbo_source) == self)
- clutter_actor_allocate_preferred_size (priv->fbo_source, flags);
-}
-
static gboolean
clutter_texture_has_overlaps (ClutterActor *self)
{
@@ -429,146 +321,6 @@ clutter_texture_has_overlaps (ClutterActor *self)
}
static void
-set_viewport_with_buffer_under_fbo_source (ClutterActor *fbo_source,
- int viewport_width,
- int viewport_height)
-{
- ClutterActorBox box = { 0, };
- float x_offset, y_offset;
-
- if (clutter_actor_get_paint_box (fbo_source, &box))
- clutter_actor_box_get_origin (&box, &x_offset, &y_offset);
- else
- {
- /* As a fallback when the paint box can't be determined we use
- * the transformed allocation to come up with an offset instead.
- *
- * FIXME: when we don't have a paint box we should instead be
- * falling back to a stage sized fbo with an offset of (0,0)
- */
-
- ClutterVertex verts[4];
- float x_min = G_MAXFLOAT, y_min = G_MAXFLOAT;
- int i;
-
- /* Get the actors allocation transformed into screen coordinates.
- *
- * XXX: Note: this may not be a bounding box for the actor, since an
- * actor with depth may escape the box due to its perspective
- * projection. */
- clutter_actor_get_abs_allocation_vertices (fbo_source, verts);
-
- for (i = 0; i < G_N_ELEMENTS (verts); ++i)
- {
- if (verts[i].x < x_min)
- x_min = verts[i].x;
- if (verts[i].y < y_min)
- y_min = verts[i].y;
- }
-
- /* XXX: It's not good enough to round by simply truncating the fraction here
- * via a cast, as it results in offscreen rendering being offset by 1 pixel
- * in many cases... */
-#define ROUND(x) ((x) >= 0 ? (long)((x) + 0.5) : (long)((x) - 0.5))
-
- x_offset = ROUND (x_min);
- y_offset = ROUND (y_min);
-
-#undef ROUND
- }
-
- /* translate the viewport so that the source actor lands on the
- * sub-region backed by the offscreen framebuffer... */
- cogl_set_viewport (-x_offset, -y_offset, viewport_width, viewport_height);
-}
-
-static void
-update_fbo (ClutterActor *self)
-{
- ClutterTexture *texture = CLUTTER_TEXTURE (self);
- ClutterTexturePrivate *priv = texture->priv;
- ClutterActor *head;
- ClutterShader *shader = NULL;
- ClutterActor *stage = NULL;
- CoglMatrix projection;
- CoglColor transparent_col;
-
- head = _clutter_context_peek_shader_stack ();
- if (head != NULL)
- shader = clutter_actor_get_shader (head);
-
- /* Temporarily turn off the shader on the top of the context's
- * shader stack, to restore the GL pipeline to it's natural state.
- */
- if (shader != NULL)
- clutter_shader_set_is_enabled (shader, FALSE);
-
- /* Redirect drawing to the fbo */
- cogl_push_framebuffer (priv->fbo_handle);
-
- if ((stage = clutter_actor_get_stage (self)) != NULL)
- {
- gfloat stage_width, stage_height;
- ClutterActor *source_parent;
-
- /* We copy the projection and modelview matrices from the stage to
- * the offscreen framebuffer and create a viewport larger than the
- * offscreen framebuffer - the same size as the stage.
- *
- * The fbo source actor gets rendered into this stage size viewport at the
- * same position it normally would after applying all it's usual parent
- * transforms and it's own scale and rotate transforms etc.
- *
- * The viewport is offset such that the offscreen buffer will be positioned
- * under the actor.
- */
-
- _clutter_stage_get_projection_matrix (CLUTTER_STAGE (stage), &projection);
-
- /* Set the projection matrix modelview matrix as it is for the
- * stage... */
- cogl_set_projection_matrix (&projection);
-
- clutter_actor_get_size (stage, &stage_width, &stage_height);
-
- /* Set a negatively offset the viewport so that the offscreen
- * framebuffer is position underneath the fbo_source actor... */
- set_viewport_with_buffer_under_fbo_source (priv->fbo_source,
- stage_width,
- stage_height);
-
- /* Apply the source's parent transformations to the modelview */
- if ((source_parent = clutter_actor_get_parent (priv->fbo_source)))
- {
- CoglMatrix modelview;
- cogl_matrix_init_identity (&modelview);
- _clutter_actor_apply_relative_transformation_matrix (source_parent,
- NULL,
- &modelview);
- cogl_set_modelview_matrix (&modelview);
- }
- }
-
-
- /* cogl_clear is called to clear the buffers */
- cogl_color_init_from_4ub (&transparent_col, 0, 0, 0, 0);
- cogl_clear (&transparent_col,
- COGL_BUFFER_BIT_COLOR |
- COGL_BUFFER_BIT_DEPTH);
- cogl_disable_fog ();
-
- /* Render the actor to the fbo */
- clutter_actor_paint (priv->fbo_source);
-
- /* Restore drawing to the previous framebuffer */
- cogl_pop_framebuffer ();
-
- /* If there is a shader on top of the shader stack, turn it back on. */
- if (shader != NULL)
- clutter_shader_set_is_enabled (shader, TRUE);
-}
-
-static void
gen_texcoords_and_draw_cogl_rectangle (ClutterActor *self)
{
ClutterTexture *texture = CLUTTER_TEXTURE (self);
@@ -652,9 +404,6 @@ clutter_texture_pick (ClutterActor *self,
return;
}
- if (priv->fbo_handle != NULL)
- update_fbo (self);
-
cogl_color_init_from_4ub (&pick_color,
color->red,
color->green,
@@ -683,9 +432,6 @@ clutter_texture_paint (ClutterActor *self)
clutter_actor_get_name (self) ? clutter_actor_get_name (self)
: "unknown");
- if (priv->fbo_handle != NULL)
- update_fbo (self);
-
cogl_pipeline_set_color4ub (priv->pipeline,
paint_opacity,
paint_opacity,
@@ -779,7 +525,6 @@ clutter_texture_dispose (GObject *object)
ClutterTexturePrivate *priv = texture->priv;
texture_free_gl_resources (texture);
- texture_fbo_free_resources (texture);
clutter_texture_async_load_cancel (texture);
@@ -974,13 +719,10 @@ clutter_texture_class_init (ClutterTextureClass *klass)
actor_class->paint = clutter_texture_paint;
actor_class->pick = clutter_texture_pick;
actor_class->get_paint_volume = clutter_texture_get_paint_volume;
- actor_class->realize = clutter_texture_realize;
- actor_class->unrealize = clutter_texture_unrealize;
actor_class->has_overlaps = clutter_texture_has_overlaps;
actor_class->get_preferred_width = clutter_texture_get_preferred_width;
actor_class->get_preferred_height = clutter_texture_get_preferred_height;
- actor_class->allocate = clutter_texture_allocate;
gobject_class->dispose = clutter_texture_dispose;
gobject_class->finalize = clutter_texture_finalize;
@@ -1284,7 +1026,6 @@ clutter_texture_init (ClutterTexture *self)
priv->repeat_x = FALSE;
priv->repeat_y = FALSE;
priv->sync_actor_size = TRUE;
- priv->fbo_handle = NULL;
priv->pick_pipeline = NULL;
priv->keep_aspect_ratio = FALSE;
priv->pick_with_alpha = FALSE;
@@ -1471,10 +1212,6 @@ clutter_texture_set_cogl_texture (ClutterTexture *texture,
already using */
cogl_object_ref (cogl_tex);
- /* Remove FBO if exisiting */
- if (priv->fbo_source)
- texture_fbo_free_resources (texture);
-
/* Remove old texture */
texture_free_gl_resources (texture);
@@ -1688,67 +1425,6 @@ clutter_texture_set_from_rgb_data (ClutterTexture *texture,
error);
}
-/**
- * clutter_texture_set_from_yuv_data:
- * @texture: A #ClutterTexture
- * @data: (array): Image data in YUV type colorspace.
- * @width: Width in pixels of image data.
- * @height: Height in pixels of image data
- * @flags: #ClutterTextureFlags
- * @error: Return location for a #GError, or %NULL.
- *
- * Sets a #ClutterTexture from YUV image data. If an error occurred,
- * %FALSE is returned and @error is set.
- *
- * The YUV support depends on the driver; the format supported by the
- * few drivers exposing this capability are not really useful.
- *
- * The proper way to convert image data in any YUV colorspace to any
- * RGB colorspace is to use a fragment shader associated with the
- * #ClutterTexture material.
- *
- * Return value: %TRUE if the texture was successfully updated
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_texture_get_cogl_material() and
- * the Cogl API to install a fragment shader for decoding YUV
- * formats on the GPU
- */
-gboolean
-clutter_texture_set_from_yuv_data (ClutterTexture *texture,
- const guchar *data,
- gint width,
- gint height,
- ClutterTextureFlags flags,
- GError **error)
-{
- g_return_val_if_fail (CLUTTER_IS_TEXTURE (texture), FALSE);
-
- if (!clutter_feature_available (CLUTTER_FEATURE_TEXTURE_YUV))
- {
- g_set_error (error, CLUTTER_TEXTURE_ERROR,
- CLUTTER_TEXTURE_ERROR_NO_YUV,
- _("YUV textures are not supported"));
- return FALSE;
- }
-
- /* Convert the flags to a CoglPixelFormat */
- if ((flags & CLUTTER_TEXTURE_YUV_FLAG_YUV2))
- {
- g_set_error (error, CLUTTER_TEXTURE_ERROR,
- CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
- _("YUV2 textues are not supported"));
- return FALSE;
- }
-
- return clutter_texture_set_from_data (texture, data,
- COGL_PIXEL_FORMAT_YUV,
- width, height,
- width * 3, 3,
- error);
-}
-
/*
* clutter_texture_async_load_complete:
* @self: a #ClutterTexture
@@ -2358,345 +2034,6 @@ clutter_texture_set_area_from_rgb_data (ClutterTexture *texture,
return TRUE;
}
-static void
-on_fbo_source_size_change (GObject *object,
- GParamSpec *param_spec,
- ClutterTexture *texture)
-{
- ClutterTexturePrivate *priv = texture->priv;
- gfloat w, h;
- ClutterActorBox box;
- gboolean status;
-
- status = clutter_actor_get_paint_box (priv->fbo_source, &box);
- if (status)
- clutter_actor_box_get_size (&box, &w, &h);
-
- /* In the end we will size the framebuffer according to the paint
- * box, but for code that does:
- * tex = clutter_texture_new_from_actor (src);
- * clutter_actor_get_size (tex, &width, &height);
- * it seems more helpfull to return the src actor size if it has a
- * degenerate paint box. The most likely reason it will have a
- * degenerate paint box is simply that the src currently has no
- * parent. */
- if (status == FALSE || w == 0 || h == 0)
- clutter_actor_get_size (priv->fbo_source, &w, &h);
-
- /* We can't create a texture with a width or height of 0... */
- w = MAX (1, w);
- h = MAX (1, h);
-
- if (w != priv->image_width || h != priv->image_height)
- {
- CoglTextureFlags flags = COGL_TEXTURE_NONE;
- CoglHandle tex;
-
- /* tear down the FBO */
- if (priv->fbo_handle != NULL)
- cogl_object_unref (priv->fbo_handle);
-
- texture_free_gl_resources (texture);
-
- priv->image_width = w;
- priv->image_height = h;
-
- flags |= COGL_TEXTURE_NO_SLICING;
-
- tex = cogl_texture_new_with_size (MAX (priv->image_width, 1),
- MAX (priv->image_height, 1),
- flags,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-
- cogl_pipeline_set_layer_texture (priv->pipeline, 0, tex);
-
- priv->fbo_handle = cogl_offscreen_new_to_texture (tex);
-
- /* The pipeline now has a reference to the texture so it will
- stick around */
- cogl_object_unref (tex);
-
- if (priv->fbo_handle == NULL)
- {
- g_warning ("%s: Offscreen texture creation failed", G_STRLOC);
- return;
- }
-
- clutter_actor_set_size (CLUTTER_ACTOR (texture), w, h);
- }
-}
-
-static void
-on_fbo_parent_change (ClutterActor *actor,
- ClutterActor *old_parent,
- ClutterTexture *texture)
-{
- ClutterActor *parent = CLUTTER_ACTOR(texture);
-
- while ((parent = clutter_actor_get_parent (parent)) != NULL)
- {
- if (parent == actor)
- {
- g_warning ("Offscreen texture is ancestor of source!");
- /* Desperate but will avoid infinite loops */
- clutter_actor_remove_child (parent, actor);
- }
- }
-}
-
-static void
-fbo_source_queue_redraw_cb (ClutterActor *source,
- ClutterActor *origin,
- ClutterTexture *texture)
-{
- clutter_actor_queue_redraw (CLUTTER_ACTOR (texture));
-}
-
-static void
-fbo_source_queue_relayout_cb (ClutterActor *source,
- ClutterTexture *texture)
-{
- clutter_actor_queue_relayout (CLUTTER_ACTOR (texture));
-}
-
-/**
- * clutter_texture_new_from_actor:
- * @actor: A source #ClutterActor
- *
- * Creates a new #ClutterTexture object with its source a prexisting
- * actor (and associated children). The textures content will contain
- * 'live' redirected output of the actors scene.
- *
- * Note this function is intented as a utility call for uniformly applying
- * shaders to groups and other potential visual effects. It requires that
- * the %CLUTTER_FEATURE_OFFSCREEN feature is supported by the current backend
- * and the target system.
- *
- * Some tips on usage:
- *
- * <itemizedlist>
- * <listitem>
- * <para>The source actor must be made visible (i.e by calling
- * #clutter_actor_show).</para>
- * </listitem>
- * <listitem>
- * <para>The source actor must have a parent in order for it to be
- * allocated a size from the layouting mechanism. If the source
- * actor does not have a parent when this function is called then
- * the ClutterTexture will adopt it and allocate it at its
- * preferred size. Using this you can clone an actor that is
- * otherwise not displayed. Because of this feature if you do
- * intend to display the source actor then you must make sure that
- * the actor is parented before calling
- * clutter_texture_new_from_actor() or that you unparent it before
- * adding it to a container.</para>
- * </listitem>
- * <listitem>
- * <para>When getting the image for the clone texture, Clutter
- * will attempt to render the source actor exactly as it would
- * appear if it was rendered on screen. The source actor's parent
- * transformations are taken into account. Therefore if your
- * source actor is rotated along the X or Y axes so that it has
- * some depth, the texture will appear differently depending on
- * the on-screen location of the source actor. While painting the
- * source actor, Clutter will set up a temporary asymmetric
- * perspective matrix as the projection matrix so that the source
- * actor will be projected as if a small section of the screen was
- * being viewed. Before version 0.8.2, an orthogonal identity
- * projection was used which meant that the source actor would be
- * clipped if any part of it was not on the zero Z-plane.</para>
- * </listitem>
- * <listitem>
- * <para>Avoid reparenting the source with the created texture.</para>
- * </listitem>
- * <listitem>
- * <para>A group can be padded with a transparent rectangle as to
- * provide a border to contents for shader output (blurring text
- * for example).</para>
- * </listitem>
- * <listitem>
- * <para>The texture will automatically resize to contain a further
- * transformed source. However, this involves overhead and can be
- * avoided by placing the source actor in a bounding group
- * sized large enough to contain any child tranformations.</para>
- * </listitem>
- * <listitem>
- * <para>Uploading pixel data to the texture (e.g by using
- * clutter_texture_set_from_file()) will destroy the offscreen texture
- * data and end redirection.</para>
- * </listitem>
- * <listitem>
- * <para>cogl_texture_get_data() with the handle returned by
- * clutter_texture_get_cogl_texture() can be used to read the
- * offscreen texture pixels into a pixbuf.</para>
- * </listitem>
- * </itemizedlist>
- *
- * Return value: A newly created #ClutterTexture object, or %NULL on failure.
- *
- * Deprecated: 1.8: Use the #ClutterOffscreenEffect and #ClutterShaderEffect
- * directly on the intended #ClutterActor to replace the functionality of
- * this function.
- *
- * Since: 0.6
- */
-ClutterActor *
-clutter_texture_new_from_actor (ClutterActor *actor)
-{
- ClutterTexture *texture;
- ClutterTexturePrivate *priv;
- gfloat w, h;
- ClutterActorBox box;
- gboolean status;
-
- g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-
- if (clutter_feature_available (CLUTTER_FEATURE_OFFSCREEN) == FALSE)
- return NULL;
-
- if (!CLUTTER_ACTOR_IS_REALIZED (actor))
- {
- clutter_actor_realize (actor);
-
- if (!CLUTTER_ACTOR_IS_REALIZED (actor))
- return NULL;
- }
-
- status = clutter_actor_get_paint_box (actor, &box);
- if (status)
- clutter_actor_box_get_size (&box, &w, &h);
-
- /* In the end we will size the framebuffer according to the paint
- * box, but for code that does:
- * tex = clutter_texture_new_from_actor (src);
- * clutter_actor_get_size (tex, &width, &height);
- * it seems more helpfull to return the src actor size if it has a
- * degenerate paint box. The most likely reason it will have a
- * degenerate paint box is simply that the src currently has no
- * parent. */
- if (status == FALSE || w == 0 || h == 0)
- clutter_actor_get_size (actor, &w, &h);
-
- /* We can't create a 0x0 fbo so always bump the size up to at least
- * 1 */
- w = MAX (1, w);
- h = MAX (1, h);
-
- /* Hopefully now were good.. */
- texture = g_object_new (CLUTTER_TYPE_TEXTURE,
- "disable-slicing", TRUE,
- NULL);
-
- priv = texture->priv;
-
- priv->fbo_source = g_object_ref_sink (actor);
-
- /* If the actor doesn't have a parent then claim it so that it will
- get a size allocation during layout */
- if (clutter_actor_get_parent (actor) == NULL)
- clutter_actor_add_child (CLUTTER_ACTOR (texture), actor);
-
- /* Connect up any signals which could change our underlying size */
- g_signal_connect (actor,
- "notify::width",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::height",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::scale-x",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::scale-y",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::rotation-angle-x",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::rotation-angle-y",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
- g_signal_connect (actor,
- "notify::rotation-angle-z",
- G_CALLBACK(on_fbo_source_size_change),
- texture);
-
- g_signal_connect (actor, "queue-relayout",
- G_CALLBACK (fbo_source_queue_relayout_cb), texture);
- g_signal_connect (actor, "queue-redraw",
- G_CALLBACK (fbo_source_queue_redraw_cb), texture);
-
- /* And a warning if the source becomes a child of the texture */
- g_signal_connect (actor,
- "parent-set",
- G_CALLBACK(on_fbo_parent_change),
- texture);
-
- priv->image_width = w;
- priv->image_height = h;
-
- clutter_actor_set_size (CLUTTER_ACTOR (texture),
- priv->image_width,
- priv->image_height);
-
- return CLUTTER_ACTOR (texture);
-}
-
-static void
-texture_fbo_free_resources (ClutterTexture *texture)
-{
- ClutterTexturePrivate *priv;
-
- priv = texture->priv;
-
- if (priv->fbo_source != NULL)
- {
- ClutterActor *parent;
-
- parent = clutter_actor_get_parent (priv->fbo_source);
-
- /* If we parented the texture then unparent it again so that it
- will lose the reference */
- if (parent == CLUTTER_ACTOR (texture))
- clutter_actor_remove_child (parent, priv->fbo_source);
-
- g_signal_handlers_disconnect_by_func
- (priv->fbo_source,
- G_CALLBACK(on_fbo_parent_change),
- texture);
-
- g_signal_handlers_disconnect_by_func
- (priv->fbo_source,
- G_CALLBACK(on_fbo_source_size_change),
- texture);
-
- g_signal_handlers_disconnect_by_func
- (priv->fbo_source,
- G_CALLBACK(fbo_source_queue_relayout_cb),
- texture);
-
- g_signal_handlers_disconnect_by_func
- (priv->fbo_source,
- G_CALLBACK(fbo_source_queue_redraw_cb),
- texture);
-
- g_object_unref (priv->fbo_source);
-
- priv->fbo_source = NULL;
- }
-
- if (priv->fbo_handle != NULL)
- {
- cogl_object_unref (priv->fbo_handle);
- priv->fbo_handle = NULL;
- }
-}
-
/**
* clutter_texture_set_sync_size:
* @texture: a #ClutterTexture
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 20c0ab2..3ee5a9f 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -164,7 +164,6 @@ enum
{
PROP_0,
- PROP_LOOP,
PROP_DELAY,
PROP_DURATION,
PROP_DIRECTION,
@@ -252,23 +251,6 @@ clutter_timeline_add_marker_internal (ClutterTimeline *timeline,
g_hash_table_insert (priv->markers_by_name, marker->name, marker);
}
-static inline void
-clutter_timeline_set_loop_internal (ClutterTimeline *timeline,
- gboolean loop)
-{
- gint old_repeat_count;
-
- old_repeat_count = timeline->priv->repeat_count;
-
- if (loop)
- clutter_timeline_set_repeat_count (timeline, -1);
- else
- clutter_timeline_set_repeat_count (timeline, 0);
-
- if (old_repeat_count != timeline->priv->repeat_count)
- g_object_notify_by_pspec (G_OBJECT (timeline), obj_props[PROP_LOOP]);
-}
-
/* Scriptable */
typedef struct _ParseClosure {
ClutterTimeline *timeline;
@@ -400,10 +382,6 @@ clutter_timeline_set_property (GObject *object,
switch (prop_id)
{
- case PROP_LOOP:
- clutter_timeline_set_loop_internal (timeline, g_value_get_boolean (value));
- break;
-
case PROP_DELAY:
clutter_timeline_set_delay (timeline, g_value_get_uint (value));
break;
@@ -445,10 +423,6 @@ clutter_timeline_get_property (GObject *object,
switch (prop_id)
{
- case PROP_LOOP:
- g_value_set_boolean (value, priv->repeat_count != 0);
- break;
-
case PROP_DELAY:
g_value_set_uint (value, priv->delay);
break;
@@ -531,25 +505,6 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
g_type_class_add_private (klass, sizeof (ClutterTimelinePrivate));
/**
- * ClutterTimeline:loop:
- *
- * Whether the timeline should automatically rewind and restart.
- *
- * As a side effect, setting this property to %TRUE will set the
- * #ClutterTimeline:repeat-count property to -1, while setting this
- * property to %FALSE will set the #ClutterTimeline:repeat-count
- * property to 0.
- *
- * Deprecated: 1.10: Use the #ClutterTimeline:repeat-count property instead.
- */
- obj_props[PROP_LOOP] =
- g_param_spec_boolean ("loop",
- P_("Loop"),
- P_("Should the timeline automatically restart"),
- FALSE,
- CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
-
- /**
* ClutterTimeline:delay:
*
* A delay, in milliseconds, that should be observed by the
@@ -1156,45 +1111,6 @@ clutter_timeline_stop (ClutterTimeline *timeline)
}
/**
- * clutter_timeline_set_loop:
- * @timeline: a #ClutterTimeline
- * @loop: %TRUE for enable looping
- *
- * Sets whether @timeline should loop.
- *
- * This function is equivalent to calling clutter_timeline_set_repeat_count()
- * with -1 if @loop is %TRUE, and with 0 if @loop is %FALSE.
- *
- * Deprecated: 1.10: Use clutter_timeline_set_repeat_count() instead.
- */
-void
-clutter_timeline_set_loop (ClutterTimeline *timeline,
- gboolean loop)
-{
- g_return_if_fail (CLUTTER_IS_TIMELINE (timeline));
-
- clutter_timeline_set_loop_internal (timeline, loop);
-}
-
-/**
- * clutter_timeline_get_loop:
- * @timeline: a #ClutterTimeline
- *
- * Gets whether @timeline is looping
- *
- * Return value: %TRUE if the timeline is looping
- *
- * Deprecated: 1.10: Use clutter_timeline_get_repeat_count() instead.
- */
-gboolean
-clutter_timeline_get_loop (ClutterTimeline *timeline)
-{
- g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), FALSE);
-
- return timeline->priv->repeat_count != 0;
-}
-
-/**
* clutter_timeline_rewind:
* @timeline: A #ClutterTimeline
*
@@ -1311,44 +1227,6 @@ clutter_timeline_is_playing (ClutterTimeline *timeline)
}
/**
- * clutter_timeline_clone:
- * @timeline: #ClutterTimeline to duplicate.
- *
- * Create a new #ClutterTimeline instance which has property values
- * matching that of supplied timeline. The cloned timeline will not
- * be started and will not be positioned to the current position of
- * @timeline: you will have to start it with clutter_timeline_start().
- *
- * <note><para>The only cloned properties are:</para>
- * <itemizedlist>
- * <listitem><simpara>#ClutterTimeline:duration</simpara></listitem>
- * <listitem><simpara>#ClutterTimeline:loop</simpara></listitem>
- * <listitem><simpara>#ClutterTimeline:delay</simpara></listitem>
- * <listitem><simpara>#ClutterTimeline:direction</simpara></listitem>
- * </itemizedlist></note>
- *
- * Return value: (transfer full): a new #ClutterTimeline, cloned
- * from @timeline
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_timeline_new() or g_object_new()
- * instead
- */
-ClutterTimeline *
-clutter_timeline_clone (ClutterTimeline *timeline)
-{
- g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), NULL);
-
- return g_object_new (CLUTTER_TYPE_TIMELINE,
- "duration", timeline->priv->duration,
- "loop", timeline->priv->repeat_count != 0,
- "delay", timeline->priv->delay,
- "direction", timeline->priv->direction,
- NULL);
-}
-
-/**
* clutter_timeline_new:
* @msecs: Duration of the timeline in milliseconds
*
diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h
index 3833a0c..2b4fb41 100644
--- a/clutter/clutter-timeline.h
+++ b/clutter/clutter-timeline.h
@@ -52,8 +52,6 @@ typedef struct _ClutterTimelinePrivate ClutterTimelinePrivate;
* A function for defining a custom progress.
*
* Return value: the progress, as a floating point value between -1.0 and 2.0.
- *
- * Since: 1.10
*/
typedef gdouble (* ClutterTimelineProgressFunc) (ClutterTimeline *timeline,
gdouble elapsed,
@@ -65,8 +63,6 @@ typedef gdouble (* ClutterTimelineProgressFunc) (ClutterTimeline *timeline,
*
* The #ClutterTimeline structure contains only private data
* and should be accessed using the provided API
- *
- * Since: 0.2
*/
struct _ClutterTimeline
{
@@ -85,8 +81,6 @@ struct _ClutterTimeline
* @marker_reached: handler for the #ClutterTimeline::marker-reached signal
*
* The #ClutterTimelineClass structure contains only private data
- *
- * Since: 0.2
*/
struct _ClutterTimelineClass
{
@@ -129,10 +123,8 @@ void clutter_timeline_stop (Clutter
void clutter_timeline_set_auto_reverse (ClutterTimeline *timeline,
gboolean reverse);
gboolean clutter_timeline_get_auto_reverse (ClutterTimeline *timeline);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_repeat_count (ClutterTimeline *timeline,
gint count);
-CLUTTER_AVAILABLE_IN_1_10
gint clutter_timeline_get_repeat_count (ClutterTimeline *timeline);
void clutter_timeline_rewind (ClutterTimeline *timeline);
void clutter_timeline_skip (ClutterTimeline *timeline,
@@ -158,15 +150,12 @@ gboolean clutter_timeline_has_marker (Clutter
const gchar *marker_name);
void clutter_timeline_advance_to_marker (ClutterTimeline *timeline,
const gchar *marker_name);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_progress_func (ClutterTimeline *timeline,
ClutterTimelineProgressFunc func,
gpointer data,
GDestroyNotify notify);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_progress_mode (ClutterTimeline *timeline,
ClutterAnimationMode mode);
-CLUTTER_AVAILABLE_IN_1_10
ClutterAnimationMode clutter_timeline_get_progress_mode (ClutterTimeline *timeline);
G_END_DECLS
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index d2b5fe2..cb3f284 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -255,7 +255,6 @@ void clutter_paint_volume_set_depth (ClutterPaintVolume
gfloat clutter_paint_volume_get_depth (const ClutterPaintVolume *pv);
void clutter_paint_volume_union (ClutterPaintVolume *pv,
const ClutterPaintVolume *another_pv);
-CLUTTER_AVAILABLE_IN_1_10
void clutter_paint_volume_union_box (ClutterPaintVolume *pv,
const ClutterActorBox *box);
diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c
index 2c754a0..7c52476 100644
--- a/clutter/clutter-util.c
+++ b/clutter/clutter-util.c
@@ -36,30 +36,8 @@
#include <glib/gi18n-lib.h>
-#include "deprecated/clutter-util.h"
#include "clutter-main.h"
-/**
- * clutter_util_next_p2:
- * @a: Value to get the next power
- *
- * Calculates the nearest power of two, greater than or equal to @a.
- *
- * Return value: The nearest power of two, greater or equal to @a.
- *
- * Deprecated: 1.2
- */
-gint
-clutter_util_next_p2 (gint a)
-{
- int rval = 1;
-
- while (rval < a)
- rval <<= 1;
-
- return rval;
-}
-
/*< private >
* _clutter_gettext:
* @str: a string to localize
diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index befd040..b87c225 100644
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -125,80 +125,22 @@ G_BEGIN_DECLS
/* XXX - Every new stable minor release bump should add a macro here */
/**
- * CLUTTER_VERSION_1_0:
- *
- * A macro that evaluates to the 1.0 version of Clutter, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 1.10
- */
-#define CLUTTER_VERSION_1_0 (G_ENCODE_VERSION (1, 0))
-
-/**
- * CLUTTER_VERSION_1_2:
- *
- * A macro that evaluates to the 1.2 version of Clutter, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 1.10
- */
-#define CLUTTER_VERSION_1_2 (G_ENCODE_VERSION (1, 2))
-
-/**
- * CLUTTER_VERSION_1_4:
- *
- * A macro that evaluates to the 1.4 version of Clutter, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 1.10
- */
-#define CLUTTER_VERSION_1_4 (G_ENCODE_VERSION (1, 4))
-
-/**
- * CLUTTER_VERSION_1_6:
- *
- * A macro that evaluates to the 1.6 version of Clutter, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 1.10
- */
-#define CLUTTER_VERSION_1_6 (G_ENCODE_VERSION (1, 6))
-
-/**
- * CLUTTER_VERSION_1_8:
- *
- * A macro that evaluates to the 1.8 version of Clutter, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 1.10
- */
-#define CLUTTER_VERSION_1_8 (G_ENCODE_VERSION (1, 8))
-
-/**
- * CLUTTER_VERSION_1_10:
+ * CLUTTER_VERSION_2_0:
*
* A macro that evaluates to the 1.10 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
-#define CLUTTER_VERSION_1_10 (G_ENCODE_VERSION (1, 10))
+#define CLUTTER_VERSION_2_0 (G_ENCODE_VERSION (2, 0))
/* evaluates to the current stable version; for development cycles,
* this means the next stable target
*/
-#if (CLUTTER_MINOR_VERSION % 2)
-# define CLUTTER_VERSION_CUR_STABLE (G_ENCODE_VERSION (CLUTTER_MAJOR_VERSION, CLUTTER_MINOR_VERSION + 1))
-#else
-# define CLUTTER_VERSION_CUR_STABLE (G_ENCODE_VERSION (CLUTTER_MAJOR_VERSION, CLUTTER_MINOR_VERSION))
-#endif
+#define CLUTTER_VERSION_CUR_STABLE (G_ENCODE_VERSION (2, 0))
/* evaluates to the previous stable version */
-#if (CLUTTER_MINOR_VERSION % 2)
-# define CLUTTER_VERSION_PREV_STABLE (G_ENCODE_VERSION (CLUTTER_MAJOR_VERSION, CLUTTER_MINOR_VERSION - 1))
-#else
-# define CLUTTER_VERSION_PREV_STABLE (G_ENCODE_VERSION (CLUTTER_MAJOR_VERSION, CLUTTER_MINOR_VERSION - 2))
-#endif
+#define CLUTTER_VERSION_PREV_STABLE (G_ENCODE_VERSION (2, 0))
/**
* CLUTTER_CHECK_VERSION:
diff --git a/clutter/clutter.h b/clutter/clutter.h
index eb5c7c0..e180d58 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -66,7 +66,6 @@
#include "clutter-fixed-layout.h"
#include "clutter-flow-layout.h"
#include "clutter-gesture-action.h"
-#include "clutter-group.h"
#include "clutter-input-device.h"
#include "clutter-interval.h"
#include "clutter-keysyms.h"
diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
index 618723a..6b2d858 100644
--- a/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/cogl/clutter-stage-cogl.c
@@ -46,7 +46,6 @@
#include "clutter-private.h"
#include "clutter-profile.h"
#include "clutter-stage-private.h"
-#include "clutter-util.h"
static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
diff --git a/clutter/cogl/clutter-stage-cogl.h b/clutter/cogl/clutter-stage-cogl.h
index e140824..10c4b3f 100644
--- a/clutter/cogl/clutter-stage-cogl.h
+++ b/clutter/cogl/clutter-stage-cogl.h
@@ -1,9 +1,9 @@
#ifndef __CLUTTER_STAGE_COGL_H__
#define __CLUTTER_STAGE_COGL_H__
-#include <cairo.h>
+#include <cogl/cogl.h>
+#include <clutter/clutter-types.h>
#include <clutter/clutter-backend.h>
-#include <clutter/clutter-stage.h>
#ifdef COGL_HAS_X11_SUPPORT
#include <X11/Xlib.h>
diff --git a/clutter/gdk/clutter-stage-gdk.h b/clutter/gdk/clutter-stage-gdk.h
index 8c4cb20..f85771f 100644
--- a/clutter/gdk/clutter-stage-gdk.h
+++ b/clutter/gdk/clutter-stage-gdk.h
@@ -23,8 +23,7 @@
#ifndef __CLUTTER_STAGE_GDK_H__
#define __CLUTTER_STAGE_GDK_H__
-#include <clutter/clutter-group.h>
-#include <clutter/clutter-stage.h>
+#include <clutter/clutter-types.h>
#include <gdk/gdk.h>
#include "clutter-backend-gdk.h"
diff --git a/clutter/osx/clutter-stage-osx.h b/clutter/osx/clutter-stage-osx.h
index cb2c126..1024233 100644
--- a/clutter/osx/clutter-stage-osx.h
+++ b/clutter/osx/clutter-stage-osx.h
@@ -22,9 +22,7 @@
#ifndef __CLUTTER_STAGE_OSX_H__
#define __CLUTTER_STAGE_OSX_H__
-#include <clutter/clutter-backend.h>
-#include <clutter/clutter-stage.h>
-#include <clutter/clutter-stage-window.h>
+#include <clutter/clutter-types.h>
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
diff --git a/clutter/win32/clutter-stage-win32.h b/clutter/win32/clutter-stage-win32.h
index 0aa2597..f9a4a64 100644
--- a/clutter/win32/clutter-stage-win32.h
+++ b/clutter/win32/clutter-stage-win32.h
@@ -22,8 +22,7 @@
#ifndef __CLUTTER_STAGE_WIN32_H__
#define __CLUTTER_STAGE_WIN32_H__
-#include <clutter/clutter-group.h>
-#include <clutter/clutter-stage.h>
+#include <clutter/clutter-types.h>
#include <windows.h>
#include "clutter-backend-win32.h"
diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/x11/clutter-stage-x11.h
index 61ff15f..c06ffb7 100644
--- a/clutter/x11/clutter-stage-x11.h
+++ b/clutter/x11/clutter-stage-x11.h
@@ -22,8 +22,7 @@
#ifndef __CLUTTER_STAGE_X11_H__
#define __CLUTTER_STAGE_X11_H__
-#include <clutter/clutter-group.h>
-#include <clutter/clutter-stage.h>
+#include <clutter/clutter-types.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
