gnomemm r1471 - in cluttermm/trunk: . build_shared clutter clutter-cairo clutter-cairo/cluttermm-cairo clutter-cairo/cluttermm-cairo/private clutter-cairo/src clutter/cluttermm clutter/src docs/reference examples tools/extra_defs_gen

From: jjongsma svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r1471 - in cluttermm/trunk: . build_shared clutter clutter-cairo clutter-cairo/cluttermm-cairo clutter-cairo/cluttermm-cairo/private clutter-cairo/src clutter/cluttermm clutter/src docs/reference examples tools/extra_defs_gen
Date: Mon, 21 Apr 2008 03:50:05 +0100 (BST)
Author: jjongsma
Date: Mon Apr 21 02:50:04 2008
New Revision: 1471
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1471&view=rev

Log:
	* clutter-cairo: split cluttermm-cairo library into its own subdirectory to
	match the way the underlying clutter library is divided


Added:
   cluttermm/trunk/clutter-cairo/   (props changed)
   cluttermm/trunk/clutter-cairo/Makefile.am
   cluttermm/trunk/clutter-cairo/README
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/   (props changed)
   cluttermm/trunk/clutter-cairo/cluttermm-cairo-config.h.in
   cluttermm/trunk/clutter-cairo/cluttermm-cairo.h
   cluttermm/trunk/clutter-cairo/cluttermm-cairo.pc.in
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.cc
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.h
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/private/   (props changed)
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/private/Makefile.am
   cluttermm/trunk/clutter-cairo/cluttermm-cairo/wrap_init.h
      - copied unchanged from r1458, /cluttermm/trunk/clutter/cluttermm/wrap_init.h
   cluttermm/trunk/clutter-cairo/src/   (props changed)
   cluttermm/trunk/clutter-cairo/src/Makefile.am
   cluttermm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/clutter-cairo/src/cairo-texture.ccg
      - copied, changed from r1458, /cluttermm/trunk/clutter/src/cairo-texture.ccg
   cluttermm/trunk/clutter-cairo/src/cairo-texture.hg
      - copied, changed from r1458, /cluttermm/trunk/clutter/src/cairo-texture.hg
   cluttermm/trunk/clutter-cairo/src/clutter-cairo.defs
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_docs.xml
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_enums.defs
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_methods.defs
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_others.defs
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_signals.defs
   cluttermm/trunk/clutter-cairo/src/clutter-cairo_vfuncs.defs
   cluttermm/trunk/clutter/cluttermm.pc.in
      - copied unchanged from r1464, /cluttermm/trunk/clutter/cluttermm-1.0.pc.in
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
      - copied, changed from r1458, /cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
Removed:
   cluttermm/trunk/clutter/cluttermm-1.0.pc.in
   cluttermm/trunk/clutter/src/cairo-texture.ccg
   cluttermm/trunk/clutter/src/cairo-texture.hg
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/Makefile.am
   cluttermm/trunk/build_shared/Makefile_gensrc.am_fragment
   cluttermm/trunk/clutter/cluttermm.h
   cluttermm/trunk/clutter/cluttermm/init.cc
   cluttermm/trunk/clutter/cluttermm/init.h
   cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/configure.in
   cluttermm/trunk/docs/reference/Doxyfile.in
   cluttermm/trunk/examples/Makefile.am_fragment
   cluttermm/trunk/examples/flowers.cc
   cluttermm/trunk/examples/simple-cairo.cc
   cluttermm/trunk/tools/extra_defs_gen/   (props changed)
   cluttermm/trunk/tools/extra_defs_gen/Makefile.am
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc

Modified: cluttermm/trunk/Makefile.am
==============================================================================
--- cluttermm/trunk/Makefile.am	(original)
+++ cluttermm/trunk/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -1,4 +1,4 @@
-SUBDIRS		= tools clutter docs examples tests
+SUBDIRS		= tools clutter clutter-cairo docs examples tests
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \

Modified: cluttermm/trunk/build_shared/Makefile_gensrc.am_fragment
==============================================================================
--- cluttermm/trunk/build_shared/Makefile_gensrc.am_fragment	(original)
+++ cluttermm/trunk/build_shared/Makefile_gensrc.am_fragment	Mon Apr 21 02:50:04 2008
@@ -39,7 +39,11 @@
 run_gmmproc	= $(gmmproc_path) $(gmmproc_args)
 
 gen_wrap_init_path = $(gmmproc_dir)/generate_wrap_init.pl
-gen_wrap_init_args = --namespace=$(sublib_namespace) --parent_dir=$(sublib_parentdir)
+# nested namespaces should be whitespace-separated.  The following line will
+# then translate them into the correct arguments to pass to
+# generate_wrap_init.pl
+namespaces = $(sublib_namespace:%=--namespace=%)
+gen_wrap_init_args = $(namespaces) --parent_dir=$(sublib_parentdir)
 run_gen_wrap_init  = $(gen_wrap_init_path) $(gen_wrap_init_args)
 
 EXTRA_DIST	= Makefile_list_of_hg.am_fragment \

Added: cluttermm/trunk/clutter-cairo/Makefile.am
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,15 @@
+SUBDIRS		= src cluttermm-cairo
+
+EXTRA_DIST	= README					\
+		  cluttermm-cairo-config.h.in cluttermm-cairo.h	\
+		  cluttermm-cairo-1.0.pc.in
+
+cluttermm_includedir		= $(includedir)/$(CLUTTERMM_CAIRO_API_VER)
+cluttermm_include_HEADERS	= cluttermm-cairo.h
+
+cluttermm_configdir		= $(libdir)/$(CLUTTERMM_CAIRO_API_VER)/include
+cluttermm_config_DATA	= cluttermm-cairo-config.h
+
+pkgconfigdir		= $(libdir)/pkgconfig
+pkgconfig_DATA		= cluttermm-cairo-1.0.pc
+

Added: cluttermm/trunk/clutter-cairo/README
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/README	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,6 @@
+Base directory for cluttermm-cairo, which integrates cluttermm and cairomm
+
+Here is the layout
+
+  src - actual sources used to build, processed with gmmproc
+  cluttermm-cairo - built sources (do not edit)

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo-config.h.in
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo-config.h.in	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,13 @@
+#ifndef _LIBCLUTTERMM_CONFIG_H
+#define _LIBCLUTTERMM_CONFIG_H 1
+
+#include "glibmmconfig.h"
+
+/* version numbers */
+#undef LIBCLUTTERMM_MAJOR_VERSION
+#undef LIBCLUTTERMM_MINOR_VERSION
+#undef LIBCLUTTERMM_MICRO_VERSION
+#undef LIBCLUTTERMM_VERSION
+
+#endif /* _LIBCLUTTERMM_CONFIG_H */
+

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo.h
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo.h	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,32 @@
+/* cluttermm-cairo - a C++ wrapper for clutter-cairo
+ *
+ * Copyright 2007 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef LIBCLUTTERMM_CAIRO_H
+#define LIBCLUTTERMM_CAIRO_H
+
+/* cluttermm version.  */
+extern const int cluttermm_major_version;
+extern const int cluttermm_minor_version;
+extern const int cluttermm_micro_version;
+
+#include <cluttermm.h>
+#include <cluttermm-cairo/init.h>
+#include <cluttermm-cairo/cairo-texture.h>
+
+#endif /* #ifndef LIBCLUTTERMM_CAIRO_H */

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo.pc.in
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo.pc.in	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: cluttermm-cairo
+Description: C++ wrapper for clutter
+Requires: clutter-0.6 cluttermm-1.0 cairomm-1.0
+Version: @VERSION@
+Libs: -L${libdir} -lcluttermm-cairo-1.0
+Cflags: -I${includedir}/cluttermm-cairo-1.0

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,24 @@
+## Copyright (c) 2001
+## The cluttermm development team.
+
+SUBDIRS			= private
+
+sublib_name		= cluttermm-cairo
+sublib_libname = cluttermm-cairo-1.0
+sublib_libversion = $(CLUTTERMM_SO_VERSION)
+sublib_namespace	= Clutter
+sublib_cflags		= $(CLUTTERMM_CAIRO_CFLAGS) -I$(top_srcdir)/clutter
+sublib_topdir = clutter-cairo
+
+
+files_extra_h	= wrap_init.h init.h
+files_extra_cc	= init.cc
+
+include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
+
+lib_LTLIBRARIES			= libcluttermm-cairo-1.0.la
+libcluttermm_cairo_1_0_la_SOURCES	= $(files_all_cc)
+libcluttermm_cairo_1_0_la_LDFLAGS	= $(common_ldflags)
+libcluttermm_cairo_1_0_la_LIBADD	= $(CLUTTERMM_CAIRO_LIBS) \
+									  $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la
+

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.cc
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.cc	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,36 @@
+// -*- c++ -*-
+/*
+ * Copyright 2008 Jonathon Jongsma
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <cluttermm-cairo-config.h> //For LIBCLUTTERMM_VERSION
+#include <cluttermm-cairo/wrap_init.h>
+#include <cluttermm/init.h>
+
+namespace Clutter
+{
+namespace Cairo
+{
+
+void init(int* nargs, gchar **args[])
+{
+  Clutter::init (nargs, args);
+  wrap_init (); //Tells the Glib::wrap() table about the libcluttermm-cairo classes.
+}
+
+} //namespace Cairo
+} //namespace Clutter

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.h
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo/init.h	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,35 @@
+// -*- c++ -*-
+#ifndef _LIBCLUTTERMM_CAIRO_INIT_H
+#define _LIBCLUTTERMM_CAIRO_INIT_H
+/*
+ * Copyright 2008 Jonathon Jongsma
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm.h>
+
+namespace Clutter
+{
+namespace Cairo
+{
+
+void init(int* nargs, gchar** args[]);
+
+} //namespace Cairo
+} //namespace Clutter
+
+#endif //_LIBCLUTTERMM_CAIRO_INIT_H
+

Added: cluttermm/trunk/clutter-cairo/cluttermm-cairo/private/Makefile.am
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/cluttermm-cairo/private/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,12 @@
+## Copyright (c) 2001
+## The cluttermm development team.
+
+include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
+files_built_h		= $(files_hg:.hg=_p.h)
+
+private_includedir	= ${includedir}/$(CLUTTERMM_CAIRO_API_VER)/cluttermm-cairo/private
+private_include_HEADERS	= $(files_built_h)
+
+maintainer-clean-local:
+	(cd $(srcdir) && rm -f $(files_built_h))
+

Added: cluttermm/trunk/clutter-cairo/src/Makefile.am
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,18 @@
+## Copyright (c) 2001
+## The cluttermm development team.
+
+sublib_name	= cluttermm-cairo
+#nested namespaces separated with spaces
+sublib_namespace = Clutter Cairo
+sublib_parentdir = cluttermm-cairo
+files_defs	= clutter-cairo.defs \
+			  clutter-cairo_methods.defs \
+			  clutter-cairo_signals.defs \
+			  clutter-cairo_enums.defs \
+			  clutter-cairo_vfuncs.defs \
+			  clutter-cairo_others.defs \
+			  clutter-cairo_docs.xml \
+			  clutter-cairo_docs_override.xml
+
+include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
+

Added: cluttermm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/Makefile_list_of_hg.am_fragment	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,6 @@
+# This file is include by other Makefile.am files, using the new automake include feature.
+# The include happens in Makefile.am, not Makefile.in or Makefile,
+# so it's like copy-and-pasting this into each of those Makefile.am files.
+
+files_hg = \
+		   cairo-texture.hg

Copied: cluttermm/trunk/clutter-cairo/src/cairo-texture.ccg (from r1458, /cluttermm/trunk/clutter/src/cairo-texture.ccg)
==============================================================================
--- /cluttermm/trunk/clutter/src/cairo-texture.ccg	(original)
+++ cluttermm/trunk/clutter-cairo/src/cairo-texture.ccg	Mon Apr 21 02:50:04 2008
@@ -19,10 +19,13 @@
 
 namespace Clutter
 {
-    void CairoTexture::set_source_color (const Cairo::RefPtr<Cairo::Context>& cr, const Color& color)
+namespace Cairo
+{
+    void CairoTexture::set_source_color (const ::Cairo::RefPtr< ::Cairo::Context >& cr, const Color& color)
     {
         clutter_cairo_set_source_color (cr->cobj (), color.gobj ());
     }
 
+} //namespace Cairo
 } //namespace Clutter
 

Copied: cluttermm/trunk/clutter-cairo/src/cairo-texture.hg (from r1458, /cluttermm/trunk/clutter/src/cairo-texture.hg)
==============================================================================
--- /cluttermm/trunk/clutter/src/cairo-texture.hg	(original)
+++ cluttermm/trunk/clutter-cairo/src/cairo-texture.hg	Mon Apr 21 02:50:04 2008
@@ -18,12 +18,14 @@
 #include <cluttermm/texture.h>
 #include <cairomm/context.h>
  
-_DEFS(cluttermm,clutter)
+_DEFS(cluttermm-cairo,clutter-cairo)
 _PINCLUDE(cluttermm/private/texture_p.h)
 
 
 namespace Clutter
 {
+namespace Cairo
+{
 
 class CairoTexture :
   public Texture
@@ -36,12 +38,13 @@
 public:
   _WRAP_CREATE(guint width, guint height);
 
-#m4 _CONVERSION(`cairo_t*',`Cairo::RefPtr<Cairo::Context>',`$2(new Cairo::Context ($3, true))')
-  _WRAP_METHOD(Cairo::RefPtr<Cairo::Context> create_cairo_context (), clutter_cairo_create)
+#m4 _CONVERSION(`cairo_t*',`::Cairo::RefPtr< ::Cairo::Context >',`$2(new ::Cairo::Context ($3, true))')
+  _WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Context > create_cairo_context (), clutter_cairo_create)
 
-  static void set_source_color (const Cairo::RefPtr<Cairo::Context>& cr, const Color& color);
+  static void set_source_color (const ::Cairo::RefPtr< ::Cairo::Context >& cr, const Color& color);
 };
 
+} // namespace Cairo
 } // namespace Clutter
 
 //vim: ts=2,sw=2

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo.defs
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/clutter-cairo.defs	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,5 @@
+(include clutter-cairo_methods.defs)
+(include clutter-cairo_signals.defs)
+(include clutter-cairo_vfuncs.defs)
+(include clutter-cairo_enums.defs)
+(include clutter-cairo_others.defs)

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_docs.xml
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/clutter-cairo_docs.xml	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,71 @@
+<root>
+<function name="clutter_cairo_new">
+<description>
+Creates a new #ClutterCairo texture.
+
+
+</description>
+<parameters>
+<parameter name="width">
+<parameter_description> clutter cairo surface width
+</parameter_description>
+</parameter>
+<parameter name="height">
+<parameter_description> clutter cairo surface height
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #ClutterCairo texture
+</return>
+</function>
+
+<function name="SECTION">
+<description>
+#ClutterCairo is a #ClutterTexture that displays text.
+
+</description>
+<parameters>
+<parameter name="short_description">
+<parameter_description> Actor for displaying 
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="clutter_cairo_set_source_color">
+<description>
+Sets @color as the source color for the cairo context.
+
+</description>
+<parameters>
+<parameter name="cr">
+<parameter_description> a #cairo_t
+</parameter_description>
+</parameter>
+<parameter name="color">
+<parameter_description> a #ClutterColor
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
+<function name="clutter_cairo_create">
+<description>
+Creates a new cairo context #ClutterCairo texture. 
+
+
+</description>
+<parameters>
+<parameter name="cairo">
+<parameter_description>  A #ClutterCairo texture.
+</parameter_description>
+</parameter>
+</parameters>
+<return> a newly created cairo context. Free with cairo_destroy() 
+when you are done drawing.  
+</return>
+</function>
+
+</root>

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_docs_override.xml
==============================================================================

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_enums.defs
==============================================================================

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_methods.defs
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/clutter-cairo_methods.defs	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,45 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object Cairo
+  (in-module "Clutter")
+  (parent "ClutterTexture")
+  (c-name "ClutterCairo")
+  (gtype-id "CLUTTER_TYPE_CAIRO")
+)
+
+;; Enumerations and flags ...
+
+
+;; From clutter-cairo.h
+
+(define-function clutter_cairo_get_type
+  (c-name "clutter_cairo_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_cairo_new
+  (c-name "clutter_cairo_new")
+  (is-constructor-of "ClutterCairo")
+  (return-type "ClutterActor*")
+  (parameters
+    '("guint" "width")
+    '("guint" "height")
+  )
+)
+
+(define-method create
+  (of-object "ClutterCairo")
+  (c-name "clutter_cairo_create")
+  (return-type "cairo_t*")
+)
+
+(define-function clutter_cairo_set_source_color
+  (c-name "clutter_cairo_set_source_color")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("const-ClutterColor*" "color")
+  )
+)
+
+

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_others.defs
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/clutter-cairo_others.defs	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,272 @@
+;; From ClutterCairo
+
+(define-property name
+  (of-object "ClutterCairo")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property x
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "X co-ord of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property y
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Y co-ord of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Width of actor in pixels")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Height of actor in pixels")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property depth
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Depth of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property clip
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The clip region for the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-clip
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor has a clip set or not")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property opacity
+  (of-object "ClutterCairo")
+  (prop-type "GParamUChar")
+  (docs "Opacity of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visible
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property reactive
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is reactive to events or not")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property scale-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "Scale factor on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property scale-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "Scale factor on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property pixbuf
+  (of-object "ClutterCairo")
+  (prop-type "GParamObject")
+  (docs "Pixbuf source for Texture.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tiled
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Enables the use of tiled GL textures to more efficiently use available texture memory")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property tile-waste
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Max wastage dimension of a texture when using tiled textures. Bigger values use less textures, smaller values less texture memory.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property pixel-type
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "GL texture pixel type used")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property pixel-format
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "GL texture pixel format used")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property sync-size
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Auto sync size of actor to underlying pixbuf dimensions")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property repeat-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Reapeat underlying pixbuf rather than scale in y direction. Currently ignored")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property repeat-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Reapeat underlying pixbuf rather than scale in x direction. Currently ignored")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property filter-quality
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Values 0 and 1 current only supported, with 0 being lower quality but fast, 1 being better quality but slower. ( Currently just maps to GL_NEAREST / GL_LINEAR )")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property surface-width
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Surface Width")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property surface-height
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Surface Height")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_signals.defs
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter-cairo/src/clutter-cairo_signals.defs	Mon Apr 21 02:50:04 2008
@@ -0,0 +1,272 @@
+;; From ClutterCairo
+
+(define-property name
+  (of-object "ClutterCairo")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property x
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "X co-ord of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property y
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Y co-ord of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Width of actor in pixels")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Height of actor in pixels")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property depth
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Depth of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property clip
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The clip region for the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-clip
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor has a clip set or not")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property opacity
+  (of-object "ClutterCairo")
+  (prop-type "GParamUChar")
+  (docs "Opacity of actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visible
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property reactive
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is reactive to events or not")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property scale-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "Scale factor on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property scale-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "Scale factor on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterCairo")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property pixbuf
+  (of-object "ClutterCairo")
+  (prop-type "GParamObject")
+  (docs "Pixbuf source for Texture.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tiled
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Enables the use of tiled GL textures to more efficiently use available texture memory")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property tile-waste
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Max wastage dimension of a texture when using tiled textures. Bigger values use less textures, smaller values less texture memory.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property pixel-type
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "GL texture pixel type used")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property pixel-format
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "GL texture pixel format used")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property sync-size
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Auto sync size of actor to underlying pixbuf dimensions")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property repeat-y
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Reapeat underlying pixbuf rather than scale in y direction. Currently ignored")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property repeat-x
+  (of-object "ClutterCairo")
+  (prop-type "GParamBoolean")
+  (docs "Reapeat underlying pixbuf rather than scale in x direction. Currently ignored")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property filter-quality
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Values 0 and 1 current only supported, with 0 being lower quality but fast, 1 being better quality but slower. ( Currently just maps to GL_NEAREST / GL_LINEAR )")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property surface-width
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Surface Width")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property surface-height
+  (of-object "ClutterCairo")
+  (prop-type "GParamInt")
+  (docs "Surface Height")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+

Added: cluttermm/trunk/clutter-cairo/src/clutter-cairo_vfuncs.defs
==============================================================================

Modified: cluttermm/trunk/clutter/cluttermm.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.h	(original)
+++ cluttermm/trunk/clutter/cluttermm.h	Mon Apr 21 02:50:04 2008
@@ -52,7 +52,6 @@
 #include <cluttermm/shader.h>
 #include <cluttermm/script.h>
 #include <cluttermm/types.h>
-#include <cluttermm/cairo-texture.h>
 
 //#include <cluttermm/box.h>
 //#include <cluttermm/container.h>

Modified: cluttermm/trunk/clutter/cluttermm/init.cc
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/init.cc	(original)
+++ cluttermm/trunk/clutter/cluttermm/init.cc	Mon Apr 21 02:50:04 2008
@@ -1,7 +1,6 @@
 // -*- c++ -*-
-/* init.cc
- *
- * Copyright 2001      Free Software Foundation
+/*
+ * Copyright 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

Modified: cluttermm/trunk/clutter/cluttermm/init.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/init.h	(original)
+++ cluttermm/trunk/clutter/cluttermm/init.h	Mon Apr 21 02:50:04 2008
@@ -1,11 +1,8 @@
 // -*- c++ -*-
 #ifndef _LIBCLUTTERMM_INIT_H
 #define _LIBCLUTTERMM_INIT_H
-/* $Id: init.h,v 1.4 2003/10/12 09:50:13 murrayc Exp $ */
-
-/* init.h
- *
- * Copyright 2001      Free Software Foundation
+/*
+ * Copyright 2008 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

Modified: cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	(original)
+++ cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	Mon Apr 21 02:50:04 2008
@@ -28,6 +28,5 @@
 score.hg \
 shader.hg \
 script.hg \
-scriptable.hg \
-cairo-texture.hg
+scriptable.hg
 #layout.hg box.hg margin.hg

Modified: cluttermm/trunk/configure.in
==============================================================================
--- cluttermm/trunk/configure.in	(original)
+++ cluttermm/trunk/configure.in	Mon Apr 21 02:50:04 2008
@@ -1,15 +1,3 @@
-# Configure.in
-#
-#  This file tests for various compiler features needed to configure
-#  the gtkmm package.  Original skeleton was provided by Stephan Kulow.
-#  All tests were written by Tero Pulkkinen, Mirko Streckenbach, and
-#  Karl Nelson.
-#
-#
-#  Copyright 2001 Free Software Foundation
-#  Copyright 1999 gtkmm Development Team
-#  Copyright 1998 Stephan Kulow
-#
 AC_INIT(clutter/cluttermmconfig.h.in)
 
 #########################################################################
@@ -49,6 +37,7 @@
 
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(clutter/cluttermmconfig.h)
+AM_CONFIG_HEADER(clutter-cairo/cluttermm-cairo-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -68,14 +57,14 @@
 AM_PROG_LIBTOOL
 
 AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
-SUN m4 does not work for building gtkmm.
+SUN m4 does not work for building cluttermm.
 Please install GNU m4.]))
 
 AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
-SUN make does not work for building gtkmm.
+SUN make does not work for building cluttermm.
 Please install GNU make.]))
 
-AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build gtkmm.]))
+AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build cluttermm.]))
 
 AC_CHECK_PROGS(PERL, perl5 perl)
 
@@ -84,21 +73,26 @@
 #########################################################################
 PKG_CHECK_MODULES(CLUTTERMM,
                   gtkmm-2.4 >= 2.10.9
-                  clutter-0.6
-                  clutter-cairo-0.6
-                  cairomm-1.0)
+                  clutter-0.6)
 AC_SUBST(CLUTTERMM_CFLAGS)
 AC_SUBST(CLUTTERMM_LIBS)
 
-GLIBMM_PREFIX=`pkg-config --variable=libdir glibmm-2.4`
-GMM_PROCDIR=$GLIBMM_PREFIX/glibmm-2.4/proc
+CLUTTERMM_API_VER=[cluttermm-1.0]
+AC_SUBST(CLUTTERMM_API_VER)
+
+PKG_CHECK_MODULES(CLUTTERMM_CAIRO,
+                  [gtkmm-2.4
+                   clutter-cairo-0.6
+                   cairomm-1.0])
+
+CLUTTERMM_CAIRO_API_VER=[cluttermm-cairo-1.0]
+AC_SUBST(CLUTTERMM_CAIRO_API_VER)
+
+GMM_PROCDIR=`pkg-config --variable=gmmprocdir glibmm-2.4`
 AC_SUBST(GMM_PROCDIR)
 GMM_PROC=$GMM_PROCDIR/gmmproc
 AC_SUBST(GMM_PROC)
 
-CLUTTERMM_API_VER=[cluttermm-1.0]
-AC_SUBST(CLUTTERMM_API_VER)
-
 #########################################################################
 #  C++ checks
 #########################################################################
@@ -106,20 +100,6 @@
 AC_LANG_CPLUSPLUS
 
 
-# Create a list of input directories for Doxygen.  We have to check wether
-# we are building in the source directory, because Doxygen doesn't like
-# duplicated directories in the input list.
-CLUTTERMM_DOXYGEN_INPUT=''
-gtkmm_srcdir=`cd "$srcdir" && pwd`
-gtkmm_builddir=`pwd`
-for sublib in clutter
-do
-  CLUTTERMM_DOXYGEN_INPUT="$CLUTTERMM_DOXYGEN_INPUT $gtkmm_builddir/$sublib/$sublib""mm/"
-  test "x$gtkmm_builddir" = "x$gtkmm_srcdir" || \
-    CLUTTERMM_DOXYGEN_INPUT="$CLUTTERMM_DOXYGEN_INPUT $gtkmm_srcdir/$sublib/$sublib""mm/"
-done
-AC_SUBST(CLUTTERMM_DOXYGEN_INPUT)
-
 # HACK:  Assign a dummy in order to prevent execution of autoheader by the
 # maintainer-mode rules.  That would fail since we aren't using autoheader.
 AUTOHEADER=':'
@@ -129,11 +109,17 @@
   Makefile
 
   clutter/Makefile
-  clutter/cluttermm-1.0.pc
+  clutter/$CLUTTERMM_API_VER.pc:clutter/cluttermm.pc.in
   clutter/src/Makefile
   clutter/cluttermm/Makefile
   clutter/cluttermm/private/Makefile
 
+  clutter-cairo/Makefile
+  clutter-cairo/$CLUTTERMM_CAIRO_API_VER.pc:clutter-cairo/cluttermm-cairo.pc.in
+  clutter-cairo/src/Makefile
+  clutter-cairo/cluttermm-cairo/Makefile
+  clutter-cairo/cluttermm-cairo/private/Makefile
+
   tools/Makefile
     tools/extra_defs_gen/Makefile
     tools/m4/Makefile

Modified: cluttermm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- cluttermm/trunk/docs/reference/Doxyfile.in	(original)
+++ cluttermm/trunk/docs/reference/Doxyfile.in	Mon Apr 21 02:50:04 2008
@@ -75,7 +75,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @CLUTTERMM_DOXYGEN_INPUT@
+INPUT                  = @top_builddir@/clutter/cluttermm @top_builddir@/clutter-cairo/cluttermm-cairo
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = NO

Modified: cluttermm/trunk/examples/Makefile.am_fragment
==============================================================================
--- cluttermm/trunk/examples/Makefile.am_fragment	(original)
+++ cluttermm/trunk/examples/Makefile.am_fragment	Mon Apr 21 02:50:04 2008
@@ -1,10 +1,12 @@
-local_cluttermm_lib = $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la
+local_cluttermm_libs = $(top_builddir)/clutter/cluttermm/libcluttermm-1.0.la \
+					   $(top_builddir)/clutter-cairo/cluttermm-cairo/libcluttermm-cairo-1.0.la
 
-LIBS  = $(CLUTTERMM_LIBS) $(local_cluttermm_lib) 
+LIBS  = $(CLUTTERMM_LIBS) $(CLUTTERMM_CAIRO_LIBS) $(local_cluttermm_libs) 
 
 all_includes = -I$(top_builddir)/clutter -I$(top_srcdir)/clutter \
-               $(CLUTTERMM_CFLAGS)
-                     
+			   -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
+               $(CLUTTERMM_CFLAGS) $(CLUTTERMM_CAIRO_CFLAGS)
+
 DEFS = @DEFS@
 DEFAULT_INCLUDES =
 INCLUDES = -I. -I$(srcdir) $(strip $(all_includes))

Modified: cluttermm/trunk/examples/flowers.cc
==============================================================================
--- cluttermm/trunk/examples/flowers.cc	(original)
+++ cluttermm/trunk/examples/flowers.cc	Mon Apr 21 02:50:04 2008
@@ -1,10 +1,11 @@
 /* 
  * Pretty cairo flower hack.
+ * This is a very cursory translation from C to C++.  As such, you will notice
+ * that there are a lot of C-isms in this example yet, but it should still give
+ * an idea of how to use cluttermm-cairo
  */
 
-#include <cluttermm/cairo-texture.h>
-#include <cluttermm/stage.h>
-#include <cluttermm/init.h>
+#include <cluttermm-cairo.h>
 #include <clutter/clutter.h>
 
 #include <unistd.h> 		/* for sleep(), used for screenshots */
@@ -15,9 +16,7 @@
 #define PETAL_VAR 40
 #define N_FLOWERS 40 /* reduce if you have a small card */
 
-using namespace Clutter;
-
-struct Flower : public CairoTexture
+struct Flower : public Clutter::Cairo::CairoTexture
 {
     static Glib::RefPtr<Flower> create ()
     {
@@ -138,12 +137,12 @@
         flowers[i]->y   += flowers[i]->v;
         flowers[i]->rot += flowers[i]->rv;
 
-        if (flowers[i]->y > (gint) Stage::get_default ()->get_height ())
+        if (flowers[i]->y > (gint) Clutter::Stage::get_default ()->get_height ())
             flowers[i]->y = -flowers[i]->get_height ();
 
         flowers[i]->set_position (flowers[i]->x, flowers[i]->y);
 
-        flowers[i]->set_rotation (Z_AXIS,
+        flowers[i]->set_rotation (Clutter::Z_AXIS,
                 flowers[i]->rot,
                 flowers[i]->get_width ()/2,
                 flowers[i]->get_height ()/2,
@@ -159,15 +158,15 @@
 main (int argc, char **argv)
 {
   int              i;
-  Glib::RefPtr<Stage> stage;
-  Color stage_color (0x0, 0x0, 0x0, 0xff);
+  Glib::RefPtr<Clutter::Stage> stage;
+  Clutter::Color stage_color (0x0, 0x0, 0x0, 0xff);
   Glib::RefPtr<Flower> flowers[N_FLOWERS];
 
   srand(time(NULL));
 
-  Clutter::init (&argc, &argv);
+  Clutter::Cairo::init (&argc, &argv);
 
-  stage = Stage::get_default ();
+  stage = Clutter::Stage::get_default ();
 
   stage->set_color (stage_color);
 

Modified: cluttermm/trunk/examples/simple-cairo.cc
==============================================================================
--- cluttermm/trunk/examples/simple-cairo.cc	(original)
+++ cluttermm/trunk/examples/simple-cairo.cc	Mon Apr 21 02:50:04 2008
@@ -2,22 +2,21 @@
  * Pretty cairo flower hack.
  */
 
-#include <cluttermm.h>
+#include <cluttermm-cairo.h>
 #include <clutter/clutter.h>
 
-using namespace Clutter;
-
 int
 main (int argc, char **argv)
 {
-  Clutter::init (&argc, &argv);
+  Clutter::Cairo::init (&argc, &argv);
 
-  Glib::RefPtr<Stage> stage = Stage::get_default ();
-  Color stage_color (0x0, 0x0, 0x0, 0xff);
+  Glib::RefPtr<Clutter::Stage> stage = Clutter::Stage::get_default ();
+  Clutter::Color stage_color (0x0, 0x0, 0x0, 0xff);
   stage->set_color (stage_color);
 
   guint size = stage->get_height () / 4;
-  Glib::RefPtr<CairoTexture> circle = CairoTexture::create (size, size);
+  Glib::RefPtr<Clutter::Cairo::CairoTexture> circle =
+      Clutter::Cairo::CairoTexture::create (size, size);
   // TODO: These brackets are necessary at the moment to limit the scope of the
   // Cairo::Context object.  Because of the way ClutterCairo is implemented,
   // whatever is drawn to the cairo context is not transferred to the Clutter

Modified: cluttermm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/Makefile.am	Mon Apr 21 02:50:04 2008
@@ -1,8 +1,13 @@
 # Build the generate_extra_defs utility executable.
 # This is not used directly to build the rest of the project.
 
-INCLUDES = $(CLUTTERMM_CFLAGS)
-LIBS = $(CLUTTERMM_LIBS) -lglibmm_generate_extra_defs-2.4
+LIBS = -lglibmm_generate_extra_defs-2.4
 
-noinst_PROGRAMS = generate_extra_defs
-generate_extra_defs_SOURCES = generate_defs_clutter.cc
+noinst_PROGRAMS = generate_extra_defs_clutter generate_extra_defs_clutter_cairo
+generate_extra_defs_clutter_SOURCES = generate_defs_clutter.cc
+generate_extra_defs_clutter_cairo_SOURCES = generate_defs_clutter_cairo.cc
+
+generate_extra_defs_clutter_CXXFLAGS = $(CLUTTERMM_CFLAGS)
+generate_extra_defs_clutter_LDADD = $(CLUTTERMM_LIBS)
+generate_extra_defs_clutter_cairo_CXXFLAGS = $(CLUTTERMM_CAIRO_CFLAGS)
+generate_extra_defs_clutter_cairo_LDADD = $(CLUTTERMM_CAIRO_LIBS)

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Mon Apr 21 02:50:04 2008
@@ -18,7 +18,6 @@
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <gtk/gtk.h>
 #include <clutter/clutter.h>
-#include <clutter-cairo/clutter-cairo.h>
 #include <iostream>
 
 
@@ -59,7 +58,6 @@
     << get_defs(CLUTTER_TYPE_SCORE)
     << get_defs(CLUTTER_TYPE_SHADER)
     << get_defs(CLUTTER_TYPE_SCRIPT)
-    << get_defs(CLUTTER_TYPE_CAIRO)
     ;
 //    << get_defs(CLUTTER_TYPE_VBOX)
 //    << get_defs(CLUTTER_TYPE_MARGIN);

Copied: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc (from r1458, /cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc)
==============================================================================
--- /cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc	Mon Apr 21 02:50:04 2008
@@ -16,7 +16,6 @@
  */
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
-#include <gtk/gtk.h>
 #include <clutter/clutter.h>
 #include <clutter-cairo/clutter-cairo.h>
 #include <iostream>
@@ -24,45 +23,11 @@
 
 int main (int argc, char *argv[])
 {
-  gtk_init(&argc, &argv) ;
+  clutter_init(&argc, &argv) ;
 
   std::cout 
-    << get_defs(CLUTTER_TYPE_ACTOR)
-    << get_defs(CLUTTER_TYPE_ALPHA)
-    << get_defs(CLUTTER_TYPE_BACKEND)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_BSPLINE)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_DEPTH)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_ELLIPSE)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_OPACITY)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_PATH)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_ROTATE)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_SCALE)
-//    << get_defs(CLUTTER_TYPE_BOX)
-    << get_defs(CLUTTER_TYPE_CLONE_TEXTURE)
-    << get_defs(CLUTTER_TYPE_COLOR)
-//    << get_defs(CLUTTER_TYPE_CONTAINER)
-    << get_defs(CLUTTER_TYPE_EFFECT_TEMPLATE)
-    << get_defs(CLUTTER_TYPE_ENTRY)
-    << get_defs(CLUTTER_TYPE_EVENT)
-    << get_defs(CLUTTER_TYPE_GROUP)
-//    << get_defs(CLUTTER_TYPE_HBOX)
-    << get_defs(CLUTTER_TYPE_LABEL)
-//    << get_defs(CLUTTER_TYPE_LAYOUT)
-    << get_defs(CLUTTER_TYPE_MEDIA)
-    << get_defs(CLUTTER_TYPE_RECTANGLE)
-    << get_defs(CLUTTER_TYPE_SCORE)
-    << get_defs(CLUTTER_TYPE_SCRIPT)
-    << get_defs(CLUTTER_TYPE_STAGE)
-    << get_defs(CLUTTER_TYPE_TEXTURE)
-    << get_defs(CLUTTER_TYPE_TIMELINE)
-    << get_defs(CLUTTER_TYPE_SCORE)
-    << get_defs(CLUTTER_TYPE_SHADER)
-    << get_defs(CLUTTER_TYPE_SCRIPT)
     << get_defs(CLUTTER_TYPE_CAIRO)
     ;
-//    << get_defs(CLUTTER_TYPE_VBOX)
-//    << get_defs(CLUTTER_TYPE_MARGIN);
 
   return 0;
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]