double-buffer place_above/place_below

2014-01-15 20:05:31 -05:00
1504 changed files with 177787 additions and 495817 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,35 @@
 Makefile
 Makefile.in
 aclocal.m4
 confdefs.h
 config.cache
 config.guess
 config.h
 config.log
 config.status
 config.sub
 configure
 configure.scan
 libtool
 ltconfig
 ltmain.sh
 stamp-h
 stamp-h.in
 stamp-h1
 stamp.h
 version.h
 config.h.in
 install-sh
 missing
 mkinstalldirs
 INSTALL
 intl
 ABOUT-NLS
 COPYING
 intltool-*
 metacity.spec
 autom4te.cache
 compile
 depcomp
 omf.make
 xmldocs.make
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ Makefile.in
 Makefile.in.in
 aclocal.m4
 autom4te.cache
 build-aux
 compile
 config.guess
 config.h
@@ -20,11 +19,11 @@ libtool
 ltmain.sh
 missing
 .deps
-50-mutter-navigation.xml
+src/50-mutter-navigation.xml
-50-mutter-system.xml
+src/50-mutter-system.xml
-50-mutter-windows.xml
+src/50-mutter-windows.xml
-mutter.desktop
+src/mutter-wm.desktop
-mutter-wayland.desktop
+src/mutter-wayland.desktop
 *.o
 *.a
 *.lo
@@ -33,29 +32,23 @@ mutter-wayland.desktop
 *.swp
 *.gir
 *.typelib
 tidy-enum-types.[ch]
 tidy-marshal.[ch]
 stamp-tidy-enum-types.h
 stamp-tidy-marshal.h
 stamp-h1
 *.gmo
 *.make
 *.log
 *.trs
 *~
 stamp-it
 .intltool-merge-cache
 ABOUT-NLS
 POTFILES
 Makevars.template
 po/*.header
 po/*.pot
-po/*.sed
+50-metacity-desktop-key.xml
-po/*.sin
+50-metacity-key.xml
-Rules-quot
+libmutter-wayland.pc
-libmutter.pc
+mutter-wayland
-mutter
+mutter-launch
 mutter-restart-helper
 mutter-test-client
 mutter-test-runner
 mutter-test-unit-tests
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
 org.gnome.mutter.wayland.gschema.valid
@@ -63,30 +56,37 @@ org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
-m4/*
+mutter-grayscale
 mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
 test-attached
 test-focus
 test-gravity
 test-resizing
 test-size-hints
 # We can't say just "wm-tester" here or it will ignore the directory
 # rather than the binary
 src/wm-tester/wm-tester
 INSTALL
 mkinstalldirs
-meta-enum-types.[ch]
+src/mutter-enum-types.[ch]
-src/stamp-meta-enum-types.h
+src/stamp-mutter-enum-types.h
-src/meta-dbus-display-config.[ch]
+src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
 src/meta-dbus-xrandr.[ch]
 src/meta-dbus-idle-monitor.[ch]
-src/meta-dbus-login1.[ch]
+src/mutter-plugins.pc
-src/gtk-primary-selection-protocol.c
+src/wayland/gtk-shell-protocol.c
-src/gtk-primary-selection-server-protocol.h
+src/wayland/gtk-shell-client-protocol.h
-src/gtk-shell-protocol.c
+src/wayland/gtk-shell-server-protocol.h
-src/gtk-shell-server-protocol.h
+src/wayland/xdg-shell-protocol.c
-src/xdg-shell-unstable-v*-protocol.c
+src/wayland/xdg-shell-client-protocol.h
-src/xdg-shell-unstable-v*-server-protocol.h
+src/wayland/xdg-shell-server-protocol.h
-src/pointer-gestures-unstable-v*-protocol.c
+src/wayland/xserver-protocol.c
-src/pointer-gestures-unstable-v*-server-protocol.h
+src/wayland/xserver-client-protocol.h
-src/relative-pointer-unstable-v*-protocol.c
+src/wayland/xserver-server-protocol.h
 src/relative-pointer-unstable-v*-server-protocol.h
 src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
 src/xdg-foreign-unstable-v*-protocol.c
 src/xdg-foreign-unstable-v*-server-protocol.h
 src/meta/meta-version.h
 src/libmutter-*.pc
 doc/reference/*.args
 doc/reference/*.bak
 doc/reference/*.hierarchy
@@ -104,11 +104,3 @@ doc/reference/meta-undocumented.txt
 doc/reference/meta-unused.txt
 doc/reference/meta-docs.sgml
 doc/reference/meta.types
 gtk-doc.m4
 intltool.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
 .dirstamp
--- a/1
+++ b/1
@@ -0,0 +1 @@
 Havoc Pennington <hp@redhat.com>
--- a/159
+++ b/159
@@ -0,0 +1,159 @@
 Metacity Standards Compliance
 =============================
 $Id$
 1) Introduction
 2) EWMH Compliance
  a. Root Window Properties
  b. Root Window Messages
  c. Application Window Properties
  d. Window Manager Protocols
 3) ICCCM Compliance
 1) Introduction
 ---------------
 This document details metacity compliance with the relevent standards.
 The format of this document is as follows:
 [-/+?] Hint Name/Feature Name (Version number)
       Errata/Comments
 The first character indicates the level of compliance as follows:
    -   none
    /   partial
    +   complete
    ?   unknown
 The title indicates a feature or a hint in the specification, and the
 version number indicates the minimum version of the specification
 supported by metacity.  Later versions may be supported if no
 incompatible changes have been made in the specification.
 2) EWMH Compliance
 ------------------
 The EWMH, or Extended Window Manager Hints is a freedesktop.org-
 developed standard to support a number of conventions for
 communication between the window manager and clients.  It builds on
 and extends the ICCCM (See Section 3).  A copy of the current EWMH
 standard is available at http://freedesktop.org/Standards/wm-spec/
  a. Root Window Properties
  -------------------------
 + _NET_SUPPORTED (1.3)
 + _NET_CLIENT_LIST (1.3)
 + _NET_NUMBER_OF_DESKTOPS (1.3)
 + _NET_DESKTOP_GEOMETRY (1.3)
  Metacity does not implement large desktops, so this is kept set to
  the screen size.
 + _NET_DESKTOP_VIEWPORT (1.3)
  Metacity does not implement viewports, so this is a constant (0,0).
 + _NET_CURRENT_DESKTOP (1.3)
 + _NET_DESKTOP_NAMES (1.3)
 + _NET_ACTIVE_WINDOW (1.3)
 + _NET_WORKAREA (1.3)
 + _NET_SUPPORTING_WM_CHECK (1.3)
 + _NET_VIRTUAL_ROOTS (1.3)
  Metacity does not read or set this property, but it does not use
  virtual roots to implement virtual desktops, so it complies with the
  specification.
 + _NET_DESKTOP_LAYOUT (1.3)
 + _NET_SHOWING_DESKTOP (1.3)
  b. Root Window Messages
  -----------------------
 + _NET_CLOSE_WINDOW (1.3)
 - _NET_MOVERESIZE_WINDOW (1.3)
  Metacity supports this message, but the specification is unclear on
  the layout of the detail value, and as such it is #if 0'd in the code
 + _NET_WM_MOVERESIZE (1.3)
 - _NET_RESTACK_WINDOW (1.3)
  Metacity will raise or lower windows in response to this message,
  but the sibling restack modes are not supported, and it is currently
  #if 0'd in the code.
 + _NET_REQUEST_FRAME_EXTENTS (1.3)  
  c. Application Window Properties
  --------------------------------
 + _NET_WM_NAME (1.3)
 + _NET_WM_VISIBLE_NAME (1.3)
  Metacity does not set this property, but metacity will never display
  a name different from _NET_WM_NAME
 + _NET_WM_ICON_NAME (1.3)
 + _NET_WM_VISIBLE_ICON_NAME (1.3)
  Metacity does not set this property, but metacity will never display
  a name different from _NET_WM_NAME
 + _NET_WM_DESKTOP (1.3)
 + _NET_WM_WINDOW_TYPE (1.3)
 / _NET_WM_STATE (1.3)
  This property is read and updated according to the specification,
  but see caveat below.
  Metacity does not recognize separate vertical and horizontal
  maximization states.  Currently metacity will do a two-dimensional
  maximization if either property is set.
  See: http://bugzilla.gnome.org/show_bug.cgi?id=113601
  Metacity doesn't implement viewports so _NET_WM_STATE_STICKY is
  unimplemented.
 + _NET_WM_ALLOWED_ACTIONS (1.3)
  Metacity keeps this hint up to date.  The code is somewhat crufty
  and should be rewritten, though it is functional.
  See: http://bugzilla.gnome.org/show_bug.cgi?id=90420
 + _NET_WM_STRUT (1.3)
 + _NET_WM_STRUT_PARTIAL (1.3)
 + _NET_WM_ICON_GEOMETRY (1.3)
  Metacity uses this property to draw minimize/restore animations
 + _NET_WM_ICON (1.3)
 + _NET_WM_PID (1.3)
 + _NET_WM_HANDLED_ICONS (1.3)
  Metacity does not read or set this property.  However, metacity
  never manages iconified windows, and so has no need to do so.
 + _NET_WM_USER_TIME (1.3)
  Metacity uses this property to prevent applications from stealing
  focus if supported by the toolkit.
 + _NET_FRAME_EXTENTS (1.3)
  If set in response to a _NET_REQUEST_FRAME_EXTENTS message received
  prior to the window being mapped, this may be an estimate.  This is,
  however, expressly allowed by the specification.
  d. Window Manager Protocols
  ---------------------------
 + _NET_WM_PING (1.3)
 3) ICCCM Compliance
 -------------------
 TODO
--- a/15414
+++ b/15414
--- a/1297
+++ b/1297
--- a/298
+++ b/298
@@ -0,0 +1,298 @@
 Intro...
 Window managers have a few ways in which they are significantly different
 from other applications.  This file, combined with the code overview in
 doc/code-overview.txt, should hopefully provide a series of relatively
 quick pointers (hopefully only a few minutes each) to some of the places
 one can look to orient themselves and get started.  Some of this will be
 general to window managers on X, much will be specific to Metacity, and
 there's probably some information that's common to programs in general but
 is nonetheless useful.
 Overview
  Administrative issues
  Minimal Building/Testing Environment
  Relevant standards and X properties
  Debugging and testing
    Debugging logs
    Adding information to the log
    Valgrind
    Testing Utilities
  Technical gotchas to keep in mind
  Other important reading
    Extra reading
    Ideas for tasks to work on
 Administrative issues
  Don't commit substantive code in here without asking hp@redhat.com.
  Adding translations, no-brainer typo fixes, etc. is fine.
  The code could use cleanup in a lot of places, feel free to do so.
  See http://developer.gnome.org/dotplan/for_maintainers.html for
  information on how to make a release.  The only difference from those
  instructions is that the minor version number of a Metacity release
  should always be a number from the Fibonacci sequence.
 Minimal Building/Testing Environment
  You do not need to _install_ a development version of Metacity to
  build, run and test it; you can run it from some temporary
  directory.  Also, you do not need to build all of Gnome in order to
  build a development version of Metacity -- odds are, you may be able
  to build metacity from CVS without building any other modules.
  As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro
  (gtk+ >= 2.6 if you manually revert the change from bug 348633), you
  should be able to install your distro's development packages
  (e.g. gtk2-devel, glib-devel, startup-notification-devel on
  Fedora; also, remember to install the gnome-common package which is
  needed for building cvs versions of Gnome modules like Metacity) as
  well as the standard development tools (gcc, autoconf, automake,
  pkg-config, intltool, and libtool) and be ready to build and test
  Metacity.  Steps to do so:
  $ svn checkout http://svn.gnome.org/svn/metacity/trunk metacity
  $ cd metacity
  $ ./autogen.sh --prefix /usr
  $ make
  $ ./src/metacity --replace
  Again, note that you do not need to run 'make install'.
 Relevant standards and X properties
  There are two documents that describe some basics about how window
  managers should behave: the ICCCM (Inter-Client Communication Conventions
  Manual) and EWMH (Extended Window Manager Hints).  You can find these at
  the following locations:
    ICCCM - http://tronche.com/gui/x/icccm/
    EWMH  - :pserver:anoncvs@pdx.freedesktop.org:/cvs
  The ICCCM is usually available in RPM or DEB format as well.  There is
  actually an online version of the EWMH, but it is almost always woefully
  out of date.  Just get it from cvs with these commands (the backslash
  means include the stuff from the next line):
    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions login
    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions \
      checkout wm-spec
  DO NOT GO AND READ THOSE THINGS.  THEY ARE REALLY, REALLY BORING.
  If you do, you'll probably end up catching up on your sleep instead of
  hacking on Metacity. ;-)  Instead, just look at the table of contents and
  glance at a page or two to get an idea of what's in there.  Then only
  refer to it if you see something weird in the code and you don't know
  what it is but has some funny looking name like you see in one of those
  two documents.
  You can refer to the COMPLIANCE file for additional information on these
  specifications and Metacity's compliance therewith.
  One of the major things those documents cover that are useful to learn
  about immediately are X properties.  The right way to learn about those,
  though, is through hand on experimentation with the xprop command (and
  then look up things you find from xprop in those two manuals if you're
  curious enough).  First, try running
    xprop
  in a terminal and click on one of the windows on your screen.  That gives
  you the x properties for that window.  Look through them and get a basic
  idea of what's there for kicks.  Note that you can get rid of some of the
  verboseness by grepping out the _NET_WM_ICON stuff, i.e.
    xprop | grep -v _NET_WM_ICON
  Next, try running
    xprop -root
  in a terminal.  There's all the properties of the root window (which you
  can think of as the "main" Xserver window).  You can also manually
  specify individual windows that you want the properties of with
    xprop -id <id>
  if you know the id of the window in question.  You can get the id of a
  given window by either running xwininfo, e.g.
    xwininfo | grep "Window id" | cut -f 4 -d ' '
  or by looking at the _NET_CLIENT_STACKING property of the root
  window.  Finally, it can also be useful to add "-spy" (without the
  quotes) to the xprop command to get it to continually monitor that
  window and report any changes to you.
 Debugging information
  Trying to run a window manager under a typical debugger, such as gdb,
  unfortunately just doesn't work very well.  So, we have to resort to
  other methods.
  Debugging logs
  First, note that you can start a new version of metacity to replace the
  existing one by running
    metacity --replace
  (which also comes in handy in the form "./src/metacity --replace" when
  trying to quickly test a small change while hacking on metacity without
  doing a full "make install", though I'm going off topic...)  This will
  allow you to see any warnings printed at the terminal.  Sometimes it's
  useful to have these directed to a logfile instead, which you can do by
  running
    METACITY_USE_LOGFILE=1 metacity --replace
  The logfile it uses will be printed in the terminal.  Sometimes, it's
  useful to get more information than just warnings.  You can set
  METACITY_VERBOSE to do that, like so:
    METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 metacity --replace
  (note that METACITY_VERBOSE=1 can be problematic without
  METACITY_USE_LOGFILE=1; avoid it unless running in from something that
  won't be managed by the new Metacity--see bug 305091 for more details).
  There are also other flags, such as METACITY_DEBUG, most of which I
  haven't tried and don't know what they do.  Go to the source code
  directory and run
    grep "METACITY_" * | grep getenv
  to find out what the other ones are.
  Adding information to the log
  Since we can't single step with a debugger, we often have to fall back to
  the primitive method of getting information we want to know: adding
  "print" statements.  Metacity has a fairly structured way to do this,
  using the functions meta_warning, meta_topic, and meta_verbose.  All
  three have the same basic format as printf, except that meta_topic also
  takes a leading enumeration parameter to specify the type of message
  being shown (makes it easier for grepping in a verbose log).  You'll find
  tons of examples in the source code if you need them; just do a quick
  grep or look in most any file.  Note that meta_topic and meta_verbose
  messages only appear if verbosity is turned on.  I tend to frequently add
  temporary meta_warning statements (or switch meta_topic or meta_verbose
  ones to meta_warning ones) and then undo the changes once I've learned
  the info that I needed.
  There is also a meta_print_backtrace (which again is only active if
  verbosity is turned on) that can also be useful if you want to learn how
  a particular line of code gets called.  And, of course, there's always
  g_assert if you want to make sure some section isn't executed (or isn't
  executed under certain conditions).
  Valgrind
  Valgrind is awesome for finding memory leaks or corruption and
  uninitialized variables.  But I also tend to use it in a non-traditional
  way as a partial substitute for a normal debugger: it can provide me with
  a stack trace of where metacity is crashing if I made a change that
  caused it to do so, which is one of the major uses of debuggers.  (And,
  what makes it cooler than a debugger is that there will also often be
  warnings pinpointing the cause of the crash from either some kind of
  simple memory corruption or an uninitialized variable).  Sometimes, when
  I merely want to know what is calling a particular function I'll just
  throw in an "int i; printf("%d\n", i);" just because valgrind will give
  me a full stacktrace whenever it sees that uninitialized variable being
  used (yes, I could use meta_print_backtrace, but that means I have to
  turn verbosity on).
  To run metacity under valgrind, use options typical for any Gnome
  program, such as
    valgrind --log-file=metacity.log --tool=memcheck --num-callers=48 \
    --leak-check=yes --leak-resolution=high --show-reachable=yes     \
    ./src/metacity --replace
  where, again, the backslashes mean to join all the stuff on the following
  line with the previous one.
  However, there is a downside.  Things run a little bit slowly, and it
  appears that you'll need about 1.5GB of ram, which unfortunately prevents
  most people from trying this.
  Testing Utilities
  src/run-metacity.sh
    The script src/run-metacity.sh is useful to hack on the window manager. 
    It runs metacity in an Xnest. e.g.:
      CLIENTS=3 ./run-metacity.sh
    or 
      DEBUG=memprof ./run-metacity.sh
    or
      DEBUG_TEST=1 ./run-metacity-sh
    or whatever.
  metacity-message
    The tool metacity-message can be used as follows:
      metacity-message reload-theme
      metacity-message restart
      metacity-message enable-keybindings
      metacity-message disable-keybindings
    The first of these is useful for testing themes, the second is just
    another way (besides the --restart flag to metacity itself) of
    restarting metacity, and the third is useful for testing Metacity when
    running it under an Xnest (typically, the Metacity under the Xnest
    wouldn't get keybinding notifications--making keyboard navigation not
    work--but if you disable the keybindings for the global Metacity then
    the Metacity under the Xnest can then get those keybinding notifications).
  metacity-window-demo
    metacity-window-demo is good for trying behavior of various kinds
    of window without launching a full desktop.
 Technical gotchas to keep in mind
  Files that include gdk.h or gtk.h are not supposed to include
  display.h or window.h or other core files.  Files in the core
  (display.[hc], window.[hc]) are not supposed to include gdk.h or
  gtk.h.  Reasons:
    "Basically you don't want GDK most of the time. It adds
    abstractions that cause problems, because they aren't designed to
    be used in a WM where we do weird stuff (display grabs, and just
    being the WM). At best GDK adds inefficiency, at worst it breaks
    things in weird ways where you have to be a GDK guru to figure
    them out. Owen also told me that they didn't want to start adding
    a lot of hacks to GDK to let a WM use it; we both agreed back in
    the mists of time that metacity would only use it for the "UI"
    bits as it does.
    Having the split in the source code contains and makes very clear
    the interface between the WM and GDK/GTK. This keeps people from
    introducing extra GDK/GTK usage when it isn't needed or
    appropriate. Also, it speeds up the compilation a bit, though this
    was perhaps more relevant 5 years ago than it is now.
    There was also a very old worry that the GDK stuff might have to
    be in a separate process to work right; that turned out to be
    untrue. Though who knows what issues the CM will introduce."
  Remember that strings stored in X properties are not in UTF-8, and they
  have to end up in UTF-8 before we try putting them through Pango.
  If you make any X request involving a client window, you have to
  meta_error_trap_push() around the call; this is not necessary for X
  requests on the frame windows.
  Remember that not all windows have frames, and window->frame can be NULL.
 Other important reading & where to get started
  Extra reading
  There are some other important things to read to get oriented as well.
  These are:
    http://pobox.com/~hp/features.html
    rationales.txt
    doc/code-overview.txt
  It pays to read http://pobox.com/~hp/features.html in order
  to understand the philosophy of Metacity.
  The rationales.txt file has two things: (1) a list of design choices with
  links in the form of bugzilla bugs that discuss the issue, and (2) a list
  outstanding bug categories, each of which is tracked by a particular
  tracker bug in bugzilla from which you can find several closely related
  bug reports.
  doc/code-overview.txt provides a fairly good overview of the code,
  including coverage of the function of the various files, the main
  structures and their relationships, and places to start looking in the
  code tailored to general categories of tasks.
  Ideas for tasks to work on
  There are a variety of things you could work on in the code.  You may
  have ideas of your own, but in case you don't, let me provide a list of
  ideas you could choose from:
  If you're ambitious, there's a list of things Havoc made that he'd really
  like to see tackled, which you can find at
  http://log.ometer.com/2004-05.html.  Be sure to double check with someone
  to make sure the item is still relevant if you're interested in one of
  these.  Another place to look for ideas, of course, is bugzilla.  One can
  just do queries and look for things that look fixable.
  However, perhaps the best way of getting ideas of related tasks to work
  on, is to look at the second half of the rationales.txt file, which tries
  to group bugs by type.
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
 Tomas Frydrych
 Email: tf linux intel com
 Userid: tomasf
 Owen Taylor
 Email: otaylor redhat com
 Userid: otaylor
--- a/43
+++ b/43
@@ -0,0 +1,43 @@
 Currently active maintainers
 --------------------------------
 Elijah Newren
 Email: newren gmail com
 Userid: newren
  - Usually won't touch the theme bugs (isn't interested) or the
    compositor (until open source nvidia drivers are up to snuff).
    Tends to be most interested in libwnck/gtk interactions, focus
    issues, constraints problems, and raising/stacking, but works on
    just about anything other than themes and the compositor.
 Thomas Thurman
 Email: thomas thurman org uk
 Userid: tthurman
  - Responsible for all theme bugs and the compositor (thank goodness
    Thomas got involved, eh?).  I'm sure he'll replace this sentence
    with his interests when he reads it.  ;-)
 Semi-active maintainers
 --------------------------------
 Havoc Pennington
 Email: hp  redhat com
 Userid: hp
  - Original author.  Doesn't patch metacity anymore, but is active in
    answering questions, responding to bugs, providing very helpful
    suggestions and insight, and even assisting with debugging.
 Important historical figureheads
 --------------------------------
 Rob Adams (readams  readams net)
  - Was the main maintainer of metacity for a while; particular areas
    of focus included xinerama, placement, and an older version of the
    constraints code.  Still responds to bugs every once in a while.
 Søren Sandmann (sandmann  redhat com)
  - Wrote most of the current compositing manager code + libcm
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,10 @@
-SUBDIRS = cogl clutter data src po doc
+SUBDIRS=src protocol po doc
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
 	po/stamp-it \
 	po/.intltool-merge-cache
--- a/986
+++ b/986
@@ -1,989 +1,3 @@
 3.24.4
 ======
 * Fix wacom cursor offset on wayland [Jason; #784009]
 * Do not throttle motion events on tablet tools [Carlos; #783535]
 * Handle left-handed mode on pen/eraser devices [Carlos; #782027]
 * Fix crash when decreasing number of workspaces [Florian; #784223]
 * Fix crash when moving across on-adjacent monitors [Jonas; #783630]
 * Fix window moving/resizing via tablet tools [Jason; #777333]
 * Improve stability of tablet plugs/unplugs [Carlos; #784881]
 * Implement tablet rings/strips configuration [Carlos; #782033]
 * Support tablet wheel events on wayland [Jason; #783716]
 * Misc. bug fixes [Carlos, Jonas; #784402, #784867, #781723]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Jason Gerecke, Florian Müllner
 Translations:
  Jordi Mas [ca]
 3.24.3
 ======
 * Fix handling of tiled monitors [Jonas; #781723]
 * Fix swapped red and blue channels in CoglTexture data [Carlos; #779234]
 * Fix glitches when opening a window maximized [Olivier; #781353, #782183]
 * Implement support for disable-while-typing option [Evan; #764852]
 * Consider subsurfaces when grabbing [mindtree; #781811]
 * Fix handling of left-handed mode on pen/eraser devices [Carlos; #782027]
 * Fix output cycling in non-display-attached tablets [Carlos; #782032]
 * Fix wacom cursor offset on wayland [Jason; #784009]
 * Handle EXIF orientation of backgrounds [Silvère; #783125]
 * Misc. bug fixes [Jonas, Bastien, Ikey, Carlos; #782156, #780407, #757661,
  #783113, #781703]
 Contributors:
  mitchmindtree, Jonas Ådahl, Ikey Doherty, Olivier Fourdan, Carlos Garnacho,
  Jason Gerecke, Silvère Latchurié, Bastien Nocera, Evan Welsh
 3.24.2
 ======
 * Don't crash when wayland clients commit to destroyed surfaces [Jonas; #781391]
 * Fix frame updates on hide-titlebar-when-maximized changes [Florian; #781862]
 * Fix accessible screen coordinates on X11 [Florian; #781902]
 * Fix copy+paste of UTF8 strings between X11 and wayland [Carlos; #782472]
 * Fix non-wayland builds [Chris; #780533]
 * Misc. bug fixes [Philip, Matthias, Nigel; #781242, #780215, #759085]
 Contributors:
  Jonas Ådahl, Philip Chimento, Carlos Garnacho, Matthias Liertzer,
  Florian Müllner, Nigel Taylor, Chris Vine
 Translations:
  Jordi Mas [ca]
 3.24.1
 ======
 * Always sync window geometry on state changes [Jonas; #780292]
 * Use EGL instead of GLX when drawing using GLES [Jonas; #771636]
 * Fix HiDPI detection on vertical monitor layouts [Carlos; #777687]
 * Get double-click timing from desktop mouse settings [Armin; #771576]
 * Scale relative motion deltas with monitor scale [Jonas, Carlos; #778119]
 * Use texture fallback when setting hardware cursor fails [Jente; #770020]
 * Fix lock-up when using additional theme variants [Shantanu; #780254]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Shantanu Goel, Jente Hidskes, Armin Krezović,
  Florian Müllner
 Translations:
  Yuras Shumovich [be], Yosef Or Boczko [he], Tom Tryfonidis [el]
 3.24.0
 ======
 Translations:
  Yuri Myasoedov [ru], Rūdolfs Mazurs [lv], Jordi Mas [ca]
 3.23.92
 =======
 * Properly handle EGLOutput acquire errors [Jonas, Miguel; #779112]
 * Fix crash when a window closes during Alt+Tab [Rui; #779483]
 * Implement DnD handling code in wayland [Hyungwon; #765003]
 * Fix fallout from pixel conversion optimization in 3.23.91 [Carlos; #779234]
 * Fix mouse input stopping to work in applications [Carlos; #763246]
 * Fix DnD between QT5 and GTK3 applications on wayland [Carlos; #779757]
 * Make EDID reading less fragile [Jonas; #779837]
 * Add support for tablet grouping [Carlos; #779986]
 * Misc. bug fixes and cleanups [Rui, Jonas; #779436, #779001, #779745]
 Contributors:
  Jonas Ådahl, Miguel A. Vico, Olivier Fourdan, Carlos Garnacho,
  Hyungwon Hwang, Rui Matos
 Translations:
  Chao-Hsiung Liao [zh_TW], Sveinn í Felli [is], Ask Hjorth Larsen [da],
  Changwoo Ryu [ko], Aurimas Černius [lt], GNOME Translation Robot [gd],
  Marek Černocký [cs], Fran Dieguez [gl], Dušan Kazik [sk]
 3.23.91
 =======
 * Give libinput read-only access to /sys [Carlos; #778472]
 * Allow edge-scrolling without 2-finger-scroll capable devices [Rui; #778554]
 * Fullscreen windows on the requested monitor on wayland [Rui; #772525]
 * Implement threaded swap_event fallback for NVIDIA driver [Owen; #779039]
 * Avoid pixel conversions when storing textures from cairo [Carlos; #779234]
 * Misc. bug fixes [Piotr, Rui, Florian; #772218, #776919, #778831, #642652]
 Contributors:
  Piotr Drąg, Carlos Garnacho, Rui Matos, Florian Müllner, Owen W. Taylor
 Translations:
  Inaki Larranaga Murgoitio [eu], Daniel Mustieles [es], Claude Paroz [fr],
  Mario Blättermann [de], Kjartan Maraas [nb], Piotr Drąg [pl],
  Andika Triwidada [id], Anders Jonsson [sv], Milo Casagrande [it],
  Fabio Tomat [fur], Rafael Fontenelle [pt_BR],
  Мирослав Николић [sr, sr@latin], Balázs Meskó [hu], Chao-Hsiung Liao [zh_TW]
 3.23.90
 =======
 * Fix window menu placement with HiDPI [Jonas; #776055]
 * Improve EGLStream support [Jonas; #773629]
 * Start moving low-level monitor configuration into mutter [Jonas; #777732]
 * Fix erroneous key event repeats [Rui; #774989]
 * Don't hardcode seat ID in ClutterDeviceManager [Carlos; #778092]
 * Fix "ghost" cursors in multi-monitor setups [Jonas; #771056]
 * Use eglGetPlatformDisplay [Adam; #772422]
 * Fix erratic raise_or_lower behavior [Jose; #705200]
 * Fix coordinate mapping of absolute devices [Carlos; #774115]
 * Show OSD on tablet mode switches [Carlos; #771098]
 * Make mutter libs parallel installable [Jonas; #777317]
 * Only apply keymap when not running nested [Jonas; #777800]
 * Set right scale for tablet tool cursors on HiDPI [Carlos; #778474]
 * Adjust server-side shadows to match Adwaita [Juraj; #744667]
 * Misc. bug fixes [Jonas, Bastien, Carlos, Peter, Lionel, Jeremy, Florian;
  #774891, #777389, #777691, #778262, #776543, #778684, #778699, #744667]
 Contributors:
  Jonas Ådahl, Jeremy Bicha, Piotr Drąg, Juraj Fiala, Carlos Garnacho,
  Peter Hutterer, Adam Jackson, Lionel Landwerlin, Jose Marino, Rui Matos,
  Florian Müllner, Bastien Nocera
 Translations:
  Kjartan Maraas [nb], Mandy Wang [zh_CN], Marek Černocký [cs],
  Anders Jonsson [sv], Dušan Kazik [sk], Piotr Drąg [pl], Matej Urbančič [sl]
 3.23.3
 ======
 * Fix frequent freezes in multihead setups on wayland [Rui; #774557]
 * Preserve root window mask on XSelectionRequest [Olivier; #776128]
 * Misc. bug fixes [Carlos, Florian, Rui, Olivier; #775478, #774891, #775986,
  #776036]
 Contributors:
  Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner
 3.23.2
 ======
 * Stack docks below other windows on fullscreen monitors [Rui; #772937]
 * Fix popup grabs blocking screen lock on wayland [Rui; #771235]
 * Handle touchpad pinch gestures with more than two fingers [Carlos; #765937]
 * Implement drawing tablet support on X11 [Carlos; #773779]
 * Fix some Wine games starting minimized [Carlos; #774333]
 * Fix switching between two finger- and edge scrolling on wayland [Rui; #771744]
 * Implement support for EGLStream/EGLDevice [Jonas; #773629]
 * Add size_changed vfunc to handle async client size changes [Rui; #770345]
 * Change focus window on clicks with any modifiers [Rui; #746642]
 * Misc. bug fixes and cleanups [Carlos, Daniel, Jonas, Rui; #771067, #774330, #774613,
  #771297, #774135, #774827, #774923]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Daniel Stone
 Translations:
  Kjartan Maraas [nb]
 3.23.1
 ======
 * Fix handling of Escape shortcut in force-quit dialog [Landry; #737109]
 * Improve pointer constraints support [Jonas; #771859]
 * Really fix framebuffer capture origin offset [Rui; #771502]
 * Fix session going into idle mode immediately on startup [Rui; #772839]
 * Fix mirror mode with stage views [Rui; #773115]
 * Fall back to X with connectors spread across multiple GPUs [Ray; #771442]
 * Fix various crashes on wayland [Jonas, Carlos; #771646, #771858, #772929]
 * Fix various placement issues on wayland [Olivier, Jonas, Sjoerd; #772729,
  #768039, #771841, #771841, #773141]
 * Misc. bug fixes [Rui, Jonas, Olivier; #771019, #773116, #772914, #773210]
 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Landry MINOZA,
  Sjoerd Simons, Ray Strode
 Translations:
  Theppitak Karoonboonyanan [th], Kjartan Maraas [nb], Hannie Dumoleyn [nl],
  liushuyu [zh_CN]
 3.22.1
 ======
 * Fix feedback loop between StClipboard and X11 bridge [Carlos; #760745]
 * Fall back gracefully if DRM plane rotation fails [Carlos; #772512]
 * Approximate native monitor backend behavior to X [Rui; #772176]
 * Fix crash on VT switch on wayland [Jonas; #771646]
 * Expose Flatpak ID for application matching [Florian; #772613, #772614]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Olav Vitters
 Translations:
  Inaki Larranaga Murgoitio [eu], Milo Casagrande [it]
 3.22.0
 ======
 * Fix wayland crashes [Jonas; #771305, #771345, #770940, #771495]
 * Fix display rotation on wayland [Jonas; #770672]
 * Fix framebuffer capture origin offset [Rui; #771502]
 * Misc. bug fixes [Jonas, Florian, Carlos; #770937, #771536, #771628, #771549]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner
 Translations:
  Ask Hjorth Larsen [da], Charles Monzat [fr], Stas Solovey [ru],
  Tom Tryfonidis [el], David King [en_GB]
 3.21.92
 =======
 * Fix absolute pointer motion events on wayland [Jonas; #770557]
 * Default to using stage views [Jonas; #770366]
 * Fix animated cursors on wayland [Rui; #749913]
 * Fix various crashes on wayland [Jonas; #757568, #770727, #770992]
 * Fix screen capture for stage views not at (0, 0) [Jonas; #770127]
 * Compress motion events instead of discarding them [Jonas; #771049]
 * Fix XWayland pointer warp emulation [Jonas; #771050]
 * Add common monitor modes in KMS backend [Rui; #744544]
 * Temporarily use g-s-d schemas for tablet configuration [Carlos; #771315]
 * Misc. bug fixes [Jonas, Carlos; #770402, #770647, #770991, #770994, #770929]
 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner
 Translations:
  Changwoo Ryu [ko], Baurzhan Muftakhidinov [kk], Anders Jonsson [sv],
  Tiago Santos [pt], Rafael Fontenelle [pt_BR], Mario Blättermann [de],
  Alexander Shopov [bg], Rūdolfs Mazurs [lv], Fran Dieguez [gl],
  Trần Ngọc Quân [vi], Piotr Drąg [pl], Мирослав Николић [sr, sr@latin]
 3.21.91
 =======
 * Add support for xdg-foreign protocol [Jonas; #769786]
 * Support monitor rotation on wayland [Carlos; #745079]
 * Port xdg-shell implementation to unstable v6 [Jonas; #769936]
 * Handle unsupported buffer sizes more gracefully [Olivier; #770387]
 * Use the same output naming logic as the X server on wayland [Rui; #770338]
 * Fix replies in gnome-shell's chat notifications on wayland [Florian; #758167]
 * Misc. bug fixes and cleanups [Bastien, Sjoerd, Jonas; #769276, #769636,
  #770131, #770324, #769731]
 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos, Florian Müllner,
  Bastien Nocera, Sjoerd Simons
 Translations:
  Piotr Drąg [pl], Mario Blättermann [de], Andika Triwidada [id],
  Enrico Nicoletto [pt_BR], Мирослав Николић [sr, sr@latin]
 3.21.90
 =======
 * Consider XDG_SESSION_TYPE when determining session type [Jouke; #759388]
 * Re-add support for edge scrolling on some touchpads [Bastien; #768245]
 * Support mouse and trackball acceleration profile [Jonas; #769179]
 * Draw monitor contentn to individual framebuffer [Jonas; #768976]
 * Support virtual input devices [Jonas, Carlos; #765009]
 * Set correct output scale on hotplug [Jonas; #769505]
 * Misc. bug fixes and cleanups [Florian, Jonas, Thomas, Bastien, Carlos;
  #769014, #769024, #769054, #769070, #769036, #769305, #769578, #769800,
  #769073]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Thomas Hindoe Paaboel Andersen, Simon McVittie,
  Alberts Muktupāvels, Florian Müllner, Bastien Nocera, Jouke Witteveen
 Translations:
  Daniel Mustieles [es], Aurimas Černius [lt], Dušan Kazik [sk],
  Fabio Tomat [fur], Balázs Úr [hu], Yosef Or Boczko [he], Marek Černocký [cs],
  Matej Urbančič [sl]
 3.21.4
 ======
 * Fix missing frame border around GTK+ dialogs [Florian; #745060]
 * Improve X11 <-> wayland copy and paste interaction [Carlos; #768007]
 * Add support for NV_robustness_video_memory_purge extension [Rui; #739178]
 * Fix restoring the old focused window on restart [Owen; #766243]
 * Fix fullscreen windows on other monitors stealing focus after closing
  a window [Rui; #768221]
 * Draw monitor content to individual framebuffer [Jonas; #768976]
 * Provide screen capture API [Jonas; #768978]
 * Misc. bug fixes and cleanups [Rui, Owen, Luca, Olivier, Jonas, Carlos;
  #767969, #768243, #762407, #767997, #768039, #768977, #768977]
 Contributors:
  Jonas Ådahl, Luca Bruno, Olivier Fourdan, Carlos Garnacho, Rui Matos,
  Florian Müllner, Owen W. Taylor
 Translations:
  Andika Triwidada [id]
 3.21.3
 ======
 * Don't create invalid UTF-8 window description strings [Rui; #765535]
 * Convert window titles and wm_class to UTF-8 [Rui; #752788]
 * Communicate tiled state to GTK+ on wayland [Olivier; #766860]
 * Use kill() to force-quit unresponsive wayland clients [Olivier; #767464]
 * Fix window position when unmaximizing via DND on wayland [Olivier; #764180]
 * Avoid full window redraws when using extended frame sync [Florian; #767798]
 Contributors:
  Olivier Fourdan, Rui Matos, Florian Müllner
 Translations:
  Cédric Valmary [oc]
 3.21.2
 ======
 * Clean up surface <-> shell interaction [Jonas; #763431]
 * Fix grabbing random keys for disabled shortcuts [Rui; #766270]
 * Fix stacking of hidden windows on wayland [Rui; #764844]
 * Misc. bug fixes [Victor, Florian, Marek, Rui; #766306, #766326, #751847,
  #763832, #766528]
 Contributors:
  Jonas Ådahl, Emmanuele Bassi, Marek Chalupa, Matthias Clasen,
  Carlos Garnacho, Rui Matos, Florian Müllner, Victor Toso
 Translations:
  Tiago Santos [pt], Cédric Valmary [oc], Muhammet Kara [tr]
 3.21.1
 ======
 * Notify clients of pending modifier state changes [Rui; #748526]
 * Add get_is_builtin_display_on() method [Florian; #765267]
 * Fix 2-finger titlebar taps on wayland [Carlos; #764519]
 * Merge clutter and cogl forks into mutter [Rui; #760439]
 * Misc. bug fixes [Florian, Victor, Jonas; #765058, #765252, #765062]
 Contributors:
  Jonas Ådahl, Emmanuele Bassi, Olivier Fourdan, Carlos Garnacho, Rui Matos,
  Florian Müllner, Victor Toso, Rico Tzschichholz
 Translations:
  GNOME Translation Robot [ja, gd]
 3.20.1
 ======
 * Constrain window move/resizes on wayland as on X11 [Rui; #748819]
 * Don't crash with invalid previous monitor configurations [Rui; #764286]
 * Misc. bug fixes and cleanups [Jonas, Cosimo; #762828, #764807]
 Contributors:
  Jonas Ådahl, Cosimo Cecchi, Rui Matos, Jasper St. Pierre
 Translations:
  Inaki Larranaga Murgoitio [eu], Reinout van Schouwen [nl], Fabio Tomat [fur],
  Trần Ngọc Quân [vi]
 3.20.0
 ======
 * Fix crash when using visual bell [Jonas; #763858]
 Contributors:
  Jonas Ådahl, Jasper St. Pierre
 Translations:
  Milo Casagrande [it], Ask Hjorth Larsen [da]
 3.19.92
 =======
 * Add system bell support on wayland [Jonas; #763284]
 * Add gtk_surface.present to gtk-shell [Jonas; #763295]
 * Handle DND drops on the root window [Carlos; #762104]
 * Misc. bug fixes [Jonas, Carlos, Rui; #762828, #760745, #763125, #762763,
  #762661, #762639, #763159]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner
 Translations:
  Rūdolfs Mazurs [lv], Balázs Úr [hu], Claude Paroz [fr], Matej Urbančič [sl],
  Мирослав Николић [sr, sr@latin], Sebastian Rasmussen [sv], Changwoo Ryu [ko],
  Gil Forcada [ca], Tom Tryfonidis [el]
 3.19.91
 =======
 * Add --nested CLI argument to fix nested wayland session [Jonas; #758658]
 * Fix stack - scene graph stacking synchronization issues [Jonas; #755605]
 * Rate-limit last-device changes to fix freezes [Carlos; #753527]
 * Implement primary selection protocol [Carlos; #762560]
 * Misc. bug fixes [Carlos, Jonas; #762878, #762716]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Tim Lunn
 Translations:
  Piotr Drąg [pl], Artur de Aquino Morais [pt_BR], Marek Černocký [cs],
  Cédric Valmary [oc], Mario Blättermann [de], Dušan Kazik [sk],
  Fran Dieguez [gl], Aurimas Černius [lt], Daniel Mustieles [es],
  Stas Solovey [ru], Yosef Or Boczko [he]
 3.19.90
 =======
 * Release buffer after processing commit [Ray; #761312, #761613]
 * Implement pointer motion, locks and confinement on wayland [Jonas; #744104]
 * Add basic startup notification support on wayland [Carlos; #762268]
 * Misc. bug fixes [Rui, Alberts, Florian; #760670, #761543, #752794, #761557]
 Contributors:
  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos,
  Alberts Muktupāvels, Florian Müllner, Jasper St. Pierre, Ray Strode
 3.19.4
 ======
 * Fix updating stacking order when setting transient_for [Jonas; #755606]
 * Support screen rotation when supported by the driver [Carlos; #745079]
 * Protect against broken WM_CLASS property implementations [Sebastian; #759658]
 * Handle wl_pointer v5 events on wayland [Carlos; #760637]
 * Implement DND actions on wayland [Carlos; #760805]
 * Misc. bug fixes [Jonas, Rui, Ray, Marek; #754711, #756789, #759297, #758613,
  #760330, #760476, #759222, #760670]
 Contributors:
  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Sebastian Keller, Rui Matos,
  Florian Müllner, Jasper St. Pierre, Ray Strode
 Translations:
  Aurimas Černius [lt]
 3.19.3
 ======
 * Correct refresh rate units on KMS/Wayland [Daniel; #758653]
 * Fix crash when initial cursor position is not on a monitor [Marek; #756698]
 * Fix crash when more CRTs are enabled than outputs connected [Rui; #751638]
 * Fix touch pointer emulation on wayland [Carlos; #756754]
 * Allow minimizing windows that don't advertise supporting it [Jasper; #758186]
 * Force 2-finger scroll by default if available [Bastien; #759304]
 * Fix crash during XWayland initialization [Marek; #751845]
 * Ensure to send a ConfigureNotify to just mapped windows [Rui; #759492]
 * Misc. bug fixes and cleanups [Carlos, Jonas, Lionel; #758239, #758633,
  #755503, #759374]
 Contributors:
  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Lionel Landwerlin, Rui Matos,
  Bastien Nocera, Daniel Stone, Jasper St. Pierre
 3.19.2
 ======
 * Fix crash on monitor unplug [Rui; #756796]
 * Exit cleanly on initialization errors [Owen; #757311]
 * Allow to determine backend setting from session type [Ray; #741666]
 * Fix DRM device detection for non-PCI devices [Alban; #754911]
 * Don't force placement of windows without buffer on wayland [Marek; #751887]
 * Fix initialization of bypass compositor hint [Rui; #758544]
 Contributors:
  Alban Browaeys, Marek Chalupa, Rui Matos, Florian Müllner, Ray Strode,
  Owen W. Taylor
 3.19.1
 ======
 * wayland: Allow to trigger popups through keyboard/touch [Carlos; #756296]
 * Fix modifiers-only input source switching on Ubuntu [Alberts; #756543]
 * Misc. bug fixes [Jonas, Rui, Giovanni, Florian; #756675, #756660, #746420,
  #756548, #756796, #757101, #757148]
 Contributors:
  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Rui Matos,
  Alberts Muktupāvels, Florian Müllner
 Translations:
  Daniel Șerbănescu [ro]
 3.18.1
 ======
 * Misc. crash fixes [Jonas, Rui, Carlos, Owen, Florian; #755096, #754979,
  #755490, #754357, #745785, #756642]
 * Improve HiDPI support on wayland [Jonas; #755097]
 * Fix doubly-scaled cursor on XWayland HiDPI [Jonas; #755099]
 * Stop hiding titlebar buttons in dialogs [Florian; #641630]
 * Add support for fullscreen/unfullscreen animations [Cosimo; #707248]
 * Misc. bug fixes [Rui, Colin, Florian; #743339, #752047, #756074, #756649]
 Contributors:
  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre, Colin Walters, Owen W. Taylor
 3.18.0
 ======
 * Misc. fixes [Florian, Jonas; #753434]
 Contributors:
  Jonas Ådahl, Florian Müllner
 Translations:
  Rūdolfs Mazurs [lv]
 3.17.92
 =======
 * Don't omit the background color for backgrounds that don't fill the screen
  [Ray; #754476]
 * Fix up key state on FocusIn when running nested [Owen; #753948]
 * Find the right DRM device instead of hardcoding card0 [Marek; #753434]
 * Scale cursor on HiDPI screens [Jonas; #744932]
 * Misc. fixes and cleanups [Lan, Jonas, Javier, Olivier; #754545, #754215,
  #754621, #754715]
 Contributors:
  Jonas Ådahl, Marek Chalupa, Olivier Fourdan, Javier Jardón, Ting-Wei Lan,
  Ray Strode, Owen W. Taylor
 3.17.91
 =======
 * Send error on pointer-gesture protocol version mismatch [Jonas; #753855]
 * Misc. cleanups [Jonas; #744932]
 Contributors:
  Jonas Ådahl
 Translations:
  Chao-Hsiung Liao [zh_TW], Piotr Drąg [pl]
 3.17.90
 =======
 * Fix glitch with some fullscreen apps [Rui; #753020]
 * Fix screen update issue with NVidia driver [Aaron, Rui; #728464]
 * Only call frame callbacks for surfaces that get drawn [Adel; #739163]
 * Misc. bug fixes and cleanups [Jonas, Rui, Ting-Wei; #753222, #752753, #753237,
  #753380, #744104, #744932]
 Contributors:
  Jonas Ådahl, Adel Gadllah, Carlos Garnacho, Ting-Wei Lan, Rui Matos,
  Florian Müllner, Aaron Plattner, Jasper St. Pierre
 Translations:
  Akom Chotiphantawanon [th]
 3.17.4
 ======
 * nested: Allow basic configuration of dummy outputs [Jonas; #747089]
 * Send wl_surface.enter and wl_surface.leave on output changes [Jonas; #744453]
 * Improve HiDPI handling on wayland [Jonas; #745655, #744934]
 * Implement compositor-side animated cursors [Carlos; #752342]
 * Misc. bug fixes [Peter, Marek, Carlos, Matthias, Rui; #750816, #751884,
  #752248, #752551, #752552, #752673, #752674]
 Contributors:
  Jonas Ådahl, Marek Chalupa, Matthias Clasen, Carlos Garnacho, Peter Hutterer,
  Rui Matos, Florian Müllner, Jasper St. Pierre
 3.17.3
 ======
 * Add X11/wayland clipboard interaction [Carlos; #738312]
 * Support VM monitor layout hints on wayland [Thomas; #750363]
 * Misc. bug fixes [Rui, Jonas, Olivier, Carlos, Ting-Wei, Peter, Florian;
  #749994, #750256, #749716, #748705, #750552, #751036, #750007, #751136,
  #750552, #751471, #751715, #750680]
 Contributors:
  Jonas Ådahl, Dave Airlie, Cosimo Cecchi, Olivier Fourdan, Carlos Garnacho,
  Thomas Hellstrom, Peter Hutterer, Ting-Wei Lan, Jasper Lievisse Adriaanse,
  Rui Matos, Florian Müllner, Jasper St. Pierre
 Translations:
  Marek Černocký [cs], Christian Kirbach [de], Pedro Albuquerque [pt]
 3.17.2
 ======
 * Honor default value for click method setting [Rui; #746290]
 * Add X11/wayland clipboard interoperation [Carlos; #738312]
 * Misc. bug fixes [Rui; #749076, #749711]
 Contributors:
  Carlos Garnacho, Rui Matos, Jasper St. Pierre
 3.17.1
 ======
 * Add public method to get neighboring monitor [Florian; #633994]
 * Apply the right settings to the right input devices [Carlos; #747886]
 * Fix scroll button setting [Ondrej; #747967]
 * Add support for modal hint on wayland [Jonas; #745720]
 * Don't reset idle time for non-hardware events [Rui; #748541]
 * Misc. bug fixes [Ray, Rui; #748380, #748478]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Ondrej Holy, Rui Matos, Florian Müllner,
  Jasper St. Pierre, Ray Strode, Tomeu Vizoso
 3.16.1
 ======
 * Add function to refresh all background instances [Rui; #739178]
 * Fix swapped scroll methods on wayland [Ondrej; #746870]
 * Manually activate stage to fix accessibility on wayland [Ray, Rui; #746670]
 * Center pointer on primary monitor on startup [Carlos; #746896]
 * wayland: Reword synchronized state application semantics [Jonas; #743617]
 * Ensure input settings are applied on startup [Rui; #747434]
 * Misc. bug fixes [Jonas, Giovanni, Calvin, Ray, Rui; #744932, #746509, #746692,
  #746510, #746545, #747263]
 Contributors:
  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Ondrej Holy, Rui Matos,
  Jasper St. Pierre, Ray Strode, Calvin Walton
 Translations:
  Khaled Hosny [ar], Marek Černocký [cs]
 3.16.0
 ======
 * wayland: Don't skip notifying about initial maximized state [Jonas; #745303]
 Contributors:
  Jonas Ådahl
 Translations:
  Kjartan Maraas [nb], Jiri Grönroos [fi], Andika Triwidada [id],
  Inaki Larranaga Murgoitio [eu], Ask H. Larsen [da], Muhammet Kara [tr]
 3.15.92
 =======
 * Ensure pointer visibility on monitor changes [Rui, Marek; #745121, #745752]
 * Fix geometry of shaded windows [Florian; #746145]
 * Take over cursor visibility handling from gsd [Carlos; #712775]
 * Fix touch interaction on window decorations [Carlos; #745335]
 * Add options for libinput_config_click_method [Carlos; #746290]
 * Scale window decorations on HiDPI displays [Florian; #744354]
 * Misc. bug fixes [Carlos, Ray, Rui; #745163, #746295, #746098, #745734]
 Contributors:
  Marek Chalupa, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre, Ray Strode
 Translations:
  Piotr Drąg [pl], Milo Casagrande [it], Changwoo Ryu [ko],
  Daniel Korostil [uk], Baurzhan Muftakhidinov [kk], Trần Ngọc Quân [vi],
  Alexander Shopov [bg], Jordi Mas [ca], Samir Ribic [bs], A S Alam [pa],
  Matej Urbančič [sl]
 3.15.91
 =======
 * wayland: Fix nested compositor mode [Jonas; #745401]
 * wayland: Fix pointer constraining [Marek; #727337]
 * wayland: Fix input region on HiDPI [Jonas; #744933]
 * Allow themes to style buttons differently based on function [Horst; #745108]
 * Misc. bug fixes and cleanups [Ray, Rui, Alban; #745141, #745118, #745476,
  #745442]
 Contributors:
  Jonas Ådahl, Alban Browaeys, Marek Chalupa, Horst, Rui Matos,
  Jasper St. Pierre, Ray Strode
 Translations:
  Chao-Hsiung Liao [zh_TW], Efstathios Iosifidis [el], Dušan Kazik [sk],
  Balázs Úr [hu], Daniel Mustieles [es], Claude Paroz [fr], Stas Solovey [ru],
  Yosef Or Boczko [he], Rafael Ferreira [pt_BR], Aurimas Černius [lt],
  Fran Dieguez [gl], Anders Jonsson [sv], Мирослав Николић [sr, sr@latin]
 3.15.90
 =======
 * Initialize MetaOutput even when we can't get the EDID [Rui; #743412]
 * Expose MetaMonitorManager to introspection [Rui; #743745]
 * Fix flash on unredirection [Chris; #743858]
 * Update xdg-shell implementation to v5 [Jonas; #744452]
 * Do not try to use seat devices that aren't (yet) present [Ray; #744640]
 * Add keybindings for switching to VT8-VT12 [Ray; #744800]
 * Misc bug fixes [Jonas, Cosimo; #743678, #744500]
 Contributors:
  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
  Ray Strode, Chris Wilson
 Translations:
  Yosef Or Boczko [he], Yuri Myasoedov [ru], Kristjan SCHMIDT [eo],
  Matej Urbančič [sl], Dušan Kazik [sk]
 3.15.4
 ======
 * Use GTK+ theme for window decorations instead of metacity [Florian; #741917]
 * Export the same EDID information on X11 and wayland [Carlos; #742882]
 * Apply input device configuration on wayland [Carlos; #739397]
 * Implement pointer barriers on wayland [Jonas; #706655]
 * Misc. bug fixes (Ting-Wei, Rui, Ikey, Florian, Marek, Jonas; #741829,
  #738630, #737463, #698995, #727893, #742825, #742824, #742841, #743173,
  #743189, #743217, #743254]
 Contributors:
  Jonas Ådahl, Giovanni Campagna, Marek Chalupa, Ikey Doherty, Adel Gadllah,
  Carlos Garnacho, Ting-Wei Lan, Rui Matos, Florian Müllner, Jasper St. Pierre,
  Rico Tzschichholz
 Translations:
  Matej Urbančič [sl], Balázs Úr [hu], Marek Černocký [cs],
  Inaki Larranaga Murgoitio [eu], Rafael Ferreira [pt_BR],
  Daniel Mustieles [es], Fran Dieguez [gl]
 3.15.3
 ======
 * Don't leave left-over frames queued [Owen; #738686]
 * Set CRTC configuration even if it might be redundant [Rui; #740838]
 Contributors:
  Rui Matos, Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
 Translations:
  Trần Ngọc Quân [vi], Muhammet Kara [tr]
 3.15.2
 ======
 * Don't enable hiDPI on monitors with broken EDID [Bastien; #734839]
 * Prevent crash applying monitor config for a closed lid [Rui; #739450]
 * Fix "flicker" during startup transition [Ray; #740377]
 * Misc. bug fixes [Lan, Florian, Carlos; #731521, #740133, #738890]
 Contributors:
  Emmanuele Bassi, Carlos Garnacho, Jonathon Jongsma, Ting-Wei Lan, Rui Matos,
  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Ray Strode
 Translations:
  Kjartan Maraas [nb]
 3.15.1
 ======
 * Use GResources for theme loading [Cosimo; #736936]
 * Fix headerbar drag getting stuck on xwayland [Carlos; #738411]
 * Fix wayland hiDPI regressions [Adel; #739161]
 * Misc bug fixes and cleanups [Jasper, Rui, Carlos; #662962, #738630, #738888,
  #738890]
 Contributors:
  Cosimo Cecchi, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre
 3.14.1
 ======
 * Fix move-titlebar-onscreen function [Florian; #736915]
 * Fix stacking of the guard window [Owen; #737233]
 * Fix keycode lookup for non-default layouts [Rui; #737134]
 * Fix workspaces-only-on-primary handling [Florian; #737178]
 * Don't unstick sticky windows on workspace removal [Florian; #737625]
 * Do not auto-minimize fullscreen windows [Jasper; #705177]
 * Upload keymap to newly added keyboard devices [Rui; #737673]
 * Apply keyboard repeat settings [Rui; #728055]
 * Don't send pressed keys on enter [Rui; #727178]
 * Fix build without wayland/native [Rico; #738225]
 * Send modifiers after the key event [Rui; #738238]
 * Fix unredirect heuristic [Adel; #738271]
 * Do not show system chrome over fullscreen windows [Florian; #693991]
 * Misc. bug fixes [Florian, Adel, Tom; #737135, #737581, #738146, #738384]
 Contributors:
  Tom Beckmann, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
 Translations:
  Krishnababu Krothapalli [te], Мирослав Николић [sr, sr@latin],
  Alexander Shopov [bg], Saibal Ray [bn_IN], Milo Casagrande [it],
  Rūdolfs Mazurs [lv]
 3.14.0
 ======
 * Fix placement of popup windows on wayland [Jasper; #736812]
 * Only increment serial once per event [Jasper; #736840]
 * Fix window positioning regression with non-GTK+ toolkits [Owen; #736719]
 Contributors:
  Jasper St. Pierre, Owen W. Taylor
 Translations:
  Saibal Ray [bn_IN], Dušan Kazik [sk], Manoj Kumar Giri [or],
  Christian Kirbach [de], Ask H. Larsen [da], YunQiang Su [zh_CN],
  Bernd Homuth [de], Shankar Prasad [kn], Petr Kovar [cs], Rajesh Ranjan [hi]
 3.13.92
 =======
 * Rewrite background code [Owen; #735637, #736568]
 * Fix size in nested mode [Owen; #736279]
 * Fix destroy animation of background windows [Florian; #735927]
 * Wire keymap changes up to the wayland frontend [Rui; #736433]
 * Add a test framework and stacking tests [Owen; #736505]
 * Simplify handling of the merged X and wayland stack [Owen; #736559]
 * Fix cursor size on HiDPI [Adel; #729337]
 * Misc. bug fixes [Owen; #735632, #736589, #736694]
 Contributors:
  Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor
 Translations:
  Andika Triwidada [id], Piotr Drąg [pl], Changwoo Ryu [ko],
  Kjartan Maraas [nb], Ville-Pekka Vainio [fi], Yuri Myasoedov [ru],
  Aurimas Černius [lt], Balázs Úr [hu], Sweta Kothari [gu], A S Alam [pa],
  Sandeep Sheshrao Shedmake [mr], Shantha kumar [ta], Gil Forcada [ca],
  Carles Ferrando [ca@valencia], Mattias Eriksson [sv]
 3.13.91
 =======
 * Misc. bug fixes [Carlos; #735452]
 Contributors:
  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
  Rico Tzschichholz
 Translations:
  Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR],
  Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he],
  Maria  Mavridou [el], Claude Paroz [fr]
 3.13.90
 =======
 * Only call XSync() once per frame [Rui; #728464]
 * Update capabilities on device list changes [Carlos; #733563]
 * Make use of GLSL optional [Adel; #733623]
 * Handle gestures and touch events on wayland [Carlos; #733631]
 * Add support for unminimize compositor effects [Cosimo; #733789]
 * Always set the frame background to None [Giovanni; #734054]
 * Add backend methods to handle keymaps [Rui; #734301]
 * Actually mark revalidated MetaTextureTower levels as valid [Owen; #734400]
 * Rely on explicit -backward switcher keybindings instead of <shift>-magic
  [Christophe; #732295, #732385]
 * Misc. bug fixes and cleanups [Rui, Adel, Christophe; #727178, #734852,
  #734960]
 Contributors:
  Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Piotr Drąg,
  Christophe Fergeau, Adel Gadllah, Carlos Garnacho, Rui Matos,
  Florian Müllner, Jasper St. Pierre, Rico Tzschichholz, Olav Vitters,
  Owen W. Taylor
 Translations:
  Kjartan Maraas [nb], Inaki Larranaga Murgoitio [eu], Lasse Liehu [fi],
  ngoswami [as], Daniel Mustieles [es]
 3.13.4
 ======
 * Fix move/resize operations for wayland clients [Marek; #731237]
 * Add ::first-frame signal to MetaWindowActor [Owen; #732343]
 * Handle keysyms without the XF86 prefix [Owen; #727993]
 * Add touch gesture support [Carlos]
 * Fix a deadlock when exiting [Owen; #733068]
 * Add framework for restarting the compositor with nice visuals
  [Owen; #733026]
 * Toggle seat capabilities on VT switch [Carlos; #733563]
 * Misc bug fixes [Florian, Owen; #732695, #732350]
 Contributors:
  Tom Beckmann, Giovanni Campagna, Marek Chalupa, Adel Gadllah,
  Carlos Garnacho, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz,
  Owen W. Taylor
 Translations:
  Yuri Myasoedov [ru], Fran Diéguez [gl], Aurimas Černius [lt], MarMav [el],
  Enrico Nicoletto [pt_BR]
 3.13.3
 ======
 * Improve behavior of window buttons with compositor menus [Florian; #731058]
 * Implement touch support on wayland [Carlos; #724442]
 * Update window shadows [Nikita; #731866]
 * Keep windows on the preferred output [Florian; #731760]
 * Misc bug fixes [Jonas, Florian, Jasper; #729601, #730681, #731353, #731332,
  #730527, #662962]
 Contributors:
  Jonas Ådahl, Nikita Churaev, Carlos Garnacho, Florian Müllner,
  Jasper St. Pierre, Rico Tzschichholz
 3.13.2
 ======
 * Add basic HiDPI support on wayland [Adel; #728902]
 * Fix crash when monitors change during suspend [Giovanni; #725637]
 * Replace mutter-launch with logind integration [Jasper; #724604]
 * Move window menu into the compositor [Jasper; #726352]
 * Fix delayed focus-follows-mouse support [Florian; #730541]
 * Support fallback app menu in window decorations [Florian; #730752]
 * Misc. bug fixes and cleanups [Giovanni, Jonas, Jasper; #729732, #729602,
  #726714]
 Contributors:
  Jonas Ådahl, Giovanni Campagna, Adel Gadllah, Florian Müllner,
  Jasper St. Pierre, Rico Tzschichholz
 Translations:
  Pau Iranzo [ca], Daniel Mustieles [es]
 3.13.1
 ======
 * Fix opacity values from _NET_WM_WINDOW_OPACITY [Nirbheek; #727874]
 * Merge wayland branch [Jasper, Giovanni, Robert B., Neil, Adel, Rui, Jonas,
  Lionel, Tim, Owen, Florian, Colin W., Cosimo, Ray, Kalev, Pavel, Robert A.,
  Magdalen, Marek, Matthias, Alban, Seán, Daniel, Stefano, Carlos, Colin G.,
  Andreas, Alexander, Ryan, Marc-André, Asad, Alberto, Bastien, Hans,
  Debarshi, Sindhu, Andika, Rico, Olav]
 * Don't prevent workspace switches for present_with_time() [Florian; #728018]
 * Add shortcuts for switching to the last workspace [Elad; #659288]
 * Make move/resize menu items behave like the keybindings [Jasper; #728617]
 * Misc. bug fixes and cleanups  [Jasper, Bastien, Florian, Adel; #720631,
  #727979, #728423, #728395, #729044]
 Contributors:
  Jonas Ådahl, Elad Alfassa, Robert Ancell, Magdalen Berns, Robert Bragg,
  Giovanni Campagna, Cosimo Cecchi, Marek Chalupa, Nirbheek Chauhan,
  Matthias Clasen, Alban Crequy, Seán de Búrca, Daniel Drake, Jason Ekstrand,
  Stefano Facchini, Adel Gadllah, Carlos Garnacho, Colin Guthrie,
  Andreas Heider, Lionel Landwerlin, Alexander Larsson, Kalev Lember,
  Ryan Lortie, Tim Lunn, Marc-André Lureau, Rui Matos, Asad Mehmood,
  Alberto Milone, Florian Müllner, Bastien Nocera, Hans Petter Jansson,
  Debarshi Ray, Neil Roberts, Sindhu S, Jasper St. Pierre, Ray Strode,
  Andika Triwidada, Rico Tzschichholz, Pavel Vasin, Olav Vitters,
  Colin Walters, A. Walton, Owen W. Taylor
 Translations:
  Inaki Larranaga Murgoitio [eu], marablack3 [el], Daniel Mustieles [es],
  Fran Diéguez [gl], Yosef Or Boczko [he], Dirgita [id]
 3.12.0
 ======
 * Fix grab issue with SSD xwayland windows [Rui; #726123]
 * Misc. bug fixes [Jasper, Ray, Rui, Florian; #727011]
 Contributors:
  Rui Matos, Florian Müllner, Jasper St. Pierre, Ray Strode
 3.11.92
 =======
 * Fix identification of CSD windows [Owen; #723029]
 * Update keyboard state unconditionally [Rui; #722847]
 * Misc bug fixes and cleanups [Owen, Rui, Giovanni, Matthias, Adel, Ryan,
  Jasper, Marek, Florian; #723580, #726123, #726683]
 Contributors:
  Giovanni Campagna, Marek Chalupa, Matthias Clasen, Adel Gadllah, Ryan Lortie,
  Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor
 3.11.91
 =======
 * Don't use keysym to match keybindings [Rui; #678001]
 * Fix message tray icons showing up blank (again) [Adel; #725180]
 * Improve keybinding lookups [Rui; #725588]
 * Fix dynamic updates of titlebar style properties [Owen; #725751]
 * Fix positioning of manually positioned windows [Owen; #724049]
 * Misc bug fixes and cleanups [Jasper, Carlos, Adel, Giovanni, Florian; #720631,
  #724969, #725216, #724402, #722266, #725338, #725525]
 Contributors:
  Giovanni Campagna, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre, Owen W. Taylor
 3.11.90
 =======
 * Fix double-scaling on high DPI resolutions [Adel; #723931]
 * Make tile previews a compositor effect [Stefano, Florian; #665758]
 * Misc. bug fixes and cleanups [Ryan, Giovanni, Jasper, Adel; #722530, #724257,
  #724258, #720631, #724364, #724472]
 Contributors:
  Giovanni Campagna, Marek Chalupa, Stefano Facchini, Adel Gadllah,
  Ryan Lortie, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
 3.11.5
 ======
 * Fix CSD titlebars being placed off-screen [Jasper; #719772]
 * Add support for subsurfaces [Jonas; #705502]
 * Expose MetaWindow:skip-taskbar property [Florian; #723307]
 * Fix legacy tray icons showing up blank [Adel; #721596]
 * Fix configuration of cloned monitors [Adel; #710610]
 * Misc bug fixes and cleanups [Jasper, Adel, Marek, Jonas; #720631, #723468,
  #720818, #723563, #723564]
 Contributors:
  Jonas Ådahl, Marek Ch, Adel Gadllah, Florian Müllner, Jasper St. Pierre
 3.11.4
 ======
 * Don't leave focus on windows that are being unmanaged [Owen; #711618]
 * Reduce server grabs [Daniel Drake; #721345, #721709]
 * Improve heuristic to determine display output name [Cosimo Cecchi; #721674]
 * Atomically unmaximize both directions [Jasper; #722108]
 * Misc bug fixes [Debarshi, Andika, Florian; #721517, #721674, #722347]
 Contributors:
  Cosimo Cecchi, Daniel Drake, Florian Müllner, Debarshi Ray, Jasper St. Pierre,
  Andika Triwidada, Owen W. Taylor
 3.11.3
 ======
 * Fix focus issues with external OSKs[Jasper; #715030]
--- a/416
+++ b/416
@@ -0,0 +1,416 @@
 The original codebase named "Metacity" is not a meta-City as in an
 urban center, but rather Meta-ness as in the state of being
 meta. i.e. metacity : meta as opacity : opaque. Also it may have
 something to do with the Meta key on UNIX keyboards.
 Since then, it has been renamed mutter after a rebase on top of
 clutter as a compositing manager.
 COMPILING MUTTER
 ===
 You need GTK+ 2.2.  For startup notification to work you need
 libstartup-notification at
 http://www.freedesktop.org/software/startup-notification/ or on the
 GNOME ftp site.
 You need Clutter 1.0. You need gobject-introspection 0.6.3.
 REPORTING BUGS AND SUBMITTING PATCHES
 ===
 Report new bugs on http://bugzilla.gnome.org. Please check for
 duplicates, *especially* if you are reporting a feature request. 
 Please do *not* add "me too!" or "yes I really want this!" comments to
 feature requests in bugzilla. Please read
 http://pobox.com/~hp/features.html prior to adding any kind of flame
 about missing features or misfeatures.
 Feel free to send patches too; Metacity is relatively small and
 simple, so if you find a bug or want to add a feature it should be
 pretty easy.  Send me mail, or put the patch in bugzilla.
 See the HACKING file for some notes on hacking Mutter.
 MUTTER FEATURES
 ===
 - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts, 
   etc. come from GTK+ theme.
 - Does not expose the concept of "window manager" to the user.  Some
   of the features in the GNOME control panel and other parts of the
   desktop happen to be implemented in metacity, such as changing your
   window border theme, or changing your window navigation shortcuts,
   but the user doesn't need to know this.
 - Includes only the window manager; does not try to be a desktop
   environment. The pager, configuration, etc. are all separate and
   modular. The "libwnck" library (which I also wrote) is available
   for writing metacity extensions, pagers, and so on. (But libwnck
   isn't metacity specific, or GNOME-dependent; it requires only GTK,
   and should work with KWin, fvwm2, and other EWMH-compliant WMs.)
 - Has a simple theme system and a couple of extra themes come with it.
   Change themes via gsettings:
     gsettings set org.gnome.desktop.wm.preferences theme Crux
     gsettings set org.gnome.desktop.wm.preferences theme Gorilla
     gsettings set org.gnome.desktop.wm.preferences theme Atlanta
     gsettings set org.gnome.desktop.wm.preferences theme Bright
   See theme-format.txt for docs on the theme format. Use 
   metacity-theme-viewer to preview themes.
 - Change number of workspaces via gsettings:
     gsettings set org.gnome.desktop.wm.preferences num-workspaces 5
   Can also change workspaces from GNOME 2 pager.
 - Change focus mode:
     gsettings set org.gnome.desktop.wm.preferences focus-mode mouse
     gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy
     gsettings set org.gnome.desktop.wm.preferences focus-mode click
 - Global keybinding defaults include:   
    Alt-Tab                forward cycle window focus
    Alt-Shift-Tab          backward cycle focus
    Alt-Ctrl-Tab           forward cycle focus among panels
    Alt-Ctrl-Shift-Tab     backward cycle focus among panels
    Alt-Escape             cycle window focus without a popup thingy
    Ctrl-Alt-Left Arrow    previous workspace
    Ctrl-Alt-Right Arrow   next workspace
    Ctrl-Alt-D             minimize/unminimize all, to show desktop
   Change keybindings for example:
     gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 '[<Alt>F1]'
   Also try the GNOME keyboard shortcuts control panel.
 - Window keybindings:
    Alt-space         window menu
    Mnemonics work in the menu. That is, Alt-space then underlined
    letter in the menu item works.
    Choose Move from menu, and arrow keys to move the window.
    While moving, hold down Control to move slower, and 
      Shift to snap to edges.
    Choose Resize from menu, and nothing happens yet, but 
      eventually I might implement something.
    Keybindings for things like maximize window, vertical maximize,
    etc. can be bound, but may not all exist by default. See
    metacity.schemas.
 - Window mouse bindings:
    Clicking anywhere on frame with button 1 will raise/focus window
    If you click a window control, such as the close button, then the 
     control will activate on button release if you are still over it
     on release (as with most GUI toolkits)
    If you click and drag borders with button 1 it resizes the window
    If you click and drag the titlebar with button 1 it moves the 
     window.
    If you click anywhere on the frame with button 2 it lowers the 
     window.
    If you click anywhere on the frame with button 3 it shows the 
     window menu.
    If you hold down Super (windows key) and click inside a window, it
     will move the window (buttons 1 and 2) or show menu (button 3).
     Or you can configure a different modifier for this.
    If you pick up a window with button 1 and then switch workspaces
     the window will come with you to the new workspace, this is 
     a feature copied from Enlightenment.
    If you hold down Shift while moving a window, the window snaps
     to edges of other windows and the screen.
 - Session management:
    Mutter connects to the session manager and will set itself up to
     be respawned. It theoretically restores sizes/positions/workspace
     for session-aware applications.
 - Mutter implements much of the EWMH window manager specification
   from freedesktop.org, as well as the older ICCCM.  Please refer to
   the COMPLIANCE file for information on mutter compliance with
   these standards.
 - Uses Pango to render text, so has cool i18n capabilities. 
   Supports UTF-8 window titles and such.
 - There are simple animations for actions such as minimization, 
   to help users see what is happening. Should probably 
   have a few more of these and make them nicer.
 - if you have the proper X setup, set the GDK_USE_XFT=1 
   environment variable to get antialiased window titles.
 - considers the panel when placing windows and maximizing
   them.
 - handles the window manager selection from the ICCCM. Will exit if
   another WM claims it, and can claim it from another WM if you pass
   the --replace argument. So if you're running another
   ICCCM-compliant WM, you can run "mutter --replace" to replace it
   with Metacity.
 - does basic colormap handling
 - and much more! well, maybe not a lot more.
 HOW TO ADD EXTERNAL FEATURES
 ===
 You can write a mutter "plugin" such as a pager, window list, icon
 box, task menu, or even things like "window matching" using the
 Extended Window Manager Hints. See http://www.freedesktop.org for the
 EWMH specification. An easy-to-use library called "libwnck" is
 available that uses the EWMH and is specifically designed for writing
 WM accessories.
 You might be interested in existing accessories such as "Devil's Pie"
 by Ross Burton, which add features to Mutter (or other
 EWMH-compliant WMs).
 MUTTER BUGS, NON-FEATURES, AND CAVEATS
 ===
 See bugzilla: http://bugzilla.gnome.org/query.cgi
 FAQ
 ===
 Q: Will you add my feature?
 A: If it makes sense to turn on unconditionally, or is genuinely a
   harmless preference that I would not be embarrassed to put in a
   simple, uncluttered, user-friendly configuration dialog.
   If the only rationale for your feature is that other window
   managers have it, or that you are personally used to it, or
   something like that, then I will not be impressed. Metacity is
   firmly in the "choose good defaults" camp rather than the "offer 6
   equally broken ways to do it, and let the user pick one" camp.
   This is part of a "no crackrock" policy, despite some exceptions
   I'm mildly embarrassed about. For example, multiple workspaces
   probably constitute crackrock, they confuse most users and really
   are not that useful if you have a decent tasklist and so on. But I
   am too used to them to turn them off.  Or alternatively
   iconification/tasklist is crack, and workspaces/pager are good. But
   having both is certainly a bit wrong.  Sloppy focus is probably
   crackrock too.
   But don't think unlimited crack is OK just because I slipped up a
   little. No slippery slope here.
   Don't let this discourage patches and fixes - I love those. ;-)
   Just be prepared to hear the above objections if your patch adds
   some crack-ridden configuration option.
   http://pobox.com/~hp/free-software-ui.html
   http://pobox.com/~hp/features.html   
 Q: Will Mutter be part of GNOME?
 A: It is not officially part of GNOME as of GNOME 2.27. We are
   hoping to have mutter officially included as of GNOME 2.28. 
 Q: Why does Mutter remember the workspace/position of some apps 
   but not others across logout/login?
 A: Mutter only stores sizes/positions for apps that are session
   managed. As far as I can determine, there is no way to attempt to
   remember workspace/position for non-session-aware apps without
   causing a lot of weird effects.
   The reason is that you don't know which non-SM-aware apps were
   launched by the session. When you initially log in, Metacity sees a
   bunch of new windows appear. But it can't distinguish between
   windows that were stored in your session, or windows you just
   launched after logging in. If Metacity tried to guess that a window
   was from the session, it could e.g. end up maximizing a dialog, or
   put a window you just launched on another desktop or in a weird
   place. And in fact I see a lot of bugs like this in window managers
   that try to handle non-session-aware apps.
   However, for session-aware apps, Mutter can tell that the
   application instance is from the session and thus restore it
   reliably, assuming the app properly restores the windows it had 
   open on session save.
   So the correct way to fix the situation is to make apps
   session-aware. libSM has come with X for years, it's very
   standardized, it's shared by GNOME and KDE - even twm is
   session-aware. So anyone who won't take a patch to add SM is more
   archaic than twm - and you should flame them. ;-)
   Docs on session management:
    http://www.fifi.org/doc/xspecs/xsmp.txt.gz
    http://www.fifi.org/doc/xspecs/SMlib.txt.gz
   See also the ICCCM section on SM. For GNOME apps, use the
   GnomeClient object. For a simple example of using libSM directly,
   twm/session.c in the twm source code is pretty easy to understand.
 Q: How about adding viewports in addition to workspaces?
 A: I could conceivably be convinced to use viewports _instead_ of
   workspaces, though currently I'm not thinking that. But I don't
   think it makes any sense to have both; it's just confusing. They
   are functionally equivalent.
   You may think this means that you won't have certain keybindings, 
   or something like that. This is a misconception. The only 
   _fundamental_ difference between viewports and workspaces is that 
   with viewports, windows can "overlap" and appear partially on 
   one and partially on another. All other differences that
   traditionally exist in other window managers are accidental - 
   the features commonly associated with viewports can be implemented
   for workspaces, and vice versa.
   So I don't want to have two kinds of
   workspace/desktop/viewport/whatever, but I'm willing to add
   features traditionally associated with either kind if those
   features make sense.
 Q: Why is the panel always on top?
 A: Because it's a better user interface, and until we made this not
   configurable a bunch of apps were not getting fixed (the app
   authors were just saying "put your panel on the bottom" instead of
   properly supporting fullscreen mode, and such).
   rationales.txt has the bugzilla URL for some flamefesting on this,
   if you want to go back and relive the glory.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
 Q: Why is there no edge flipping?
 A: This one is also in rationales.txt. Because "ouija board" UI, where
   you just move the mouse around and the computer guesses what you
   mean, has a lot of issues. This includes mouse focus, shade-hover
   mode, edge flipping, autoraise, etc. Metacity has mouse focus and
   autoraise as a compromise, but these features are all confusing for
   many users, and cause problems with accessibility, fitt's law, and
   so on.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
 Q: Why does wireframe move/resize suck?
 A: You can turn it on with the reduced_resources setting.
   But: it has low usability, and is a pain
   to implement, and there's no reason opaque move/resize should be a
   problem on any setup that can run a modern desktop worth a darn to
   begin with.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
   The reason we had to add wireframe anyway was broken 
   proprietary apps that can't handle lots of resize events.
 Q: Why no XYZ?
 A: You are probably getting the idea by now - check rationales.txt,
   query/search bugzilla, and read http://pobox.com/~hp/features.html
   and http://pobox.com/~hp/free-software-ui.html
   Then sit down and answer the question for yourself.  Is the feature
   good? What's the rationale for it? Answer "why" not just "why not."
   Justify in terms of users as a whole, not just users like
   yourself. How else can you solve the same problem? etc. If that
   leads you to a strong opinion, then please, post the rationale for
   discussion to an appropriate bugzilla bug, or to
   usability@gnome.org.
   Please don't just "me too!" on bugzilla bugs, please don't think
   flames will get you anywhere, and please don't repeat rationale
   that's already been offered.
 Q: Your dumb web pages you made me read talk about solving problems in
   fundamental ways instead of adding preferences or workarounds.
   What are some examples where metacity has done this?
 A: There are quite a few, though many opportunities remain.  Sometimes
   the real fix involves application changes. The metacity approach is
   that it's OK to require apps to change, though there are also
   plenty of workarounds in metacity for battles considered too hard
   to fight.
   Here are some examples:
   - fullscreen mode was introduced to allow position constraints,
     panel-on-top, and other such things to apply to normal windows
     while still allowing video players etc. to "just work"
   - "whether to include minimized windows in Alt+Tab" was solved 
     by putting minimized windows at the *end* of the tab order. 
   - Whether to pop up a feedback display during Alt+Tab was solved by
     having both Alt+Tab and Alt+Esc
   - Whether to have a "kill" feature was solved by automatically
     detecting and offering to kill stuck apps. Better, metacity
     actually does "kill -9" on the process, it doesn't just
     disconnect the process from the X server. You'll appreciate this
     if you ever did a "kill" on Netscape 4, and watched it keep
     eating 100% CPU even though the X server had booted it.
   - The workspaces vs. viewports mess was avoided by adding
     directional navigation and such to workspaces, see discussion
     earlier in this file.
   - Instead of configurable placement algorithms, there's just one 
     that works fairly well most of the time.
   - To avoid excess CPU use during opaque move/resize, we rate limit
     the updates to the application window's size.
   - Instead of configurable "show size of window while resizing,"
     it's only shown for windows where it matters, such as terminals.
     (Only use-case given for all windows is for web designers
     choosing their web browser size, but there are web sites and
     desktop backgrounds that do this for you.)
   - Using startup notification, applications open on the workspace
     where you launched them, not the active workspace when their
     window is opened.
   - and much more.
 Q: I think mutter sucks.
 A: Feel free to use any WM you like. The reason metacity follows the
   ICCCM and EWMH specifications is that it makes metacity a modular,
   interchangeable part in the desktop. libwnck-based apps such as the
   GNOME window list will work just fine with any EWMH-compliant WM.
 Q: Did you spend a lot of time on this?
 A: Originally the answer was no. Sadly the answer is now yes.
 Q: How can you claim that you are anti-crack, while still 
   writing a window manager?
 A: I have no comment on that.
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,28 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.11
+PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.13
-olddir="$(pwd)"
+(test -f $srcdir/configure.ac \
-
+  && test -d $srcdir/src) || {
 cd "${srcdir}"
 (test -f configure.ac \
  && test -d src) || {
    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level mutter directory"
+    echo " top-level metacity directory"
    exit 1
 }
-aclocal --install || exit 1
+which gnome-autogen.sh || {
-intltoolize --force --copy --automake || exit 1
+    echo "You need to install gnome-common from GNOME Subversion (or from"
-autoreconf --verbose --force --install || exit 1
+    echo "your distribution's package manager)."
-
+    exit 1
-cd "${olddir}"
+}
-
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
 if [ "$NOCONFIGURE" = "" ]; then
    "${srcdir}/configure" "$@" || exit 1
 fi
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@@ -1,96 +0,0 @@
 ABOUT-NLS
 INSTALL
 Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
 compile
 *.pc
 .deps
 .libs
 *.o
 *.lo
 *.la
 *.gcov
 .dirstamp
 README
 stamp-enum-types
 stamp-marshal
 tags
 /ChangeLog*
 clutter-build-config.h
 clutter-build-config.h.in
 clutter-config.h
 clutter-enum-types.[ch]
 clutter-marshal.[ch]
 clutter-version.h
 gcov-report.txt
 clutter-json.h
 clutter-lcov.info
 clutter-lcov
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4
 !/build/autotools/as-compiler-flag.m4
 !/build/autotools/glibtests.m4
 /build/autotools/*.m4
 /build/test-driver
 *.gir
 *.typelib
 *.gcda
 *.gcno
 config.*
 configure
 depcomp
 /doc/cookbook/*.pdf
 /doc/cookbook/html
 /doc/cookbook/*.stamp
 /doc/cookbook/clutter-cookbook.xml
 /doc/cookbook/clutter-cookbook.html
 doc/reference/clutter-*.txt
 !/doc/reference/clutter-sections.txt
 doc/reference/html
 doc/reference/tmpl
 doc/reference/xml
 doc/reference/clutter.args
 doc/reference/clutter.hierarchy
 doc/reference/clutter.interfaces
 doc/reference/clutter.prerequisites
 doc/reference/clutter.signals
 doc/reference/clutter-docs.xml
 doc/reference/*.stamp
 doc/reference/*.bak
 doc/reference/*.log
 doc/reference/gtkdoc-check.*
 gtk-doc.make
 install-sh
 libtool
 ltmain.sh
 missing
 mkinstalldirs
 stamp-h1
 TAGS
 /tests/tools/disable-npots.sh
 /tests/conform/test-launcher.sh
 /tests/interactive/wrapper.sh
 /po/POTFILES
 /po/clutter-1.0.pot
 /po/*.gmo
 /po/Makefile.in.in
 /po/Makevars.template
 /po/Rules-quot
 /po/boldquot.sed
 /po/en@boldquot.header
 /po/en@quot.header
 /po/insert-header.sin
 /po/quot.sed
 /po/remove-potcdate.sin
 /po/remove-potcdate.sed
 /po/stamp-po
 *.swn
 *.swo
 *.swp
 *~
 *.orig
 *.rej
 .DS_Store
 .testlogs-*
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -1,53 +0,0 @@
 NULL =
 SUBDIRS = build clutter tests
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif
 DIST_SUBDIRS = clutter tests examples build
 # XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
 # that jhbuild sets while still retaining build/autotools as the authoritative
 # source for m4 macros
 ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 CLEANFILES = $(pcfiles)
 DISTCLEANFILES =
 DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-flags
 # proxy rules for tests
 test-report full-report:
 	$(MAKE) -C tests/conform $(@)
 perf-report:
 	$(MAKE) -C tests/performance $(@)
 if ENABLE_GCOV
 # use recursive makes in order to ignore errors during check/perf
 lcov:
 	-$(MAKE) $(AM_MAKEFLAGS) -C clutter check
 	-$(MAKE) $(AM_MAKEFLAGS) -C tests/conform test
 	$(MAKE) $(AM_MAKEFLAGS) genlcov
 # we have to massage the lcov.info file slightly to hide the effect of libtool
 # placing the objects files in the .libs/ directory separate from the *.c
 genlcov:
 	$(LTP) --directory $(top_builddir) --capture --output-file clutter-lcov.info --test-name CLUTTER_TEST --no-checksum
 	$(SED) -e 's#.libs/##' < clutter-lcov.info > clutter-lcov.info.tmp
 	LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory clutter-lcov --title "Clutter Code Coverage" --show-details clutter-lcov.info.tmp
 	rm -f clutter-lcov.info.tmp
 lcov-clean:
 	-$(LTP) --directory $(top_builddir) -z
 	-$(RM) -rf clutter-lcov.info clutter-lcov
 else
 lcov genlcov lcov-clean:
 	@echo You need to configure Clutter with support for gcov enabled.
 	@echo e.g., ./configure --enable-gcov
 endif
 .PHONY: test-report full-report perf-report lcov genlcov lcov-clean
--- a/clutter/build/Makefile.am
+++ b/clutter/build/Makefile.am
@@ -1 +0,0 @@
 SUBDIRS = autotools
--- a/clutter/build/autotools/.gitignore
+++ b/clutter/build/autotools/.gitignore
@@ -1,8 +0,0 @@
 gtk-doc.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
 shave
 shave-libtool
--- a/clutter/build/autotools/Makefile.am
+++ b/clutter/build/autotools/Makefile.am
@@ -1,10 +0,0 @@
 NULL =
 EXTRA_DIST = \
 	introspection.m4	\
 	as-compiler-flag.m4	\
 	glibtests.m4		\
 	glib-tap.mk		\
 	tap-driver.sh		\
 	tap-test		\
 	$(NULL)
--- a/clutter/build/autotools/as-compiler-flag.m4
+++ b/clutter/build/autotools/as-compiler-flag.m4
@@ -1,62 +0,0 @@
 dnl as-compiler-flag.m4 0.1.0
 dnl autostars m4 macro for detection of compiler flags
 dnl David Schleef <ds@schleef.org>
 dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
 dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
 dnl Tries to compile with the given CFLAGS.
 dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
 dnl and ACTION-IF-NOT-ACCEPTED otherwise.
 AC_DEFUN([AS_COMPILER_FLAG],
 [
  AC_MSG_CHECKING([to see if compiler understands $1])
  save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS $1"
  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
  CFLAGS="$save_CFLAGS"
  if test "X$flag_ok" = Xyes ; then
    m4_ifvaln([$2],[$2])
    true
  else
    m4_ifvaln([$3],[$3])
    true
  fi
  AC_MSG_RESULT([$flag_ok])
 ])
 dnl AS_COMPILER_FLAGS(VAR, FLAGS)
 dnl Tries to compile with the given CFLAGS.
 AC_DEFUN([AS_COMPILER_FLAGS],
 [
  list=$2
  flags_supported=""
  flags_unsupported=""
  AC_MSG_CHECKING([for supported compiler flags])
  for each in $list
  do
    save_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS $each"
    AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
    CFLAGS="$save_CFLAGS"
    if test "X$flag_ok" = Xyes ; then
      flags_supported="$flags_supported $each"
    else
      flags_unsupported="$flags_unsupported $each"
    fi
  done
  AC_MSG_RESULT([$flags_supported])
  if test "X$flags_unsupported" != X ; then
    AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
  fi
  $1="$$1 $flags_supported"
 ])
--- a/clutter/build/autotools/glib-tap.mk
+++ b/clutter/build/autotools/glib-tap.mk
@@ -1,134 +0,0 @@
 # GLIB - Library of useful C routines
 TESTS_ENVIRONMENT= \
 	G_TEST_SRCDIR="$(abs_srcdir)" 		\
 	G_TEST_BUILDDIR="$(abs_builddir)" 	\
 	G_DEBUG=gc-friendly 			\
 	MALLOC_CHECK_=2 			\
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build/autotools/tap-driver.sh
 LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
 NULL =
 # initialize variables for unconditional += appending
 BUILT_SOURCES =
 BUILT_EXTRA_DIST =
 CLEANFILES = *.log *.trs
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 EXTRA_DIST =
 TESTS =
 installed_test_LTLIBRARIES =
 installed_test_PROGRAMS =
 installed_test_SCRIPTS =
 nobase_installed_test_DATA =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 noinst_DATA =
 check_LTLIBRARIES =
 check_PROGRAMS =
 check_SCRIPTS =
 check_DATA =
 # We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
 # will belong in exactly one of the following variables.
 #
 # First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
 #
 #   test_programs, test_scripts, test_data, test_ltlibraries
 #
 # The above are used to list files that are involved in both uninstalled and installed testing.  The
 # test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
 # Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
 # installed in the same way as it appears in the package layout.
 #
 # In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
 # like so:
 #
 #   installed_test_programs, uninstalled_test_programs
 #   installed_test_scripts, uninstalled_test_scripts
 #   installed_test_data, uninstalled_test_data
 #   installed_test_ltlibraries, uninstalled_test_ltlibraries
 #
 # Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
 # that should not themselves be run as testcases (but exist to be used from other testcases):
 #
 #   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
 #   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
 #
 # Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
 # file automatically end up in the tarball.
 #
 #   dist_test_scripts, dist_test_data, dist_test_extra_scripts
 #   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
 #   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
 #
 # Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
 # standard automake convention of not disting programs scripts or data by default.
 #
 # test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
 # variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
 # gtester.  That's a bit strange for scripts, but it's possible.
 TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
 # Note: build even the installed-only targets during 'make check' to ensure that they still work.
 # We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
 # prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
 # filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
 all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
 all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
 all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
 all_test_scripts     += $(all_dist_test_scripts)
 EXTRA_DIST           += $(all_dist_test_scripts)
 all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
 all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
 all_test_data        += $(all_dist_test_data)
 EXTRA_DIST           += $(all_dist_test_data)
 all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
 if ENABLE_ALWAYS_BUILD_TESTS
 noinst_LTLIBRARIES += $(all_test_ltlibs)
 noinst_PROGRAMS += $(all_test_programs)
 noinst_SCRIPTS += $(all_test_scripts)
 noinst_DATA += $(all_test_data)
 else
 check_LTLIBRARIES += $(all_test_ltlibs)
 check_PROGRAMS += $(all_test_programs)
 check_SCRIPTS += $(all_test_scripts)
 check_DATA += $(all_test_data)
 endif
 if ENABLE_INSTALLED_TESTS
 installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
                          $(test_extra_programs) $(installed_test_extra_programs)
 installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
                          $(test_extra_scripts) $(test_installed_extra_scripts)
 installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
 nobase_installed_test_DATA += $(test_data) $(installed_test_data)
 nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
 installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
 installed_testcases = $(test_programs) $(installed_test_programs) \
                      $(test_scripts) $(installed_test_scripts) \
                      $(dist_test_scripts) $(dist_installed_test_scripts)
 installed_test_meta_DATA = $(installed_testcases:=.test)
 %.test: %$(EXEEXT) Makefile
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
 	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
 	mv $@.tmp $@)
 CLEANFILES += $(installed_test_meta_DATA)
 endif
--- a/clutter/build/autotools/glibtests.m4
+++ b/clutter/build/autotools/glibtests.m4
@@ -1,28 +0,0 @@
 dnl GLIB_TESTS
 dnl
 AC_DEFUN([GLIB_TESTS],
 [
  AC_ARG_ENABLE(installed-tests,
                AS_HELP_STRING([--enable-installed-tests],
                               [Enable installation of some test cases]),
                [case ${enableval} in
                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
                  no)  ENABLE_INSTALLED_TESTS="" ;;
                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
                 esac])
  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
  AC_ARG_ENABLE(always-build-tests,
                AS_HELP_STRING([--enable-always-build-tests],
                               [Enable always building tests during 'make all']),
                [case ${enableval} in
                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
                 esac])
  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
  fi
 ])
--- a/clutter/build/autotools/introspection.m4
+++ b/clutter/build/autotools/introspection.m4
@@ -1,96 +0,0 @@
 dnl -*- mode: autoconf -*-
 dnl Copyright 2009 Johan Dahlin
 dnl
 dnl This file is free software; the author(s) gives unlimited
 dnl permission to copy and/or distribute it, with or without
 dnl modifications, as long as this notice is preserved.
 dnl
 # serial 1
 m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
 [
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
    dnl enable/disable introspection
    m4_if([$2], [require],
    [dnl
        enable_introspection=yes
    ],[dnl
        AC_ARG_ENABLE(introspection,
                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
                                 [Enable introspection for this build]),, 
                                 [enable_introspection=auto])
    ])dnl
    AC_MSG_CHECKING([for gobject-introspection])
    dnl presence/version checking
    AS_CASE([$enable_introspection],
    [no], [dnl
        found_introspection="no (disabled, use --enable-introspection to enable)"
    ],dnl
    [yes],[dnl
        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
                         found_introspection=yes,
                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
    ],dnl
    [auto],[dnl
        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
 	dnl Canonicalize enable_introspection
 	enable_introspection=$found_introspection
    ],dnl
    [dnl	
        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
    ])dnl
    AC_MSG_RESULT([$found_introspection])
    INTROSPECTION_SCANNER=
    INTROSPECTION_COMPILER=
    INTROSPECTION_GENERATE=
    INTROSPECTION_GIRDIR=
    INTROSPECTION_TYPELIBDIR=
    if test "x$found_introspection" = "xyes"; then
       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
    fi
    AC_SUBST(INTROSPECTION_SCANNER)
    AC_SUBST(INTROSPECTION_COMPILER)
    AC_SUBST(INTROSPECTION_GENERATE)
    AC_SUBST(INTROSPECTION_GIRDIR)
    AC_SUBST(INTROSPECTION_TYPELIBDIR)
    AC_SUBST(INTROSPECTION_CFLAGS)
    AC_SUBST(INTROSPECTION_LIBS)
    AC_SUBST(INTROSPECTION_MAKEFILE)
    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])
 dnl Usage:
 dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
 AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
 [
  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
 ])
 dnl Usage:
 dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
 AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
 [
  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
 ])
--- a/clutter/build/autotools/tap-driver.sh
+++ b/clutter/build/autotools/tap-driver.sh
@@ -1,652 +0,0 @@
 #! /bin/sh
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program 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 General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 scriptversion=2011-12-27.17; # UTC
 # Make unconditional expansion of undefined variables an error.  This
 # helps a lot in preventing typo-related bugs.
 set -u
 me=tap-driver.sh
 fatal ()
 {
  echo "$me: fatal: $*" >&2
  exit 1
 }
 usage_error ()
 {
  echo "$me: $*" >&2
  print_usage >&2
  exit 2
 }
 print_usage ()
 {
  cat <<END
 Usage:
  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
                [--expect-failure={yes|no}] [--color-tests={yes|no}]
                [--enable-hard-errors={yes|no}] [--ignore-exit]
                [--diagnostic-string=STRING] [--merge|--no-merge]
                [--comments|--no-comments] [--] TEST-COMMAND
 The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
 END
 }
 # TODO: better error handling in option parsing (in particular, ensure
 # TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the result and output of the test script.
 trs_file=  # Where to save the metadata of the test run.
 expect_failure=0
 color_tests=0
 merge=0
 ignore_exit=0
 comments=0
 diag_string='#'
 while test $# -gt 0; do
  case $1 in
  --help) print_usage; exit $?;;
  --version) echo "$me $scriptversion"; exit $?;;
  --test-name) test_name=$2; shift;;
  --log-file) log_file=$2; shift;;
  --trs-file) trs_file=$2; shift;;
  --color-tests) color_tests=$2; shift;;
  --expect-failure) expect_failure=$2; shift;;
  --enable-hard-errors) shift;; # No-op.
  --merge) merge=1;;
  --no-merge) merge=0;;
  --ignore-exit) ignore_exit=1;;
  --comments) comments=1;;
  --no-comments) comments=0;;
  --diagnostic-string) diag_string=$2; shift;;
  --) shift; break;;
  -*) usage_error "invalid option: '$1'";;
  esac
  shift
 done
 test $# -gt 0 || usage_error "missing test command"
 case $expect_failure in
  yes) expect_failure=1;;
    *) expect_failure=0;;
 esac
 if test $color_tests = yes; then
  init_colors='
    color_map["red"]="[0;31m" # Red.
    color_map["grn"]="[0;32m" # Green.
    color_map["lgn"]="[1;32m" # Light green.
    color_map["blu"]="[1;34m" # Blue.
    color_map["mgn"]="[0;35m" # Magenta.
    color_map["std"]="[m"     # No color.
    color_for_result["ERROR"] = "mgn"
    color_for_result["PASS"]  = "grn"
    color_for_result["XPASS"] = "red"
    color_for_result["FAIL"]  = "red"
    color_for_result["XFAIL"] = "lgn"
    color_for_result["SKIP"]  = "blu"'
 else
  init_colors=''
 fi
 # :; is there to work around a bug in bash 3.2 (and earlier) which
 # does not always set '$?' properly on redirection failure.
 # See the Autoconf manual for more details.
 :;{
  (
    # Ignore common signals (in this subshell only!), to avoid potential
    # problems with Korn shells.  Some Korn shells are known to propagate
    # to themselves signals that have killed a child process they were
    # waiting for; this is done at least for SIGINT (and usually only for
    # it, in truth).  Without the `trap' below, such a behaviour could
    # cause a premature exit in the current subshell, e.g., in case the
    # test command it runs gets terminated by a SIGINT.  Thus, the awk
    # script we are piping into would never seen the exit status it
    # expects on its last input line (which is displayed below by the
    # last `echo $?' statement), and would thus die reporting an internal
    # error.
    # For more information, see the Autoconf manual and the threads:
    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
    trap : 1 3 2 13 15
    if test $merge -gt 0; then
      exec 2>&1
    else
      exec 2>&3
    fi
    "$@"
    echo $?
  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
        -v me="$me" \
        -v test_script_name="$test_name" \
        -v log_file="$log_file" \
        -v trs_file="$trs_file" \
        -v expect_failure="$expect_failure" \
        -v merge="$merge" \
        -v ignore_exit="$ignore_exit" \
        -v comments="$comments" \
        -v diag_string="$diag_string" \
 '
 # FIXME: the usages of "cat >&3" below could be optimized when using
 # FIXME: GNU awk, and/on on systems that supports /dev/fd/.
 # Implementation note: in what follows, `result_obj` will be an
 # associative array that (partly) simulates a TAP result object
 # from the `TAP::Parser` perl module.
 ## ----------- ##
 ##  FUNCTIONS  ##
 ## ----------- ##
 function fatal(msg)
 {
  print me ": " msg | "cat >&2"
  exit 1
 }
 function abort(where)
 {
  fatal("internal error " where)
 }
 # Convert a boolean to a "yes"/"no" string.
 function yn(bool)
 {
  return bool ? "yes" : "no";
 }
 function add_test_result(result)
 {
  if (!test_results_index)
    test_results_index = 0
  test_results_list[test_results_index] = result
  test_results_index += 1
  test_results_seen[result] = 1;
 }
 # Whether the test script should be re-run by "make recheck".
 function must_recheck()
 {
  for (k in test_results_seen)
    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
      return 1
  return 0
 }
 # Whether the content of the log file associated to this test should
 # be copied into the "global" test-suite.log.
 function copy_in_global_log()
 {
  for (k in test_results_seen)
    if (k != "PASS")
      return 1
  return 0
 }
 # FIXME: this can certainly be improved ...
 function get_global_test_result()
 {
    if ("ERROR" in test_results_seen)
      return "ERROR"
    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
      return "FAIL"
    all_skipped = 1
    for (k in test_results_seen)
      if (k != "SKIP")
        all_skipped = 0
    if (all_skipped)
      return "SKIP"
    return "PASS";
 }
 function stringify_result_obj(result_obj)
 {
  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
    return "ERROR"
  if (plan_seen == LATE_PLAN)
    return "ERROR"
  if (result_obj["directive"] == "TODO")
    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
  if (result_obj["directive"] == "SKIP")
    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
  if (length(result_obj["directive"]))
      abort("in function stringify_result_obj()")
  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
 }
 function decorate_result(result)
 {
  color_name = color_for_result[result]
  if (color_name)
    return color_map[color_name] "" result "" color_map["std"]
  # If we are not using colorized output, or if we do not know how
  # to colorize the given result, we should return it unchanged.
  return result
 }
 function report(result, details)
 {
  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
    {
      msg = ": " test_script_name
      add_test_result(result)
    }
  else if (result == "#")
    {
      msg = " " test_script_name ":"
    }
  else
    {
      abort("in function report()")
    }
  if (length(details))
    msg = msg " " details
  # Output on console might be colorized.
  print decorate_result(result) msg
  # Log the result in the log file too, to help debugging (this is
  # especially true when said result is a TAP error or "Bail out!").
  print result msg | "cat >&3";
 }
 function testsuite_error(error_message)
 {
  report("ERROR", "- " error_message)
 }
 function handle_tap_result()
 {
  details = result_obj["number"];
  if (length(result_obj["description"]))
    details = details " " result_obj["description"]
  if (plan_seen == LATE_PLAN)
    {
      details = details " # AFTER LATE PLAN";
    }
  else if (result_obj["is_unplanned"])
    {
       details = details " # UNPLANNED";
    }
  else if (result_obj["number"] != testno)
    {
       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
                         details, testno);
    }
  else if (result_obj["directive"])
    {
      details = details " # " result_obj["directive"];
      if (length(result_obj["explanation"]))
        details = details " " result_obj["explanation"]
    }
  report(stringify_result_obj(result_obj), details)
 }
 # `skip_reason` should be empty whenever planned > 0.
 function handle_tap_plan(planned, skip_reason)
 {
  planned += 0 # Avoid getting confused if, say, `planned` is "00"
  if (length(skip_reason) && planned > 0)
    abort("in function handle_tap_plan()")
  if (plan_seen)
    {
      # Error, only one plan per stream is acceptable.
      testsuite_error("multiple test plans")
      return;
    }
  planned_tests = planned
  # The TAP plan can come before or after *all* the TAP results; we speak
  # respectively of an "early" or a "late" plan.  If we see the plan line
  # after at least one TAP result has been seen, assume we have a late
  # plan; in this case, any further test result seen after the plan will
  # be flagged as an error.
  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
  # If testno > 0, we have an error ("too many tests run") that will be
  # automatically dealt with later, so do not worry about it here.  If
  # $plan_seen is true, we have an error due to a repeated plan, and that
  # has already been dealt with above.  Otherwise, we have a valid "plan
  # with SKIP" specification, and should report it as a particular kind
  # of SKIP result.
  if (planned == 0 && testno == 0)
    {
      if (length(skip_reason))
        skip_reason = "- "  skip_reason;
      report("SKIP", skip_reason);
    }
 }
 function extract_tap_comment(line)
 {
  if (index(line, diag_string) == 1)
    {
      # Strip leading `diag_string` from `line`.
      line = substr(line, length(diag_string) + 1)
      # And strip any leading and trailing whitespace left.
      sub("^[ \t]*", "", line)
      sub("[ \t]*$", "", line)
      # Return what is left (if any).
      return line;
    }
  return "";
 }
 # When this function is called, we know that line is a TAP result line,
 # so that it matches the (perl) RE "^(not )?ok\b".
 function setup_result_obj(line)
 {
  # Get the result, and remove it from the line.
  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
  sub("^(not )?ok[ \t]*", "", line)
  # If the result has an explicit number, get it and strip it; otherwise,
  # automatically assing the next progresive number to it.
  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
    {
      match(line, "^[0-9]+")
      # The final `+ 0` is to normalize numbers with leading zeros.
      result_obj["number"] = substr(line, 1, RLENGTH) + 0
      line = substr(line, RLENGTH + 1)
    }
  else
    {
      result_obj["number"] = testno
    }
  if (plan_seen == LATE_PLAN)
    # No further test results are acceptable after a "late" TAP plan
    # has been seen.
    result_obj["is_unplanned"] = 1
  else if (plan_seen && testno > planned_tests)
    result_obj["is_unplanned"] = 1
  else
    result_obj["is_unplanned"] = 0
  # Strip trailing and leading whitespace.
  sub("^[ \t]*", "", line)
  sub("[ \t]*$", "", line)
  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
  result_obj["description"] = line
  result_obj["directive"] = ""
  result_obj["explanation"] = ""
  if (index(line, "#") == 0)
    return # No possible directive, nothing more to do.
  # Directives are case-insensitive.
  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
  # See whether we have the directive, and if yes, where.
  pos = match(line, rx "$")
  if (!pos)
    pos = match(line, rx "[^a-zA-Z0-9_]")
  # If there was no TAP directive, we have nothing more to do.
  if (!pos)
    return
  # Let`s now see if the TAP directive has been escaped.  For example:
  #  escaped:     ok \# SKIP
  #  not escaped: ok \\# SKIP
  #  escaped:     ok \\\\\# SKIP
  #  not escaped: ok \ # SKIP
  if (substr(line, pos, 1) == "#")
    {
      bslash_count = 0
      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
        bslash_count += 1
      if (bslash_count % 2)
        return # Directive was escaped.
    }
  # Strip the directive and its explanation (if any) from the test
  # description.
  result_obj["description"] = substr(line, 1, pos - 1)
  # Now remove the test description from the line, that has been dealt
  # with already.
  line = substr(line, pos)
  # Strip the directive, and save its value (normalized to upper case).
  sub("^[ \t]*#[ \t]*", "", line)
  result_obj["directive"] = toupper(substr(line, 1, 4))
  line = substr(line, 5)
  # Now get the explanation for the directive (if any), with leading
  # and trailing whitespace removed.
  sub("^[ \t]*", "", line)
  sub("[ \t]*$", "", line)
  result_obj["explanation"] = line
 }
 function get_test_exit_message(status)
 {
  if (status == 0)
    return ""
  if (status !~ /^[1-9][0-9]*$/)
    abort("getting exit status")
  if (status < 127)
    exit_details = ""
  else if (status == 127)
    exit_details = " (command not found?)"
  else if (status >= 128 && status <= 255)
    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
  else if (status > 256 && status <= 384)
    # We used to report an "abnormal termination" here, but some Korn
    # shells, when a child process die due to signal number n, can leave
    # in $? an exit status of 256+n instead of the more standard 128+n.
    # Apparently, both behaviours are allowed by POSIX (2008), so be
    # prepared to handle them both.  See also Austing Group report ID
    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
  else
    # Never seen in practice.
    exit_details = " (abnormal termination)"
  return sprintf("exited with status %d%s", status, exit_details)
 }
 function write_test_results()
 {
  print ":global-test-result: " get_global_test_result() > trs_file
  print ":recheck: "  yn(must_recheck()) > trs_file
  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
  for (i = 0; i < test_results_index; i += 1)
    print ":test-result: " test_results_list[i] > trs_file
  close(trs_file);
 }
 BEGIN {
 ## ------- ##
 ##  SETUP  ##
 ## ------- ##
 '"$init_colors"'
 # Properly initialized once the TAP plan is seen.
 planned_tests = 0
 COOKED_PASS = expect_failure ? "XPASS": "PASS";
 COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
 # Enumeration-like constants to remember which kind of plan (if any)
 # has been seen.  It is important that NO_PLAN evaluates "false" as
 # a boolean.
 NO_PLAN = 0
 EARLY_PLAN = 1
 LATE_PLAN = 2
 testno = 0     # Number of test results seen so far.
 bailed_out = 0 # Whether a "Bail out!" directive has been seen.
 # Whether the TAP plan has been seen or not, and if yes, which kind
 # it is ("early" is seen before any test result, "late" otherwise).
 plan_seen = NO_PLAN
 ## --------- ##
 ##  PARSING  ##
 ## --------- ##
 is_first_read = 1
 while (1)
  {
    # Involutions required so that we are able to read the exit status
    # from the last input line.
    st = getline
    if (st < 0) # I/O error.
      fatal("I/O error while reading from input stream")
    else if (st == 0) # End-of-input
      {
        if (is_first_read)
          abort("in input loop: only one input line")
        break
      }
    if (is_first_read)
      {
        is_first_read = 0
        nextline = $0
        continue
      }
    else
      {
        curline = nextline
        nextline = $0
        $0 = curline
      }
    # Copy any input line verbatim into the log file.
    print | "cat >&3"
    # Parsing of TAP input should stop after a "Bail out!" directive.
    if (bailed_out)
      continue
    # TAP test result.
    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
      {
        testno += 1
        setup_result_obj($0)
        handle_tap_result()
      }
    # TAP plan (normal or "SKIP" without explanation).
    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
      {
        # The next two lines will put the number of planned tests in $0.
        sub("^1\\.\\.", "")
        sub("[^0-9]*$", "")
        handle_tap_plan($0, "")
        continue
      }
    # TAP "SKIP" plan, with an explanation.
    else if ($0 ~ /^1\.\.0+[ \t]*#/)
      {
        # The next lines will put the skip explanation in $0, stripping
        # any leading and trailing whitespace.  This is a little more
        # tricky in truth, since we want to also strip a potential leading
        # "SKIP" string from the message.
        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
        sub("[ \t]*$", "");
        handle_tap_plan(0, $0)
      }
    # "Bail out!" magic.
    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
    # recognize a "Bail out!" directive when preceded by leading
    # whitespace, but more modern versions (e.g., 3.23) do.  So we
    # emulate the latter, "more modern" behaviour.
    else if ($0 ~ /^[ \t]*Bail out!/)
      {
        bailed_out = 1
        # Get the bailout message (if any), with leading and trailing
        # whitespace stripped.  The message remains stored in `$0`.
        sub("^[ \t]*Bail out![ \t]*", "");
        sub("[ \t]*$", "");
        # Format the error message for the
        bailout_message = "Bail out!"
        if (length($0))
          bailout_message = bailout_message " " $0
        testsuite_error(bailout_message)
      }
    # Maybe we have too look for dianogtic comments too.
    else if (comments != 0)
      {
        comment = extract_tap_comment($0);
        if (length(comment))
          report("#", comment);
      }
  }
 ## -------- ##
 ##  FINISH  ##
 ## -------- ##
 # A "Bail out!" directive should cause us to ignore any following TAP
 # error, as well as a non-zero exit status from the TAP producer.
 if (!bailed_out)
  {
    if (!plan_seen)
      {
        testsuite_error("missing test plan")
      }
    else if (planned_tests != testno)
      {
        bad_amount = testno > planned_tests ? "many" : "few"
        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
                                bad_amount, planned_tests, testno))
      }
    if (!ignore_exit)
      {
        # Fetch exit status from the last line.
        exit_message = get_test_exit_message(nextline)
        if (exit_message)
          testsuite_error(exit_message)
      }
  }
 write_test_results()
 exit 0
 } # End of "BEGIN" block.
 '
 # TODO: document that we consume the file descriptor 3 :-(
 } 3>"$log_file"
 test $? -eq 0 || fatal "I/O or internal error"
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/clutter/build/autotools/tap-test
+++ b/clutter/build/autotools/tap-test
@@ -1,5 +0,0 @@
 #! /bin/sh
 # run a GTest in tap mode. The test binary is passed as $1
 $1 -k --tap
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -1,719 +0,0 @@
 AUTOMAKE_OPTIONS = subdir-objects
 # preamble
 NULL =
 # common definitions
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 BUILT_SOURCES =
 AM_CPPFLAGS = \
 	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
 	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
 	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
 	-DCLUTTER_LOCALEDIR=\""$(localedir)"\"	\
 	-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
 	-DCLUTTER_COMPILATION=1			\
 	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
 	-DG_LOG_DOMAIN=\"Clutter\" 		\
 	-I$(top_srcdir) 			\
 	-I$(top_srcdir)/clutter			\
 	-I$(top_srcdir)/clutter/cally		\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/clutter		\
 	-I$(top_srcdir)/../cogl			\
 	-I$(top_builddir)/../cogl		\
 	-I$(top_builddir)/../cogl/cogl		\
 	$(CLUTTER_DEPRECATED_CFLAGS)		\
 	$(CLUTTER_DEBUG_CFLAGS)			\
 	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
 	$(NULL)
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 # these are the gir files we generate using g-ir-scanner
 INTROSPECTION_GIRS =
 # the base include path for headers
 clutter_base_includedir = $(includedir)/mutter/clutter-$(LIBMUTTER_API_VERSION)
 clutter_includedir = $(clutter_base_includedir)/clutter
 clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
 # pkg-config files
 pc_files =
 # common sources - please, keep these sorted alphabetically
 source_h =					\
 	clutter-action.h		\
 	clutter-actor-meta.h		\
 	clutter-actor.h		\
 	clutter-align-constraint.h	\
 	clutter-animatable.h          \
 	clutter-backend.h		\
 	clutter-bind-constraint.h	\
 	clutter-binding-pool.h 	\
 	clutter-bin-layout.h		\
 	clutter-blur-effect.h		\
 	clutter-box-layout.h		\
 	clutter-brightness-contrast-effect.h	\
 	clutter-cairo.h		\
 	clutter-canvas.h		\
 	clutter-child-meta.h		\
 	clutter-click-action.h	\
 	clutter-clone.h		\
 	clutter-color-static.h	\
 	clutter-color.h		\
 	clutter-colorize-effect.h	\
 	clutter-constraint.h		\
 	clutter-container.h		\
 	clutter-content.h		\
 	clutter-deform-effect.h	\
 	clutter-deprecated.h		\
 	clutter-desaturate-effect.h	\
 	clutter-device-manager.h	\
 	clutter-drag-action.h		\
 	clutter-drop-action.h		\
 	clutter-effect.h		\
 	clutter-enums.h		\
 	clutter-event.h 		\
 	clutter-feature.h 		\
 	clutter-fixed-layout.h	\
 	clutter-flow-layout.h		\
 	clutter-gesture-action.h 	\
 	clutter-grid-layout.h 	\
 	clutter-group.h 		\
 	clutter-image.h		\
 	clutter-input-device.h	\
 	clutter-input-device-tool.h	\
        clutter-interval.h            \
 	clutter-keyframe-transition.h	\
 	clutter-keysyms.h 		\
 	clutter-layout-manager.h	\
 	clutter-layout-meta.h		\
 	clutter-macros.h		\
 	clutter-main.h		\
 	clutter-offscreen-effect.h	\
 	clutter-page-turn-effect.h	\
 	clutter-paint-nodes.h		\
 	clutter-paint-node.h		\
 	clutter-pan-action.h		\
 	clutter-path-constraint.h	\
 	clutter-path.h		\
 	clutter-property-transition.h	\
 	clutter-rotate-action.h	\
 	clutter-script.h		\
 	clutter-scriptable.h		\
 	clutter-scroll-actor.h	\
 	clutter-settings.h		\
 	clutter-shader-effect.h	\
 	clutter-shader-types.h	\
 	clutter-swipe-action.h	\
 	clutter-snap-constraint.h	\
 	clutter-stage.h 		\
 	clutter-stage-manager.h	\
 	clutter-tap-action.h		\
 	clutter-test-utils.h		\
 	clutter-texture.h 		\
 	clutter-text.h		\
 	clutter-text-buffer.h		\
 	clutter-timeline.h 		\
 	clutter-transition-group.h	\
 	clutter-transition.h		\
 	clutter-types.h		\
 	clutter-units.h 		\
 	clutter-virtual-input-device.h	\
 	clutter-zoom-action.h		\
 	$(NULL)
 source_c = \
 	clutter-action.c		\
 	clutter-actor-box.c		\
 	clutter-actor-meta.c		\
 	clutter-actor.c		\
 	clutter-align-constraint.c	\
 	clutter-animatable.c		\
 	clutter-backend.c		\
 	clutter-base-types.c		\
 	clutter-bezier.c		\
 	clutter-bind-constraint.c	\
 	clutter-binding-pool.c	\
 	clutter-bin-layout.c		\
 	clutter-blur-effect.c		\
 	clutter-box-layout.c		\
 	clutter-brightness-contrast-effect.c	\
 	clutter-cairo.c		\
 	clutter-canvas.c		\
 	clutter-child-meta.c		\
 	clutter-click-action.c	\
 	clutter-clone.c		\
 	clutter-color.c 		\
 	clutter-colorize-effect.c	\
 	clutter-constraint.c		\
 	clutter-container.c		\
 	clutter-content.c		\
 	clutter-deform-effect.c	\
 	clutter-desaturate-effect.c	\
 	clutter-device-manager.c	\
 	clutter-drag-action.c		\
 	clutter-drop-action.c		\
 	clutter-effect.c		\
 	clutter-event.c 		\
 	clutter-feature.c 		\
 	clutter-fixed-layout.c	\
 	clutter-flatten-effect.c	\
 	clutter-flow-layout.c		\
 	clutter-gesture-action.c 	\
 	clutter-grid-layout.c 	\
 	clutter-image.c		\
 	clutter-input-device.c	\
 	clutter-input-device-tool.c	\
 	clutter-virtual-input-device.c	\
 	clutter-interval.c            \
 	clutter-keyframe-transition.c	\
 	clutter-keysyms-table.c	\
 	clutter-layout-manager.c	\
 	clutter-layout-meta.c		\
 	clutter-main.c 		\
 	clutter-master-clock.c	\
 	clutter-master-clock-default.c	\
 	clutter-offscreen-effect.c	\
 	clutter-page-turn-effect.c	\
 	clutter-paint-nodes.c		\
 	clutter-paint-node.c		\
 	clutter-pan-action.c		\
 	clutter-path-constraint.c	\
 	clutter-path.c		\
 	clutter-property-transition.c	\
 	clutter-rotate-action.c	\
 	clutter-script.c		\
 	clutter-script-parser.c	\
 	clutter-scriptable.c		\
 	clutter-scroll-actor.c	\
 	clutter-settings.c		\
 	clutter-shader-effect.c	\
 	clutter-shader-types.c	\
 	clutter-swipe-action.c	\
 	clutter-snap-constraint.c	\
 	clutter-stage.c		\
 	clutter-stage-manager.c	\
 	clutter-stage-window.c	\
 	clutter-tap-action.c		\
 	clutter-test-utils.c		\
 	clutter-text.c		\
 	clutter-text-buffer.c		\
 	clutter-transition-group.c	\
 	clutter-transition.c		\
 	clutter-timeline.c 		\
 	clutter-units.c		\
 	clutter-util.c 		\
 	clutter-paint-volume.c 	\
 	clutter-zoom-action.c 	\
 	$(NULL)
 # private headers; these should not be distributed or introspected
 source_h_priv = \
 	clutter-actor-meta-private.h		\
 	clutter-actor-private.h			\
 	clutter-backend-private.h		\
 	clutter-bezier.h			\
 	clutter-constraint-private.h		\
 	clutter-content-private.h		\
 	clutter-debug.h 			\
 	clutter-device-manager-private.h	\
 	clutter-easing.h			\
 	clutter-effect-private.h		\
 	clutter-event-translator.h		\
 	clutter-event-private.h			\
 	clutter-flatten-effect.h		\
 	clutter-gesture-action-private.h	\
 	clutter-id-pool.h 			\
 	clutter-master-clock.h			\
 	clutter-master-clock-default.h		\
 	clutter-offscreen-effect-private.h	\
 	clutter-paint-node-private.h		\
 	clutter-paint-volume-private.h		\
 	clutter-private.h 			\
 	clutter-script-private.h		\
 	clutter-settings-private.h		\
 	clutter-stage-manager-private.h		\
 	clutter-stage-private.h			\
 	clutter-stage-view.h			\
 	clutter-stage-window.h			\
 	$(NULL)
 # private source code; these should not be introspected
 source_c_priv = \
 	clutter-easing.c		\
 	clutter-event-translator.c	\
 	clutter-id-pool.c 		\
 	clutter-stage-view.c		\
 	$(NULL)
 # deprecated installed headers
 deprecated_h = \
 	deprecated/clutter-actor.h			\
 	deprecated/clutter-alpha.h 			\
 	deprecated/clutter-animatable.h		\
 	deprecated/clutter-animation.h		\
 	deprecated/clutter-animator.h			\
 	deprecated/clutter-backend.h			\
 	deprecated/clutter-behaviour.h 		\
 	deprecated/clutter-behaviour-depth.h 		\
 	deprecated/clutter-behaviour-ellipse.h	\
 	deprecated/clutter-behaviour-opacity.h 	\
 	deprecated/clutter-behaviour-path.h 		\
 	deprecated/clutter-behaviour-rotate.h 	\
 	deprecated/clutter-behaviour-scale.h 		\
 	deprecated/clutter-bin-layout.h		\
 	deprecated/clutter-box.h			\
 	deprecated/clutter-cairo-texture.h		\
 	deprecated/clutter-container.h		\
 	deprecated/clutter-frame-source.h		\
 	deprecated/clutter-group.h			\
 	deprecated/clutter-input-device.h		\
 	deprecated/clutter-keysyms.h			\
 	deprecated/clutter-list-model.h			\
 	deprecated/clutter-main.h			\
 	deprecated/clutter-media.h			\
 	deprecated/clutter-model.h			\
 	deprecated/clutter-rectangle.h		\
 	deprecated/clutter-score.h 			\
 	deprecated/clutter-shader.h 			\
 	deprecated/clutter-stage-manager.h		\
 	deprecated/clutter-stage.h			\
 	deprecated/clutter-state.h			\
 	deprecated/clutter-table-layout.h		\
 	deprecated/clutter-texture.h			\
 	deprecated/clutter-timeline.h 		\
 	deprecated/clutter-timeout-pool.h 		\
 	deprecated/clutter-util.h 			\
 	$(NULL)
 # deprecated source code
 deprecated_c = \
 	deprecated/clutter-actor-deprecated.c		\
 	deprecated/clutter-alpha.c 			\
 	deprecated/clutter-animation.c		\
 	deprecated/clutter-animator.c			\
 	deprecated/clutter-behaviour.c 		\
 	deprecated/clutter-behaviour-depth.c		\
 	deprecated/clutter-behaviour-ellipse.c	\
 	deprecated/clutter-behaviour-opacity.c	\
 	deprecated/clutter-behaviour-path.c		\
 	deprecated/clutter-behaviour-rotate.c		\
 	deprecated/clutter-behaviour-scale.c		\
 	deprecated/clutter-box.c			\
 	deprecated/clutter-cairo-texture.c		\
 	deprecated/clutter-frame-source.c		\
 	deprecated/clutter-group.c 			\
 	deprecated/clutter-input-device-deprecated.c	\
 	deprecated/clutter-layout-manager-deprecated.c \
 	deprecated/clutter-list-model.c			\
 	deprecated/clutter-media.c			\
 	deprecated/clutter-model.c			\
 	deprecated/clutter-rectangle.c 		\
 	deprecated/clutter-score.c 			\
 	deprecated/clutter-shader.c 			\
 	deprecated/clutter-state.c			\
 	deprecated/clutter-table-layout.c		\
 	deprecated/clutter-texture.c 			\
 	deprecated/clutter-timeout-pool.c		\
 	$(NULL)
 # deprecated private headers; these should not be installed
 deprecated_h_priv = \
 	deprecated/clutter-model-private.h	\
 	deprecated/clutter-timeout-interval.h	\
 	$(NULL)
 # deprecated private source code; these should not be introspected
 deprecated_c_priv = \
 	deprecated/clutter-timeout-interval.c	\
 	$(NULL)
 # built sources
 built_source_c = \
 	clutter-enum-types.c			\
 	clutter-marshal.c			\
 	$(NULL)
 # built headers
 built_source_h = \
 	clutter-enum-types.h			\
 	clutter-marshal.h			\
 	$(NULL)
 # config header
 DISTCLEANFILES += clutter-config.h
 EXTRA_DIST += clutter-config.h.in
 # version header
 DISTCLEANFILES += clutter-version.h
 EXTRA_DIST += clutter-version.h.in clutter-version.h
 # key symbol update script
 EXTRA_DIST += clutter-keysyms-update.pl
 pc_files += mutter-clutter-$(LIBMUTTER_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
 #   backend_source_h := installed public headers
 #   backend_source_c_priv := source that should not be scanned by g-i
 #   backend_source_h_priv := private headers
 #   backend_source_built := built sources
 #
 backend_source_c =
 backend_source_h =
 backend_source_c_priv =
 backend_source_h_priv =
 backend_source_built =
 # X11 backend rules
 x11_source_c = \
 	x11/clutter-backend-x11.c		\
 	x11/clutter-device-manager-core-x11.c	\
 	x11/clutter-event-x11.c		\
 	x11/clutter-input-device-core-x11.c	\
 	x11/clutter-keymap-x11.c		\
 	x11/clutter-stage-x11.c		\
 	x11/clutter-x11-texture-pixmap.c	\
 	$(NULL)
 x11_source_h = \
 	x11/clutter-x11.h			\
 	x11/clutter-x11-texture-pixmap.h	\
 	$(NULL)
 x11_source_h_priv = \
 	x11/clutter-backend-x11.h		\
 	x11/clutter-device-manager-core-x11.h	\
 	x11/clutter-input-device-core-x11.h	\
 	x11/clutter-keymap-x11.h		\
 	x11/clutter-settings-x11.h		\
 	x11/clutter-stage-x11.h		\
 	$(NULL)
 x11_source_c_priv = \
 	x11/xsettings/xsettings-client.c	\
 	x11/xsettings/xsettings-client.h	\
 	x11/xsettings/xsettings-common.c	\
 	x11/xsettings/xsettings-common.h	\
 	$(NULL)
 x11_source_c += \
 	x11/clutter-device-manager-xi2.c	\
 	x11/clutter-input-device-xi2.c	\
 	x11/clutter-input-device-tool-xi2.c \
 	$(NULL)
 x11_source_h_priv += \
 	x11/clutter-device-manager-xi2.h	\
 	x11/clutter-input-device-xi2.h	\
 	x11/clutter-input-device-tool-xi2.h \
 	$(NULL)
 x11_source_c += \
 	x11/clutter-virtual-input-device-x11.c	\
 	$(NULL)
 x11_source_h_priv += \
 	x11/clutter-virtual-input-device-x11.h	\
 	$(NULL)
 backend_source_h += $(x11_source_h)
 backend_source_c += $(x11_source_c)
 backend_source_h_priv += $(x11_source_h_priv)
 backend_source_c_priv += $(x11_source_c_priv)
 # the list of files we want to introspect on X11
 x11_introspection = $(x11_source_c) $(x11_source_h)
 clutterx11_includedir = $(clutter_includedir)/x11
 clutterx11_include_HEADERS = $(x11_source_h)
 mutter-clutter-x11-@LIBMUTTER_API_VERSION@.pc: mutter-clutter-$(LIBMUTTER_API_VERSION).pc
 	$(QUIET_GEN)cp -f $< $(@F)
 pc_files += mutter-clutter-x11-$(LIBMUTTER_API_VERSION).pc
 # Shared cogl backend files
 cogl_source_h =
 cogl_source_c = \
 	cogl/clutter-stage-cogl.c	\
 	$(NULL)
 cogl_source_h_priv = \
 	cogl/clutter-stage-cogl.h	\
 	$(NULL)
 cogl_source_c_priv =
 backend_source_h += $(cogl_source_h)
 backend_source_c += $(cogl_source_c)
 backend_source_h_priv += $(cogl_source_h_priv)
 backend_source_c_priv += $(cogl_source_c_priv)
 backend_source_h += $(glx_source_h)
 backend_source_c += $(glx_source_c)
 evdev_c_priv = \
 	evdev/clutter-device-manager-evdev.c	\
 	evdev/clutter-input-device-evdev.c	\
 	evdev/clutter-seat-evdev.c		\
 	evdev/clutter-virtual-input-device-evdev.c	\
 	evdev/clutter-event-evdev.c		\
 	evdev/clutter-input-device-tool-evdev.c	\
 	$(NULL)
 evdev_h_priv = \
 	evdev/clutter-device-manager-evdev.h	\
 	evdev/clutter-input-device-evdev.h	\
 	evdev/clutter-seat-evdev.h		\
 	evdev/clutter-input-device-tool-evdev.h	\
 	evdev/clutter-virtual-input-device-evdev.h	\
 	$(NULL)
 evdev_h = evdev/clutter-evdev.h
 if SUPPORT_WAYLAND
 backend_source_c_priv += $(evdev_c_priv)
 backend_source_h_priv += $(evdev_h_priv)
 backend_source_h += $(evdev_h)
 clutterevdev_includedir = $(clutter_includedir)/evdev
 clutterevdev_include_HEADERS = $(evdev_h)
 backend_source_c += evdev/clutter-xkb-utils.c
 backend_source_h_priv += evdev/clutter-xkb-utils.h
 # EGL backend rules
 egl_source_h = \
 	egl/clutter-egl-headers.h	\
 	egl/clutter-egl.h		\
 	$(NULL)
 egl_source_h_priv = egl/clutter-backend-eglnative.h
 egl_source_c = egl/clutter-backend-eglnative.c
 wayland_compositor_source_h = \
 	wayland/clutter-wayland-compositor.h		\
 	wayland/clutter-wayland-surface.h
 backend_source_h += $(wayland_compositor_source_h)
 backend_source_c += \
 	wayland/clutter-wayland-surface.c
 wayland_compositor_includedir = $(clutter_includedir)/wayland
 wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
 backend_source_h += $(egl_source_h)
 backend_source_c += $(egl_source_c)
 backend_source_h_priv += $(egl_source_h_priv)
 clutteregl_includedir = $(clutter_includedir)/egl
 clutteregl_include_HEADERS = $(egl_source_h)
 endif # SUPPORT_WAYLAND
 # cally
 cally_sources_h = \
 	cally/cally-actor.h		\
 	cally/cally-clone.h		\
 	cally/cally-factory.h		\
 	cally/cally-group.h		\
 	cally/cally.h			\
 	cally/cally-main.h		\
 	cally/cally-rectangle.h	\
 	cally/cally-root.h		\
 	cally/cally-stage.h		\
 	cally/cally-text.h		\
 	cally/cally-texture.h		\
 	cally/cally-util.h		\
 	$(NULL)
 cally_sources_c = \
 	cally/cally-actor.c		\
 	cally/cally.c			\
 	cally/cally-clone.c		\
 	cally/cally-group.c		\
 	cally/cally-rectangle.c	\
 	cally/cally-root.c		\
 	cally/cally-stage.c		\
 	cally/cally-text.c		\
 	cally/cally-texture.c		\
 	cally/cally-util.c		\
 	$(NULL)
 cally_sources_private = \
 	cally/cally-actor-private.h	\
 	$(NULL)
 cally_includedir = $(clutter_base_includedir)/cally
 cally_include_HEADERS = $(cally_sources_h)
 # general build rules:
 # you should not need to modify anything below this point
 # glib-genmarshal rules
 glib_marshal_list = clutter-marshal.list
 glib_marshal_prefix = _clutter_marshal
 include $(srcdir)/Makefile.am.marshal
 # glib-mkenums rules
 glib_enum_h = clutter-enum-types.h
 glib_enum_c = clutter-enum-types.c
 glib_enum_headers = $(source_h) $(deprecated_h)
 include $(srcdir)/Makefile.am.enums
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
 DISTCLEANFILES += $(pc_files)
 clutter_include_HEADERS = $(source_h) clutter.h clutter-version.h clutter-autocleanups.h clutter-mutter.h
 nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
 clutter_deprecated_HEADERS = $(deprecated_h)
 mutterlibdir = $(libdir)/mutter
 mutterlib_LTLIBRARIES = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
 libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LIBADD = \
 	$(LIBM) \
 	$(CLUTTER_LIBS) \
 	$(top_builddir)/../cogl/cogl/libmutter-cogl-$(LIBMUTTER_API_VERSION).la \
 	$(top_builddir)/../cogl/cogl-pango/libmutter-cogl-pango-$(LIBMUTTER_API_VERSION).la \
 	$(top_builddir)/../cogl/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la \
 	$(NULL)
 libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
 	$(backend_source_c) \
 	$(backend_source_h) \
 	$(backend_source_c_priv) \
 	$(backend_source_h_priv) \
 	$(source_c) \
 	$(source_h) \
 	$(source_c_priv) \
 	$(source_h_priv) \
 	$(deprecated_c) \
 	$(deprecated_h) \
 	$(deprecated_c_priv) \
 	$(deprecated_h_priv) \
 	$(cally_sources_c) \
 	$(cally_sources_h) \
 	$(cally_sources_private) \
 	$(NULL)
 nodist_libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
 	$(backend_source_built) \
 	$(built_source_c) \
 	$(built_source_h)
 libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
 	$(CLUTTER_LINK_FLAGS) \
 	$(CLUTTER_LT_LDFLAGS) \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
 	$(NULL)
 install-exec-local:
 	test -z "$(mutterlibdir)" || $(MKDIR_P) "$(DESTDIR)$(mutterlibdir)"
 	for lib in `echo $(compat_libs)`; do \
 	  (cd $(DESTDIR)$(mutterlibdir) && \
 	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
 	  ) ; \
 	  (cd $(DESTDIR)$(mutterlibdir) && \
 	    { ln -s -f libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
 	      { rm -f $$lib.0 && ln -s libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
 	    } \
 	  ) ; \
 	  (cd $(DESTDIR)$(mutterlibdir) && \
 	    { ln -s -f libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
 	      { rm -f $$lib && ln -s libmutter-clutter-$(LIBMUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
 	    } \
 	  ) ; \
 	done
 # gobject-introspection rules
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(top_builddir)/../cogl/cogl \
 	--add-include-path=$(top_builddir)/../cogl/cogl-pango
 INTROSPECTION_COMPILER_ARGS = \
 	--includedir=$(top_builddir)/../cogl/cogl \
 	--includedir=$(top_builddir)/../cogl/cogl-pango
 INTROSPECTION_SCANNER_ENV = \
 	PKG_CONFIG_PATH=$(top_builddir)/../cogl/cogl/:$(top_builddir)/../cogl/cogl-pango/:$${PKG_CONFIG_PATH}
 Clutter-@LIBMUTTER_API_VERSION@.gir: libmutter-clutter-@LIBMUTTER_API_VERSION@.la Makefile
 Clutter_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = Clutter
 Clutter_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
 Clutter_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
 Clutter_@LIBMUTTER_API_VERSION@_gir_FILES = \
 	$(clutter_include_HEADERS) \
 	$(clutter_deprecated_HEADERS) \
 	$(nodist_clutter_include_HEADERS) \
 	$(source_c) \
 	$(deprecated_c) \
 	$(built_source_c)
 Clutter_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Clutter_@LIBMUTTER_API_VERSION@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-@LIBMUTTER_API_VERSION@ CoglPango-@LIBMUTTER_API_VERSION@ Atk-1.0 Json-1.0
 Clutter_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='clutter/clutter.h' \
 	--pkg-export=mutter-clutter-@LIBMUTTER_API_VERSION@
 INTROSPECTION_GIRS += Clutter-@LIBMUTTER_API_VERSION@.gir
 Cally-@LIBMUTTER_API_VERSION@.gir: Makefile Clutter-@LIBMUTTER_API_VERSION@.gir
 Cally_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = Cally
 Cally_@LIBMUTTER_API_VERSION@_gir_VERSION = @LIBMUTTER_API_VERSION@
 Cally_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
 Cally_@LIBMUTTER_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
 Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
 	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
 	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
 INTROSPECTION_GIRS += Cally-@LIBMUTTER_API_VERSION@.gir
 ClutterX11-@LIBMUTTER_API_VERSION@.gir: Makefile Clutter-@LIBMUTTER_API_VERSION@.gir
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_NAMESPACE = ClutterX11
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_INCLUDES = xlib-2.0
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_LIBS = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_FILES = $(x11_introspection)
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 ClutterX11_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='clutter/x11/clutter-x11.h' \
 	--pkg-export=mutter-clutter-x11-@LIBMUTTER_API_VERSION@ \
 	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir
 INTROSPECTION_GIRS += ClutterX11-@LIBMUTTER_API_VERSION@.gir
 # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
 # install anything - we need to install inside our prefix.
 girdir = $(mutterlibdir)
 gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(mutterlibdir)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 EXTRA_DIST += \
 	Makefile.am.marshal	\
 	Makefile.am.enums
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
--- a/clutter/clutter/Makefile.am.enums
+++ b/clutter/clutter/Makefile.am.enums
@@ -1,52 +0,0 @@
 # Rules for generating enumeration types using glib-mkenums
 #
 # Define:
 # 	glib_enum_h = header template file
 # 	glib_enum_c = source template file
 # 	glib_enum_headers = list of headers to parse
 #
 # before including Makefile.am.enums. You will also need to have
 # the following targets already defined:
 #
 # 	CLEANFILES
 #	DISTCLEANFILES
 #	BUILT_SOURCES
 #	EXTRA_DIST
 #
 # Author: Emmanuele Bassi <ebassi@linux.intel.com>
 # Basic sanity checks
 $(if $(GLIB_MKENUMS),,$(error Need to define GLIB_MKENUMS))
 $(if $(or $(glib_enum_h), \
          $(glib_enum_c)),, \
    $(error Need to define glib_enum_h and glib_enum_c))
 $(if $(glib_enum_headers),,$(error Need to define glib_enum_headers))
 enum_tmpl_h=$(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in))
 enum_tmpl_c=$(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in))
 enum_headers=$(addprefix $(srcdir)/, $(glib_enum_headers))
 CLEANFILES += stamp-enum-types
 DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
 BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 stamp-enum-types: $(enum_headers) $(enum_tmpl_h)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_h) \
 	$(enum_headers) > xgen-eh \
 	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
 	&& rm -f xgen-eh \
 	&& echo timestamp > $(@F)
 $(glib_enum_h): stamp-enum-types
 	@true
 $(glib_enum_c): $(enum_headers) $(enum_tmpl_h) $(enum_tmpl_c)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_c) \
 	$(enum_headers) > xgen-ec \
 	&& cp -f xgen-ec $(glib_enum_c) \
 	&& rm -f xgen-ec
--- a/clutter/clutter/Makefile.am.marshal
+++ b/clutter/clutter/Makefile.am.marshal
@@ -1,52 +0,0 @@
 # Rules for generating marshal files using glib-genmarshal
 #
 # Define:
 # 	glib_marshal_list = marshal list file
 # 	glib_marshal_prefix = prefix for marshal functions
 #
 # before including Makefile.am.marshal. You will also need to have
 # the following targets already defined:
 #
 # 	CLEANFILES
 #	DISTCLEANFILES
 #	BUILT_SOURCES
 #	EXTRA_DIST
 #
 # Author: Emmanuele Bassi <ebassi@linux.intel.com>
 # Basic sanity checks
 $(if $(GLIB_GENMARSHAL),,$(error Need to define GLIB_GENMARSHAL))
 $(if $(or $(glib_marshal_list), \
          $(glib_marshal_prefix)),, \
    $(error Need to define glib_marshal_list and glib_marshal_prefix))
 marshal_h = $(glib_marshal_list:.list=.h)
 marshal_c = $(glib_marshal_list:.list=.c)
 marshal_list = $(addprefix $(srcdir)/, $(glib_marshal_list))
 CLEANFILES += stamp-marshal
 DISTCLEANFILES += $(marshal_h) $(marshal_c)
 BUILT_SOURCES += $(marshal_h) $(marshal_c)
 EXTRA_DIST += $(marshal_list)
 stamp-marshal: $(marshal_list)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--header \
 	$(marshal_list) > xgen-mh \
 	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
 	&& rm -f xgen-mh \
 	&& echo timestamp > $(@F)
 $(marshal_h): stamp-marshal
 	@true
 $(marshal_c): $(marshal_h)
 	$(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \
 	$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--body \
 	$(marshal_list)) > xgen-mc \
 	&& cp xgen-mc $(marshal_c) \
 	&& rm -f xgen-mc
--- a/clutter/clutter/cally/ChangeLog.pre-cally-merge
+++ b/clutter/clutter/cally/ChangeLog.pre-cally-merge
@@ -1,986 +0,0 @@
 # DO NOT MODIFY THIS FILE
 #
 # Clutter uses the Git commit log to generate the ChangeLog files when
 # creating the tarball for releases and snapshots. This file is maintained
 # only for historical reasons.
 2010-07-05 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Cleaning ClutterText
  * Removing superfluous g_return_if_fail
  * Removing unused ClutterText::text-changed callback
 2010-07-05 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Refactoring "window:create" and "window:destroy" emission code
 Previously "window:create" and "window:destroy" were emitted on
 CallyUtil. Although it works, and CallyUtil already have callbacks to
 stage_added/removed signals, I think that it is more tidy/clear to do
 that on CallyRoot:
  * CallyRoot already has code to manage ClutterStage addition/removal
  * In fact, we can see CallyRoot as the object exposing the a11y
    information from ClutterStageManager, so it fits better here.
  * CallyUtil callbacks these signals are related to key event
    listeners (key snooper simulation). One of the main CallyUtil
    responsabilities is managing event (connecting, emitting), so I
    would prefer to not start to add/mix more functionalities here.
 Ideally it would be better to emit all CallyStage methods from
 CallyStage, but it is clear that "create" and "destroy" are more easy
 to emit from a external object.
 2010-06-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Cleaning clutter-actor
 Some cleaning changes:
  * Using CallyActionFunc instead of ACTION_FUNC
  * Removing a extra * on cally-actor-private macro documentation, to
    avoid gtk-doc warnings
  * Using g_strcmp0 instead of strcmp
 Changes to be applied on clutter (see CB#2097 and CB#2098), applied
 also here to maintain the sync. My intention is keep this developing line
 until the real integration, in order to make a final independent cally
 release.
 2010-06-14 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Adding -Wshadow option and solving warnings related
 2010-06-14 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added dummy padding for future vt expasion
 Added dummy padding on the different classes structures, to allow
 future expansion of virtual methods.
 I decided to add this on all the classes, although it would be
 really unlikely in some cases (ie, CallyGroup)
 2010-06-10 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Adding and emitting "window:xxx" methods on CallyStage
 Added some window related signals on CallyStage:
  * window:activate and window:deactivate emitted from CallyStage
  * window:create and window:destroy emitted from CallyUtil
 ClutterStage doesn't fulfill 100% the window concept, but some of
 these signals are important in order to identify the object which
 could emit global/key events.
 The current implementation is equivalent to GailWindow one, supposing
 CallyStage as the only window related window. This likely would change
 in any clutter-based toolkit implement a real Window object, so a more
 flexible procedure would be required. But we would solve problems step
 by step.
 BTW: as I explain here [1] I really think that the current way to
 implement "window:xxx" signals (not defined in ATK but expected from
 the a11y implementation toolkit) somewhat hacky and undocumented (you
 need to check at-spi2 idls to know that you require to emit this
 events)
 Related to bug CB#2147 (Orca doesn't speech out properly non
 printable chars on some environments), as solves this problem
 in a specific case.
 [1] https://bugzilla.gnome.org/show_bug.cgi?id=620977#c1
 2010-06-04 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Avoiding clutter_stage_get_key_focus warning
 For any reason, in some cases, a clutter actor doesn't have a stage
 associated. We use the default one as fallback.
 2010-06-02 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added a defunct check on cally_group_get_n_children
 Some warnings appeared when we tried to get the number
 of children of a defunct object.
 2010-06-02 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Update TODO file
 Use Bugzilla to setting missing features.
 2010-06-01 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Removing heuristics to decide CallyRectable/CallyTexture role
 Previously CallyRectangle and CallyTexture used some heuristics in
 order to decide the default role: ATK_ROLE_IMAGE or
 ATK_PUSH_BUTTON, as in practice most applications using these
 objects as buttons were not applying the proper role.
 As this is a hack, and a application responsibility, finally we
 have decided to remove this, so the default role is ATK_ROLE_IMAGE.
 Fixes CB#1732 (CallyTexture and CallyRectangle uses some heuristics to
 decide the role)
 2010-05-28 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Post-release version bump, after release 1.2.0
 I wrongly added the last commit on the 1.1 branch, when in fact it
 requires clutter 1.3.3, and on the README it is explained that
 cally versioning is tied to clutter versioning. In order to solve
 that a clutter-1.2 release branch is created, and bumped the version.
 This versioning tyding will be obsolete when the integration with
 clutter become a reality, but in the same way, this is the way to
 tidy this thinking in this integration.
 2010-04-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Use clutter_actor_get_accessible
 The method clutter_actor_get_accessible was added due work on
 bug 2070, and should be used to get the accessibility object,
 instead of atk_gobject_accessible_for_object
 This would allow to implement a11y support directly on
 any clutter based toolkit object (ie StLabel).
 2010-05-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added CallyClone example
 2010-05-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added a11y support for ClutterClone
 Resolved in the most simplified way, just as a image and a
 default description to identify cloned objects.
 More information:
 http://lists.o-hand.com/clutter/3797.html
 2010-04-14 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Remove gail dependency
 Removed to avoid gdk/gtk dependency on cally.
 Part of bug CB#2072 solution
 2010-04-14 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Avoid gdk functions filling AtkKeyEventStruct
 Now when AtkKeyEventStruct is filled in order to emit any key event
 signal, it is not used any gdk function on the keyval or the
 string fields.
 event_string is filled with the printable character if possible, if
 not (Ctrl, Alt, etc) it is set as NULL.
 Now the AT should take care of that, at least until we define atk key
 event struct in a more agnostic way (not tied to gdk/gtk). See orca
 bug bgo#616206 as a example.
 Part of bug CB#2072 solution.
 2010-04-15 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added gail_misc_layout_get_run_attributes implementation
 Part of bug CB#2072 solution
 2010-04-14 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Remove gailutil/gailmisc functions calls
 This is because gailutil/gailmisc added a gdk/gtk dependency, and
 this dependency is being removed. New cally-specific implementation
 are required.
 Related to bug CB#1733
 Part of bug CB#2072 solution
 2010-04-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Fixing the libdir directory in some examples
 2010-03-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Previous cally.pc.in update was incomplete
 The previous commit was not tested properly, and it was missing one
 detail. Sorry for the noise.
 2010-03-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Update cally.pc.in after module relocation
 Previous commit places cally module in a different directory.
 It also corrects where the include directory is placed.
 2010-03-15 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Use a proper clutter module directory
 Use a proper clutter module directory, instead of keep being
 installed on a gtk directory.
 Improve the cally-examples-util, in order to keep using
 hardcoded values.
 Fixes CB#1737 (Wrong cally module directory)
 2010-03-15 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Proper UTF-8 headers
 2010-02-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Change "--with-dbus" option for "atk-bridge-dir" on examples
 The atk-adaptor in the dbus at-spi was renamed to atk-bridge due
 some apps hardcoding the name. So right now the only difference
 is the final directory.
 So the option was removed, and atk-bridge-dir added. This also allows
 to use the system atk-bridge or the compiled in any developing environment,
 so it is really more flexible.
 See the README (updated with this commit) for more information.
 2010-02-19 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added .gitignore file
 2010-02-19 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Release 1.1.1
 2010-02-19 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Using clutter_threads_idle_add instead of the gdk one
 The idea is being as less gdk dependent as possible. Right now
 it is inviable to remove the dependency (gailutil and so on) but
 hypothetically, the ideal is remove this dependency in the future,
 and being "clutter pure".
 2010-02-15 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Check if the state is defunct on cally_text_get_name
 Check if the state is defunct on cally_text_get_name, in order
 to avoid warnings cally clutter_text_get_text when the clutter
 object is NULL
 2010-01-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Update on configure.ac after autoupdate call
 2010-02-02 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Try to apply the key modifiers to event->keyval like GDK does
 ClutterKeyEvent defines the keyval without taking into account the
 modifiers. GDK defines this keyval taking into account the modifiers.
 AtkKeyEventStruct expects the keyval in a GDK fashion, so a
 translation is required.
 This patch tries to do that using using
 gdk_keymap_translate_keyboard_state.
 This functions only works correctly if gtk has been initialized, so
 the fallback is create the AtkKeyEventStruct with the keyval
 provided by Clutter.
 More information:
 http://library.gnome.org/devel/atk/stable/AtkUtil.html#AtkKeyEventStruct
 http://bugzilla.openedhand.com/show_bug.cgi?id=1961
 2010-02-02 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Filling AtkKeyEventStruct->string used on the atk key event listeners
 Finally we use directly gdk_keyval_name. Not the ideal solution, but works,
 and more important, it avoids to reimplement this issue on clutter or cally.
 More information on Bug 1952
 Fixes http://bugzilla.openedhand.com/show_bug.cgi?id=1952
 2010-01-22 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added AM_PROG_CC_C_O option to avoid a warning running configure
 2010-01-22 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Fix clutter version required on the pc files
 2010-01-22 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Check on configure time if any x11 clutter backend is in use
 It uses AC_CHECK_LIB in order to check if x11 backend is in use.
 It also modifies cally-actor in order to use the information
 retrieved.
 So now cally has a minimum multi-backend support. It only manages
 a x11 (glx or eglx) backend, but at least, it checks it, so you
 can compile cally without this backend. It probably will not work
 properly, but at least you can compile and execute it.
 Solves http://bugzilla.openedhand.com/show_bug.cgi?id=1736
 2010-01-21 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Fix the perspective problems computing the on-screen extensions
 Use clutter_actor_get_abs_allocation_vertices and
 clutter_actor_get_transformed_size to get the real on-screen
 position and size, instead of compute that using the geometry
 and the anchor point.
 It also update cally-atkcomponent-example, adding a actor inside
 a nested ClutterGroup hierarchy.
 Fixes: http://bugzilla.openedhand.com/show_bug.cgi?id=1731
 2010-01-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added extra button on cally-atkeditabletext-example
 Added a button to print the current cursor position, and also
 extend the size of the buttons
 2010-01-12 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Remove superfluous g_print on CallyStage
 2009-12-03 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Use clutter_stage_manager_peek_stages to avoid a leak
 2009-12-03 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added ATK_STATE_SELECTABLE_TEXT management
 2009-11-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Manage properly ATK_STATE_ACTIVE on CallyStage
 * cally/cally-stage.c
 Added private struct
 (cally_stage_class_init),(cally_stage_init),(cally_stage_real_initalize):
 Initialization stuff
 (cally_stage_activate_cb)
 (cally_stage_deactivate_cb): new ClutterStage signal callbacks, change
 the internal value of active, and notify the atk state change
 (cally_stage_ref_state_set): manage ATK_STATE_ACTIVATE
 * examples/cally-atktext-example2.c
 If possible, creates two stage, in order to test ATK_STATE_ACTIVATE
 2009-11-24 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Focused state change and focused object notification
 * cally/cally-actor.h
 (focus_clutter): added virtual method for the focus management
 * cally/cally-actor.c
 (cally_actor_component_interface_init)
 (cally_actor_add_focus_handler)
 (cally_actor_remove_focus_handler):
 Implementation of the AtkComponent methods add_focus_handler and
 remove_focus_handler
 (cally_actor_focus_event): CallyActor specific focus handler, notify
 the state focused change
 (cally_actor_focus_clutter)
 (cally_actor_real_focus_clutter):
 Handlers for the ClutterActor "key-focus-in" and "key-focus-out"
 signals. Emit the signal AtkObject "focus_event" and set the focus
 object with atk_focus_tracker_notify.
 (cally_actor_initialize):
 Connect to the signals "key-focus-in" and "key-focus-out", use
 atk_component_add_focus_handler to add cally_actor_focus_event
 Note: The focus management is more simplified that the gail one. The
 main reason is that the focus management in GTK is really more complex
 that the Clutter one.
 2009-11-24 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Modify cally-atkeditabletext-example.c to manage "activatable" status
 2009-11-24 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added "activate" action in ClutterText
 * cally/cally-actor.h
 * cally/cally-actor.c
 cally_actor_add_action now returns the action id added. Documentation
 added in order to explain the return values and others.
 * cally/cally-text.c
 Added action "activate". This action is only available if the ClutterText is
 activatable, so the "activatable" property is tracked in the notify
 2009-11-20 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Signal event emission
 Emits the signals "text_selection_changed", "text_caret_moved",
 "text_changed::insert", "text_changed::delete", and notify the
 ATK_STATE_EDITABLE state change.
 It also adds the ATK_STATE_EDITABLE in the ref_state_set, includes a
 finalize to clean the new private data used, and move part of the
 initialization from the _init to the _real_initialization.
 2009-12-03 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Remove the ATK_STATE_DEFUNCT emission
 Remove the ATK_STATE_DEFUNCT emission, as this is already made by
 AtkGObjectAccessible.
 It also removes the clutter actor from the private structure, as we
 can use the AtkGObjectAccessible API to obtain it. This makes the code
 more coherent, with respect of the rest of the Cally classes
 implementation.
 2009-11-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Remove ; from the CALLY_GET_CLUTTER_ACTOR macro
 2009-11-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 TODO cleanup and more implementation notes
 * TODO: removed the data that we have in the bugzilla or in the implementation
  notes on the cally source
 * cally/cally-actor.c: complete implementations notes
 * cally/Makefile.am: add a comment related to the public headers, and include
  Makefile.in in the MAINTAINERCLEANFILES
 2009-11-13 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Adding new tips on CODING_STYLE
 2009-11-09 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 AtkEditableText implementation on CallyText
 * examples/Makefile.am
 * examples/cally-atkeditabletext-example.c: New example added
 * cally/cally-text.c
 Interface AtkEditableText implemented, except some methods:
  * Missing ClipBoard feature on Clutter:
      paste_text
      copy_text
      cut_text
  * Missing a equivalent GtkTextTag on Clutter (so the possibility to
    set run attributes in a range):
       set_run_attributes
 Fixes bug CB#1734
 2009-11-03 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Removed DG_DISABLE_CHECKS and DG_DISABLE_CAST_CHECKS from CFLAGS
 * configure.ac: Removed DG_DISABLE_CHECKS and DG_DISABLE_CAST_CHECKS
  from the common CFLAGS options
 * cally/cally-actor.c: fixed cast errors on some return values, not
  detected previously because of the use of relaxed compilation
  options
 Problem detected by Mario Sánchez Prada <msanchez@igalia.com>
 2009-10-28 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Support for multiple stages
 * cally-root.c
 * cally-stage.c
 * cally-util.c
 Implemented the support for multiple stages, by tracking the signals
 stage-added and stage-removed of the ClutterStageManager.
 In the same way CallyRoot has implement properly the atk_object_initialize,
 and in general now is more tied to ClutterStageManager (CallyRoot is now
 the a11y object of ClutterStageManager), but factory not required anyway,
 as it is instanced on the CallyUtil atk_get_root
 Fixes: CB#1754 (Missing multi-stage support)
 2009-10-27 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Implemented atk_[add/remove]_key_event_listener on CallyUtil
 * cally/cally-util.c:
  Implemented atk_[add/remove]_key_event_listener
 * examples/cally-atktext-example2.c:
  Modified in order to install and remove key event listeners,
  for testing purposes
 Fixes CB#1852 (AtkUtil implementation misses
 atk_[add/remove]_key_event_listener)
 2009-10-21 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Implemented atk-[add/remove]-global-event-listener on CallyUtil
 * cally/cally-util.c:
   Implemented atk-[add/remove]-global-event-listener on CallyUtil
 * examples/Makefile.am
 * examples/cally-atktext-example2.c
   New example in order to test easier the event emission on focus
   change (not working right now)
 2009-10-12 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Add --with-dbus option executing the examples
 The replacement for atk-bridge on at-spi-dbus has a different name
 (atk-adaptor), and it has not defined the method gnome_accessibility_init.
 The --with-dbus option allow to load the correct library and use the
 correct hook method if you are using at-spi-dbus.
 Anyway, take into account that this is just an example, and in a final
 environment, this should be made in a more general way.
 More information: CB#1738, CB#1737
 2009-09-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Symplifying shave support.
 2009-09-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Cleanup on the compilation and installation process
 * cally/Makefile.am:
  Added libcallydir and libcally_HEADERS in order to publish all cally
  headers, as the current policy is use the cally headers as public.
 * configure.ac:
  Change API_VERSION_MAJOR for CALLY_API_VERSION, as was the real
  meaning, and define CALLY_VERSION.
  Change CALLY_OBJ_CFLAGS and CALLY_OBJ_LIBS, used to compile the
  tests, as was not required to compile against the cally module (the
  example only required to compile against Clutter, as the cally
  module was just a module loaded by GModule).
  Support for Shave.
 2009-07-31 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Be able to run the examples without installing Cally
 Before that, the examples searched the cally module from the final installed
 directory. This means that you should install the library to use the examples.
 On development this is not desirable. Now it is loaded from ../cally/.libs
 This is a little hackish, but more useful, and in the end, it is just a example.
 Probably a best option could be configure that on the command line.
   $ ./example --cally-dir="mydir"
 But just a nitpick.
 2009-07-29 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Upgrade to cally-1.0, using clutter-1.0
 * NEWS
 * TODO: removed several items, waiting to be moved to the bugzilla
 * configure.ac
 * examples/cally-examples-util.c
 2009-07-27 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Fixed return value of cally_actor_get_index_in_parent
 Bug and solutiond pointed by Gerd Kohlberger
 2009-06-30 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added the implementation of most AtkText methods for CluttetText (CallyText)
 It remains some methods:
  get_default_attributes
  get_character_extents
  get_offset_at_point
 The current gail implementation delegate on gailmisc, but this is tied to
 GtkWidget so an equivalent functionality would be implemented (something like
 callymisc), and in the case of get_character_extents, not sure about the layout
 position (see gtk_entry_get_layout_offsets).
 I think that worth manage this in a different commit.
 In the same way is still missing AtkEditableText support.
 2009-07-07 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Added CALLY_GET_CLUTTER_ACTOR macro
 This macro was created to simplify how do you get the clutter actor object
 related to the cally object. On CallyActor a private attributte maintains it
 (for convenience, as it is heavily used) but outside, atkgobject methods can
 be used. Note that there is a possibility on the future to change it. Two
 options:
  * Add a public method to get the clutter object
  * Use this method on CallyActor too
 This macro simplifies this:
 CLUTTER_ACTOR (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (cally_object)))
 2009-06-24 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Renamed examples/cally-util.[ch] to examples/cally-examples-util.[ch]
 Renamed examples/cally-util.[ch] to examples/cally-examples-util.[ch] to avoid
 confusion with cally/cally-util.[ch], implementation of the AtkUtil interface
 2009-06-23 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Adding examples directory
 * NEWS: Updates
 * configure.ac
 * Makefile.am
 * cally/Makefile.am
 * examples/Makefile.am: New
 * examples/cally-util.[ch]: New
 * examples/example1.c: New
 Added a directory in order to put examples. In this way we don't require any
 external clutter app to make the basic a11y functionality checks. At this
 moment only an example was added, but all the compiling structure is working.
 By default the examples are not compiled, use "--enable-examples" on configure
 time in order to enable their compilation.
 This basic example basically shows several objects, with different depth, in
 order to check that AtkComponent returns the correct screen position.
 Other minor changes done on the building infrastructure.
 2009-06-23 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Fix clutter version required
 2009-06-23 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Solve a problem calling clutter_actor_get_anchor_point
 * cally/cally-actor.c:
 (_get_actor_extents): use gfloat instead of gint, as now this clutter_actor_get_anchor_point
 use floats
 2009-06-11 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Minor fixes
  * Update TODO
  * Fix .pc files, to use clutter-0.9 version
 2009-05-20 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Library renamed from cail to cally
 2009-05-08 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Removed cail-clone-texture.h from cail.h
 * cail/cail.h: Removed reference to cail-clone-texture.h
 2009-05-08 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Upgrade to cail-0.9, using clutter-0.9, first compilable version
 * NEWS: new file with the information of the releases
 * TODO: updated
 * configure.ac: updated clutter version to compile against
 * cail/cail-clone-texture.[ch]: Removed as ClutterCloneTexture was removed on Clutter 0.9.0
 * cail/cail-label.[ch]: Removed as ClutterLabel was removed on Clutter 0.9.0
 * cail/Makefile.am: updated due the source files removed
 * cail/cail-actor.c: removed include to <clutter/clutter-actor.h>
 * cail/cail.c: removed the factories for CailLabel and CailCloneTexture
 2009-05-07 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Reflect change on the version number policy
 * README: correct some typos and explain that the cail version number
 is tied to the clutter version number and how
 * configure.ac
 Set the version number to 0.8.0
 2009-05-07 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Edit the ChangeLog file, to show that now we are using git
 * ChangeLog.SVN: new file, with the ChangeLog used while cail was
 using a Subversion repository
 * ChangeLog: now is empty, and only maintains a reference to use git log
 2009-04-29 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Coding style review
 * CODING_STYLE
 * cail/Makefile.am
 * cail/cail-actor-private.[ch]
 * cail/cail-actor.h
 * cail/cail-clone-texture.[ch]
 * cail/cail-group.[ch]
 * cail/cail-label.[ch]
 * cail/cail-rectangle.[ch]
 * cail/cail-root.[ch]
 * cail/cail-stage.[ch]
 * cail/cail-texture.[ch]
 * cail/cail-util.[ch]
 * cail/cail.c
 2009-04-28 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Coding style review: cail-actor.c
 2009-04-21 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-04-21 Alejandro Pinheiro <apinheiro@igalia.com>
 	* TODO: updated TODO file
 2009-04-21 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-06 Alejandro Pinheiro <apinheiro@igalia.com>
 	* AUTHORS: update authors file to public release
 2009-03-06 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-06 Alejandro Pinheiro <apinheiro@igalia.com>
 	* debian/control
 	Added cdbs dependency, renamed debugging package
 	* debian/libcail-common-dbg.dirs: new file
 	* debian/libcail-common.dirs
 	* debian/libcail-common.install
 	Minor changes
 2009-03-05 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-05 Alejandro Pinheiro <apinheiro@igalia.com>
 	* TODO
 	Added TODO file, in order to list the remaining tasks.
 2009-03-05 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-05 Alejandro Pinheiro <apinheiro@igalia.com>
 	* configure.ac
 	* cail/cail.c
 	* cail/cail-util.c
 	* Makefile.am
 	Removed all the missing gtk related stuff
 2009-03-05 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-05 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor.c
 	(_get_actor_extents): managing too the anchor point to compute the position
 	(_get_top_level_origin): reimplemented using x11 functions, removed
 	gtk/gdk related functions, and taking into account the relative position
 	inside the parent (previous position calculation was wrong if a child
 	was not a direct stage child)
 	* cail/clutter-gtk/cail-clutter-embed.[ch]
 	* cail/clutter-gtk/cail-gtk-factory.h
 	Removed, in order to remove any gtk dependency
 	* cail/debian/control: removed gtk dependency
 2009-03-03 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-03 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor-private.[ch]: new files to private utility functions
 	(_cail_actor_pushable): new function, that checks if a cail actor is
 	pushable by checking if the clutter actor related has a handler for
 	a release event
 	* cail/cail-texture.c
 	* cail/cail-clone-texture.c
 	* cail/cail-rectangle.c
 	Use of new function _cail_actor_pushable
 	* cail-actor.c: Added some documentation related to current implementation
 	* cail-util.c: Code style review
 2009-03-02 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-03-02 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-label.[ch]: new
 	* cail/cail.[ch]
 	(cail_accessibility_module_init)
 	* cail/Makefile.am
 	Added CailLabel, a11y object for ClutterLabel
 2009-02-27 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-27 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor.c
 	(cail_actor_real_remove_actor)
 	Fixed a typo that causes a crash while removing the actor from a
 	container
 2009-02-26 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-26 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor.c
 	(cail_actor_remove_actor)
 	(cail_actor_add_actor)
 	Fixed a typo calling klass->add_actor and klass->remove_actor that causes
 	a crash in some (container,actor) combinations
 	(cail_actor_real_add_actor)
 	Additional parameter check
 2009-02-25 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 Missing cail-rectangle.[ch] files, according 2009-02-23 entry at Changelog
 2009-02-23 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-23 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-rectangle.[ch]
 	* cail/cail.[ch]
 	* cail/Makefile.am
 	Added CailRectangle, a11y object for ClutterRectangle
 	* cail/cail-group.c
 	* cail/cail-texture.c
 	* cail/cail-stage.c
 	Avoid to add a empty private structure, to avoid the glib warning. Anyway
 	the pointer to the private structure is still on the .h, to allow future
 	add-on.
 2009-02-20 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-20 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail-actor.[ch]
 	* cail-group.[ch]
 	Moved most of the ClutterContainer a11y support from cail-group to
 	cail-actor, in order to generalize this support.
 	* cail-stage.[ch]
 	* cail-util.[ch]
 	Normalize the private structure to avoid future problems with missing
 	gaps
 2009-02-20 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-20 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor.c
 	(cail_actor_connect_actor_destroyed): connects to the clutter actor
 	destroy signal
 	(cail_actor_clutter_actor_destroyed): handler to the clutter actor
 	destroy signal, update the priv->actor pointer and notify a state change
 	This change allows to be sure about the priv->actor correct value, so we
 	can use directly priv->actor instead of atk_gobject_accessible_get_object
 	in the next functions:
 	(cail_actor_get_parent)
 	(cail_actor_get_index_in_parent)
 	(cail_actor_ref_state_set)
 	(cail_actor_get_extents)
 2009-02-19 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-19 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-texture.[ch]
 	* cail/cail-clone-texture.[ch]
 	* cail/cail.[ch]
 	* cail/Makefile.am
 	Added CailTexture and CailCloneTexture a11y objects for ClutterTexture
 	and ClutterCloneTexture
 	* cail/cail-util.c
 	Added private structure
 2009-02-18 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-18 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-actor.c:
 	(cail_actor_get_parent)
 	Return the accessible object of the clutter actor if accessible_parent
 	is not available. Previously it only took into account the these object
 	as a possible parent to return (you can set it with atk_object_set_parent)
 2009-02-18 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-18 Alejandro Pinheiro <apinheiro@igalia.com>
 	* cail/cail-group.[ch]: code style review
 	* cail/cail-actor.[ch]: implemented basic support for ClutterContainer
 2009-02-18 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-18 Alejandro Pinheiro <apinheiro@igalia.com>
 	* debian/control: updating dependencies
 2009-02-18 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-18 Alejandro Pinheiro <apinheiro@igalia.com>
 	* configure.ac: added aditional compile flags
 	* cail/cail-actor.[ch]: Reimplemented support for AtkAction interface
 	* cail/cail-root.[ch]: code style review
 2009-02-16 Alejandro Pi<50>eiro <apinheiro@igalia.com>
 2009-02-16 Alejandro Pinheiro <apinheiro@igalia.com>
 	* First release.
--- a/clutter/clutter/cally/cally-actor-private.h
+++ b/clutter/clutter/cally/cally-actor-private.h
@@ -1,42 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Some parts are based on GailWidget from GAIL
 * GAIL - The GNOME Accessibility Implementation Library
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_ACTOR_PRIVATE_H__
 #define __CALLY_ACTOR_PRIVATE_H__
 #include "cally-actor.h"
 /*
 * Auxiliar define, in order to get the clutter actor from the AtkObject using
 * AtkGObject methods
 *
 */
 #define CALLY_GET_CLUTTER_ACTOR(cally_object) \
  (CLUTTER_ACTOR (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (cally_object))))
 void _cally_actor_get_top_level_origin (ClutterActor *actor,
                                        gint         *x,
                                        gint         *y);
 #endif /* __CALLY_ACTOR_PRIVATE_H__ */
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
--- a/clutter/clutter/cally/cally-actor.h
+++ b/clutter/clutter/cally/cally-actor.h
@@ -1,160 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Some parts are based on GailWidget from GAIL
 * GAIL - The GNOME Accessibility Implementation Library
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_ACTOR_H__
 #define __CALLY_ACTOR_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <atk/atk.h>
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_ACTOR            (cally_actor_get_type ())
 #define CALLY_ACTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_ACTOR, CallyActor))
 #define CALLY_ACTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_ACTOR, CallyActorClass))
 #define CALLY_IS_ACTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_ACTOR))
 #define CALLY_IS_ACTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_ACTOR))
 #define CALLY_ACTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_ACTOR, CallyActorClass))
 typedef struct _CallyActor           CallyActor;
 typedef struct _CallyActorClass      CallyActorClass;
 typedef struct _CallyActorPrivate    CallyActorPrivate;
 /**
 * CallyActionFunc:
 * @cally_actor: a #CallyActor
 *
 * Action function, to be used on #AtkAction implementations as a individual
 * action
 *
 * Since: 1.4
 */
 typedef void (* CallyActionFunc) (CallyActor *cally_actor);
 /**
 * CallyActionCallback:
 * @cally_actor: a #CallyActor
 * @user_data: user data passed to the function
 *
 * Action function, to be used on #AtkAction implementations as
 * an individual action. Unlike #CallyActionFunc, this function
 * uses the @user_data argument passed to cally_actor_add_action_full().
 *
 * Since: 1.6
 */
 typedef void (* CallyActionCallback) (CallyActor *cally_actor,
                                      gpointer    user_data);
 /**
 * CallyActor:
 *
 * The <structname>CallyActor</structname> structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyActor
 {
  /*< private >*/
  AtkGObjectAccessible parent;
  CallyActorPrivate *priv;
 };
 /**
 * CallyActorClass:
 * @notify_clutter: Signal handler for notify signal on Clutter actor
 * @focus_clutter: Signal handler for key-focus-in and key-focus-out
 *   signal on Clutter actor. This virtual functions is deprecated.
 * @add_actor: Signal handler for actor-added signal on
 *   ClutterContainer interface
 * @remove_actor: Signal handler for actor-added signal on
 *   ClutterContainer interface
 *
 * The <structname>CallyActorClass</structname> structure contains
 * only private data
 *
 * Since: 1.4
 */
 struct _CallyActorClass
 {
  /*< private >*/
  AtkGObjectAccessibleClass parent_class;
  /*< public >*/
  void     (*notify_clutter) (GObject    *object,
                              GParamSpec *pspec);
  gboolean (*focus_clutter)  (ClutterActor *actor,
                              gpointer      data);
  gint     (*add_actor)      (ClutterActor *container,
                              ClutterActor *actor,
                              gpointer      data);
  gint     (*remove_actor)   (ClutterActor *container,
                              ClutterActor *actor,
                              gpointer      data);
  /*< private >*/
  /* padding for future expansion */
  gpointer _padding_dummy[32];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_actor_get_type              (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_actor_new                   (ClutterActor        *actor);
 CLUTTER_AVAILABLE_IN_1_4
 guint      cally_actor_add_action            (CallyActor          *cally_actor,
                                              const gchar         *action_name,
                                              const gchar         *action_description,
                                              const gchar         *action_keybinding,
                                              CallyActionFunc      action_func);
 CLUTTER_AVAILABLE_IN_1_6
 guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                              const gchar         *action_name,
                                              const gchar         *action_description,
                                              const gchar         *action_keybinding,
                                              CallyActionCallback  callback,
                                              gpointer             user_data,
                                              GDestroyNotify       notify);
 CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action         (CallyActor          *cally_actor,
                                              gint                 action_id);
 CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action_by_name (CallyActor          *cally_actor,
                                              const gchar         *action_name);
 G_END_DECLS
 #endif /* __CALLY_ACTOR_H__ */
--- a/clutter/clutter/cally/cally-clone.c
+++ b/clutter/clutter/cally/cally-clone.c
@@ -1,132 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2010 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-clone
 * @Title: CallyClone
 * @short_description: Implementation of the ATK interfaces for a #ClutterClone
 * @see_also: #ClutterClone
 *
 * #CallyClone implements the required ATK interfaces of #ClutterClone
 *
 * In particular it sets a proper role for the clone, as just a image,
 * as it is the sanest and simplest approach.
 */
 /* Design rationale for CallyClone:
 *
 * In the old times, it was just ClutterCloneTexture. So, from a a11y POV
 * CallyCloneTexture was just another image, like ClutterTexture, and if
 * it was a clone was irrevelant. So on cally-0.8, CallyCloneTexture
 * expose a object with role ATK_ROLE_IMAGE. But now, ClutterClone is more
 * general. You can clone any object, including groups, and made things
 * like have one text entry, and a clone with different properties in the
 * same window, updated both at once.
 *
 * The question is if the idea is have a ClutterClone as a "first-class"
 * citizen inside the stage hierarchy (full clone), or it is just supposed
 * to be a mirror image of the original object.
 *
 * In the case of the a11y POV this would mean that if the text changes on
 * the source, the clone should emit as well the text-changing signals.
 *
 * As ClutterClone smartly just paint the same object with different
 * parameters, this would mean that it should be the cally object the one
 * that should replicate the source clutter hierarchy to do that,
 * something that just sound crazy.
 *
 * Taking into account that:
 *
 * - ClutterClone doesn't re-emit mirrored signals from the source 
 *   I think that likely the answer would be "yes, it is just a
 *   mirrored image, not a real full clone".
 *
 * - You can't interact directly with the clone (ie: focus, and so on).
 *   Its basic usage (right now) is clone textures.
 *
 * Any other solution could be overwhelming.
 *
 * I think that the final solution would be that ClutterClone from the
 * a11y POV should still be managed as a image (with the proper properties,
 * position, size, etc.).
 */
 #include "clutter-build-config.h"
 #include "cally-clone.h"
 #include "cally-actor-private.h"
 /* AtkObject */
 static void                  cally_clone_real_initialize (AtkObject *obj,
                                                          gpointer   data);
 G_DEFINE_TYPE (CallyClone, cally_clone, CALLY_TYPE_ACTOR)
 static void
 cally_clone_class_init (CallyCloneClass *klass)
 {
 /*   GObjectClass   *gobject_class = G_OBJECT_CLASS (klass); */
  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
  class->initialize      = cally_clone_real_initialize;
 }
 static void
 cally_clone_init (CallyClone *clone)
 {
  /* nothing to do yet */
 }
 /**
 * cally_clone_new:
 * @actor: a #ClutterActor
 *
 * Creates a new #CallyClone for the given @actor. @actor must be a
 * #ClutterClone.
 *
 * Return value: the newly created #AtkObject
 *
 * Since: 1.4
 */
 AtkObject*
 cally_clone_new (ClutterActor *actor)
 {
  GObject   *object     = NULL;
  AtkObject *accessible = NULL;
  g_return_val_if_fail (CLUTTER_IS_CLONE (actor), NULL);
  object = g_object_new (CALLY_TYPE_CLONE, NULL);
  accessible = ATK_OBJECT (object);
  atk_object_initialize (accessible, actor);
  return accessible;
 }
 static void
 cally_clone_real_initialize (AtkObject *obj,
                              gpointer   data)
 {
  ATK_OBJECT_CLASS (cally_clone_parent_class)->initialize (obj, data);
  obj->role = ATK_ROLE_IMAGE;
 }
--- a/clutter/clutter/cally/cally-clone.h
+++ b/clutter/clutter/cally/cally-clone.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2010 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_CLONE_H__
 #define __CALLY_CLONE_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <clutter/clutter.h>
 #include <cally/cally-actor.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_CLONE            (cally_clone_get_type ())
 #define CALLY_CLONE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_CLONE, CallyClone))
 #define CALLY_CLONE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_CLONE, CallyCloneClass))
 #define CALLY_IS_CLONE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_CLONE))
 #define CALLY_IS_CLONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_CLONE))
 #define CALLY_CLONE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_CLONE, CallyCloneClass))
 typedef struct _CallyClone        CallyClone;
 typedef struct _CallyCloneClass   CallyCloneClass;
 typedef struct _CallyClonePrivate CallyClonePrivate;
 /**
 * CallyClone:
 *
 * The <structname>CallyClone</structname> structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyClone
 {
  /*< private >*/
  CallyActor parent;
  CallyClonePrivate *priv;
 };
 /**
 * CallyCloneClass:
 *
 * The <structname>CallyCloneClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyCloneClass
 {
  /*< private >*/
  CallyActorClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_clone_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_clone_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_CLONE_H__ */
--- a/clutter/clutter/cally/cally-factory.h
+++ b/clutter/clutter/cally/cally-factory.h
@@ -1,117 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Based on gailfactory.h from GAIL
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 #ifndef _CALLY_FACTORY_H__
 #define _CALLY_FACTORY_H__
 #include <glib-object.h>
 #include <atk/atkobject.h>
 /**
 * CALLY_ACCESSIBLE_FACTORY:
 * @type: GType of the accessible which is created by the factory
 * @type_as_function: prefix of the accessible object methods
 * @opt_create_accessible: method to instantiate the accessibility object
 *
 * Defines a new #AtkObjectFactory factory to create accessible
 * objects of a specific GType. It defines the factory GType and also
 * overrides the proper #AtkObjectFactory methods.
 *
 * It assumes that the accessibility object provides a
 * @opt_create_accessible method in order to create the accessibility
 * object. It returns a @type GType object.
 *
 * Since: 1.4
 */
 #define CALLY_ACCESSIBLE_FACTORY(type, type_as_function, opt_create_accessible)	\
 										\
 static GType									\
 type_as_function ## _factory_get_accessible_type (void)				\
 {										\
  return type;									\
 }										\
 										\
 static AtkObject*								\
 type_as_function ## _factory_create_accessible (GObject *obj)			\
 {										\
  ClutterActor *actor;								\
  AtkObject *accessible;							\
 										\
  g_return_val_if_fail (CLUTTER_ACTOR (obj), NULL);				\
 										\
  actor = CLUTTER_ACTOR (obj);                                                  \
 										\
  accessible = opt_create_accessible (actor);					\
 										\
  return accessible;								\
 }										\
 										\
 static void									\
 type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
 {										\
  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
 }										\
 										\
 static GType									\
 type_as_function ## _factory_get_type (void)					\
 {										\
  static GType t = 0;								\
 										\
  if (!t)									\
  {										\
    char *name;									\
    static const GTypeInfo tinfo =						\
    {										\
      sizeof (AtkObjectFactoryClass),					\
      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
    };										\
 										\
    name = g_strconcat (g_type_name (type), "Factory", NULL);			\
    t = g_type_register_static (						\
 	    ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0);				\
    g_free (name);								\
  }										\
 										\
  return t;									\
 }
 /**
 * CALLY_ACTOR_SET_FACTORY:
 * @widget_type: GType of the clutter actor
 * @type_as_function: prefix of the accessible object methods
 *
 * Sets the #AtkObjectFactory to be used in order to instantiate
 * accessibility objects for the actor which GType is @widget_type.
 *
 * Since: 1.4
 */
 #define CALLY_ACTOR_SET_FACTORY(widget_type, type_as_function)			\
 	atk_registry_set_factory_type (atk_get_default_registry (),		\
 				       widget_type,				\
 				       type_as_function ## _factory_get_type ())
 #endif /* _CALLY_FACTORY_H__ */
--- a/clutter/clutter/cally/cally-group.c
+++ b/clutter/clutter/cally/cally-group.c
@@ -1,147 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Based on GailContainer from GAIL
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-group
 * @Title: CallyGroup
 * @short_description: Implementation of the ATK interfaces for a #ClutterGroup
 * @see_also: #ClutterGroup
 *
 * #CallyGroup implements the required ATK interfaces of #ClutterGroup
 * In particular it exposes each of the Clutter actors contained in the
 * group.
 */
 #include "clutter-build-config.h"
 #include "cally-group.h"
 #include "cally-actor-private.h"
 static gint       cally_group_get_n_children  (AtkObject *obj);
 static AtkObject* cally_group_ref_child       (AtkObject *obj,
                                              gint       i);
 static void       cally_group_real_initialize (AtkObject *obj,
                                              gpointer   data);
 G_DEFINE_TYPE (CallyGroup, cally_group, CALLY_TYPE_ACTOR)
 static void
 cally_group_class_init (CallyGroupClass *klass)
 {
 /*   GObjectClass   *gobject_class = G_OBJECT_CLASS (klass); */
  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
  class->get_n_children = cally_group_get_n_children;
  class->ref_child      = cally_group_ref_child;
  class->initialize     = cally_group_real_initialize;
 }
 static void
 cally_group_init (CallyGroup      *group)
 {
  /* nothing to do yet */
 }
 /**
 * cally_group_new:
 * @actor: a #ClutterGroup
 *
 * Creates a #CallyGroup for @actor
 *
 * Return value: the newly created #CallyGroup
 *
 * Since: 1.4
 */
 AtkObject *
 cally_group_new (ClutterActor *actor)
 {
  GObject   *object     = NULL;
  AtkObject *accessible = NULL;
  g_return_val_if_fail (CLUTTER_IS_GROUP (actor), NULL);
  object = g_object_new (CALLY_TYPE_GROUP, NULL);
  accessible = ATK_OBJECT (object);
  atk_object_initialize (accessible, actor);
  return accessible;
 }
 static gint
 cally_group_get_n_children (AtkObject *obj)
 {
  ClutterActor *actor = NULL;
  gint          count = 0;
  g_return_val_if_fail (CALLY_IS_GROUP (obj), count);
  actor = CALLY_GET_CLUTTER_ACTOR (obj);
  if (actor == NULL) /* defunct */
    return 0;
  g_return_val_if_fail (CLUTTER_IS_GROUP(actor), count);
  count = clutter_actor_get_n_children (actor);
  return count;
 }
 static AtkObject*
 cally_group_ref_child (AtkObject *obj,
                       gint       i)
 {
  AtkObject    *accessible = NULL;
  ClutterActor *actor      = NULL;
  ClutterActor *child      = NULL;
  g_return_val_if_fail (CALLY_IS_GROUP (obj), NULL);
  g_return_val_if_fail ((i >= 0), NULL);
  actor = CALLY_GET_CLUTTER_ACTOR (obj);
  g_return_val_if_fail (CLUTTER_IS_GROUP(actor), NULL);
  child = clutter_actor_get_child_at_index (actor, i);
  if (!child)
    return NULL;
  accessible = clutter_actor_get_accessible (child);
  if (accessible != NULL)
    g_object_ref (accessible);
  return accessible;
 }
 static void
 cally_group_real_initialize (AtkObject *obj,
                            gpointer   data)
 {
  ATK_OBJECT_CLASS (cally_group_parent_class)->initialize (obj, data);
  obj->role = ATK_ROLE_PANEL;
 }
--- a/clutter/clutter/cally/cally-group.h
+++ b/clutter/clutter/cally/cally-group.h
@@ -1,87 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Based on GailContainer from GAIL
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_GROUP_H__
 #define __CALLY_GROUP_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <cally/cally-actor.h>
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_GROUP                         (cally_group_get_type ())
 #define CALLY_GROUP(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_GROUP, CallyGroup))
 #define CALLY_GROUP_CLASS(klass)                 (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_GROUP, CallyGroupClass))
 #define CALLY_IS_GROUP(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_GROUP))
 #define CALLY_IS_GROUP_CLASS(klass)              (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_GROUP))
 #define CALLY_GROUP_GET_CLASS(obj)               (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_GROUP, CallyGroupClass))
 typedef struct _CallyGroup        CallyGroup;
 typedef struct _CallyGroupClass   CallyGroupClass;
 typedef struct _CallyGroupPrivate CallyGroupPrivate;
 /**
 * CallyGroup:
 *
 * The <structname>CallyGroup</structname> structure contains only
 * private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyGroup
 {
  /*< private >*/
  CallyActor parent;
  CallyGroupPrivate *priv;
 };
 /**
 * CallyGroupClass:
 *
 * The <structname>CallyGroupClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyGroupClass
 {
  /*< private >*/
  CallyActorClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_group_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_group_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_GROUP_H__ */
--- a/clutter/clutter/cally/cally-main.h
+++ b/clutter/clutter/cally/cally-main.h
@@ -1,44 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Some parts are based on GailWidget from GAIL
 * GAIL - The GNOME Accessibility Implementation Library
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_MAIN_H__
 #define __CALLY_MAIN_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <glib.h>
 #include <atk/atk.h>
 G_BEGIN_DECLS
 CLUTTER_AVAILABLE_IN_1_4
 gboolean cally_get_cally_initialized (void);
 CLUTTER_AVAILABLE_IN_1_4
 gboolean cally_accessibility_init    (void);
 G_END_DECLS
 #endif /* __CALLY_MAIN_H__ */
--- a/clutter/clutter/cally/cally-rectangle.c
+++ b/clutter/clutter/cally/cally-rectangle.c
@@ -1,98 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-rectangle
 * @short_description: Implementation of the ATK interfaces for a #ClutterRectangle
 * @see_also: #ClutterRectangle
 *
 * #CallyRectangle implements the required ATK interfaces of #ClutterRectangle
 *
 * In particular it sets a proper role for the rectangle.
 */
 #include "clutter-build-config.h"
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "cally-rectangle.h"
 #include "cally-actor-private.h"
 #include "clutter-color.h"
 #include "deprecated/clutter-rectangle.h"
 /* AtkObject */
 static void                  cally_rectangle_real_initialize (AtkObject *obj,
                                                              gpointer   data);
 G_DEFINE_TYPE (CallyRectangle, cally_rectangle, CALLY_TYPE_ACTOR)
 static void
 cally_rectangle_class_init (CallyRectangleClass *klass)
 {
 /*   GObjectClass   *gobject_class = G_OBJECT_CLASS (klass); */
  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
  class->initialize      = cally_rectangle_real_initialize;
 }
 static void
 cally_rectangle_init (CallyRectangle *rectangle)
 {
  /* nothing to do yet */
 }
 /**
 * cally_rectangle_new:
 * @actor: a #ClutterActor
 *
 * Creates a new #CallyRectangle for the given @actor. @actor must be
 * a #ClutterRectangle.
 *
 * Return value: the newly created #AtkObject
 *
 * Since: 1.4
 */
 AtkObject*
 cally_rectangle_new (ClutterActor *actor)
 {
  GObject   *object     = NULL;
  AtkObject *accessible = NULL;
  g_return_val_if_fail (CLUTTER_IS_RECTANGLE (actor), NULL);
  object = g_object_new (CALLY_TYPE_RECTANGLE, NULL);
  accessible = ATK_OBJECT (object);
  atk_object_initialize (accessible, actor);
  return accessible;
 }
 static void
 cally_rectangle_real_initialize (AtkObject *obj,
                                 gpointer   data)
 {
  ATK_OBJECT_CLASS (cally_rectangle_parent_class)->initialize (obj, data);
  obj->role = ATK_ROLE_IMAGE;
 }
--- a/clutter/clutter/cally/cally-rectangle.h
+++ b/clutter/clutter/cally/cally-rectangle.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_RECTANGLE_H__
 #define __CALLY_RECTANGLE_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <cally/cally-actor.h>
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_RECTANGLE            (cally_rectangle_get_type ())
 #define CALLY_RECTANGLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_RECTANGLE, CallyRectangle))
 #define CALLY_RECTANGLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_RECTANGLE, CallyRectangleClass))
 #define CALLY_IS_RECTANGLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_RECTANGLE))
 #define CALLY_IS_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_RECTANGLE))
 #define CALLY_RECTANGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_RECTANGLE, CallyRectangleClass))
 typedef struct _CallyRectangle         CallyRectangle;
 typedef struct _CallyRectangleClass    CallyRectangleClass;
 typedef struct _CallyRectanglePrivate  CallyRectanglePrivate;
 /**
 * CallyRectangle:
 *
 * The <structname>CallyRectangle</structname> structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyRectangle
 {
  /*< private >*/
  CallyActor parent;
  CallyRectanglePrivate *priv;
 };
 /**
 * CallyRectangleClass:
 *
 * The <structname>CallyRectangleClass</structname> structure contains
 * only private data
 *
 * Since: 1.4
 */
 struct _CallyRectangleClass
 {
  /*< private >*/
  CallyActorClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_rectangle_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_rectangle_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_RECTANGLE_H__ */
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@@ -1,294 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-root
 * @short_description: Root object for the Cally toolkit
 * @see_also: #ClutterStage
 *
 * #CallyRoot is the root object of the accessibility tree-like
 * hierarchy, exposing the application level.
 *
 * Somewhat equivalent to #GailTopLevel. We consider that this class
 * expose the a11y information of the #ClutterStageManager, as the
 * children of this object are the different ClutterStage managed (so
 * the #GObject used in the atk_object_initialize() is the
 * #ClutterStageManager).
 */
 #include "clutter-build-config.h"
 #include "cally-root.h"
 #include "clutter-actor.h"
 #include "clutter-stage-private.h"
 #include "clutter-stage-manager.h"
 /* GObject */
 static void cally_root_finalize   (GObject *object);
 /* AtkObject.h */
 static void             cally_root_initialize           (AtkObject *accessible,
                                                         gpointer   data);
 static gint             cally_root_get_n_children       (AtkObject *obj);
 static AtkObject *      cally_root_ref_child            (AtkObject *obj,
                                                         gint i);
 static AtkObject *      cally_root_get_parent           (AtkObject *obj);
 static const char *     cally_root_get_name             (AtkObject *obj);
 /* Private */
 static void             cally_util_stage_added_cb       (ClutterStageManager *stage_manager,
                                                         ClutterStage *stage,
                                                         gpointer data);
 static void             cally_util_stage_removed_cb     (ClutterStageManager *stage_manager,
                                                         ClutterStage *stage,
                                                         gpointer data);
 struct _CallyRootPrivate
 {
 /* We save the CallyStage objects. Other option could save the stage
 * list, and then just get the a11y object on the ref_child, etc. But
 * the ref_child is more common that the init and the stage-add,
 * stage-remove, so we avoid getting the accessible object
 * constantly
 */
  GSList *stage_list;
  /* signals id */
  guint stage_added_id;
  guint stage_removed_id;
 };
 G_DEFINE_TYPE_WITH_PRIVATE (CallyRoot, cally_root,  ATK_TYPE_GOBJECT_ACCESSIBLE)
 static void
 cally_root_class_init (CallyRootClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
  gobject_class->finalize = cally_root_finalize;
  /* AtkObject */
  class->get_n_children = cally_root_get_n_children;
  class->ref_child = cally_root_ref_child;
  class->get_parent = cally_root_get_parent;
  class->initialize = cally_root_initialize;
  class->get_name = cally_root_get_name;
 }
 static void
 cally_root_init (CallyRoot *root)
 {
  root->priv = cally_root_get_instance_private (root);
  root->priv->stage_list = NULL;
  root->priv->stage_added_id = 0;
  root->priv->stage_removed_id = 0;
 }
 /**
 * cally_root_new:
 *
 * Creates a new #CallyRoot object.
 *
 * Return value: the newly created #AtkObject
 *
 * Since: 1.4
 */
 AtkObject*
 cally_root_new (void)
 {
  GObject *object = NULL;
  AtkObject *accessible = NULL;
  ClutterStageManager *stage_manager = NULL;
  object = g_object_new (CALLY_TYPE_ROOT, NULL);
  accessible = ATK_OBJECT (object);
  stage_manager = clutter_stage_manager_get_default ();
  atk_object_initialize (accessible, stage_manager);
  return accessible;
 }
 static void
 cally_root_finalize (GObject *object)
 {
  CallyRoot *root = CALLY_ROOT (object);
  GObject *stage_manager = NULL;
  g_return_if_fail (CALLY_IS_ROOT (object));
  if (root->priv->stage_list)
    {
      g_slist_free (root->priv->stage_list);
      root->priv->stage_list = NULL;
    }
  stage_manager = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (root));
  g_signal_handler_disconnect (stage_manager,
                               root->priv->stage_added_id);
  g_signal_handler_disconnect (stage_manager,
                               root->priv->stage_added_id);
  G_OBJECT_CLASS (cally_root_parent_class)->finalize (object);
 }
 /* AtkObject.h */
 static void
 cally_root_initialize (AtkObject              *accessible,
                       gpointer                data)
 {
  ClutterStageManager *stage_manager = NULL;
  const GSList        *iter          = NULL;
  const GSList        *stage_list    = NULL;
  ClutterStage        *clutter_stage = NULL;
  AtkObject           *cally_stage   = NULL;
  CallyRoot           *root          = NULL;
  accessible->role = ATK_ROLE_APPLICATION;
  accessible->accessible_parent = NULL;
  /* children initialization */
  root = CALLY_ROOT (accessible);
  stage_manager = CLUTTER_STAGE_MANAGER (data);
  stage_list = clutter_stage_manager_peek_stages (stage_manager);
  for (iter = stage_list; iter != NULL; iter = g_slist_next (iter))
    {
      clutter_stage = CLUTTER_STAGE (iter->data);
      cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (clutter_stage));
      atk_object_set_parent (cally_stage, ATK_OBJECT (root));
      root->priv->stage_list = g_slist_append (root->priv->stage_list,
                                               cally_stage);
    }
  root->priv->stage_added_id =
    g_signal_connect (G_OBJECT (stage_manager), "stage-added",
                      G_CALLBACK (cally_util_stage_added_cb), root);
  root->priv->stage_removed_id =
    g_signal_connect (G_OBJECT (stage_manager), "stage-removed",
                      G_CALLBACK (cally_util_stage_removed_cb), root);
  ATK_OBJECT_CLASS (cally_root_parent_class)->initialize (accessible, data);
 }
 static gint
 cally_root_get_n_children (AtkObject *obj)
 {
  CallyRoot *root = CALLY_ROOT (obj);
  return g_slist_length (root->priv->stage_list);
 }
 static AtkObject*
 cally_root_ref_child (AtkObject *obj,
                     gint i)
 {
  CallyRoot *cally_root = NULL;
  GSList *stage_list = NULL;
  gint num = 0;
  AtkObject *item = NULL;
  cally_root = CALLY_ROOT (obj);
  stage_list = cally_root->priv->stage_list;
  num = g_slist_length (stage_list);
  g_return_val_if_fail ((i < num)&&(i >= 0), NULL);
  item = g_slist_nth_data (stage_list, i);
  if (!item)
    {
      return NULL;
    }
  g_object_ref (item);
  return item;
 }
 static AtkObject*
 cally_root_get_parent (AtkObject *obj)
 {
  return NULL;
 }
 static const char *
 cally_root_get_name (AtkObject *obj)
 {
  return g_get_prgname ();
 }
 /* -------------------------------- PRIVATE --------------------------------- */
 static void
 cally_util_stage_added_cb (ClutterStageManager *stage_manager,
                           ClutterStage *stage,
                           gpointer data)
 {
  CallyRoot *root = CALLY_ROOT (data);
  AtkObject *cally_stage = NULL;
  gint index = -1;
  cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
  atk_object_set_parent (cally_stage, ATK_OBJECT (root));
  root->priv->stage_list = g_slist_append (root->priv->stage_list,
                                           cally_stage);
  index = g_slist_index (root->priv->stage_list, cally_stage);
  g_signal_emit_by_name (root, "children_changed::add",
                         index, cally_stage, NULL);
  g_signal_emit_by_name (cally_stage, "create", 0);
 }
 static void
 cally_util_stage_removed_cb (ClutterStageManager *stage_manager,
                             ClutterStage *stage,
                             gpointer data)
 {
  CallyRoot *root = CALLY_ROOT (data);
  AtkObject *cally_stage = NULL;
  gint index = -1;
  cally_stage = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
  index = g_slist_index (root->priv->stage_list, cally_stage);
  root->priv->stage_list = g_slist_remove (root->priv->stage_list,
                                           cally_stage);
  index = g_slist_index (root->priv->stage_list, cally_stage);
  g_signal_emit_by_name (root, "children_changed::remove",
                         index, cally_stage, NULL);
  g_signal_emit_by_name (cally_stage, "destroy", 0);
 }
--- a/clutter/clutter/cally/cally-root.h
+++ b/clutter/clutter/cally/cally-root.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_ROOT_H__
 #define __CALLY_ROOT_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <atk/atk.h>
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_ROOT            (cally_root_get_type ())
 #define CALLY_ROOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_ROOT, CallyRoot))
 #define CALLY_ROOT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_ROOT, CallyRootClass))
 #define CALLY_IS_ROOT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_ROOT))
 #define CALLY_IS_ROOT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_ROOT))
 #define CALLY_ROOT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_ROOT, CallyRootClass))
 typedef struct _CallyRoot        CallyRoot;
 typedef struct _CallyRootClass   CallyRootClass;
 typedef struct _CallyRootPrivate CallyRootPrivate;
 /**
 * CallyRoot:
 *
 * The <structname>CallyRoot</structname> structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyRoot
 {
  /*< private >*/
  AtkGObjectAccessible parent;
  CallyRootPrivate *priv;
 };
 /**
 * CallyRootClass:
 *
 * The <structname>CallyRootClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyRootClass
 {
  /*< private >*/
  AtkGObjectAccessibleClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[16];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_root_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_root_new      (void);
 G_END_DECLS
 #endif /* __CALLY_ROOT_H__ */
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally/cally-stage.c
@@ -1,260 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-stage
 * @Title: CallyStage
 * @short_description: Implementation of the ATK interfaces for a #ClutterStage
 * @see_also: #ClutterStage
 *
 * #CallyStage implements the required ATK interfaces for #ClutterStage
 *
 * Some implementation details: at this moment #CallyStage is used as
 * the most similar Window object in this toolkit (ie: emitting window
 * related signals), although the real purpose of #ClutterStage is
 * being a canvas. Anyway, this is required for applications using
 * just clutter, or directly #ClutterStage
 */
 #include "clutter-build-config.h"
 #include "cally-stage.h"
 #include "cally-actor-private.h"
 /* AtkObject.h */
 static void                  cally_stage_real_initialize (AtkObject *obj,
                                                          gpointer   data);
 static AtkStateSet*          cally_stage_ref_state_set   (AtkObject *obj);
 /* AtkWindow */
 static void                  cally_stage_window_interface_init (AtkWindowIface *iface);
 /* Auxiliar */
 static void                  cally_stage_activate_cb     (ClutterStage *stage,
                                                          gpointer      data);
 static void                  cally_stage_deactivate_cb   (ClutterStage *stage,
                                                          gpointer      data);
 struct _CallyStagePrivate
 {
  /* NULL means that the stage will receive the focus */
  ClutterActor *key_focus;
  gboolean active;
 };
 G_DEFINE_TYPE_WITH_CODE (CallyStage,
                         cally_stage,
                         CALLY_TYPE_GROUP,
                         G_ADD_PRIVATE (CallyStage)
                         G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
                                                cally_stage_window_interface_init));
 static void
 cally_stage_class_init (CallyStageClass *klass)
 {
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
  /* AtkObject */
  class->initialize = cally_stage_real_initialize;
  class->ref_state_set = cally_stage_ref_state_set;
 }
 static void
 cally_stage_init (CallyStage *cally_stage)
 {
  CallyStagePrivate *priv = cally_stage_get_instance_private (cally_stage);
  cally_stage->priv = priv;
  priv->active = FALSE;
 }
 /**
 * cally_stage_new:
 * @actor: a #ClutterActor
 *
 * Creates a new #CallyStage for the given @actor. @actor should be a
 * #ClutterStage.
 *
 * Return value: the newly created #AtkObject
 *
 * Since: 1.4
 */
 AtkObject*
 cally_stage_new (ClutterActor *actor)
 {
  GObject   *object     = NULL;
  AtkObject *accessible = NULL;
  g_return_val_if_fail (CLUTTER_IS_STAGE (actor), NULL);
  object = g_object_new (CALLY_TYPE_STAGE, NULL);
  accessible = ATK_OBJECT (object);
  atk_object_initialize (accessible, actor);
  return accessible;
 }
 static void
 cally_stage_notify_key_focus_cb (ClutterStage *stage,
                                 GParamSpec   *pspec,
                                 CallyStage   *self)
 {
  ClutterActor *key_focus = NULL;
  AtkObject *new = NULL;
  if (self->priv->active == FALSE)
    return;
  key_focus = clutter_stage_get_key_focus (stage);
  if (key_focus != self->priv->key_focus)
    {
      AtkObject *old = NULL;
      if (self->priv->key_focus != NULL)
        {
          g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus),
                                        (gpointer *) &self->priv->key_focus);
          old = clutter_actor_get_accessible (self->priv->key_focus);
        }
      else
        old = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
      atk_object_notify_state_change (old,
                                      ATK_STATE_FOCUSED,
                                      FALSE);
    }
  /* we keep notifying the focus gain without checking previous
   * key-focus to avoid some missing events due timing
   */
  self->priv->key_focus = key_focus;
  if (key_focus != NULL)
    {
      /* ensure that if the key focus goes away, the field inside
       * CallyStage is reset. see bug:
       *
       * https://bugzilla.gnome.org/show_bug.cgi?id=692706
       *
       * we remove the weak pointer above.
       */
      g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus),
                                 (gpointer *) &self->priv->key_focus);
      new = clutter_actor_get_accessible (key_focus);
    }
  else
    new = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
  atk_object_notify_state_change (new,
                                  ATK_STATE_FOCUSED,
                                  TRUE);
 }
 static void
 cally_stage_real_initialize (AtkObject *obj,
                             gpointer  data)
 {
  ClutterStage *stage = NULL;
  g_return_if_fail (CALLY_IS_STAGE (obj));
  ATK_OBJECT_CLASS (cally_stage_parent_class)->initialize (obj, data);
  stage = CLUTTER_STAGE (CALLY_GET_CLUTTER_ACTOR (obj));
  g_signal_connect (stage, "activate", G_CALLBACK (cally_stage_activate_cb), obj);
  g_signal_connect (stage, "deactivate", G_CALLBACK (cally_stage_deactivate_cb), obj);
  g_signal_connect (stage, "notify::key-focus",
                    G_CALLBACK (cally_stage_notify_key_focus_cb), obj);
  atk_object_set_role (obj, ATK_ROLE_WINDOW);
 }
 static AtkStateSet*
 cally_stage_ref_state_set   (AtkObject *obj)
 {
  CallyStage   *cally_stage = NULL;
  AtkStateSet  *state_set   = NULL;
  ClutterStage *stage       = NULL;
  g_return_val_if_fail (CALLY_IS_STAGE (obj), NULL);
  cally_stage = CALLY_STAGE (obj);
  state_set = ATK_OBJECT_CLASS (cally_stage_parent_class)->ref_state_set (obj);
  stage = CLUTTER_STAGE (CALLY_GET_CLUTTER_ACTOR (cally_stage));
  if (stage == NULL)
    return state_set;
  if (cally_stage->priv->active)
    atk_state_set_add_state (state_set, ATK_STATE_ACTIVE);
  return state_set;
 }
 /* AtkWindow */
 static void
 cally_stage_window_interface_init (AtkWindowIface *iface)
 {
  /* At this moment AtkWindow is just about signals */
 }
 /* Auxiliar */
 static void
 cally_stage_activate_cb     (ClutterStage *stage,
                             gpointer      data)
 {
  CallyStage *cally_stage = NULL;
  g_return_if_fail (CALLY_IS_STAGE (data));
  cally_stage = CALLY_STAGE (data);
  cally_stage->priv->active = TRUE;
  atk_object_notify_state_change (ATK_OBJECT (cally_stage),
                                  ATK_STATE_ACTIVE, TRUE);
  g_signal_emit_by_name (cally_stage, "activate", 0);
 }
 static void
 cally_stage_deactivate_cb   (ClutterStage *stage,
                             gpointer      data)
 {
  CallyStage *cally_stage = NULL;
  g_return_if_fail (CALLY_IS_STAGE (data));
  cally_stage = CALLY_STAGE (data);
  cally_stage->priv->active = FALSE;
  atk_object_notify_state_change (ATK_OBJECT (cally_stage),
                                  ATK_STATE_ACTIVE, FALSE);
  g_signal_emit_by_name (cally_stage, "deactivate", 0);
 }
--- a/clutter/clutter/cally/cally-stage.h
+++ b/clutter/clutter/cally/cally-stage.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_STAGE_H__
 #define __CALLY_STAGE_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <cally/cally-group.h>
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_STAGE            (cally_stage_get_type ())
 #define CALLY_STAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_STAGE, CallyStage))
 #define CALLY_STAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_STAGE, CallyStageClass))
 #define CALLY_IS_STAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_STAGE))
 #define CALLY_IS_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_STAGE))
 #define CALLY_STAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_STAGE, CallyStageClass))
 typedef struct _CallyStage        CallyStage;
 typedef struct _CallyStageClass   CallyStageClass;
 typedef struct _CallyStagePrivate CallyStagePrivate;
 /**
 * CallyStage:
 *
 * The <structname>CallyStage</structname> structure contains only
 * private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyStage
 {
  /*< private >*/
  CallyGroup parent;
  CallyStagePrivate *priv;
 };
 /**
 * CallyStageClass:
 *
 * The <structname>CallyStageClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyStageClass
 {
  /*< private >*/
  CallyGroupClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[16];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_stage_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_stage_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_STAGE_H__ */
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
--- a/clutter/clutter/cally/cally-text.h
+++ b/clutter/clutter/cally/cally-text.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_TEXT_H__
 #define __CALLY_TEXT_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <clutter/clutter.h>
 #include <cally/cally-actor.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_TEXT                 (cally_text_get_type ())
 #define CALLY_TEXT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXT, CallyText))
 #define CALLY_TEXT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXT, CallyTextClass))
 #define CALLY_IS_TEXT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXT))
 #define CALLY_IS_TEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXT))
 #define CALLY_TEXT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXT, CallyTextClass))
 typedef struct _CallyText               CallyText;
 typedef struct _CallyTextClass          CallyTextClass;
 typedef struct _CallyTextPrivate        CallyTextPrivate;
 /**
 * CallyText:
 *
 * The <structname>CallyText</structname> structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyText
 {
  /*< private >*/
  CallyActor parent;
  CallyTextPrivate *priv;
 };
 /**
 * CallyTextClass:
 *
 * The <structname>CallyTextClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyTextClass
 {
  /*< private >*/
  CallyActorClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_text_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_text_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_TEXT_H__ */
--- a/clutter/clutter/cally/cally-texture.c
+++ b/clutter/clutter/cally/cally-texture.c
@@ -1,98 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-texture
 * @Title: CallyTexture
 * @short_description: Implementation of the ATK interfaces for a #ClutterTexture
 * @see_also: #ClutterTexture
 *
 * #CallyTexture implements the required ATK interfaces of #ClutterTexture
 *
 * In particular it sets a proper role for the texture.
 */
 #include "clutter-build-config.h"
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "cally-texture.h"
 #include "cally-actor-private.h"
 #include "deprecated/clutter-texture.h"
 /* AtkObject */
 static void                  cally_texture_real_initialize (AtkObject *obj,
                                                           gpointer   data);
 G_DEFINE_TYPE (CallyTexture, cally_texture, CALLY_TYPE_ACTOR)
 static void
 cally_texture_class_init (CallyTextureClass *klass)
 {
 /*   GObjectClass   *gobject_class = G_OBJECT_CLASS (klass); */
  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
  class->initialize      = cally_texture_real_initialize;
 }
 static void
 cally_texture_init (CallyTexture *texture)
 {
  /* nothing to do yet */
 }
 /**
 * cally_texture_new:
 * @actor: a #ClutterActor
 *
 * Creates a new #CallyTexture for the given @actor. @actor must be
 * a #ClutterTexture.
 *
 * Return value: the newly created #AtkObject
 *
 * Since: 1.4
 */
 AtkObject*
 cally_texture_new (ClutterActor *actor)
 {
  GObject   *object     = NULL;
  AtkObject *accessible = NULL;
  g_return_val_if_fail (CLUTTER_IS_TEXTURE (actor), NULL);
  object = g_object_new (CALLY_TYPE_TEXTURE, NULL);
  accessible = ATK_OBJECT (object);
  atk_object_initialize (accessible, actor);
  return accessible;
 }
 static void
 cally_texture_real_initialize (AtkObject *obj,
                              gpointer   data)
 {
  ATK_OBJECT_CLASS (cally_texture_parent_class)->initialize (obj, data);
  /* default role */
  obj->role = ATK_ROLE_IMAGE;
 }
--- a/clutter/clutter/cally/cally-texture.h
+++ b/clutter/clutter/cally/cally-texture.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2009 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_TEXTURE_H__
 #define __CALLY_TEXTURE_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <clutter/clutter.h>
 #include <cally/cally-actor.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_TEXTURE            (cally_texture_get_type ())
 #define CALLY_TEXTURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXTURE, CallyTexture))
 #define CALLY_TEXTURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXTURE, CallyTextureClass))
 #define CALLY_IS_TEXTURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXTURE))
 #define CALLY_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXTURE))
 #define CALLY_TEXTURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXTURE, CallyTextureClass))
 typedef struct _CallyTexture        CallyTexture;
 typedef struct _CallyTextureClass   CallyTextureClass;
 typedef struct _CallyTexturePrivate CallyTexturePrivate;
 /**
 * CallyTexture:
 *
 * The <structname>CallyTexture</structname> structure contains only
 * private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyTexture
 {
  /*< private >*/
  CallyActor parent;
  CallyTexturePrivate *priv;
 };
 /**
 * CallyTextureClass:
 *
 * The <structname>CallyTextureClass</structname> structure contains
 * only private data
 *
 * Since: 1.4
 */
 struct _CallyTextureClass
 {
  /*< private >*/
  CallyActorClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType      cally_texture_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_texture_new      (ClutterActor *actor);
 G_END_DECLS
 #endif /* __CALLY_TEXTURE_H__ */
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -1,452 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * Based on GailUtil from GAIL
 * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally-util
 * @Title: CallyUtil
 * @short_description: #AtkUtil implementation
 * @see_also: #ClutterActor
 *
 * #CallyUtil implements #AtkUtil abstract methods. Although it
 * includes the name "Util" it is in fact one of the most important
 * interfaces to be implemented in any ATK toolkit implementation.
 * For instance, it defines atk_get_root(), the method that returns
 * the root object in the hierarchy. Without it, you don't have
 * available any accessible object.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <clutter/clutter.h>
 #include "cally-util.h"
 #include "cally-root.h"
 #include "cally-stage.h"
 #define DEFAULT_PASSWORD_CHAR '*'
 /* atkutil.h */
 static guint                 cally_util_add_key_event_listener	    (AtkKeySnoopFunc listener,
                                                                     gpointer        data);
 static void                  cally_util_remove_key_event_listener    (guint remove_listener);
 static AtkObject*            cally_util_get_root			    (void);
 static const gchar *         cally_util_get_toolkit_name		    (void);
 static const gchar *         cally_util_get_toolkit_version          (void);
 /* private */
 static void                  cally_util_simulate_snooper_install     (void);
 static void                  cally_util_simulate_snooper_remove      (void);
 static gboolean              cally_key_snooper                       (ClutterActor *actor,
                                                                      ClutterEvent *event,
                                                                      gpointer      user_data);
 static void                  cally_util_stage_added_cb               (ClutterStageManager *stage_manager,
                                                                      ClutterStage *stage,
                                                                      gpointer data);
 static void                  cally_util_stage_removed_cb             (ClutterStageManager *stage_manager,
                                                                      ClutterStage *stage,
                                                                      gpointer data);
 static gboolean              notify_hf                               (gpointer key,
                                                                      gpointer value,
                                                                      gpointer data);
 static void                  insert_hf                               (gpointer key,
                                                                      gpointer value,
                                                                      gpointer data);
 /* This is just a copy of the Gail one, a shared library or place to
   define it could be a good idea. */
 typedef struct _CallyKeyEventInfo CallyKeyEventInfo;
 struct _CallyKeyEventInfo
 {
  AtkKeySnoopFunc listener;
  gpointer func_data;
 };
 static AtkObject* root = NULL;
 static GHashTable *key_listener_list = NULL;
 G_DEFINE_TYPE (CallyUtil, cally_util, ATK_TYPE_UTIL);
 static void
 cally_util_class_init (CallyUtilClass *klass)
 {
  AtkUtilClass *atk_class;
  gpointer data;
  data = g_type_class_peek (ATK_TYPE_UTIL);
  atk_class = ATK_UTIL_CLASS (data);
  atk_class->add_key_event_listener       = cally_util_add_key_event_listener;
  atk_class->remove_key_event_listener    = cally_util_remove_key_event_listener;
  atk_class->get_root                     = cally_util_get_root;
  atk_class->get_toolkit_name             = cally_util_get_toolkit_name;
  atk_class->get_toolkit_version          = cally_util_get_toolkit_version;
  /* FIXME: Instead of create this on the class, I think that would
     worth to implement CallyUtil as a singleton instance, so the
     class methods will access this instance. This will be a good
     future enhancement, meanwhile, just using the same *working*
     implementation used on GailUtil */
 }
 static void
 cally_util_init (CallyUtil *cally_util)
 {
  /* instance init: usually not required */
 }
 /* ------------------------------ ATK UTIL METHODS -------------------------- */
 static AtkObject*
 cally_util_get_root (void)
 {
  if (!root)
    root = cally_root_new ();
  return root;
 }
 static const gchar *
 cally_util_get_toolkit_name (void)
 {
  return "clutter";
 }
 static const gchar *
 cally_util_get_toolkit_version (void)
 {
  return CLUTTER_VERSION_S;
 }
 static guint
 cally_util_add_key_event_listener (AtkKeySnoopFunc  listener,
                                   gpointer         data)
 {
  static guint key = 1;
  CallyKeyEventInfo *event_info = NULL;
  if (!key_listener_list)
  {
    key_listener_list = g_hash_table_new_full (NULL, NULL, NULL, g_free);
    cally_util_simulate_snooper_install ();
  }
  event_info = g_new (CallyKeyEventInfo, 1);
  event_info->listener = listener;
  event_info->func_data = data;
  g_hash_table_insert (key_listener_list, GUINT_TO_POINTER (key++), event_info);
  /* XXX: we don't check to see if n_listeners > MAXUINT */
  return key - 1;
 }
 static void
 cally_util_remove_key_event_listener (guint remove_listener)
 {
  if (!g_hash_table_remove (key_listener_list, GUINT_TO_POINTER (remove_listener))) {
    g_warning ("Not able to remove listener with id %i", remove_listener);
  }
  if (g_hash_table_size (key_listener_list) == 0)
    {
      g_hash_table_destroy (key_listener_list);
      key_listener_list = NULL;
      cally_util_simulate_snooper_remove ();
    }
 }
 /* ------------------------------ PRIVATE FUNCTIONS ------------------------- */
 /* Trying to emulate gtk_key_snooper install (a kind of wrapper). This
   could be implemented without it, but I will maintain it in this
   way, so if in the future clutter implements it natively it would be
   easier the transition */
 static void
 cally_util_simulate_snooper_install (void)
 {
  ClutterStageManager *stage_manager = NULL;
  ClutterStage *stage = NULL;
  GSList *stage_list = NULL;
  GSList *iter = NULL;
  stage_manager = clutter_stage_manager_get_default ();
  stage_list = clutter_stage_manager_list_stages (stage_manager);
  for (iter = stage_list; iter != NULL; iter = g_slist_next (iter))
    {
      stage = CLUTTER_STAGE (iter->data);
      g_signal_connect (G_OBJECT (stage), "captured-event",
                        G_CALLBACK (cally_key_snooper), NULL);
    }
  g_signal_connect (G_OBJECT (stage_manager), "stage-added",
                    G_CALLBACK (cally_util_stage_added_cb), cally_key_snooper);
  g_signal_connect (G_OBJECT (stage_manager), "stage-removed",
                    G_CALLBACK (cally_util_stage_removed_cb), cally_key_snooper);
 }
 static void
 cally_util_simulate_snooper_remove (void)
 {
  ClutterStageManager *stage_manager = NULL;
  ClutterStage *stage = NULL;
  GSList *stage_list = NULL;
  GSList *iter = NULL;
  gint num = 0;
  stage_manager = clutter_stage_manager_get_default ();
  stage_list = clutter_stage_manager_list_stages (stage_manager);
  for (iter = stage_list; iter != NULL; iter = g_slist_next (iter))
    {
      stage = CLUTTER_STAGE (iter->data);
      num += g_signal_handlers_disconnect_by_func (stage, cally_key_snooper, NULL);
    }
  g_signal_handlers_disconnect_by_func (G_OBJECT (stage_manager),
                                        G_CALLBACK (cally_util_stage_added_cb),
                                        cally_key_snooper);
  g_signal_handlers_disconnect_by_func (G_OBJECT (stage_manager),
                                        G_CALLBACK (cally_util_stage_removed_cb),
                                        cally_key_snooper);
 #ifdef CALLY_DEBUG
  g_print ("Number of snooper callbacks disconnected: %i\n", num);
 #endif
 }
 static AtkKeyEventStruct *
 atk_key_event_from_clutter_event_key (ClutterKeyEvent *clutter_event,
                                      gunichar         password_char)
 {
  AtkKeyEventStruct *atk_event = g_new0 (AtkKeyEventStruct, 1);
  gunichar key_unichar;
  switch (clutter_event->type)
    {
    case CLUTTER_KEY_PRESS:
      atk_event->type = ATK_KEY_EVENT_PRESS;
      break;
    case CLUTTER_KEY_RELEASE:
      atk_event->type = ATK_KEY_EVENT_RELEASE;
      break;
    default:
      g_assert_not_reached ();
      return NULL;
    }
  if (password_char)
    atk_event->state = 0;
  else
    atk_event->state = clutter_event->modifier_state;
  /* We emit the clutter keyval. This is not exactly the one expected
     by AtkKeyEventStruct, as it expects a Gdk-like event, with the
     modifiers applied. But to avoid a dependency to gdk, we delegate
     that on the AT application.
     More information: Bug 1952 and bug 2072
  */
  if (password_char)
    atk_event->keyval = clutter_unicode_to_keysym (password_char);
  else
    atk_event->keyval = clutter_event->keyval;
  /* It is expected to store a key defining string here (ie "Space" in
     case you press a space). Anyway, there are no function on clutter
     to obtain that, and we want to avoid a gdk dependency here, so we
     delegate on the AT application to obtain that string using the
     rest of the data on the ATK event struct.
     More information: Bug 1952 and 2072
  */
  if (password_char)
    key_unichar = password_char;
  else
    key_unichar = clutter_event_get_key_unicode ((ClutterEvent *) clutter_event);
  if (g_unichar_validate (key_unichar) && !g_unichar_iscntrl (key_unichar))
    {
      GString *new = NULL;
      new = g_string_new ("");
      new = g_string_insert_unichar (new, 0, key_unichar);
      atk_event->string = new->str;
      g_string_free (new, FALSE);
    }
  else
    atk_event->string = NULL;
  atk_event->length = 0;
  /* Computing the hardware keycode from the password-char is
     difficult. But we are in a password situation. We are already a
     unichar that it is not the original one. Providing a "almost
     real" keycode is irrelevant */
  if (password_char)
    atk_event->keycode = 0;
  else
    atk_event->keycode = clutter_event->hardware_keycode;
  atk_event->timestamp = clutter_event->time;
 #ifdef CALLY_DEBUG
  g_debug ("CallyKeyEvent:\tsym 0x%x\n\t\tmods %x\n\t\tcode %u\n\t\ttime %lx \n\t\tstring %s\n",
 	   (unsigned int) atk_event->keyval,
 	   (unsigned int) atk_event->state,
 	   (unsigned int) atk_event->keycode,
 	   (unsigned long int) atk_event->timestamp,
           atk_event->string);
 #endif
  return atk_event;
 }
 static gboolean
 notify_hf (gpointer key, gpointer value, gpointer data)
 {
  CallyKeyEventInfo *info = (CallyKeyEventInfo *) value;
  AtkKeyEventStruct *key_event = (AtkKeyEventStruct *)data;
  return (*(AtkKeySnoopFunc) info->listener) (key_event, info->func_data) ? TRUE : FALSE;
 }
 static void
 insert_hf (gpointer key, gpointer value, gpointer data)
 {
  GHashTable *new_table = (GHashTable *) data;
  g_hash_table_insert (new_table, key, value);
 }
 /*
 * 0 if the key of that event is visible, in other case the password
 * char
 */
 static gunichar
 check_key_visibility (ClutterEvent *event)
 {
  ClutterKeyEvent *key_event = (ClutterKeyEvent *)event;
  AtkObject *accessible = clutter_actor_get_accessible (key_event->source);
  g_return_val_if_fail (accessible != NULL, 0);
  if (atk_object_get_role (accessible) != ATK_ROLE_PASSWORD_TEXT)
    return 0;
  /* If it is a clutter text, we use his password char.  Note that
     although at Clutter toolkit itself, only ClutterText exposes a
     password role, nothing prevents on any derived toolkit (like st)
     to create a new actor that can behave like a password entry. And
     the key event will still be emitted here. Although in that case
     we would lose any password char from the derived toolkit, it is
     still better fill this with a default unichar that the original
     one */
  if (CLUTTER_IS_TEXT (key_event->source))
    return clutter_text_get_password_char (CLUTTER_TEXT (key_event->source));
  else
    return DEFAULT_PASSWORD_CHAR;
 }
 static gboolean
 cally_key_snooper (ClutterActor *actor,
                   ClutterEvent *event,
                   gpointer      user_data)
 {
  AtkKeyEventStruct *key_event = NULL;
  gint consumed = 0;
  gunichar password_char = 0;
  /* filter key events */
  if ((event->type != CLUTTER_KEY_PRESS) && (event->type != CLUTTER_KEY_RELEASE))
    {
      return FALSE;
    }
  password_char = check_key_visibility (event);
  if (key_listener_list)
    {
      GHashTable *new_hash = g_hash_table_new (NULL, NULL);
      g_hash_table_foreach (key_listener_list, insert_hf, new_hash);
      key_event = atk_key_event_from_clutter_event_key ((ClutterKeyEvent *)event,
                                                        password_char);
      /* func data is inside the hash table */
      consumed = g_hash_table_foreach_steal (new_hash, notify_hf, key_event);
      g_hash_table_destroy (new_hash);
      g_free (key_event->string);
      g_free (key_event);
    }
  return (consumed ? 1 : 0);
 }
 static void
 cally_util_stage_added_cb (ClutterStageManager *stage_manager,
                           ClutterStage *stage,
                           gpointer data)
 {
  GCallback cally_key_snooper_cb = G_CALLBACK (data);
  g_signal_connect (G_OBJECT (stage), "captured-event", cally_key_snooper_cb, NULL);
 }
 static void
 cally_util_stage_removed_cb (ClutterStageManager *stage_manager,
                             ClutterStage *stage,
                             gpointer data)
 {
  GCallback cally_key_snooper_cb = G_CALLBACK (data);
  g_signal_handlers_disconnect_by_func (stage, cally_key_snooper_cb, NULL);
 }
 void
 _cally_util_override_atk_util (void)
 {
  AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL));
  atk_class->add_key_event_listener = cally_util_add_key_event_listener;
  atk_class->remove_key_event_listener = cally_util_remove_key_event_listener;
  atk_class->get_root = cally_util_get_root;
  atk_class->get_toolkit_name = cally_util_get_toolkit_name;
  atk_class->get_toolkit_version = cally_util_get_toolkit_version;
 }
--- a/clutter/clutter/cally/cally-util.h
+++ b/clutter/clutter/cally/cally-util.h
@@ -1,84 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_UTIL_H__
 #define __CALLY_UTIL_H__
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 #include <clutter/clutter.h>
 #include <atk/atk.h>
 G_BEGIN_DECLS
 #define CALLY_TYPE_UTIL            (cally_util_get_type ())
 #define CALLY_UTIL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_UTIL, CallyUtil))
 #define CALLY_UTIL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_UTIL, CallyUtilClass))
 #define CALLY_IS_UTIL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_UTIL))
 #define CALLY_IS_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_UTIL))
 #define CALLY_UTIL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_UTIL, CallyUtilClass))
 typedef struct _CallyUtil        CallyUtil;
 typedef struct _CallyUtilClass   CallyUtilClass;
 typedef struct _CallyUtilPrivate CallyUtilPrivate;
 /**
 * CallyUtil:
 *
 * The <structname>CallyUtil</structname> structure contains only
 * private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _CallyUtil
 {
  /*< private >*/
  AtkUtil parent;
  CallyUtilPrivate *priv;
 };
 /**
 * CallyUtilClass:
 *
 * The <structname>CallyUtilClass</structname> structure contains only
 * private data
 *
 * Since: 1.4
 */
 struct _CallyUtilClass
 {
  /*< private >*/
  AtkUtilClass parent_class;
  /* padding for future expansion */
  gpointer _padding_dummy[8];
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType cally_util_get_type (void) G_GNUC_CONST;
 void _cally_util_override_atk_util (void);
 G_END_DECLS
 #endif /* __CALLY_UTIL_H__ */
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -1,108 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
 /**
 * SECTION:cally
 * @Title: Cally
 * @short_description: Cally initialization methods.
 *
 * Cally initialization methods.
 *
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #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"
 #include "cally-util.h"
 #include "clutter.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 /* 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)
 /**
 * cally_accessibility_init:
 *
 * Initializes the accessibility support.
 *
 * Return value: %TRUE if accessibility support has been correctly
 * initialized.
 *
 * Since: 1.4
 */
 gboolean
 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 */
  _cally_util_override_atk_util ();
  CLUTTER_NOTE (MISC, "Clutter Accessibility initialized");
  return TRUE;
 }
 /**
 * cally_get_cally_initialized:
 *
 * Returns if the accessibility support using cally is enabled.
 *
 * Return value: %TRUE if accessibility support has been correctly
 * initialized.
 *
 * Since: 1.4
 */
 gboolean cally_get_cally_initialized (void)
 {
  return !g_strcmp0 (atk_get_toolkit_name (), "clutter");
 }
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -1,40 +0,0 @@
 /* CALLY - The Clutter Accessibility Implementation Library
 *
 * Copyright (C) 2008 Igalia, S.L.
 *
 * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CALLY_H__
 #define __CALLY_H__
 #define __CALLY_H_INSIDE__
 #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"
 #include "cally-texture.h"
 #include "cally-util.h"
 #undef __CALLY_H_INSIDE__
 #endif /* __CALLY_H__ */
--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@@ -1,63 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-action
 * @Title: ClutterAction
 * @Short_Description: Abstract class for event-related logic
 * @See_Also: #ClutterConstraint
 *
 * #ClutterAction is an abstract base class for event-related actions that
 * modify the user interaction of a #ClutterActor, just like
 * #ClutterConstraint is an abstract class for modifiers of an actor's
 * position or size.
 *
 * Implementations of #ClutterAction are associated to an actor and can
 * provide behavioral changes when dealing with user input - for instance
 * drag and drop capabilities, or scrolling, or panning - by using the
 * various event-related signals provided by #ClutterActor itself.
 *
 * #ClutterAction is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-action.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 G_DEFINE_ABSTRACT_TYPE (ClutterAction, clutter_action, CLUTTER_TYPE_ACTOR_META);
 static void
 clutter_action_class_init (ClutterActionClass *klass)
 {
 }
 static void
 clutter_action_init (ClutterAction *self)
 {
 }
--- a/clutter/clutter/clutter-action.h
+++ b/clutter/clutter/clutter-action.h
@@ -1,111 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_ACTION_H__
 #define __CLUTTER_ACTION_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-actor-meta.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_ACTION             (clutter_action_get_type ())
 #define CLUTTER_ACTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTION, ClutterAction))
 #define CLUTTER_IS_ACTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ACTION))
 #define CLUTTER_ACTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_ACTION, ClutterActionClass))
 #define CLUTTER_IS_ACTION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ACTION))
 #define CLUTTER_ACTION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ACTION, ClutterActionClass))
 typedef struct _ClutterActionClass      ClutterActionClass;
 /**
 * ClutterAction:
 *
 * The #ClutterAction structure contains only private data and
 * should be accessed using the provided API.
 *
 * Since: 1.4
 */
 struct _ClutterAction
 {
  /*< private >*/
  ClutterActorMeta parent_instance;
 };
 /**
 * ClutterActionClass:
 *
 * The ClutterActionClass structure contains only private data
 *
 * Since: 1.4
 */
 struct _ClutterActionClass
 {
  /*< private >*/
  ClutterActorMetaClass parent_class;
  void (* _clutter_action1) (void);
  void (* _clutter_action2) (void);
  void (* _clutter_action3) (void);
  void (* _clutter_action4) (void);
  void (* _clutter_action5) (void);
  void (* _clutter_action6) (void);
  void (* _clutter_action7) (void);
  void (* _clutter_action8) (void);
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_action_get_type (void) G_GNUC_CONST;
 /* ClutterActor API */
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_action            (ClutterActor  *self,
                                                    ClutterAction *action);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_action_with_name  (ClutterActor  *self,
                                                    const gchar   *name,
                                                    ClutterAction *action);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_action         (ClutterActor  *self,
                                                    ClutterAction *action);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_action_by_name (ClutterActor  *self,
                                                    const gchar   *name);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterAction *clutter_actor_get_action            (ClutterActor  *self,
                                                    const gchar   *name);
 CLUTTER_AVAILABLE_IN_1_4
 GList *        clutter_actor_get_actions           (ClutterActor  *self);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_clear_actions         (ClutterActor  *self);
 CLUTTER_AVAILABLE_IN_1_10
 gboolean       clutter_actor_has_actions           (ClutterActor  *self);
 G_END_DECLS
 #endif /* __CLUTTER_ACTION_H__ */
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -1,550 +0,0 @@
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
 #include "clutter-types.h"
 #include "clutter-interval.h"
 #include "clutter-private.h"
 /**
 * clutter_actor_box_new:
 * @x_1: X coordinate of the top left point
 * @y_1: Y coordinate of the top left point
 * @x_2: X coordinate of the bottom right point
 * @y_2: Y coordinate of the bottom right point
 *
 * Allocates a new #ClutterActorBox using the passed coordinates
 * for the top left and bottom right points.
 *
 * This function is the logical equivalent of:
 *
 * |[
 *   clutter_actor_box_init (clutter_actor_box_alloc (),
 *                           x_1, y_1,
 *                           x_2, y_2);
 * ]|
 *
 * Return value: (transfer full): the newly allocated #ClutterActorBox.
 *   Use clutter_actor_box_free() to free the resources
 *
 * Since: 1.0
 */
 ClutterActorBox *
 clutter_actor_box_new (gfloat x_1,
                       gfloat y_1,
                       gfloat x_2,
                       gfloat y_2)
 {
  return clutter_actor_box_init (clutter_actor_box_alloc (),
                                 x_1, y_1,
                                 x_2, y_2);
 }
 /**
 * clutter_actor_box_alloc:
 *
 * Allocates a new #ClutterActorBox.
 *
 * Return value: (transfer full): the newly allocated #ClutterActorBox.
 *   Use clutter_actor_box_free() to free its resources
 *
 * Since: 1.12
 */
 ClutterActorBox *
 clutter_actor_box_alloc (void)
 {
  return g_slice_new0 (ClutterActorBox);
 }
 /**
 * clutter_actor_box_init:
 * @box: a #ClutterActorBox
 * @x_1: X coordinate of the top left point
 * @y_1: Y coordinate of the top left point
 * @x_2: X coordinate of the bottom right point
 * @y_2: Y coordinate of the bottom right point
 *
 * Initializes @box with the given coordinates.
 *
 * Return value: (transfer none): the initialized #ClutterActorBox
 *
 * Since: 1.10
 */
 ClutterActorBox *
 clutter_actor_box_init (ClutterActorBox *box,
                        gfloat           x_1,
                        gfloat           y_1,
                        gfloat           x_2,
                        gfloat           y_2)
 {
  g_return_val_if_fail (box != NULL, NULL);
  box->x1 = x_1;
  box->y1 = y_1;
  box->x2 = x_2;
  box->y2 = y_2;
  return box;
 }
 /**
 * clutter_actor_box_init_rect:
 * @box: a #ClutterActorBox
 * @x: X coordinate of the origin
 * @y: Y coordinate of the origin
 * @width: width of the box
 * @height: height of the box
 *
 * Initializes @box with the given origin and size.
 *
 * Since: 1.10
 */
 void
 clutter_actor_box_init_rect (ClutterActorBox *box,
                             gfloat           x,
                             gfloat           y,
                             gfloat           width,
                             gfloat           height)
 {
  g_return_if_fail (box != NULL);
  box->x1 = x;
  box->y1 = y;
  box->x2 = box->x1 + width;
  box->y2 = box->y1 + height;
 }
 /**
 * clutter_actor_box_copy:
 * @box: a #ClutterActorBox
 *
 * Copies @box
 *
 * Return value: a newly allocated copy of #ClutterActorBox. Use
 *   clutter_actor_box_free() to free the allocated resources
 *
 * Since: 1.0
 */
 ClutterActorBox *
 clutter_actor_box_copy (const ClutterActorBox *box)
 {
  if (G_LIKELY (box != NULL))
    return g_slice_dup (ClutterActorBox, box);
  return NULL;
 }
 /**
 * clutter_actor_box_free:
 * @box: a #ClutterActorBox
 *
 * Frees a #ClutterActorBox allocated using clutter_actor_box_new()
 * or clutter_actor_box_copy()
 *
 * Since: 1.0
 */
 void
 clutter_actor_box_free (ClutterActorBox *box)
 {
  if (G_LIKELY (box != NULL))
    g_slice_free (ClutterActorBox, box);
 }
 /**
 * clutter_actor_box_equal:
 * @box_a: a #ClutterActorBox
 * @box_b: a #ClutterActorBox
 *
 * Checks @box_a and @box_b for equality
 *
 * Return value: %TRUE if the passed #ClutterActorBox are equal
 *
 * Since: 1.0
 */
 gboolean
 clutter_actor_box_equal (const ClutterActorBox *box_a,
                         const ClutterActorBox *box_b)
 {
  g_return_val_if_fail (box_a != NULL && box_b != NULL, FALSE);
  if (box_a == box_b)
    return TRUE;
  return box_a->x1 == box_b->x1 && box_a->y1 == box_b->y1 &&
         box_a->x2 == box_b->x2 && box_a->y2 == box_b->y2;
 }
 /**
 * clutter_actor_box_get_x:
 * @box: a #ClutterActorBox
 *
 * Retrieves the X coordinate of the origin of @box
 *
 * Return value: the X coordinate of the origin
 *
 * Since: 1.0
 */
 gfloat
 clutter_actor_box_get_x (const ClutterActorBox *box)
 {
  g_return_val_if_fail (box != NULL, 0.);
  return box->x1;
 }
 /**
 * clutter_actor_box_get_y:
 * @box: a #ClutterActorBox
 *
 * Retrieves the Y coordinate of the origin of @box
 *
 * Return value: the Y coordinate of the origin
 *
 * Since: 1.0
 */
 gfloat
 clutter_actor_box_get_y (const ClutterActorBox *box)
 {
  g_return_val_if_fail (box != NULL, 0.);
  return box->y1;
 }
 /**
 * clutter_actor_box_get_width:
 * @box: a #ClutterActorBox
 *
 * Retrieves the width of the @box
 *
 * Return value: the width of the box
 *
 * Since: 1.0
 */
 gfloat
 clutter_actor_box_get_width (const ClutterActorBox *box)
 {
  g_return_val_if_fail (box != NULL, 0.);
  return box->x2 - box->x1;
 }
 /**
 * clutter_actor_box_get_height:
 * @box: a #ClutterActorBox
 *
 * Retrieves the height of the @box
 *
 * Return value: the height of the box
 *
 * Since: 1.0
 */
 gfloat
 clutter_actor_box_get_height (const ClutterActorBox *box)
 {
  g_return_val_if_fail (box != NULL, 0.);
  return box->y2 - box->y1;
 }
 /**
 * clutter_actor_box_get_origin:
 * @box: a #ClutterActorBox
 * @x: (out) (allow-none): return location for the X coordinate, or %NULL
 * @y: (out) (allow-none): return location for the Y coordinate, or %NULL
 *
 * Retrieves the origin of @box
 *
 * Since: 1.0
 */
 void
 clutter_actor_box_get_origin (const ClutterActorBox *box,
                              gfloat                *x,
                              gfloat                *y)
 {
  g_return_if_fail (box != NULL);
  if (x)
    *x = box->x1;
  if (y)
    *y = box->y1;
 }
 /**
 * clutter_actor_box_get_size:
 * @box: a #ClutterActorBox
 * @width: (out) (allow-none): return location for the width, or %NULL
 * @height: (out) (allow-none): return location for the height, or %NULL
 *
 * Retrieves the size of @box
 *
 * Since: 1.0
 */
 void
 clutter_actor_box_get_size (const ClutterActorBox *box,
                            gfloat                *width,
                            gfloat                *height)
 {
  g_return_if_fail (box != NULL);
  if (width)
    *width = box->x2 - box->x1;
  if (height)
    *height = box->y2 - box->y1;
 }
 /**
 * clutter_actor_box_get_area:
 * @box: a #ClutterActorBox
 *
 * Retrieves the area of @box
 *
 * Return value: the area of a #ClutterActorBox, in pixels
 *
 * Since: 1.0
 */
 gfloat
 clutter_actor_box_get_area (const ClutterActorBox *box)
 {
  g_return_val_if_fail (box != NULL, 0.);
  return (box->x2 - box->x1) * (box->y2 - box->y1);
 }
 /**
 * clutter_actor_box_contains:
 * @box: a #ClutterActorBox
 * @x: X coordinate of the point
 * @y: Y coordinate of the point
 *
 * Checks whether a point with @x, @y coordinates is contained
 * withing @box
 *
 * Return value: %TRUE if the point is contained by the #ClutterActorBox
 *
 * Since: 1.0
 */
 gboolean
 clutter_actor_box_contains (const ClutterActorBox *box,
                            gfloat                 x,
                            gfloat                 y)
 {
  g_return_val_if_fail (box != NULL, FALSE);
  return (x > box->x1 && x < box->x2) &&
         (y > box->y1 && y < box->y2);
 }
 /**
 * clutter_actor_box_from_vertices:
 * @box: a #ClutterActorBox
 * @verts: (array fixed-size=4): array of four #ClutterVertex
 *
 * Calculates the bounding box represented by the four vertices; for details
 * of the vertex array see clutter_actor_get_abs_allocation_vertices().
 *
 * Since: 1.0
 */
 void
 clutter_actor_box_from_vertices (ClutterActorBox     *box,
                                 const ClutterVertex  verts[])
 {
  gfloat x_1, x_2, y_1, y_2;
  g_return_if_fail (box != NULL);
  g_return_if_fail (verts != NULL);
  /* 4-way min/max */
  x_1 = verts[0].x;
  y_1 = verts[0].y;
  if (verts[1].x < x_1)
    x_1 = verts[1].x;
  if (verts[2].x < x_1)
    x_1 = verts[2].x;
  if (verts[3].x < x_1)
    x_1 = verts[3].x;
  if (verts[1].y < y_1)
    y_1 = verts[1].y;
  if (verts[2].y < y_1)
    y_1 = verts[2].y;
  if (verts[3].y < y_1)
    y_1 = verts[3].y;
  x_2 = verts[0].x;
  y_2 = verts[0].y;
  if (verts[1].x > x_2)
    x_2 = verts[1].x;
  if (verts[2].x > x_2)
    x_2 = verts[2].x;
  if (verts[3].x > x_2)
    x_2 = verts[3].x;
  if (verts[1].y > y_2)
    y_2 = verts[1].y;
  if (verts[2].y > y_2)
    y_2 = verts[2].y;
  if (verts[3].y > y_2)
    y_2 = verts[3].y;
  box->x1 = x_1;
  box->x2 = x_2;
  box->y1 = y_1;
  box->y2 = y_2;
 }
 /**
 * clutter_actor_box_interpolate:
 * @initial: the initial #ClutterActorBox
 * @final: the final #ClutterActorBox
 * @progress: the interpolation progress
 * @result: (out): return location for the interpolation
 *
 * Interpolates between @initial and @final #ClutterActorBox<!-- -->es
 * using @progress
 *
 * Since: 1.2
 */
 void
 clutter_actor_box_interpolate (const ClutterActorBox *initial,
                               const ClutterActorBox *final,
                               gdouble                progress,
                               ClutterActorBox       *result)
 {
  g_return_if_fail (initial != NULL);
  g_return_if_fail (final != NULL);
  g_return_if_fail (result != NULL);
  result->x1 = initial->x1 + (final->x1 - initial->x1) * progress;
  result->y1 = initial->y1 + (final->y1 - initial->y1) * progress;
  result->x2 = initial->x2 + (final->x2 - initial->x2) * progress;
  result->y2 = initial->y2 + (final->y2 - initial->y2) * progress;
 }
 /**
 * clutter_actor_box_clamp_to_pixel:
 * @box: (inout): the #ClutterActorBox to clamp
 *
 * Clamps the components of @box to the nearest integer
 *
 * Since: 1.2
 */
 void
 clutter_actor_box_clamp_to_pixel (ClutterActorBox *box)
 {
  g_return_if_fail (box != NULL);
  box->x1 = floorf (box->x1);
  box->y1 = floorf (box->y1);
  box->x2 = ceilf (box->x2);
  box->y2 = ceilf (box->y2);
 }
 /**
 * clutter_actor_box_union:
 * @a: (in): the first #ClutterActorBox
 * @b: (in): the second #ClutterActorBox
 * @result: (out): the #ClutterActorBox representing a union
 *   of @a and @b
 *
 * Unions the two boxes @a and @b and stores the result in @result.
 *
 * Since: 1.4
 */
 void
 clutter_actor_box_union (const ClutterActorBox *a,
                         const ClutterActorBox *b,
                         ClutterActorBox       *result)
 {
  g_return_if_fail (a != NULL);
  g_return_if_fail (b != NULL);
  g_return_if_fail (result != NULL);
  result->x1 = MIN (a->x1, b->x1);
  result->y1 = MIN (a->y1, b->y1);
  result->x2 = MAX (a->x2, b->x2);
  result->y2 = MAX (a->y2, b->y2);
 }
 static gboolean
 clutter_actor_box_progress (const GValue *a,
                            const GValue *b,
                            gdouble       factor,
                            GValue       *retval)
 {
  ClutterActorBox res = { 0, };
  clutter_actor_box_interpolate (g_value_get_boxed (a),
                                 g_value_get_boxed (b),
                                 factor,
                                 &res);
  g_value_set_boxed (retval, &res);
  return TRUE;
 }
 /**
 * clutter_actor_box_set_origin:
 * @box: a #ClutterActorBox
 * @x: the X coordinate of the new origin
 * @y: the Y coordinate of the new origin
 *
 * Changes the origin of @box, maintaining the size of the #ClutterActorBox.
 *
 * Since: 1.6
 */
 void
 clutter_actor_box_set_origin (ClutterActorBox *box,
                              gfloat           x,
                              gfloat           y)
 {
  gfloat width, height;
  g_return_if_fail (box != NULL);
  width = box->x2 - box->x1;
  height = box->y2 - box->y1;
  clutter_actor_box_init_rect (box, x, y, width, height);
 }
 /**
 * clutter_actor_box_set_size:
 * @box: a #ClutterActorBox
 * @width: the new width
 * @height: the new height
 *
 * Sets the size of @box, maintaining the origin of the #ClutterActorBox.
 *
 * Since: 1.6
 */
 void
 clutter_actor_box_set_size (ClutterActorBox *box,
                            gfloat           width,
                            gfloat           height)
 {
  g_return_if_fail (box != NULL);
  box->x2 = box->x1 + width;
  box->y2 = box->y1 + height;
 }
 G_DEFINE_BOXED_TYPE_WITH_CODE (ClutterActorBox, clutter_actor_box,
                               clutter_actor_box_copy,
                               clutter_actor_box_free,
                               CLUTTER_REGISTER_INTERVAL_PROGRESS (clutter_actor_box_progress));
--- a/clutter/clutter/clutter-actor-meta-private.h
+++ b/clutter/clutter/clutter-actor-meta-private.h
@@ -1,97 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_ACTOR_META_PRIVATE_H__
 #define __CLUTTER_ACTOR_META_PRIVATE_H__
 #include <clutter/clutter-actor-meta.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_META_GROUP         (_clutter_meta_group_get_type ())
 #define CLUTTER_META_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_META_GROUP, ClutterMetaGroup))
 #define CLUTTER_IS_META_GROUP(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_META_GROUP))
 typedef struct _ClutterMetaGroup        ClutterMetaGroup;
 typedef struct _ClutterMetaGroupClass   ClutterMetaGroupClass;
 struct _ClutterMetaGroup
 {
  GObject parent_instance;
  ClutterActor *actor;
  GList *meta;
 };
 struct _ClutterMetaGroupClass
 {
  GObjectClass parent_class;
 };
 /* Each actor meta has a priority with zero as a default. A higher
   number means higher priority. Higher priority metas stay at the
   beginning of the list. The priority can be negative to give lower
   priority than the default. */
 #define CLUTTER_ACTOR_META_PRIORITY_DEFAULT 0
 /* Any value greater than this is considered an 'internal' priority
   and if we expose the priority property publicly then an application
   would not be able to use these values. */
 #define CLUTTER_ACTOR_META_PRIORITY_INTERNAL_HIGH (G_MAXINT / 2)
 #define CLUTTER_ACTOR_META_PRIORITY_INTERNAL_LOW (G_MININT / 2)
 GType _clutter_meta_group_get_type (void) G_GNUC_CONST;
 void                    _clutter_meta_group_add_meta    (ClutterMetaGroup *group,
                                                         ClutterActorMeta *meta);
 void                    _clutter_meta_group_remove_meta (ClutterMetaGroup *group,
                                                         ClutterActorMeta *meta);
 const GList *           _clutter_meta_group_peek_metas  (ClutterMetaGroup *group);
 void                    _clutter_meta_group_clear_metas (ClutterMetaGroup *group);
 ClutterActorMeta *      _clutter_meta_group_get_meta    (ClutterMetaGroup *group,
                                                         const gchar      *name);
 gboolean                _clutter_meta_group_has_metas_no_internal (ClutterMetaGroup *group);
 GList *                 _clutter_meta_group_get_metas_no_internal   (ClutterMetaGroup *group);
 void                    _clutter_meta_group_clear_metas_no_internal (ClutterMetaGroup *group);
 /* ActorMeta */
 void                    _clutter_actor_meta_set_actor           (ClutterActorMeta *meta,
                                                                 ClutterActor     *actor);
 const gchar *           _clutter_actor_meta_get_debug_name      (ClutterActorMeta *meta);
 void                    _clutter_actor_meta_set_priority        (ClutterActorMeta *meta,
                                                                 gint priority);
 int                     _clutter_actor_meta_get_priority        (ClutterActorMeta *meta);
 gboolean                _clutter_actor_meta_is_internal         (ClutterActorMeta *meta);
 G_END_DECLS
 #endif /* __CLUTTER_ACTOR_META_PRIVATE_H__ */
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -1,664 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-actor-meta
 * @Title: ClutterActorMeta
 * @Short_Description: Base class of actor modifiers
 * @See_Also: #ClutterAction, #ClutterConstraint
 *
 * #ClutterActorMeta is an abstract class providing a common API for
 * modifiers of #ClutterActor behaviour, appearance or layout.
 *
 * A #ClutterActorMeta can only be owned by a single #ClutterActor at
 * any time.
 *
 * Every sub-class of #ClutterActorMeta should check if the
 * #ClutterActorMeta:enabled property is set to %TRUE before applying
 * any kind of modification.
 *
 * #ClutterActorMeta is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-actor-meta-private.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 struct _ClutterActorMetaPrivate
 {
  ClutterActor *actor;
  guint destroy_id;
  gchar *name;
  guint is_enabled : 1;
  gint priority;
 };
 enum
 {
  PROP_0,
  PROP_ACTOR,
  PROP_NAME,
  PROP_ENABLED,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterActorMeta,
                                     clutter_actor_meta,
                                     G_TYPE_INITIALLY_UNOWNED)
 static void
 on_actor_destroy (ClutterActor     *actor,
                  ClutterActorMeta *meta)
 {
  meta->priv->actor = NULL;
 }
 static void
 clutter_actor_meta_real_set_actor (ClutterActorMeta *meta,
                                   ClutterActor     *actor)
 {
  if (meta->priv->actor == actor)
    return;
  if (meta->priv->destroy_id != 0)
    {
      g_signal_handler_disconnect (meta->priv->actor, meta->priv->destroy_id);
      meta->priv->destroy_id = 0;
    }
  meta->priv->actor = actor;
  if (meta->priv->actor != NULL)
    meta->priv->destroy_id = g_signal_connect (meta->priv->actor, "destroy",
                                               G_CALLBACK (on_actor_destroy),
                                               meta);
 }
 static void
 clutter_actor_meta_set_property (GObject      *gobject,
                                 guint         prop_id,
                                 const GValue *value,
                                 GParamSpec   *pspec)
 {
  ClutterActorMeta *meta = CLUTTER_ACTOR_META (gobject);
  switch (prop_id)
    {
    case PROP_NAME:
      clutter_actor_meta_set_name (meta, g_value_get_string (value));
      break;
    case PROP_ENABLED:
      clutter_actor_meta_set_enabled (meta, g_value_get_boolean (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_actor_meta_get_property (GObject    *gobject,
                                 guint       prop_id,
                                 GValue     *value,
                                 GParamSpec *pspec)
 {
  ClutterActorMeta *meta = CLUTTER_ACTOR_META (gobject);
  switch (prop_id)
    {
    case PROP_ACTOR:
      g_value_set_object (value, meta->priv->actor);
      break;
    case PROP_NAME:
      g_value_set_string (value, meta->priv->name);
      break;
    case PROP_ENABLED:
      g_value_set_boolean (value, meta->priv->is_enabled);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_actor_meta_finalize (GObject *gobject)
 {
  ClutterActorMetaPrivate *priv = CLUTTER_ACTOR_META (gobject)->priv;
  if (priv->destroy_id != 0 && priv->actor != NULL)
    g_signal_handler_disconnect (priv->actor, priv->destroy_id);
  g_free (priv->name);
  G_OBJECT_CLASS (clutter_actor_meta_parent_class)->finalize (gobject);
 }
 void
 clutter_actor_meta_class_init (ClutterActorMetaClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  klass->set_actor = clutter_actor_meta_real_set_actor;
  /**
   * ClutterActorMeta:actor:
   *
   * The #ClutterActor attached to the #ClutterActorMeta instance
   *
   * Since: 1.4
   */
  obj_props[PROP_ACTOR] =
    g_param_spec_object ("actor",
                         P_("Actor"),
                         P_("The actor attached to the meta"),
                         CLUTTER_TYPE_ACTOR,
                         CLUTTER_PARAM_READABLE);
  /**
   * ClutterActorMeta:name:
   *
   * The unique name to access the #ClutterActorMeta
   *
   * Since: 1.4
   */
  obj_props[PROP_NAME] =
    g_param_spec_string ("name",
                         P_("Name"),
                         P_("The name of the meta"),
                         NULL,
                         CLUTTER_PARAM_READWRITE);
  /**
   * ClutterActorMeta:enabled:
   *
   * Whether or not the #ClutterActorMeta is enabled
   *
   * Since: 1.4
   */
  obj_props[PROP_ENABLED] =
    g_param_spec_boolean ("enabled",
                          P_("Enabled"),
                          P_("Whether the meta is enabled"),
                          TRUE,
                          CLUTTER_PARAM_READWRITE);
  gobject_class->finalize = clutter_actor_meta_finalize;
  gobject_class->set_property = clutter_actor_meta_set_property;
  gobject_class->get_property = clutter_actor_meta_get_property;
  g_object_class_install_properties (gobject_class,
                                     PROP_LAST,
                                     obj_props);
 }
 void
 clutter_actor_meta_init (ClutterActorMeta *self)
 {
  self->priv = clutter_actor_meta_get_instance_private (self);
  self->priv->is_enabled = TRUE;
  self->priv->priority = CLUTTER_ACTOR_META_PRIORITY_DEFAULT;
 }
 /**
 * clutter_actor_meta_set_name:
 * @meta: a #ClutterActorMeta
 * @name: the name of @meta
 *
 * Sets the name of @meta
 *
 * The name can be used to identify the #ClutterActorMeta instance
 *
 * Since: 1.4
 */
 void
 clutter_actor_meta_set_name (ClutterActorMeta *meta,
                             const gchar      *name)
 {
  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
  if (g_strcmp0 (meta->priv->name, name) == 0)
    return;
  g_free (meta->priv->name);
  meta->priv->name = g_strdup (name);
  g_object_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_NAME]);
 }
 /**
 * clutter_actor_meta_get_name:
 * @meta: a #ClutterActorMeta
 *
 * Retrieves the name set using clutter_actor_meta_set_name()
 *
 * Return value: (transfer none): the name of the #ClutterActorMeta
 *   instance, or %NULL if none was set. The returned string is owned
 *   by the #ClutterActorMeta instance and it should not be modified
 *   or freed
 *
 * Since: 1.4
 */
 const gchar *
 clutter_actor_meta_get_name (ClutterActorMeta *meta)
 {
  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), NULL);
  return meta->priv->name;
 }
 /**
 * clutter_actor_meta_set_enabled:
 * @meta: a #ClutterActorMeta
 * @is_enabled: whether @meta is enabled
 *
 * Sets whether @meta should be enabled or not
 *
 * Since: 1.4
 */
 void
 clutter_actor_meta_set_enabled (ClutterActorMeta *meta,
                                gboolean          is_enabled)
 {
  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
  is_enabled = !!is_enabled;
  if (meta->priv->is_enabled == is_enabled)
    return;
  meta->priv->is_enabled = is_enabled;
  g_object_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_ENABLED]);
 }
 /**
 * clutter_actor_meta_get_enabled:
 * @meta: a #ClutterActorMeta
 *
 * Retrieves whether @meta is enabled
 *
 * Return value: %TRUE if the #ClutterActorMeta instance is enabled
 *
 * Since: 1.4
 */
 gboolean
 clutter_actor_meta_get_enabled (ClutterActorMeta *meta)
 {
  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), FALSE);
  return meta->priv->is_enabled;
 }
 /*
 * _clutter_actor_meta_set_actor
 * @meta: a #ClutterActorMeta
 * @actor: a #ClutterActor or %NULL
 *
 * Sets or unsets a back pointer to the #ClutterActor that owns
 * the @meta
 *
 * Since: 1.4
 */
 void
 _clutter_actor_meta_set_actor (ClutterActorMeta *meta,
                               ClutterActor     *actor)
 {
  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
  g_return_if_fail (actor == NULL || CLUTTER_IS_ACTOR (actor));
  CLUTTER_ACTOR_META_GET_CLASS (meta)->set_actor (meta, actor);
 }
 /**
 * clutter_actor_meta_get_actor:
 * @meta: a #ClutterActorMeta
 *
 * Retrieves a pointer to the #ClutterActor that owns @meta
 *
 * Return value: (transfer none): a pointer to a #ClutterActor or %NULL
 *
 * Since: 1.4
 */
 ClutterActor *
 clutter_actor_meta_get_actor (ClutterActorMeta *meta)
 {
  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), NULL);
  return meta->priv->actor;
 }
 void
 _clutter_actor_meta_set_priority (ClutterActorMeta *meta,
                                  gint priority)
 {
  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
  /* This property shouldn't be modified after the actor meta is in
     use because ClutterMetaGroup doesn't resort the list when it
     changes. If we made the priority public then we could either make
     the priority a construct-only property or listen for
     notifications on the property from the ClutterMetaGroup and
     resort. */
  g_return_if_fail (meta->priv->actor == NULL);
  meta->priv->priority = priority;
 }
 gint
 _clutter_actor_meta_get_priority (ClutterActorMeta *meta)
 {
  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), 0);
  return meta->priv->priority;
 }
 gboolean
 _clutter_actor_meta_is_internal (ClutterActorMeta *meta)
 {
  gint priority = meta->priv->priority;
  return (priority <= CLUTTER_ACTOR_META_PRIORITY_INTERNAL_LOW ||
          priority >= CLUTTER_ACTOR_META_PRIORITY_INTERNAL_HIGH);
 }
 /*
 * ClutterMetaGroup: a collection of ClutterActorMeta instances
 */
 G_DEFINE_TYPE (ClutterMetaGroup, _clutter_meta_group, G_TYPE_OBJECT);
 static void
 _clutter_meta_group_dispose (GObject *gobject)
 {
  _clutter_meta_group_clear_metas (CLUTTER_META_GROUP (gobject));
  G_OBJECT_CLASS (_clutter_meta_group_parent_class)->dispose (gobject);
 }
 static void
 _clutter_meta_group_class_init (ClutterMetaGroupClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  gobject_class->dispose = _clutter_meta_group_dispose;
 }
 static void
 _clutter_meta_group_init (ClutterMetaGroup *self)
 {
 }
 /*
 * _clutter_meta_group_add_meta:
 * @group: a #ClutterMetaGroup
 * @meta: a #ClutterActorMeta to add
 *
 * Adds @meta to @group
 *
 * This function will remove the floating reference of @meta or, if the
 * floating reference has already been sunk, add a reference to it
 */
 void
 _clutter_meta_group_add_meta (ClutterMetaGroup *group,
                              ClutterActorMeta *meta)
 {
  GList *prev = NULL, *l;
  if (meta->priv->actor != NULL)
    {
      g_warning ("The meta of type '%s' with name '%s' is "
                 "already attached to actor '%s'",
                 G_OBJECT_TYPE_NAME (meta),
                 meta->priv->name != NULL
                   ? meta->priv->name
                   : "<unknown>",
                 clutter_actor_get_name (meta->priv->actor) != NULL
                   ? clutter_actor_get_name (meta->priv->actor)
                   : G_OBJECT_TYPE_NAME (meta->priv->actor));
      return;
    }
  /* Find a meta that has lower priority and insert before that */
  for (l = group->meta; l; l = l->next)
    if (_clutter_actor_meta_get_priority (l->data) <
        _clutter_actor_meta_get_priority (meta))
      break;
    else
      prev = l;
  if (prev == NULL)
    group->meta = g_list_prepend (group->meta, meta);
  else
    {
      prev->next = g_list_prepend (prev->next, meta);
      prev->next->prev = prev;
    }
  g_object_ref_sink (meta);
  _clutter_actor_meta_set_actor (meta, group->actor);
 }
 /*
 * _clutter_meta_group_remove_meta:
 * @group: a #ClutterMetaGroup
 * @meta: a #ClutterActorMeta to remove
 *
 * Removes @meta from @group and releases the reference being held on it
 */
 void
 _clutter_meta_group_remove_meta (ClutterMetaGroup *group,
                                 ClutterActorMeta *meta)
 {
  if (meta->priv->actor != group->actor)
    {
      g_warning ("The meta of type '%s' with name '%s' is not "
                 "attached to the actor '%s'",
                 G_OBJECT_TYPE_NAME (meta),
                 meta->priv->name != NULL
                   ? meta->priv->name
                   : "<unknown>",
                 clutter_actor_get_name (group->actor) != NULL
                   ? clutter_actor_get_name (group->actor)
                   : G_OBJECT_TYPE_NAME (group->actor));
      return;
    }
  _clutter_actor_meta_set_actor (meta, NULL);
  group->meta = g_list_remove (group->meta, meta);
  g_object_unref (meta);
 }
 /*
 * _clutter_meta_group_peek_metas:
 * @group: a #ClutterMetaGroup
 *
 * Returns a pointer to the #ClutterActorMeta list
 *
 * Return value: a const pointer to the #GList of #ClutterActorMeta
 */
 const GList *
 _clutter_meta_group_peek_metas (ClutterMetaGroup *group)
 {
  return group->meta;
 }
 /*
 * _clutter_meta_group_get_metas_no_internal:
 * @group: a #ClutterMetaGroup
 *
 * Returns a new allocated list containing all of the metas that don't
 * have an internal priority.
 *
 * Return value: A GList containing non-internal metas. Free with
 * g_list_free.
 */
 GList *
 _clutter_meta_group_get_metas_no_internal (ClutterMetaGroup *group)
 {
  GList *ret = NULL;
  GList *l;
  /* Build a new list filtering out the internal metas */
  for (l = group->meta; l; l = l->next)
    if (!_clutter_actor_meta_is_internal (l->data))
      ret = g_list_prepend (ret, l->data);
  return g_list_reverse (ret);
 }
 /*
 * _clutter_meta_group_has_metas_no_internal:
 * @group: a #ClutterMetaGroup
 *
 * Returns whether the group has any metas that don't have an internal priority.
 *
 * Return value: %TRUE if metas without internal priority exist
 *   %FALSE otherwise
 */
 gboolean
 _clutter_meta_group_has_metas_no_internal (ClutterMetaGroup *group)
 {
  GList *l;
  for (l = group->meta; l; l = l->next)
    if (!_clutter_actor_meta_is_internal (l->data))
      return TRUE;
  return FALSE;
 }
 /*
 * _clutter_meta_group_clear_metas:
 * @group: a #ClutterMetaGroup
 *
 * Clears @group of all #ClutterActorMeta instances and releases
 * the reference on them
 */
 void
 _clutter_meta_group_clear_metas (ClutterMetaGroup *group)
 {
  g_list_foreach (group->meta, (GFunc) _clutter_actor_meta_set_actor, NULL);
  g_list_foreach (group->meta, (GFunc) g_object_unref, NULL);
  g_list_free (group->meta);
  group->meta = NULL;
 }
 /*
 * _clutter_meta_group_clear_metas_no_internal:
 * @group: a #ClutterMetaGroup
 *
 * Clears @group of all #ClutterActorMeta instances that don't have an
 * internal priority and releases the reference on them
 */
 void
 _clutter_meta_group_clear_metas_no_internal (ClutterMetaGroup *group)
 {
  GList *internal_list = NULL;
  GList *l, *next;
  for (l = group->meta; l; l = next)
    {
      next = l->next;
      if (_clutter_actor_meta_is_internal (l->data))
        {
          if (internal_list)
            internal_list->prev = l;
          l->next = internal_list;
          l->prev = NULL;
          internal_list = l;
        }
      else
        {
          _clutter_actor_meta_set_actor (l->data, NULL);
          g_object_unref (l->data);
          g_list_free_1 (l);
        }
    }
  group->meta = g_list_reverse (internal_list);
 }
 /*
 * _clutter_meta_group_get_meta:
 * @group: a #ClutterMetaGroup
 * @name: the name of the #ClutterActorMeta to retrieve
 *
 * Retrieves a named #ClutterActorMeta from @group
 *
 * Return value: a #ClutterActorMeta for the given name, or %NULL
 */
 ClutterActorMeta *
 _clutter_meta_group_get_meta (ClutterMetaGroup *group,
                              const gchar      *name)
 {
  GList *l;
  for (l = group->meta; l != NULL; l = l->next)
    {
      ClutterActorMeta *meta = l->data;
      if (g_strcmp0 (meta->priv->name, name) == 0)
        return meta;
    }
  return NULL;
 }
 /*< private >
 * clutter_actor_meta_get_debug_name:
 * @meta: a #ClutterActorMeta
 *
 * Retrieves the name of the @meta for debugging purposes.
 *
 * Return value: (transfer none): the name of the @meta. The returned
 *   string is owned by the @meta instance and it should not be
 *   modified or freed
 */
 const gchar *
 _clutter_actor_meta_get_debug_name (ClutterActorMeta *meta)
 {
  return meta->priv->name != NULL ? meta->priv->name
                                  : G_OBJECT_TYPE_NAME (meta);
 }
--- a/clutter/clutter/clutter-actor-meta.h
+++ b/clutter/clutter/clutter-actor-meta.h
@@ -1,119 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_ACTOR_META_H__
 #define __CLUTTER_ACTOR_META_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_ACTOR_META                 (clutter_actor_meta_get_type ())
 #define CLUTTER_ACTOR_META(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTOR_META, ClutterActorMeta))
 #define CLUTTER_IS_ACTOR_META(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ACTOR_META))
 #define CLUTTER_ACTOR_META_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_ACTOR_META, ClutterActorMetaClass))
 #define CLUTTER_IS_ACTOR_META_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ACTOR_META))
 #define CLUTTER_ACTOR_META_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ACTOR_META, ClutterActorMetaClass))
 typedef struct _ClutterActorMetaPrivate         ClutterActorMetaPrivate;
 typedef struct _ClutterActorMetaClass           ClutterActorMetaClass;
 /**
 * ClutterActorMeta:
 *
 * The #ClutterActorMeta structure contains only
 * private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _ClutterActorMeta
 {
  /*< private >*/
  GInitiallyUnowned parent_instance;
  ClutterActorMetaPrivate *priv;
 };
 /**
 * ClutterActorMetaClass:
 * @set_actor: virtual function, invoked when attaching and detaching
 *   a #ClutterActorMeta instance to a #ClutterActor
 *
 * The #ClutterActorMetaClass structure contains
 * only private data
 *
 * Since: 1.4
 */
 struct _ClutterActorMetaClass
 {
  /*< private >*/
  GInitiallyUnownedClass parent_class;
  /*< public >*/
  /**
   * ClutterActorMetaClass::set_actor:
   * @meta: a #ClutterActorMeta
   * @actor: (allow-none): the actor attached to @meta, or %NULL
   *
   * Virtual function, called when @meta is attached or detached
   * from a #ClutterActor.
   */
  void (* set_actor) (ClutterActorMeta *meta,
                      ClutterActor     *actor);
  /*< private >*/
  void (* _clutter_meta1) (void);
  void (* _clutter_meta2) (void);
  void (* _clutter_meta3) (void);
  void (* _clutter_meta4) (void);
  void (* _clutter_meta5) (void);
  void (* _clutter_meta6) (void);
  void (* _clutter_meta7) (void);
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_actor_meta_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 void            clutter_actor_meta_set_name     (ClutterActorMeta *meta,
                                                 const gchar      *name);
 CLUTTER_AVAILABLE_IN_1_4
 const gchar *   clutter_actor_meta_get_name     (ClutterActorMeta *meta);
 CLUTTER_AVAILABLE_IN_1_4
 void            clutter_actor_meta_set_enabled  (ClutterActorMeta *meta,
                                                 gboolean          is_enabled);
 CLUTTER_AVAILABLE_IN_1_4
 gboolean        clutter_actor_meta_get_enabled  (ClutterActorMeta *meta);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *  clutter_actor_meta_get_actor    (ClutterActorMeta *meta);
 G_END_DECLS
 #endif /* __CLUTTER_ACTOR_META_H__ */
--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -1,327 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_ACTOR_PRIVATE_H__
 #define __CLUTTER_ACTOR_PRIVATE_H__
 #include <clutter/clutter-actor.h>
 G_BEGIN_DECLS
 /*< private >
 * ClutterRedrawFlags:
 * @CLUTTER_REDRAW_CLIPPED_TO_ALLOCATION: Tells clutter the maximum
 *   extents of what needs to be redrawn lies within the actors
 *   current allocation. (Only use this for 2D actors though because
 *   any actor with depth may be projected outside of its allocation)
 *
 * Flags passed to the clutter_actor_queue_redraw_with_clip ()
 * function
 *
 * Since: 1.6
 */
 typedef enum
 {
  CLUTTER_REDRAW_CLIPPED_TO_ALLOCATION  = 1 << 0
 } ClutterRedrawFlags;
 /*< private >
 * ClutterActorTraverseFlags:
 * CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST: Traverse the graph in
 *   a depth first order.
 * CLUTTER_ACTOR_TRAVERSE_BREADTH_FIRST: Traverse the graph in a
 *   breadth first order.
 *
 * Controls some options for how clutter_actor_traverse() iterates
 * through the graph.
 */
 typedef enum {
  CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST   = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_BREADTH_FIRST = 1L<<1
 } ClutterActorTraverseFlags;
 /*< private >
 * ClutterActorTraverseVisitFlags:
 * CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE: Continue traversing as
 *   normal
 * CLUTTER_ACTOR_TRAVERSE_VISIT_SKIP_CHILDREN: Don't traverse the
 *   children of the last visited actor. (Not applicable when using
 *   %CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST_POST_ORDER since the children
 *   are visited before having an opportunity to bail out)
 * CLUTTER_ACTOR_TRAVERSE_VISIT_BREAK: Immediately bail out without
 *   visiting any more actors.
 *
 * Each time an actor is visited during a scenegraph traversal the
 * ClutterTraverseCallback can return a set of flags that may affect
 * the continuing traversal. It may stop traversal completely, just
 * skip over children for the current actor or continue as normal.
 */
 typedef enum {
  CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE       = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_VISIT_SKIP_CHILDREN  = 1L<<1,
  CLUTTER_ACTOR_TRAVERSE_VISIT_BREAK          = 1L<<2
 } ClutterActorTraverseVisitFlags;
 /*< private >
 * ClutterTraverseCallback:
 *
 * The callback prototype used with clutter_actor_traverse. The
 * returned flags can be used to affect the continuing traversal
 * either by continuing as normal, skipping over children of an
 * actor or bailing out completely.
 */
 typedef ClutterActorTraverseVisitFlags (*ClutterTraverseCallback) (ClutterActor *actor,
                                                                   gint          depth,
                                                                   gpointer      user_data);
 /*< private >
 * ClutterForeachCallback:
 * @actor: The actor being iterated
 * @user_data: The private data specified when starting the iteration
 *
 * A generic callback for iterating over actor, such as with
 * _clutter_actor_foreach_child. The difference when compared to
 * #ClutterCallback is that it returns a boolean so it is possible to break
 * out of an iteration early.
 *
 * Return value: %TRUE to continue iterating or %FALSE to break iteration
 * early.
 */
 typedef gboolean (*ClutterForeachCallback) (ClutterActor *actor,
                                            gpointer      user_data);
 typedef struct _AnchorCoord             AnchorCoord;
 typedef struct _SizeRequest             SizeRequest;
 typedef struct _ClutterLayoutInfo       ClutterLayoutInfo;
 typedef struct _ClutterTransformInfo    ClutterTransformInfo;
 typedef struct _ClutterAnimationInfo    ClutterAnimationInfo;
 /* Internal helper struct to represent a point that can be stored in
   either direct pixel coordinates or as a fraction of the actor's
   size. It is used for the anchor point, scale center and rotation
   centers. */
 struct _AnchorCoord
 {
  gboolean is_fractional;
  union
  {
    /* Used when is_fractional == TRUE */
    struct
    {
      gdouble x;
      gdouble y;
    } fraction;
    /* Use when is_fractional == FALSE */
    ClutterVertex units;
  } v;
 };
 struct _SizeRequest
 {
  guint  age;
  gfloat for_size;
  gfloat min_size;
  gfloat natural_size;
 };
 /*< private >
 * ClutterLayoutInfo:
 * @fixed_pos: the fixed position of the actor
 * @margin: the composed margin of the actor
 * @x_align: the horizontal alignment, if the actor expands horizontally
 * @y_align: the vertical alignment, if the actor expands vertically
 * @x_expand: whether the actor should expand horizontally
 * @y_expand: whether the actor should expand vertically
 * @minimum: the fixed minimum size
 * @natural: the fixed natural size
 *
 * Ancillary layout information for an actor.
 */
 struct _ClutterLayoutInfo
 {
  /* fixed position coordinates */
  ClutterPoint fixed_pos;
  ClutterMargin margin;
  guint x_align : 4;
  guint y_align : 4;
  guint x_expand : 1;
  guint y_expand : 1;
  ClutterSize minimum;
  ClutterSize natural;
 };
 const ClutterLayoutInfo *       _clutter_actor_get_layout_info_or_defaults      (ClutterActor *self);
 ClutterLayoutInfo *             _clutter_actor_get_layout_info                  (ClutterActor *self);
 ClutterLayoutInfo *             _clutter_actor_peek_layout_info                 (ClutterActor *self);
 struct _ClutterTransformInfo
 {
  /* rotation (angle and center) */
  gdouble rx_angle;
  AnchorCoord rx_center;
  gdouble ry_angle;
  AnchorCoord ry_center;
  gdouble rz_angle;
  AnchorCoord rz_center;
  /* scaling */
  gdouble scale_x;
  gdouble scale_y;
  gdouble scale_z;
  AnchorCoord scale_center;
  /* anchor point */
  AnchorCoord anchor;
  /* translation */
  ClutterVertex translation;
  /* z_position */
  gfloat z_position;
  /* transformation center */
  ClutterPoint pivot;
  gfloat pivot_z;
  CoglMatrix transform;
  guint transform_set : 1;
  CoglMatrix child_transform;
  guint child_transform_set : 1;
 };
 const ClutterTransformInfo *    _clutter_actor_get_transform_info_or_defaults   (ClutterActor *self);
 ClutterTransformInfo *          _clutter_actor_get_transform_info               (ClutterActor *self);
 typedef struct _AState {
  guint easing_duration;
  guint easing_delay;
  ClutterAnimationMode easing_mode;
 } AState;
 struct _ClutterAnimationInfo
 {
  GArray *states;
  AState *cur_state;
  GHashTable *transitions;
 };
 const ClutterAnimationInfo *    _clutter_actor_get_animation_info_or_defaults           (ClutterActor *self);
 ClutterAnimationInfo *          _clutter_actor_get_animation_info                       (ClutterActor *self);
 ClutterTransition *             _clutter_actor_create_transition                        (ClutterActor *self,
                                                                                         GParamSpec   *pspec,
                                                                                         ...);
 ClutterTransition *             _clutter_actor_get_transition                           (ClutterActor *self,
                                                                                         GParamSpec   *pspec);
 gboolean                        _clutter_actor_foreach_child                            (ClutterActor *self,
                                                                                         ClutterForeachCallback callback,
                                                                                         gpointer user_data);
 void                            _clutter_actor_traverse                                 (ClutterActor *actor,
                                                                                         ClutterActorTraverseFlags flags,
                                                                                         ClutterTraverseCallback before_children_callback,
                                                                                         ClutterTraverseCallback after_children_callback,
                                                                                         gpointer user_data);
 ClutterActor *                  _clutter_actor_get_stage_internal                       (ClutterActor *actor);
 void                            _clutter_actor_apply_modelview_transform                (ClutterActor *self,
                                                                                         CoglMatrix   *matrix);
 void                            _clutter_actor_apply_relative_transformation_matrix     (ClutterActor *self,
                                                                                         ClutterActor *ancestor,
                                                                                         CoglMatrix   *matrix);
 void                            _clutter_actor_rerealize                                (ClutterActor    *self,
                                                                                         ClutterCallback  callback,
                                                                                         gpointer         data);
 void                            _clutter_actor_set_in_clone_paint                       (ClutterActor *self,
                                                                                         gboolean      is_in_clone_paint);
 void                            _clutter_actor_set_enable_model_view_transform          (ClutterActor *self,
                                                                                         gboolean      enable);
 void                            _clutter_actor_set_enable_paint_unmapped                (ClutterActor *self,
                                                                                         gboolean      enable);
 void                            _clutter_actor_set_has_pointer                          (ClutterActor *self,
                                                                                         gboolean      has_pointer);
 void                            _clutter_actor_queue_redraw_with_clip                   (ClutterActor       *self,
                                                                                         ClutterRedrawFlags  flags,
                                                                                         ClutterPaintVolume *clip_volume);
 void                            _clutter_actor_queue_redraw_full                        (ClutterActor       *self,
                                                                                         ClutterRedrawFlags  flags,
                                                                                         ClutterPaintVolume *volume,
                                                                                         ClutterEffect      *effect);
 ClutterPaintVolume *            _clutter_actor_get_queue_redraw_clip                    (ClutterActor       *self);
 void                            _clutter_actor_set_queue_redraw_clip                    (ClutterActor       *self,
                                                                                         ClutterPaintVolume *clip_volume);
 void                            _clutter_actor_finish_queue_redraw                      (ClutterActor       *self,
                                                                                         ClutterPaintVolume *clip);
 gboolean                        _clutter_actor_set_default_paint_volume                 (ClutterActor       *self,
                                                                                         GType               check_gtype,
                                                                                         ClutterPaintVolume *volume);
 const gchar *                   _clutter_actor_get_debug_name                           (ClutterActor *self);
 void                            _clutter_actor_push_clone_paint                         (void);
 void                            _clutter_actor_pop_clone_paint                          (void);
 guint32                         _clutter_actor_get_pick_id                              (ClutterActor *self);
 void                            _clutter_actor_shader_pre_paint                         (ClutterActor *actor,
                                                                                         gboolean      repeat);
 void                            _clutter_actor_shader_post_paint                        (ClutterActor *actor);
 ClutterActorAlign               _clutter_actor_get_effective_x_align                    (ClutterActor *self);
 void                            _clutter_actor_handle_event                             (ClutterActor       *actor,
                                                                                         const ClutterEvent *event);
 void                            _clutter_actor_attach_clone                             (ClutterActor *actor,
                                                                                         ClutterActor *clone);
 void                            _clutter_actor_detach_clone                             (ClutterActor *actor,
                                                                                         ClutterActor *clone);
 void                            _clutter_actor_queue_redraw_on_clones                   (ClutterActor *actor);
 void                            _clutter_actor_queue_relayout_on_clones                 (ClutterActor *actor);
 void                            _clutter_actor_queue_only_relayout                      (ClutterActor *actor);
 CoglFramebuffer *               _clutter_actor_get_active_framebuffer                   (ClutterActor *actor);
 ClutterPaintNode *              clutter_actor_create_texture_paint_node                 (ClutterActor *self,
                                                                                         CoglTexture  *texture);
 G_END_DECLS
 #endif /* __CLUTTER_ACTOR_PRIVATE_H__ */
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -1,901 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Matthew Allum  <mallum@openedhand.com>
 *
 * Copyright (C) 2006, 2007, 2008 OpenedHand Ltd
 * Copyright (C) 2009, 2010 Intel Corp
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_ACTOR_H__
 #define __CLUTTER_ACTOR_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 /* clutter-actor.h */
 #include <gio/gio.h>
 #include <pango/pango.h>
 #include <atk/atk.h>
 #include <cogl/cogl.h>
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-event.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_ACTOR              (clutter_actor_get_type ())
 #define CLUTTER_ACTOR(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ACTOR, ClutterActor))
 #define CLUTTER_ACTOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_ACTOR, ClutterActorClass))
 #define CLUTTER_IS_ACTOR(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ACTOR))
 #define CLUTTER_IS_ACTOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ACTOR))
 #define CLUTTER_ACTOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ACTOR, ClutterActorClass))
 /**
 * CLUTTER_ACTOR_SET_FLAGS:
 * @a: a #ClutterActor
 * @f: the #ClutterActorFlags to set
 *
 * Sets the given flags on a #ClutterActor
 *
 * Deprecated: 1.24: Changing flags directly is heavily discouraged in
 *   newly written code. #ClutterActor will take care of setting the
 *   internal state.
 */
 #define CLUTTER_ACTOR_SET_FLAGS(a,f) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
  (((ClutterActor*)(a))->flags |= (f))
 /**
 * CLUTTER_ACTOR_UNSET_FLAGS:
 * @a: a #ClutterActor
 * @f: the #ClutterActorFlags to unset
 *
 * Unsets the given flags on a #ClutterActor
 *
 * Deprecated: 1.24: Changing flags directly is heavily discouraged in
 *   newly written code. #ClutterActor will take care of unsetting the
 *   internal state.
 */
 #define CLUTTER_ACTOR_UNSET_FLAGS(a,f) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
  (((ClutterActor*)(a))->flags &= ~(f))
 #define CLUTTER_ACTOR_IS_MAPPED(a) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_mapped instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_MAPPED) != FALSE)
 #define CLUTTER_ACTOR_IS_REALIZED(a) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_realized instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REALIZED) != FALSE)
 #define CLUTTER_ACTOR_IS_VISIBLE(a) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_visible instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_VISIBLE) != FALSE)
 #define CLUTTER_ACTOR_IS_REACTIVE(a) \
  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_get_reactive instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REACTIVE) != FALSE)
 typedef struct _ClutterActorClass    ClutterActorClass;
 typedef struct _ClutterActorPrivate  ClutterActorPrivate;
 /**
 * ClutterCallback:
 * @actor: a #ClutterActor
 * @data: (closure): user data
 *
 * Generic callback
 */
 typedef void (*ClutterCallback) (ClutterActor *actor,
                                 gpointer      data);
 /**
 * CLUTTER_CALLBACK:
 * @f: a function
 *
 * Convenience macro to cast a function to #ClutterCallback
 */
 #define CLUTTER_CALLBACK(f)        ((ClutterCallback) (f))
 /**
 * ClutterActor:
 * @flags: #ClutterActorFlags
 *
 * Base class for actors.
 */
 struct _ClutterActor
 {
  /*< private >*/
  GInitiallyUnowned parent_instance;
  /*< public >*/
  guint32 flags;
  /*< private >*/
  guint32 private_flags;
  ClutterActorPrivate *priv;
 };
 /**
 * ClutterActorClass:
 * @show: signal class handler for #ClutterActor::show; it must chain
 *   up to the parent's implementation
 * @show_all: virtual function for containers and composite actors, to
 *   determine which children should be shown when calling
 *   clutter_actor_show_all() on the actor. Defaults to calling
 *   clutter_actor_show(). This virtual function is deprecated and it
 *   should not be overridden.
 * @hide: signal class handler for #ClutterActor::hide; it must chain
 *   up to the parent's implementation
 * @hide_all: virtual function for containers and composite actors, to
 *   determine which children should be shown when calling
 *   clutter_actor_hide_all() on the actor. Defaults to calling
 *   clutter_actor_hide(). This virtual function is deprecated and it
 *   should not be overridden.
 * @realize: virtual function, used to allocate resources for the actor;
 *   it should chain up to the parent's implementation. This virtual
 *   function is deprecated and should not be overridden in newly
 *   written code.
 * @unrealize: virtual function, used to deallocate resources allocated
 *   in ::realize; it should chain up to the parent's implementation. This
 *   function is deprecated and should not be overridden in newly
 *   written code.
 * @map: virtual function for containers and composite actors, to
 *   map their children; it must chain up to the parent's implementation.
 *   Overriding this function is optional.
 * @unmap: virtual function for containers and composite actors, to
 *   unmap their children; it must chain up to the parent's implementation.
 *   Overriding this function is optional.
 * @paint: virtual function, used to paint the actor
 * @get_preferred_width: virtual function, used when querying the minimum
 *   and natural widths of an actor for a given height; it is used by
 *   clutter_actor_get_preferred_width()
 * @get_preferred_height: virtual function, used when querying the minimum
 *   and natural heights of an actor for a given width; it is used by
 *   clutter_actor_get_preferred_height()
 * @allocate: virtual function, used when settings the coordinates of an
 *   actor; it is used by clutter_actor_allocate(); it must chain up to
 *   the parent's implementation, or call clutter_actor_set_allocation()
 * @apply_transform: virtual function, used when applying the transformations
 *   to an actor before painting it or when transforming coordinates or
 *   the allocation; it must chain up to the parent's implementation
 * @parent_set: signal class handler for the #ClutterActor::parent-set
 * @destroy: signal class handler for #ClutterActor::destroy. It must
 *   chain up to the parent's implementation
 * @pick: virtual function, used to draw an outline of the actor with
 *   the given color
 * @queue_redraw: class handler for #ClutterActor::queue-redraw
 * @event: class handler for #ClutterActor::event
 * @button_press_event: class handler for #ClutterActor::button-press-event
 * @button_release_event: class handler for
 *   #ClutterActor::button-release-event
 * @scroll_event: signal class closure for #ClutterActor::scroll-event
 * @key_press_event: signal class closure for #ClutterActor::key-press-event
 * @key_release_event: signal class closure for
 *   #ClutterActor::key-release-event
 * @motion_event: signal class closure for #ClutterActor::motion-event
 * @enter_event: signal class closure for #ClutterActor::enter-event
 * @leave_event: signal class closure for #ClutterActor::leave-event
 * @captured_event: signal class closure for #ClutterActor::captured-event
 * @key_focus_in: signal class closure for #ClutterActor::key-focus-in
 * @key_focus_out: signal class closure for #ClutterActor::key-focus-out
 * @queue_relayout: class handler for #ClutterActor::queue-relayout
 * @get_accessible: virtual function, returns the accessible object that
 *   describes the actor to an assistive technology.
 * @get_paint_volume: virtual function, for sub-classes to define their
 *   #ClutterPaintVolume
 * @has_overlaps: virtual function for
 *   sub-classes to advertise whether they need an offscreen redirect
 *   to get the correct opacity. See
 *   clutter_actor_set_offscreen_redirect() for details.
 * @paint_node: virtual function for creating paint nodes and attaching
 *   them to the render tree
 * @touch_event: signal class closure for #ClutterActor::touch-event
 *
 * Base class for actors.
 */
 struct _ClutterActorClass
 {
  /*< private >*/
  GInitiallyUnownedClass parent_class;
  /*< 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);
  void (* unmap)                (ClutterActor          *self);
  void (* paint)                (ClutterActor          *self);
  void (* parent_set)           (ClutterActor          *actor,
                                 ClutterActor          *old_parent);
  void (* destroy)              (ClutterActor          *self);
  void (* pick)                 (ClutterActor          *actor,
                                 const ClutterColor    *color);
  void (* queue_redraw)         (ClutterActor          *actor,
                                 ClutterActor          *leaf_that_queued);
  /* size negotiation */
  void (* get_preferred_width)  (ClutterActor           *self,
                                 gfloat                  for_height,
                                 gfloat                 *min_width_p,
                                 gfloat                 *natural_width_p);
  void (* get_preferred_height) (ClutterActor           *self,
                                 gfloat                  for_width,
                                 gfloat                 *min_height_p,
                                 gfloat                 *natural_height_p);
  void (* allocate)             (ClutterActor           *self,
                                 const ClutterActorBox  *box,
                                 ClutterAllocationFlags  flags);
  /* transformations */
  void (* apply_transform)      (ClutterActor           *actor,
                                 ClutterMatrix          *matrix);
  /* event signals */
  gboolean (* event)                (ClutterActor         *actor,
                                     ClutterEvent         *event);
  gboolean (* button_press_event)   (ClutterActor         *actor,
                                     ClutterButtonEvent   *event);
  gboolean (* button_release_event) (ClutterActor         *actor,
                                     ClutterButtonEvent   *event);
  gboolean (* scroll_event)         (ClutterActor         *actor,
                                     ClutterScrollEvent   *event);
  gboolean (* key_press_event)      (ClutterActor         *actor,
                                     ClutterKeyEvent      *event);
  gboolean (* key_release_event)    (ClutterActor         *actor,
                                     ClutterKeyEvent      *event);
  gboolean (* motion_event)         (ClutterActor         *actor,
                                     ClutterMotionEvent   *event);
  gboolean (* enter_event)          (ClutterActor         *actor,
                                     ClutterCrossingEvent *event);
  gboolean (* leave_event)          (ClutterActor         *actor,
                                     ClutterCrossingEvent *event);
  gboolean (* captured_event)       (ClutterActor         *actor,
                                     ClutterEvent         *event);
  void     (* key_focus_in)         (ClutterActor         *actor);
  void     (* key_focus_out)        (ClutterActor         *actor);
  void     (* queue_relayout)       (ClutterActor         *self);
  /* accessibility support */
  AtkObject * (* get_accessible)    (ClutterActor         *self);
  gboolean (* get_paint_volume)     (ClutterActor         *actor,
                                     ClutterPaintVolume   *volume);
  gboolean (* has_overlaps)         (ClutterActor         *self);
  void     (* paint_node)           (ClutterActor         *self,
                                     ClutterPaintNode     *root);
  gboolean (* touch_event)          (ClutterActor         *self,
                                     ClutterTouchEvent    *event);
  /*< private >*/
  /* padding for future expansion */
  gpointer _padding_dummy[26];
 };
 /**
 * ClutterActorIter:
 *
 * An iterator structure that allows to efficiently iterate over a
 * section of the scene graph.
 *
 * The contents of the #ClutterActorIter structure
 * are private and should only be accessed using the provided API.
 *
 * Since: 1.10
 */
 struct _ClutterActorIter
 {
  /*< private >*/
  gpointer CLUTTER_PRIVATE_FIELD (dummy1);
  gpointer CLUTTER_PRIVATE_FIELD (dummy2);
  gpointer CLUTTER_PRIVATE_FIELD (dummy3);
  gint     CLUTTER_PRIVATE_FIELD (dummy4);
  gpointer CLUTTER_PRIVATE_FIELD (dummy5);
 };
 CLUTTER_AVAILABLE_IN_ALL
 GType clutter_actor_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_10
 ClutterActor *                  clutter_actor_new                               (void);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_flags                         (ClutterActor                *self,
                                                                                 ClutterActorFlags            flags);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unset_flags                       (ClutterActor                *self,
                                                                                 ClutterActorFlags            flags);
 CLUTTER_AVAILABLE_IN_ALL
 ClutterActorFlags               clutter_actor_get_flags                         (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_show                              (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_hide                              (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_realize                           (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unrealize                         (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_map                               (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unmap                             (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_paint                             (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_continue_paint                    (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 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);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_queue_relayout                    (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_destroy                           (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_name                          (ClutterActor                *self,
                                                                                 const gchar                 *name);
 CLUTTER_AVAILABLE_IN_ALL
 const gchar *                   clutter_actor_get_name                          (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_24
 gboolean                        clutter_actor_is_visible                        (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_24
 gboolean                        clutter_actor_is_mapped                         (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_24
 gboolean                        clutter_actor_is_realized                       (ClutterActor                *self);
 /* Size negotiation */
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_request_mode                  (ClutterActor                *self,
                                                                                 ClutterRequestMode           mode);
 CLUTTER_AVAILABLE_IN_ALL
 ClutterRequestMode              clutter_actor_get_request_mode                  (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_width               (ClutterActor                *self,
                                                                                 gfloat                       for_height,
                                                                                 gfloat                      *min_width_p,
                                                                                 gfloat                      *natural_width_p);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_height              (ClutterActor                *self,
                                                                                 gfloat                       for_width,
                                                                                 gfloat                      *min_height_p,
                                                                                 gfloat                      *natural_height_p);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_size                (ClutterActor                *self,
                                                                                 gfloat                      *min_width_p,
                                                                                 gfloat                      *min_height_p,
                                                                                 gfloat                      *natural_width_p,
                                                                                 gfloat                      *natural_height_p);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate                          (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 ClutterAllocationFlags       flags);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_preferred_size           (ClutterActor                *self,
                                                                                 ClutterAllocationFlags       flags);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_available_size           (ClutterActor                *self,
                                                                                 gfloat                       x,
                                                                                 gfloat                       y,
                                                                                 gfloat                       available_width,
                                                                                 gfloat                       available_height,
                                                                                 ClutterAllocationFlags       flags);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_align_fill               (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 gdouble                      x_align,
                                                                                 gdouble                      y_align,
                                                                                 gboolean                     x_fill,
                                                                                 gboolean                     y_fill,
                                                                                 ClutterAllocationFlags       flags);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_allocation                    (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 ClutterAllocationFlags       flags);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_allocation_box                (ClutterActor                *self,
                                                                                 ClutterActorBox             *box);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_allocation_vertices           (ClutterActor                *self,
                                                                                 ClutterActor                *ancestor,
                                                                                 ClutterVertex                verts[]);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_allocation                    (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_size                          (ClutterActor                *self,
                                                                                 gfloat                       width,
                                                                                 gfloat                       height);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_size                          (ClutterActor                *self,
                                                                                 gfloat                      *width,
                                                                                 gfloat                      *height);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_position                      (ClutterActor                *self,
                                                                                 gfloat                       x,
                                                                                 gfloat                       y);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_position                      (ClutterActor                *self,
                                                                                 gfloat                      *x,
                                                                                 gfloat                      *y);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_fixed_position_set            (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_fixed_position_set            (ClutterActor                *self,
                                                                                 gboolean                     is_set);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_move_by                           (ClutterActor                *self,
                                                                                 gfloat                       dx,
                                                                                 gfloat                       dy);
 /* Actor geometry */
 CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_width                         (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_height                        (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_width                         (ClutterActor                *self,
                                                                                 gfloat                       width);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_height                        (ClutterActor                *self,
                                                                                 gfloat                       height);
 CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_x                             (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_y                             (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_x                             (ClutterActor                *self,
                                                                                 gfloat                       x);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_y                             (ClutterActor                *self,
                                                                                 gfloat                       y);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_z_position                    (ClutterActor                *self,
                                                                                 gfloat                       z_position);
 CLUTTER_AVAILABLE_IN_1_12
 gfloat                          clutter_actor_get_z_position                    (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);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_x_expand                      (ClutterActor                *self,
                                                                                 gboolean                     expand);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                        clutter_actor_get_x_expand                      (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_y_expand                      (ClutterActor                *self,
                                                                                 gboolean                     expand);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                        clutter_actor_get_y_expand                      (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                        clutter_actor_needs_expand                      (ClutterActor                *self,
                                                                                 ClutterOrientation           orientation);
 /* Paint */
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_clip                          (ClutterActor                *self,
                                                                                 gfloat                       xoff,
                                                                                 gfloat                       yoff,
                                                                                 gfloat                       width,
                                                                                 gfloat                       height);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_remove_clip                       (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_clip                          (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_clip                          (ClutterActor               *self,
                                                                                 gfloat                     *xoff,
                                                                                 gfloat                     *yoff,
                                                                                 gfloat                     *width,
                                                                                 gfloat                     *height);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_clip_to_allocation            (ClutterActor               *self,
                                                                                 gboolean                    clip_set);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_clip_to_allocation            (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_opacity                       (ClutterActor               *self,
                                                                                 guint8                      opacity);
 CLUTTER_AVAILABLE_IN_ALL
 guint8                          clutter_actor_get_opacity                       (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 guint8                          clutter_actor_get_paint_opacity                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_paint_visibility              (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_8
 void                            clutter_actor_set_offscreen_redirect            (ClutterActor               *self,
                                                                                 ClutterOffscreenRedirect    redirect);
 CLUTTER_AVAILABLE_IN_1_8
 ClutterOffscreenRedirect        clutter_actor_get_offscreen_redirect            (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_should_pick_paint                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_in_clone_paint                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
 CLUTTER_AVAILABLE_IN_1_8
 gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);
 /* Content */
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_content                       (ClutterActor               *self,
                                                                                 ClutterContent             *content);
 CLUTTER_AVAILABLE_IN_1_10
 ClutterContent *                clutter_actor_get_content                       (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_content_gravity               (ClutterActor               *self,
                                                                                 ClutterContentGravity       gravity);
 CLUTTER_AVAILABLE_IN_1_10
 ClutterContentGravity           clutter_actor_get_content_gravity               (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_content_scaling_filters       (ClutterActor               *self,
                                                                                 ClutterScalingFilter        min_filter,
                                                                                 ClutterScalingFilter        mag_filter);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_get_content_scaling_filters       (ClutterActor               *self,
                                                                                 ClutterScalingFilter       *min_filter,
                                                                                 ClutterScalingFilter       *mag_filter);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_content_repeat                (ClutterActor               *self,
                                                                                 ClutterContentRepeat        repeat);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterContentRepeat            clutter_actor_get_content_repeat                (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_get_content_box                   (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
 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);
 CLUTTER_AVAILABLE_IN_1_6
 const ClutterPaintVolume *      clutter_actor_get_paint_volume                  (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_6
 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 */
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_reactive                      (ClutterActor               *actor,
                                                                                 gboolean                    reactive);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_reactive                      (ClutterActor               *actor);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_key_focus                     (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_grab_key_focus                    (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_event                             (ClutterActor               *actor,
                                                                                 const ClutterEvent         *event,
                                                                                 gboolean                    capture);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_pointer                       (ClutterActor               *self);
 /* Text */
 CLUTTER_AVAILABLE_IN_ALL
 PangoContext *                  clutter_actor_get_pango_context                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 PangoContext *                  clutter_actor_create_pango_context              (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 PangoLayout *                   clutter_actor_create_pango_layout               (ClutterActor               *self,
                                                                                 const gchar                *text);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_text_direction                (ClutterActor               *self,
                                                                                 ClutterTextDirection        text_dir);
 CLUTTER_AVAILABLE_IN_ALL
 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);
 CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *                  clutter_actor_get_parent                        (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_4
 gboolean                        clutter_actor_contains                          (ClutterActor               *self,
                                                                                 ClutterActor               *descendant);
 CLUTTER_AVAILABLE_IN_ALL
 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);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                        clutter_actor_iter_is_valid                     (const ClutterActorIter     *iter);
 /* Transformations */
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_rotated                        (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_scaled                         (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_pivot_point                   (ClutterActor               *self,
                                                                                 gfloat                      pivot_x,
                                                                                 gfloat                      pivot_y);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_get_pivot_point                   (ClutterActor               *self,
                                                                                 gfloat                     *pivot_x,
                                                                                 gfloat                     *pivot_y);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_pivot_point_z                 (ClutterActor               *self,
                                                                                 gfloat                      pivot_z);
 CLUTTER_AVAILABLE_IN_1_12
 gfloat                          clutter_actor_get_pivot_point_z                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_rotation_angle                (ClutterActor               *self,
                                                                                 ClutterRotateAxis           axis,
                                                                                 gdouble                     angle);
 CLUTTER_AVAILABLE_IN_1_12
 gdouble                         clutter_actor_get_rotation_angle                (ClutterActor               *self,
                                                                                 ClutterRotateAxis           axis);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_scale                         (ClutterActor               *self,
                                                                                 gdouble                     scale_x,
                                                                                 gdouble                     scale_y);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_scale                         (ClutterActor               *self,
                                                                                 gdouble                    *scale_x,
                                                                                 gdouble                    *scale_y);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_scale_z                       (ClutterActor               *self,
                                                                                 gdouble                     scale_z);
 CLUTTER_AVAILABLE_IN_1_12
 gdouble                         clutter_actor_get_scale_z                       (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_translation                   (ClutterActor               *self,
                                                                                 gfloat                      translate_x,
                                                                                 gfloat                      translate_y,
                                                                                 gfloat                      translate_z);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_get_translation                   (ClutterActor               *self,
                                                                                 gfloat                     *translate_x,
                                                                                 gfloat                     *translate_y,
                                                                                 gfloat                     *translate_z);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_transform                     (ClutterActor               *self,
                                                                                 const ClutterMatrix        *transform);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_get_transform                     (ClutterActor               *self,
                                                                                 ClutterMatrix              *transform);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_child_transform               (ClutterActor               *self,
                                                                                 const ClutterMatrix        *transform);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_get_child_transform               (ClutterActor               *self,
                                                                                 ClutterMatrix              *transform);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_transformed_position          (ClutterActor               *self,
                                                                                 gfloat                     *x,
                                                                                 gfloat                     *y);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_transformed_size              (ClutterActor               *self,
                                                                                 gfloat                     *width,
                                                                                 gfloat                     *height);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_transform_stage_point             (ClutterActor               *self,
                                                                                 gfloat                      x,
                                                                                 gfloat                      y,
                                                                                 gfloat                     *x_out,
                                                                                 gfloat                     *y_out);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_abs_allocation_vertices       (ClutterActor               *self,
                                                                                 ClutterVertex               verts[]);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_apply_transform_to_point          (ClutterActor               *self,
                                                                                 const ClutterVertex        *point,
                                                                                 ClutterVertex              *vertex);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_apply_relative_transform_to_point (ClutterActor               *self,
                                                                                 ClutterActor               *ancestor,
                                                                                 const ClutterVertex        *point,
                                                                                 ClutterVertex              *vertex);
 /* Implicit animations */
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_save_easing_state                 (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_restore_easing_state              (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_easing_mode                   (ClutterActor               *self,
                                                                                 ClutterAnimationMode        mode);
 CLUTTER_AVAILABLE_IN_1_10
 ClutterAnimationMode            clutter_actor_get_easing_mode                   (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_easing_duration               (ClutterActor               *self,
                                                                                 guint                       msecs);
 CLUTTER_AVAILABLE_IN_1_10
 guint                           clutter_actor_get_easing_duration               (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_easing_delay                  (ClutterActor               *self,
                                                                                 guint                       msecs);
 CLUTTER_AVAILABLE_IN_1_10
 guint                           clutter_actor_get_easing_delay                  (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 ClutterTransition *             clutter_actor_get_transition                    (ClutterActor               *self,
                                                                                 const char                 *name);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_add_transition                    (ClutterActor               *self,
                                                                                 const char                 *name,
                                                                                 ClutterTransition          *transition);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_remove_transition                 (ClutterActor               *self,
                                                                                 const char                 *name);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_remove_all_transitions            (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_16
 gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
 CLUTTER_AVAILABLE_IN_1_22
 void                            clutter_actor_set_opacity_override              (ClutterActor               *self,
                                                                                 gint                        opacity);
 CLUTTER_AVAILABLE_IN_1_22
 gint                            clutter_actor_get_opacity_override              (ClutterActor               *self);
 /**
 * ClutterActorCreateChildFunc:
 * @item: (type GObject): the item in the model
 * @user_data: Data passed to clutter_actor_bind_model()
 *
 * Creates a #ClutterActor using the @item in the model.
 *
 * The usual way to implement this function is to create a #ClutterActor
 * instance and then bind the #GObject properties to the actor properties
 * of interest, using g_object_bind_property(). This way, when the @item
 * in the #GListModel changes, the #ClutterActor changes as well.
 *
 * Returns: (transfer full): The newly created child #ClutterActor
 *
 * Since: 1.24
 */
 typedef ClutterActor * (* ClutterActorCreateChildFunc) (gpointer item,
                                                        gpointer user_data);
 CLUTTER_AVAILABLE_IN_1_24
 void                            clutter_actor_bind_model                        (ClutterActor               *self,
                                                                                 GListModel                 *model,
                                                                                 ClutterActorCreateChildFunc create_child_func,
                                                                                 gpointer                    user_data,
                                                                                 GDestroyNotify              notify);
 CLUTTER_AVAILABLE_IN_1_24
 void                            clutter_actor_bind_model_with_properties        (ClutterActor               *self,
                                                                                 GListModel                 *model,
                                                                                 GType                       child_type,
                                                                                 const char                 *first_model_property,
                                                                                 ...);
 G_END_DECLS
 #endif /* __CLUTTER_ACTOR_H__ */
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@@ -1,542 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-align-constraint
 * @Title: ClutterAlignConstraint
 * @Short_Description: A constraint aligning the position of an actor
 *
 * #ClutterAlignConstraint is a #ClutterConstraint that aligns the position
 * of the #ClutterActor to which it is applied to the size of another
 * #ClutterActor using an alignment factor
 *
 * #ClutterAlignConstraint is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-align-constraint.h"
 #include "clutter-actor-meta-private.h"
 #include "clutter-actor-private.h"
 #include "clutter-constraint.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-private.h"
 #include <math.h>
 #define CLUTTER_ALIGN_CONSTRAINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_ALIGN_CONSTRAINT, ClutterAlignConstraintClass))
 #define CLUTTER_IS_ALIGN_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ALIGN_CONSTRAINT))
 #define CLUTTER_ALIGN_CONSTRAINT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ALIGN_CONSTRAINT, ClutterAlignConstraintClass))
 struct _ClutterAlignConstraint
 {
  ClutterConstraint parent_instance;
  ClutterActor *actor;
  ClutterActor *source;
  ClutterAlignAxis align_axis;
  gfloat factor;
 };
 struct _ClutterAlignConstraintClass
 {
  ClutterConstraintClass parent_class;
 };
 enum
 {
  PROP_0,
  PROP_SOURCE,
  PROP_ALIGN_AXIS,
  PROP_FACTOR,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE (ClutterAlignConstraint,
               clutter_align_constraint,
               CLUTTER_TYPE_CONSTRAINT);
 static void
 source_position_changed (ClutterActor           *actor,
                         const ClutterActorBox  *allocation,
                         ClutterAllocationFlags  flags,
                         ClutterAlignConstraint *align)
 {
  if (align->actor != NULL)
    clutter_actor_queue_relayout (align->actor);
 }
 static void
 source_destroyed (ClutterActor           *actor,
                  ClutterAlignConstraint *align)
 {
  align->source = NULL;
 }
 static void
 clutter_align_constraint_set_actor (ClutterActorMeta *meta,
                                    ClutterActor     *new_actor)
 {
  ClutterAlignConstraint *align = CLUTTER_ALIGN_CONSTRAINT (meta);
  ClutterActorMetaClass *parent;
  if (new_actor != NULL &&
      align->source != NULL &&
      clutter_actor_contains (new_actor, align->source))
    {
      g_warning (G_STRLOC ": The source actor '%s' is contained "
                 "by the actor '%s' associated to the constraint "
                 "'%s'",
                 _clutter_actor_get_debug_name (align->source),
                 _clutter_actor_get_debug_name (new_actor),
                 _clutter_actor_meta_get_debug_name (meta));
      return;
    }
  /* store the pointer to the actor, for later use */
  align->actor = new_actor;
  parent = CLUTTER_ACTOR_META_CLASS (clutter_align_constraint_parent_class);
  parent->set_actor (meta, new_actor);
 }
 static void
 clutter_align_constraint_update_allocation (ClutterConstraint *constraint,
                                            ClutterActor      *actor,
                                            ClutterActorBox   *allocation)
 {
  ClutterAlignConstraint *align = CLUTTER_ALIGN_CONSTRAINT (constraint);
  gfloat source_width, source_height;
  gfloat actor_width, actor_height;
  gfloat source_x, source_y;
  if (align->source == NULL)
    return;
  clutter_actor_box_get_size (allocation, &actor_width, &actor_height);
  clutter_actor_get_position (align->source, &source_x, &source_y);
  clutter_actor_get_size (align->source, &source_width, &source_height);
  switch (align->align_axis)
    {
    case CLUTTER_ALIGN_X_AXIS:
      allocation->x1 = ((source_width - actor_width) * align->factor)
                     + source_x;
      allocation->x2 = allocation->x1 + actor_width;
      break;
    case CLUTTER_ALIGN_Y_AXIS:
      allocation->y1 = ((source_height - actor_height) * align->factor)
                     + source_y;
      allocation->y2 = allocation->y1 + actor_height;
      break;
    case CLUTTER_ALIGN_BOTH:
      allocation->x1 = ((source_width - actor_width) * align->factor)
                     + source_x;
      allocation->y1 = ((source_height - actor_height) * align->factor)
                     + source_y;
      allocation->x2 = allocation->x1 + actor_width;
      allocation->y2 = allocation->y1 + actor_height;
      break;
    default:
      g_assert_not_reached ();
      break;
    }
  clutter_actor_box_clamp_to_pixel (allocation);
 }
 static void
 clutter_align_constraint_dispose (GObject *gobject)
 {
  ClutterAlignConstraint *align = CLUTTER_ALIGN_CONSTRAINT (gobject);
  if (align->source != NULL)
    {
      g_signal_handlers_disconnect_by_func (align->source,
                                            G_CALLBACK (source_destroyed),
                                            align);
      g_signal_handlers_disconnect_by_func (align->source,
                                            G_CALLBACK (source_position_changed),
                                            align);
      align->source = NULL;
    }
  G_OBJECT_CLASS (clutter_align_constraint_parent_class)->dispose (gobject);
 }
 static void
 clutter_align_constraint_set_property (GObject      *gobject,
                                       guint         prop_id,
                                       const GValue *value,
                                       GParamSpec   *pspec)
 {
  ClutterAlignConstraint *align = CLUTTER_ALIGN_CONSTRAINT (gobject);
  switch (prop_id)
    {
    case PROP_SOURCE:
      clutter_align_constraint_set_source (align, g_value_get_object (value));
      break;
    case PROP_ALIGN_AXIS:
      clutter_align_constraint_set_align_axis (align, g_value_get_enum (value));
      break;
    case PROP_FACTOR:
      clutter_align_constraint_set_factor (align, g_value_get_float (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_align_constraint_get_property (GObject    *gobject,
                                       guint       prop_id,
                                       GValue     *value,
                                       GParamSpec *pspec)
 {
  ClutterAlignConstraint *align = CLUTTER_ALIGN_CONSTRAINT (gobject);
  switch (prop_id)
    {
    case PROP_SOURCE:
      g_value_set_object (value, align->source);
      break;
    case PROP_ALIGN_AXIS:
      g_value_set_enum (value, align->align_axis);
      break;
    case PROP_FACTOR:
      g_value_set_float (value, align->factor);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_align_constraint_class_init (ClutterAlignConstraintClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
  ClutterConstraintClass *constraint_class = CLUTTER_CONSTRAINT_CLASS (klass);
  meta_class->set_actor = clutter_align_constraint_set_actor;
  constraint_class->update_allocation = clutter_align_constraint_update_allocation;
  /**
   * ClutterAlignConstraint:source:
   *
   * The #ClutterActor used as the source for the alignment.
   *
   * The #ClutterActor must not be a child or a grandchild of the actor
   * using the constraint.
   *
   * Since: 1.4
   */
  obj_props[PROP_SOURCE] =
    g_param_spec_object ("source",
                           P_("Source"),
                           P_("The source of the alignment"),
                           CLUTTER_TYPE_ACTOR,
                           CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  /**
   * ClutterAlignConstraint:align-axis:
   *
   * The axis to be used to compute the alignment
   *
   * Since: 1.4
   */
  obj_props[PROP_ALIGN_AXIS] =
    g_param_spec_enum ("align-axis",
                       P_("Align Axis"),
                       P_("The axis to align the position to"),
                       CLUTTER_TYPE_ALIGN_AXIS,
                       CLUTTER_ALIGN_X_AXIS,
                       CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  /**
   * ClutterAlignConstraint:factor:
   *
   * The alignment factor, as a normalized value between 0.0 and 1.0
   *
   * The factor depends on the #ClutterAlignConstraint:align-axis property:
   * with an align-axis value of %CLUTTER_ALIGN_X_AXIS, 0.0 means left and
   * 1.0 means right; with a value of %CLUTTER_ALIGN_Y_AXIS, 0.0 means top
   * and 1.0 means bottom.
   *
   * Since: 1.4
   */
  obj_props[PROP_FACTOR] =
    g_param_spec_float ("factor",
                        P_("Factor"),
                        P_("The alignment factor, between 0.0 and 1.0"),
                        0.0, 1.0,
                        0.0,
                        CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  gobject_class->dispose = clutter_align_constraint_dispose;
  gobject_class->set_property = clutter_align_constraint_set_property;
  gobject_class->get_property = clutter_align_constraint_get_property;
  g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
 }
 static void
 clutter_align_constraint_init (ClutterAlignConstraint *self)
 {
  self->actor = NULL;
  self->source = NULL;
  self->align_axis = CLUTTER_ALIGN_X_AXIS;
  self->factor = 0.0f;
 }
 /**
 * clutter_align_constraint_new:
 * @source: (allow-none): the #ClutterActor to use as the source of the
 *   alignment, or %NULL
 * @axis: the axis to be used to compute the alignment
 * @factor: the alignment factor, between 0.0 and 1.0
 *
 * Creates a new constraint, aligning a #ClutterActor's position with
 * regards of the size of the actor to @source, with the given
 * alignment @factor
 *
 * Return value: the newly created #ClutterAlignConstraint
 *
 * Since: 1.4
 */
 ClutterConstraint *
 clutter_align_constraint_new (ClutterActor     *source,
                              ClutterAlignAxis  axis,
                              gfloat            factor)
 {
  g_return_val_if_fail (source == NULL || CLUTTER_IS_ACTOR (source), NULL);
  return g_object_new (CLUTTER_TYPE_ALIGN_CONSTRAINT,
                       "source", source,
                       "align-axis", axis,
                       "factor", factor,
                       NULL);
 }
 /**
 * clutter_align_constraint_set_source:
 * @align: a #ClutterAlignConstraint
 * @source: (allow-none): a #ClutterActor, or %NULL to unset the source
 *
 * Sets the source of the alignment constraint
 *
 * Since: 1.4
 */
 void
 clutter_align_constraint_set_source (ClutterAlignConstraint *align,
                                     ClutterActor           *source)
 {
  ClutterActor *old_source, *actor;
  ClutterActorMeta *meta;
  g_return_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align));
  g_return_if_fail (source == NULL || CLUTTER_IS_ACTOR (source));
  if (align->source == source)
    return;
  meta = CLUTTER_ACTOR_META (align);
  actor = clutter_actor_meta_get_actor (meta);
  if (actor != NULL && source != NULL)
    {
      if (clutter_actor_contains (actor, source))
        {
          g_warning (G_STRLOC ": The source actor '%s' is contained "
                     "by the actor '%s' associated to the constraint "
                     "'%s'",
                     _clutter_actor_get_debug_name (source),
                     _clutter_actor_get_debug_name (actor),
                     _clutter_actor_meta_get_debug_name (meta));
          return;
        }
    }
  old_source = align->source;
  if (old_source != NULL)
    {
      g_signal_handlers_disconnect_by_func (old_source,
                                            G_CALLBACK (source_destroyed),
                                            align);
      g_signal_handlers_disconnect_by_func (old_source,
                                            G_CALLBACK (source_position_changed),
                                            align);
    }
  align->source = source;
  if (align->source != NULL)
    {
      g_signal_connect (align->source, "allocation-changed",
                        G_CALLBACK (source_position_changed),
                        align);
      g_signal_connect (align->source, "destroy",
                        G_CALLBACK (source_destroyed),
                        align);
      if (align->actor != NULL)
        clutter_actor_queue_relayout (align->actor);
    }
  g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_SOURCE]);
 }
 /**
 * clutter_align_constraint_get_source:
 * @align: a #ClutterAlignConstraint
 *
 * Retrieves the source of the alignment
 *
 * Return value: (transfer none): the #ClutterActor used as the source
 *   of the alignment
 *
 * Since: 1.4
 */
 ClutterActor *
 clutter_align_constraint_get_source (ClutterAlignConstraint *align)
 {
  g_return_val_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align), NULL);
  return align->source;
 }
 /**
 * clutter_align_constraint_set_align_axis:
 * @align: a #ClutterAlignConstraint
 * @axis: the axis to which the alignment refers to
 *
 * Sets the axis to which the alignment refers to
 *
 * Since: 1.4
 */
 void
 clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
                                         ClutterAlignAxis        axis)
 {
  g_return_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align));
  if (align->align_axis == axis)
    return;
  align->align_axis = axis;
  if (align->actor != NULL)
    clutter_actor_queue_relayout (align->actor);
  g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_ALIGN_AXIS]);
 }
 /**
 * clutter_align_constraint_get_align_axis:
 * @align: a #ClutterAlignConstraint
 *
 * Retrieves the value set using clutter_align_constraint_set_align_axis()
 *
 * Return value: the alignment axis
 *
 * Since: 1.4
 */
 ClutterAlignAxis
 clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align)
 {
  g_return_val_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align),
                        CLUTTER_ALIGN_X_AXIS);
  return align->align_axis;
 }
 /**
 * clutter_align_constraint_set_factor:
 * @align: a #ClutterAlignConstraint
 * @factor: the alignment factor, between 0.0 and 1.0
 *
 * Sets the alignment factor of the constraint
 *
 * The factor depends on the #ClutterAlignConstraint:align-axis property
 * and it is a value between 0.0 (meaning left, when
 * #ClutterAlignConstraint:align-axis is set to %CLUTTER_ALIGN_X_AXIS; or
 * meaning top, when #ClutterAlignConstraint:align-axis is set to
 * %CLUTTER_ALIGN_Y_AXIS) and 1.0 (meaning right, when
 * #ClutterAlignConstraint:align-axis is set to %CLUTTER_ALIGN_X_AXIS; or
 * meaning bottom, when #ClutterAlignConstraint:align-axis is set to
 * %CLUTTER_ALIGN_Y_AXIS). A value of 0.5 aligns in the middle in either
 * cases
 *
 * Since: 1.4
 */
 void
 clutter_align_constraint_set_factor (ClutterAlignConstraint *align,
                                     gfloat                  factor)
 {
  g_return_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align));
  align->factor = CLAMP (factor, 0.0, 1.0);
  if (align->actor != NULL)
    clutter_actor_queue_relayout (align->actor);
  g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_FACTOR]);
 }
 /**
 * clutter_align_constraint_get_factor:
 * @align: a #ClutterAlignConstraint
 *
 * Retrieves the factor set using clutter_align_constraint_set_factor()
 *
 * Return value: the alignment factor
 *
 * Since: 1.4
 */
 gfloat
 clutter_align_constraint_get_factor (ClutterAlignConstraint *align)
 {
  g_return_val_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align), 0.0);
  return align->factor;
 }
--- a/clutter/clutter/clutter-align-constraint.h
+++ b/clutter/clutter/clutter-align-constraint.h
@@ -1,77 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_ALIGN_CONSTRAINT_H__
 #define __CLUTTER_ALIGN_CONSTRAINT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-constraint.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_ALIGN_CONSTRAINT           (clutter_align_constraint_get_type ())
 #define CLUTTER_ALIGN_CONSTRAINT(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ALIGN_CONSTRAINT, ClutterAlignConstraint))
 #define CLUTTER_IS_ALIGN_CONSTRAINT(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ALIGN_CONSTRAINT))
 /**
 * ClutterAlignConstraint:
 *
 * #ClutterAlignConstraint is an opaque structure
 * whose members cannot be directly accesses
 *
 * Since: 1.4
 */
 typedef struct _ClutterAlignConstraint          ClutterAlignConstraint;
 typedef struct _ClutterAlignConstraintClass     ClutterAlignConstraintClass;
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_align_constraint_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 ClutterConstraint *clutter_align_constraint_new            (ClutterActor           *source,
                                                            ClutterAlignAxis        axis,
                                                            gfloat                  factor);
 CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_source     (ClutterAlignConstraint *align,
                                                            ClutterActor           *source);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *align);
 CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
                                                            ClutterAlignAxis        axis);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align);
 CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *align,
                                                            gfloat                  factor);
 CLUTTER_AVAILABLE_IN_1_4
 gfloat             clutter_align_constraint_get_factor     (ClutterAlignConstraint *align);
 G_END_DECLS
 #endif /* __CLUTTER_ALIGN_CONSTRAINT_H__ */
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -1,286 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2009  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-animatable
 * @short_description: Interface for animatable classes
 *
 * #ClutterAnimatable is an interface that allows a #GObject class
 * to control how a #ClutterAnimation will animate a property.
 *
 * Each #ClutterAnimatable should implement the
 * #ClutterAnimatableIface.interpolate_property() virtual function of the
 * interface to compute the animation state between two values of an interval
 * depending on a progress factor, expressed as a floating point value.
 *
 * If a #ClutterAnimatable is animated by a #ClutterAnimation
 * instance, the #ClutterAnimation will call
 * clutter_animatable_interpolate_property() passing the name of the
 * currently animated property; the values interval; and the progress factor.
 * The #ClutterAnimatable implementation should return the computed value for
 * the animated
 * property.
 *
 * #ClutterAnimatable is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "clutter-animatable.h"
 #include "clutter-interval.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 #include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"
 typedef ClutterAnimatableIface  ClutterAnimatableInterface;
 G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
 static void
 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
 *
 * Finds the #GParamSpec for @property_name
 *
 * Return value: (transfer none): The #GParamSpec for the given property
 *   or %NULL
 *
 * Since: 1.4
 */
 GParamSpec *
 clutter_animatable_find_property (ClutterAnimatable *animatable,
                                  const gchar       *property_name)
 {
  ClutterAnimatableIface *iface;
  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), NULL);
  g_return_val_if_fail (property_name != NULL, NULL);
  CLUTTER_NOTE (ANIMATION, "Looking for property '%s'", property_name);
  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
  if (iface->find_property != NULL)
    return iface->find_property (animatable, property_name);
  return g_object_class_find_property (G_OBJECT_GET_CLASS (animatable),
                                       property_name);
 }
 /**
 * clutter_animatable_get_initial_state:
 * @animatable: a #ClutterAnimatable
 * @property_name: the name of the animatable property to retrieve
 * @value: a #GValue initialized to the type of the property to retrieve
 *
 * Retrieves the current state of @property_name and sets @value with it
 *
 * Since: 1.4
 */
 void
 clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
                                      const gchar       *property_name,
                                      GValue            *value)
 {
  ClutterAnimatableIface *iface;
  g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable));
  g_return_if_fail (property_name != NULL);
  CLUTTER_NOTE (ANIMATION, "Getting initial state of '%s'", property_name);
  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
  if (iface->get_initial_state != NULL)
    iface->get_initial_state (animatable, property_name, value);
  else
    g_object_get_property (G_OBJECT (animatable), property_name, value);
 }
 /**
 * clutter_animatable_set_final_state:
 * @animatable: a #ClutterAnimatable
 * @property_name: the name of the animatable property to set
 * @value: the value of the animatable property to set
 *
 * Sets the current state of @property_name to @value
 *
 * Since: 1.4
 */
 void
 clutter_animatable_set_final_state (ClutterAnimatable *animatable,
                                    const gchar       *property_name,
                                    const GValue      *value)
 {
  ClutterAnimatableIface *iface;
  g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable));
  g_return_if_fail (property_name != NULL);
  CLUTTER_NOTE (ANIMATION, "Setting state of property '%s'", property_name);
  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
  if (iface->set_final_state != NULL)
    iface->set_final_state (animatable, property_name, value);
  else
    g_object_set_property (G_OBJECT (animatable), property_name, value);
 }
 /**
 * clutter_animatable_interpolate_value:
 * @animatable: a #ClutterAnimatable
 * @property_name: the name of the property to interpolate
 * @interval: a #ClutterInterval with the animation range
 * @progress: the progress to use to interpolate between the
 *   initial and final values of the @interval
 * @value: (out): return location for an initialized #GValue
 *   using the same type of the @interval
 *
 * Asks a #ClutterAnimatable implementation to interpolate a
 * a named property between the initial and final values of
 * a #ClutterInterval, using @progress as the interpolation
 * value, and store the result inside @value.
 *
 * This function should be used for every property animation
 * involving #ClutterAnimatable<!-- -->s.
 *
 * This function replaces clutter_animatable_animate_property().
 *
 * Return value: %TRUE if the interpolation was successful,
 *   and %FALSE otherwise
 *
 * Since: 1.8
 */
 gboolean
 clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
                                      const gchar       *property_name,
                                      ClutterInterval   *interval,
                                      gdouble            progress,
                                      GValue            *value)
 {
  ClutterAnimatableIface *iface;
  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
  g_return_val_if_fail (property_name != NULL, FALSE);
  g_return_val_if_fail (CLUTTER_IS_INTERVAL (interval), FALSE);
  g_return_val_if_fail (value != NULL, FALSE);
  CLUTTER_NOTE (ANIMATION, "Interpolating '%s' (progress: %.3f)",
                property_name,
                progress);
  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
  if (iface->interpolate_value != NULL)
    {
      return iface->interpolate_value (animatable, property_name,
                                       interval,
                                       progress,
                                       value);
    }
  else
    return clutter_interval_compute_value (interval, progress, value);
 }
--- a/clutter/clutter/clutter-animatable.h
+++ b/clutter/clutter/clutter-animatable.h
@@ -1,121 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2009  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_ANIMATABLE_H__
 #define __CLUTTER_ANIMATABLE_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_ANIMATABLE                 (clutter_animatable_get_type ())
 #define CLUTTER_ANIMATABLE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatable))
 #define CLUTTER_IS_ANIMATABLE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ANIMATABLE))
 #define CLUTTER_ANIMATABLE_GET_IFACE(obj)       (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatableIface))
 typedef struct _ClutterAnimatableIface          ClutterAnimatableIface;
 /**
 * ClutterAnimatable:
 *
 * #ClutterAnimatable is an opaque structure whose members cannot be directly
 * accessed
 *
 * Since: 1.0
 */
 /**
 * 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
 *   state of an animatable property
 * @set_final_state: virtual function for setting the state of an
 *   animatable property
 * @interpolate_value: virtual function for interpolating the progress
 *   of a property
 *
 * Base interface for #GObject<!-- -->s that can be animated by a
 * a #ClutterAnimation.
 *
 * Since: 1.0
 */
 struct _ClutterAnimatableIface
 {
  /*< private >*/
  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,
                                     const gchar       *property_name,
                                     GValue            *value);
  void        (* set_final_state)   (ClutterAnimatable *animatable,
                                     const gchar       *property_name,
                                     const GValue      *value);
  gboolean    (* interpolate_value) (ClutterAnimatable *animatable,
                                     const gchar       *property_name,
                                     ClutterInterval   *interval,
                                     gdouble            progress,
                                     GValue            *value);
 };
 CLUTTER_AVAILABLE_IN_1_0
 GType clutter_animatable_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_0
 GParamSpec *clutter_animatable_find_property     (ClutterAnimatable *animatable,
                                                  const gchar       *property_name);
 CLUTTER_AVAILABLE_IN_1_0
 void        clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  GValue            *value);
 CLUTTER_AVAILABLE_IN_1_0
 void        clutter_animatable_set_final_state   (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  const GValue      *value);
 CLUTTER_AVAILABLE_IN_1_8
 gboolean    clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  ClutterInterval   *interval,
                                                  gdouble            progress,
                                                  GValue            *value);
 G_END_DECLS
 #endif /* __CLUTTER_ANIMATABLE_H__ */
--- a/clutter/clutter/clutter-autocleanups.h
+++ b/clutter/clutter/clutter-autocleanups.h
@@ -1,106 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright 2015  Emmanuele Bassi
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 *
 */
 #ifndef __CLUTTER_AUTO_CLEANUPS_H__
 #define __CLUTTER_AUTO_CLEANUPS_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #ifndef __GI_SCANNER__
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActor, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorMeta, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAlignConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAnimatable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackend, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindingPool, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBinLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBlurEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBoxLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBrightnessContrastEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterCanvas, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterChildMeta, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClickAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContainer, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContent, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeviceManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDragAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDropAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFixedLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFlowLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterGestureAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterGridLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterImage, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInputDevice, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInterval, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterKeyframeTransition, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterLayoutManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterLayoutMeta, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterOffscreenEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPageTurnEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPanAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPath, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPropertyTransition, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterRotateAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScriptable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScript, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScrollActor, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSettings, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterShaderEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSnapConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterStage, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSwipeAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTapAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTextBuffer, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterText, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTimeline, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTransitionGroup, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterTransition, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterZoomAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorBox, clutter_actor_box_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColor, clutter_color_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMargin, clutter_margin_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMatrix, clutter_matrix_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintNode, clutter_paint_node_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathNode, clutter_path_node_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPoint, clutter_point_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterRect, clutter_rect_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterSize, clutter_size_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterVertex, clutter_vertex_free)
 #endif /* __GI_SCANNER__ */
 #endif /* __CLUTTER_AUTO_CLEANUPS_H__ */
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -1,158 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_BACKEND_PRIVATE_H__
 #define __CLUTTER_BACKEND_PRIVATE_H__
 #include <clutter/clutter-backend.h>
 #include <clutter/clutter-device-manager.h>
 #include <clutter/clutter-stage-window.h>
 #include "clutter-event-translator.h"
 #define CLUTTER_BACKEND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
 #define CLUTTER_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND))
 #define CLUTTER_BACKEND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
 G_BEGIN_DECLS
 typedef struct _ClutterBackendPrivate   ClutterBackendPrivate;
 struct _ClutterBackend
 {
  /*< private >*/
  GObject parent_instance;
  CoglRenderer *cogl_renderer;
  CoglDisplay *cogl_display;
  CoglContext *cogl_context;
  GSource *cogl_source;
  CoglOnscreen *dummy_onscreen;
  ClutterDeviceManager *device_manager;
  cairo_font_options_t *font_options;
  gchar *font_name;
  gfloat units_per_em;
  gint32 units_serial;
  GList *event_translators;
 };
 struct _ClutterBackendClass
 {
  /*< private >*/
  GObjectClass parent_class;
  /* vfuncs */
  gboolean              (* pre_parse)          (ClutterBackend  *backend,
                                                GError         **error);
  gboolean              (* post_parse)         (ClutterBackend  *backend,
                                                GError         **error);
  ClutterStageWindow *  (* create_stage)       (ClutterBackend  *backend,
                                                ClutterStage    *wrapper,
                                                GError         **error);
  void                  (* init_events)        (ClutterBackend  *backend);
  void                  (* init_features)      (ClutterBackend  *backend);
  void                  (* add_options)        (ClutterBackend  *backend,
                                                GOptionGroup    *group);
  ClutterFeatureFlags   (* get_features)       (ClutterBackend  *backend);
  CoglRenderer *        (* get_renderer)       (ClutterBackend  *backend,
                                                GError         **error);
  CoglDisplay *         (* get_display)        (ClutterBackend  *backend,
                                                CoglRenderer    *renderer,
                                                CoglSwapChain   *swap_chain,
                                                GError         **error);
  gboolean              (* create_context)     (ClutterBackend  *backend,
                                                GError         **error);
  ClutterDeviceManager *(* get_device_manager) (ClutterBackend  *backend);
  void                  (* copy_event_data)    (ClutterBackend     *backend,
                                                const ClutterEvent *src,
                                                ClutterEvent       *dest);
  void                  (* free_event_data)    (ClutterBackend     *backend,
                                                ClutterEvent       *event);
  gboolean              (* translate_event)    (ClutterBackend     *backend,
                                                gpointer            native,
                                                ClutterEvent       *event);
  PangoDirection        (* get_keymap_direction) (ClutterBackend   *backend);
  /* signals */
  void (* resolution_changed) (ClutterBackend *backend);
  void (* font_changed)       (ClutterBackend *backend);
  void (* settings_changed)   (ClutterBackend *backend);
 };
 ClutterBackend *        _clutter_create_backend                         (void);
 ClutterStageWindow *    _clutter_backend_create_stage                   (ClutterBackend         *backend,
                                                                         ClutterStage           *wrapper,
                                                                         GError                **error);
 gboolean                _clutter_backend_create_context                 (ClutterBackend         *backend,
                                                                         GError                **error);
 void                    _clutter_backend_add_options                    (ClutterBackend         *backend,
                                                                         GOptionGroup           *group);
 gboolean                _clutter_backend_pre_parse                      (ClutterBackend         *backend,
                                                                         GError                **error);
 gboolean                _clutter_backend_post_parse                     (ClutterBackend         *backend,
                                                                         GError                **error);
 void                    _clutter_backend_init_events                    (ClutterBackend         *backend);
 void                    _clutter_backend_copy_event_data                (ClutterBackend         *backend,
                                                                         const ClutterEvent     *src,
                                                                         ClutterEvent           *dest);
 void                    _clutter_backend_free_event_data                (ClutterBackend         *backend,
                                                                         ClutterEvent           *event);
 gboolean                _clutter_backend_translate_event                (ClutterBackend         *backend,
                                                                         gpointer                native,
                                                                         ClutterEvent           *event);
 CLUTTER_AVAILABLE_IN_MUTTER
 void                    _clutter_backend_add_event_translator           (ClutterBackend         *backend,
                                                                         ClutterEventTranslator *translator);
 void                    _clutter_backend_remove_event_translator        (ClutterBackend         *backend,
                                                                         ClutterEventTranslator *translator);
 ClutterFeatureFlags     _clutter_backend_get_features                   (ClutterBackend         *backend);
 gfloat                  _clutter_backend_get_units_per_em               (ClutterBackend         *backend,
                                                                         PangoFontDescription   *font_desc);
 gint32                  _clutter_backend_get_units_serial               (ClutterBackend         *backend);
 PangoDirection          _clutter_backend_get_keymap_direction           (ClutterBackend         *backend);
 CLUTTER_AVAILABLE_IN_MUTTER
 void                    _clutter_backend_reset_cogl_framebuffer         (ClutterBackend         *backend);
 void                    clutter_set_allowed_drivers                     (const char             *drivers);
 void                    clutter_try_set_windowing_backend               (const char             *drivers);
 G_END_DECLS
 #endif /* __CLUTTER_BACKEND_PRIVATE_H__ */
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -1,79 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Matthew Allum  <mallum@openedhand.com>
 *
 * Copyright (C) 2006 OpenedHand
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_BACKEND_H__
 #define __CLUTTER_BACKEND_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <cairo.h>
 #include <pango/pango.h>
 #include <cogl/cogl.h>
 #include <clutter/clutter-config.h>
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BACKEND            (clutter_backend_get_type ())
 #define CLUTTER_BACKEND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND, ClutterBackend))
 #define CLUTTER_IS_BACKEND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND))
 /**
 * ClutterBackend:
 *
 * #ClutterBackend is an opaque structure whose
 * members cannot be directly accessed.
 *
 * Since: 0.4
 */
 typedef struct _ClutterBackend          ClutterBackend;
 typedef struct _ClutterBackendClass     ClutterBackendClass;
 CLUTTER_AVAILABLE_IN_ALL
 GType clutter_backend_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_ALL
 ClutterBackend *                clutter_get_default_backend             (void);
 CLUTTER_AVAILABLE_IN_1_16
 void                            clutter_set_windowing_backend           (const char *backend_type);
 CLUTTER_AVAILABLE_IN_ALL
 gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);
 CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_backend_set_font_options        (ClutterBackend             *backend,
                                                                         const cairo_font_options_t *options);
 CLUTTER_AVAILABLE_IN_ALL
 const cairo_font_options_t *    clutter_backend_get_font_options        (ClutterBackend             *backend);
 CLUTTER_AVAILABLE_IN_1_8
 CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);
 G_END_DECLS
 #endif /* __CLUTTER_BACKEND_H__ */
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
--- a/clutter/clutter/clutter-bezier.c
+++ b/clutter/clutter/clutter-bezier.c
@@ -1,514 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Tomas Frydrych  <tf@openedhand.com>
 *
 * Copyright (C) 2007 OpenedHand
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "clutter-build-config.h"
 #include <glib.h>
 #include <string.h>
 #include "clutter-bezier.h"
 #include "clutter-debug.h"
 /*
 * We have some experimental code here to allow for constant velocity
 * movement of actors along the bezier path, this macro enables it.
 */
 #undef CBZ_L2T_INTERPOLATION
 /****************************************************************************
 * ClutterBezier -- represenation of a cubic bezier curve                   *
 * (private; a building block for the public bspline object)                *
 ****************************************************************************/
 /*
 * The t parameter of the bezier is from interval <0,1>, so we can use
 * 14.18 format and special multiplication functions that preserve
 * more of the least significant bits but would overflow if the value
 * is > 1
 */
 #define CBZ_T_Q 18
 #define CBZ_T_ONE (1 << CBZ_T_Q)
 #define CBZ_T_MUL(x,y) ((((x) >> 3) * ((y) >> 3)) >> 12)
 #define CBZ_T_POW2(x) CBZ_T_MUL (x, x)
 #define CBZ_T_POW3(x) CBZ_T_MUL (CBZ_T_POW2 (x), x)
 #define CBZ_T_DIV(x,y) ((((x) << 9)/(y)) << 9)
 /*
 * Constants for sampling of the bezier
 */
 #define CBZ_T_SAMPLES 128
 #define CBZ_T_STEP (CBZ_T_ONE / CBZ_T_SAMPLES)
 #define CBZ_L_STEP (CBZ_T_ONE / CBZ_T_SAMPLES)
 #define FIXED_BITS (32)
 #define FIXED_Q (FIXED_BITS - 16)
 #define FIXED_FROM_INT(x) ((x) << FIXED_Q)
 typedef gint32 _FixedT;
 /*
 * This is a private type representing a single cubic bezier
 */
 struct _ClutterBezier
 {
  /*
   * bezier coefficients -- these are calculated using multiplication and
   * addition from integer input, so these are also integers
   */
  gint ax;
  gint bx;
  gint cx;
  gint dx;
  gint ay;
  gint by;
  gint cy;
  gint dy;
  /* length of the bezier */
  guint length;
 #ifdef CBZ_L2T_INTERPOLATION
  /*
   * coefficients for the L -> t bezier; these are calculated from fixed
   * point input, and more specifically numbers that have been normalised
   * to fit <0,1>, so these are also fixed point, and we can used the
   * _FixedT type here.
   */
  _FixedT La;
  _FixedT Lb;
  _FixedT Lc;
  /*  _FixedT Ld; == 0 */
 #endif
 };
 ClutterBezier *
 _clutter_bezier_new (void)
 {
  return g_slice_new0 (ClutterBezier);
 }
 void
 _clutter_bezier_free (ClutterBezier * b)
 {
  if (G_LIKELY (b))
    {
      g_slice_free (ClutterBezier, b);
    }
 }
 ClutterBezier *
 _clutter_bezier_clone_and_move (const ClutterBezier *b, gint x, gint y)
 {
  ClutterBezier * b2 = _clutter_bezier_new ();
  memcpy (b2, b, sizeof (ClutterBezier));
  b2->dx += x;
  b2->dy += y;
  return b2;
 }
 #ifdef CBZ_L2T_INTERPOLATION
 /*
 * L is relative advance along the bezier curve from interval <0,1>
 */
 static _FixedT
 _clutter_bezier_L2t (const ClutterBezier *b, _FixedT L)
 {
  _FixedT t = CBZ_T_MUL (b->La, CBZ_T_POW3(L))
    +  CBZ_T_MUL (b->Lb, CBZ_T_POW2(L))
    +  CBZ_T_MUL (b->Lc, L);
  if (t > CBZ_T_ONE)
    t = CBZ_T_ONE;
  else if (t < 0)
    t = 0;
  return t;
 }
 #endif
 static gint
 _clutter_bezier_t2x (const ClutterBezier * b, _FixedT t)
 {
  /*
   * NB -- the int coefficients can be at most 8192 for the multiplication
   * to work in this fashion due to the limits of the 14.18 fixed.
   */
  return ((b->ax*CBZ_T_POW3(t) + b->bx*CBZ_T_POW2(t) + b->cx*t) >> CBZ_T_Q)
    + b->dx;
 }
 static gint
 _clutter_bezier_t2y (const ClutterBezier * b, _FixedT t)
 {
  /*
   * NB -- the int coefficients can be at most 8192 for the multiplication
   * to work in this fashion due to the limits of the 14.18 fixed.
   */
  return ((b->ay*CBZ_T_POW3(t) + b->by*CBZ_T_POW2(t) + b->cy*t) >> CBZ_T_Q)
    + b->dy;
 }
 /*
 * Advances along the bezier to relative length L and returns the coordinances
 * in knot
 */
 void
 _clutter_bezier_advance (const ClutterBezier *b, gint L, ClutterKnot * knot)
 {
 #ifdef CBZ_L2T_INTERPOLATION
  _FixedT t = clutter_bezier_L2t (b, L);
 #else
  _FixedT t = L;
 #endif
  knot->x = _clutter_bezier_t2x (b, t);
  knot->y = _clutter_bezier_t2y (b, t);
  CLUTTER_NOTE (MISC, "advancing to relative pt %f: t %f, {%d,%d}",
                (double) L / (double) CBZ_T_ONE,
                (double) t / (double) CBZ_T_ONE,
                knot->x, knot->y);
 }
 static int
 sqrti (int number)
 {
 #if defined __SSE2__
    /* The GCC built-in with SSE2 (sqrtsd) is up to twice as fast as
     * the pure integer code below. It is also more accurate.
     */
    return __builtin_sqrt (number);
 #else
    /* This is a fixed point implementation of the Quake III sqrt algorithm,
     * described, for example, at
     *   http://www.codemaestro.com/reviews/review00000105.html
     *
     * While the original QIII is extremely fast, the use of floating division
     * and multiplication makes it perform very on arm processors without FPU.
     *
     * The key to successfully replacing the floating point operations with
     * fixed point is in the choice of the fixed point format. The QIII
     * algorithm does not calculate the square root, but its reciprocal ('y'
     * below), which is only at the end turned to the inverse value. In order
     * for the algorithm to produce satisfactory results, the reciprocal value
     * must be represented with sufficient precission; the 16.16 we use
     * elsewhere in clutter is not good enough, and 10.22 is used instead.
     */
    _FixedT x;
    uint32_t y_1;        /* 10.22 fixed point */
    uint32_t f = 0x600000; /* '1.5' as 10.22 fixed */
    union
    {
 	float f;
 	uint32_t i;
    } flt, flt2;
    flt.f = number;
    x = FIXED_FROM_INT (number) / 2;
    /* The QIII initial estimate */
    flt.i = 0x5f3759df - ( flt.i >> 1 );
    /* Now, we convert the float to 10.22 fixed. We exploit the mechanism
     * described at http://www.d6.com/users/checker/pdfs/gdmfp.pdf.
     *
     * We want 22 bit fraction; a single precission float uses 23 bit
     * mantisa, so we only need to add 2^(23-22) (no need for the 1.5
     * multiplier as we are only dealing with positive numbers).
     *
     * Note: we have to use two separate variables here -- for some reason,
     * if we try to use just the flt variable, gcc on ARM optimises the whole
     * addition out, and it all goes pear shape, since without it, the bits
     * in the float will not be correctly aligned.
     */
    flt2.f = flt.f + 2.0;
    flt2.i &= 0x7FFFFF;
    /* Now we correct the estimate */
    y_1 = (flt2.i >> 11) * (flt2.i >> 11);
    y_1 = (y_1 >> 8) * (x >> 8);
    y_1 = f - y_1;
    flt2.i = (flt2.i >> 11) * (y_1 >> 11);
    /* If the original argument is less than 342, we do another
     * iteration to improve precission (for arguments >= 342, the single
     * iteration produces generally better results).
     */
    if (x < 171)
      {
 	y_1 = (flt2.i >> 11) * (flt2.i >> 11);
 	y_1 = (y_1 >> 8) * (x >> 8);
 	y_1 = f - y_1;
 	flt2.i = (flt2.i >> 11) * (y_1 >> 11);
      }
    /* Invert, round and convert from 10.22 to an integer
     * 0x1e3c68 is a magical rounding constant that produces slightly
     * better results than 0x200000.
     */
    return (number * flt2.i + 0x1e3c68) >> 22;
 #endif
 }
 void
 _clutter_bezier_init (ClutterBezier *b,
 		     gint x_0, gint y_0,
 		     gint x_1, gint y_1,
 		     gint x_2, gint y_2,
 		     gint x_3, gint y_3)
 {
  _FixedT t;
  int i;
  int xp = x_0;
  int yp = y_0;
  _FixedT length [CBZ_T_SAMPLES + 1];
 #ifdef CBZ_L2T_INTERPOLATION
  int j, k;
  _FixedT L;
  _FixedT t_equalized [CBZ_T_SAMPLES + 1];
 #endif
 #if 0
  g_debug ("Initializing bezier at {{%d,%d},{%d,%d},{%d,%d},{%d,%d}}",
           x0, y0, x1, y1, x2, y2, x3, y3);
 #endif
  b->dx = x_0;
  b->dy = y_0;
  b->cx = 3 * (x_1 - x_0);
  b->cy = 3 * (y_1 - y_0);
  b->bx = 3 * (x_2 - x_1) - b->cx;
  b->by = 3 * (y_2 - y_1) - b->cy;
  b->ax = x_3 - 3 * x_2 + 3 * x_1 - x_0;
  b->ay = y_3 - 3 * y_2 + 3 * y_1 - y_0;
 #if 0
  g_debug ("Cooeficients {{%d,%d},{%d,%d},{%d,%d},{%d,%d}}",
           b->ax, b->ay, b->bx, b->by, b->cx, b->cy, b->dx, b->dy);
 #endif
  /*
   * Because of the way we do the multiplication in bezeir_t2x,y
   * these coefficients need to be at most 0x1fff; this should be the case,
   * I think, but have added this warning to catch any problems -- if it
   * triggers, we need to change those two functions a bit.
   */
  if (b->ax > 0x1fff || b->bx > 0x1fff || b->cx > 0x1fff)
    g_warning ("Calculated coefficents will result in multiplication "
               "overflow in clutter_bezier_t2x and clutter_bezier_t2y.");
  /*
   * Sample the bezier with CBZ_T_SAMPLES and calculate length at
   * each point.
   *
   * We are working with integers here, so we use the fast sqrti function.
   */
  length[0] = 0;
  for (t = CBZ_T_STEP, i = 1; i <= CBZ_T_SAMPLES; ++i, t += CBZ_T_STEP)
    {
      int x = _clutter_bezier_t2x (b, t);
      int y = _clutter_bezier_t2y (b, t);
      guint l = sqrti ((y - yp)*(y - yp) + (x - xp)*(x - xp));
      l += length[i-1];
      length[i] = l;
      xp = x;
      yp = y;
    }
  b->length = length[CBZ_T_SAMPLES];
 #if 0
  g_debug ("length %d", b->length);
 #endif
 #ifdef CBZ_L2T_INTERPOLATION
  /*
   * Now normalize the length values, converting them into _FixedT
   */
  for (i = 0; i <= CBZ_T_SAMPLES; ++i)
    {
      length[i] = (length[i] << CBZ_T_Q) / b->length;
    }
  /*
   * Now generate a L -> t table such that the L will equidistant
   * over <0,1>
   */
  t_equalized[0] = 0;
  for (i = 1, j = 1, L = CBZ_L_STEP; i < CBZ_T_SAMPLES; ++i, L += CBZ_L_STEP)
    {
      _FixedT l1, l2;
      _FixedT d1, d2, d;
      _FixedT t1, t2;
      /* find the band for our L */
      for (k = j; k < CBZ_T_SAMPLES; ++k)
 	{
          if (L < length[k])
            break;
 	}
      /*
       * Now we know that L is from (length[k-1],length[k]>
       * We remember k-1 in order not to have to iterate over the
       * whole length array in the next iteration of the main loop
       */
      j = k - 1;
      /*
       * Now interpolate equlised t as a weighted average
       */
      l1 = length[k-1];
      l2 = length[k];
      d1 = l2 - L;
      d2 = L - l1;
      d = l2 - l1;
      t1 = (k - 1) * CBZ_T_STEP;
      t2 = k * CBZ_T_STEP;
      t_equalized[i] = (t1*d1 + t2*d2)/d;
      if (t_equalized[i] < t_equalized[i-1])
        g_debug ("wrong t: L %f, l1 %f, l2 %f, t1 %f, t2 %f",
                 (double) (L)/(double)CBZ_T_ONE,
                 (double) (l1)/(double)CBZ_T_ONE,
                 (double) (l2)/(double)CBZ_T_ONE,
                 (double) (t1)/(double)CBZ_T_ONE,                 
                 (double) (t2)/(double)CBZ_T_ONE);
    }
  t_equalized[CBZ_T_SAMPLES] = CBZ_T_ONE;
  /* We now fit a bezier -- at this stage, do a single fit through our values
   * at 0, 1/3, 2/3 and 1
   *
   * FIXME -- do we need to  use a better fitting approach to choose the best
   * beziere. The actual curve we acquire this way is not too bad shapwise,
   * but (probably due to rounding errors) the resulting curve no longer
   * satisfies the necessary condition that for L2 > L1, t2 > t1, which 
   * causes oscilation.
   */
 #if 0
  /*
   * These are the control points we use to calculate the curve coefficients
   * for bezier t(L); these are not needed directly, but are implied in the
   * calculations below.
   *
   * (p0 is 0,0, and p3 is 1,1)
   */
  p1 = (18 * t_equalized[CBZ_T_SAMPLES/3] -
        9 * t_equalized[2*CBZ_T_SAMPLES/3] +
        2 << CBZ_T_Q) / 6;
  p2 = (18 * t_equalized[2*CBZ_T_SAMPLES/3] -
        9 * t_equalized[CBZ_T_SAMPLES/3] -
        (5 << CBZ_T_Q)) / 6;
 #endif
  b->Lc = (18 * t_equalized[CBZ_T_SAMPLES/3] -
           9 * t_equalized[2*CBZ_T_SAMPLES/3] +
           (2 << CBZ_T_Q)) >> 1;
  b->Lb = (36 * t_equalized[2*CBZ_T_SAMPLES/3] -
           45 * t_equalized[CBZ_T_SAMPLES/3] -
           (9 << CBZ_T_Q)) >> 1;
  b->La = ((27 * (t_equalized[CBZ_T_SAMPLES/3] -
                 t_equalized[2*CBZ_T_SAMPLES/3]) +
            (7 << CBZ_T_Q)) >> 1) + CBZ_T_ONE;
  g_debug ("t(1/3) %f, t(2/3) %f",
           (double)t_equalized[CBZ_T_SAMPLES/3]/(double)CBZ_T_ONE,
           (double)t_equalized[2*CBZ_T_SAMPLES/3]/(double)CBZ_T_ONE);
  g_debug ("L -> t coefficients: %f, %f, %f",
           (double)b->La/(double)CBZ_T_ONE,
           (double)b->Lb/(double)CBZ_T_ONE,
           (double)b->Lc/(double)CBZ_T_ONE);
  /*
   * For debugging, you can load these values into a spreadsheet and graph
   * them to see how well the approximation matches the data
   */
  for (i = 0; i < CBZ_T_SAMPLES; ++i)
    {
      g_print ("%f, %f, %f\n",
               (double)(i*CBZ_T_STEP)/(double)CBZ_T_ONE,
               (double)(t_equalized[i])/(double)CBZ_T_ONE,
               (double)(clutter_bezier_L2t(b,i*CBZ_T_STEP))/(double)CBZ_T_ONE);
    }
 #endif
 }
 /*
 * Moves a control point at indx to location represented by knot
 */
 void
 _clutter_bezier_adjust (ClutterBezier * b, ClutterKnot * knot, guint indx)
 {
  guint x[4], y[4];
  g_assert (indx < 4);
  x[0] = b->dx;
  y[0] = b->dy;
  x[1] = b->cx / 3 + x[0];
  y[1] = b->cy / 3 + y[0];
  x[2] = b->bx / 3 + b->cx + x[1];
  y[2] = b->by / 3 + b->cy + y[1];
  x[3] = b->ax + x[0] + b->cx + b->bx;
  y[3] = b->ay + y[0] + b->cy + b->by;
  x[indx] = knot->x;
  y[indx] = knot->y;
  _clutter_bezier_init (b, x[0], y[0], x[1], y[1], x[2], y[2], x[3], y[3]);
 }
 guint
 _clutter_bezier_get_length (const ClutterBezier *b)
 {
  return b->length;
 }
--- a/clutter/clutter/clutter-bezier.h
+++ b/clutter/clutter/clutter-bezier.h
@@ -1,65 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Tomas Frydrych  <tf@openedhand.com>
 *
 * Copyright (C) 2006, 2007 OpenedHand
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_BEZIER_H__
 #define __CLUTTER_BEZIER_H__
 #include <glib.h>
 #include "clutter-types.h"
 G_BEGIN_DECLS
 /* This is used in _clutter_bezier_advance to represent the full
   length of the bezier curve. Anything less than that represents a
   fraction of the length */
 #define CLUTTER_BEZIER_MAX_LENGTH (1 << 18)
 typedef struct _ClutterBezier ClutterBezier;
 ClutterBezier *_clutter_bezier_new ();
 void           _clutter_bezier_free (ClutterBezier * b);
 ClutterBezier *_clutter_bezier_clone_and_move (const ClutterBezier *b,
                                               gint           x,
                                               gint           y);
 void           _clutter_bezier_advance (const ClutterBezier *b,
                                        gint           L,
                                        ClutterKnot   *knot);
 void           _clutter_bezier_init (ClutterBezier *b,
                                     gint x_0, gint y_0,
                                     gint x_1, gint y_1,
                                     gint x_2, gint y_2,
                                     gint x_3, gint y_3);
 void           _clutter_bezier_adjust (ClutterBezier *b,
                                       ClutterKnot   *knot,
                                       guint          indx);
 guint          _clutter_bezier_get_length (const ClutterBezier *b);
 G_END_DECLS
 #endif /* __CLUTTER_BEZIER_H__ */
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -1,886 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2009  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-bin-layout
 * @short_description: A simple layout manager
 *
 * #ClutterBinLayout is a layout manager which implements the following
 * policy:
 *
 *   - the preferred size is the maximum preferred size
 *   between all the children of the container using the
 *   layout;
 *   - each child is allocated in "layers", on on top
 *   of the other;
 *   - for each layer there are horizontal and vertical
 *   alignment policies.
 *
 * The [bin-layout example](https://git.gnome.org/browse/clutter/tree/examples/bin-layout.c?h=clutter-1.18)
 * shows how to pack actors inside a #ClutterBinLayout.
 *
 * #ClutterBinLayout is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-bin-layout.h"
 #include "clutter-actor-private.h"
 #include "clutter-animatable.h"
 #include "clutter-child-meta.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-layout-meta.h"
 #include "clutter-private.h"
 #define CLUTTER_TYPE_BIN_LAYER          (clutter_bin_layer_get_type ())
 #define CLUTTER_BIN_LAYER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIN_LAYER, ClutterBinLayer))
 #define CLUTTER_IS_BIN_LAYER(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BIN_LAYER))
 typedef struct _ClutterBinLayer         ClutterBinLayer;
 typedef struct _ClutterLayoutMetaClass  ClutterBinLayerClass;
 struct _ClutterBinLayoutPrivate
 {
  ClutterBinAlignment x_align;
  ClutterBinAlignment y_align;
  ClutterContainer *container;
 };
 struct _ClutterBinLayer
 {
  ClutterLayoutMeta parent_instance;
  ClutterBinAlignment x_align;
  ClutterBinAlignment y_align;
 };
 enum
 {
  PROP_LAYER_0,
  PROP_LAYER_X_ALIGN,
  PROP_LAYER_Y_ALIGN,
  PROP_LAYER_LAST
 };
 enum
 {
  PROP_0,
  PROP_X_ALIGN,
  PROP_Y_ALIGN,
  PROP_LAST
 };
 static GParamSpec *layer_props[PROP_LAYER_LAST] = { NULL, };
 static GParamSpec *bin_props[PROP_LAST] = { NULL, };
 GType clutter_bin_layer_get_type (void);
 G_DEFINE_TYPE (ClutterBinLayer,
               clutter_bin_layer,
               CLUTTER_TYPE_LAYOUT_META)
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterBinLayout,
                            clutter_bin_layout,
                            CLUTTER_TYPE_LAYOUT_MANAGER)
 /*
 * ClutterBinLayer
 */
 static void
 set_layer_x_align (ClutterBinLayer     *self,
                   ClutterBinAlignment  alignment)
 {
  ClutterLayoutManager *manager;
  ClutterLayoutMeta *meta;
  if (self->x_align == alignment)
    return;
  self->x_align = alignment;
  meta = CLUTTER_LAYOUT_META (self);
  manager = clutter_layout_meta_get_manager (meta);
  clutter_layout_manager_layout_changed (manager);
  g_object_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_X_ALIGN]);
 }
 static void
 set_layer_y_align (ClutterBinLayer     *self,
                   ClutterBinAlignment  alignment)
 {
  ClutterLayoutManager *manager;
  ClutterLayoutMeta *meta;
  if (self->y_align == alignment)
    return;
  self->y_align = alignment;
  meta = CLUTTER_LAYOUT_META (self);
  manager = clutter_layout_meta_get_manager (meta);
  clutter_layout_manager_layout_changed (manager);
  g_object_notify_by_pspec (G_OBJECT (self), layer_props[PROP_LAYER_Y_ALIGN]);
 }
 static void
 clutter_bin_layer_set_property (GObject      *gobject,
                                guint         prop_id,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
  ClutterBinLayer *layer = CLUTTER_BIN_LAYER (gobject);
  switch (prop_id)
    {
    case PROP_LAYER_X_ALIGN:
      set_layer_x_align (layer, g_value_get_enum (value));
      break;
    case PROP_LAYER_Y_ALIGN:
      set_layer_y_align (layer, g_value_get_enum (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bin_layer_get_property (GObject    *gobject,
                                guint       prop_id,
                                GValue     *value,
                                GParamSpec *pspec)
 {
  ClutterBinLayer *layer = CLUTTER_BIN_LAYER (gobject);
  switch (prop_id)
    {
    case PROP_LAYER_X_ALIGN:
      g_value_set_enum (value, layer->x_align);
      break;
    case PROP_LAYER_Y_ALIGN:
      g_value_set_enum (value, layer->y_align);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bin_layer_class_init (ClutterBinLayerClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  gobject_class->set_property = clutter_bin_layer_set_property;
  gobject_class->get_property = clutter_bin_layer_get_property;
  layer_props[PROP_LAYER_X_ALIGN] =
    g_param_spec_enum ("x-align",
                       P_("Horizontal Alignment"),
                       P_("Horizontal alignment for the actor "
                          "inside the layout manager"),
                       CLUTTER_TYPE_BIN_ALIGNMENT,
                       CLUTTER_BIN_ALIGNMENT_CENTER,
                       CLUTTER_PARAM_READWRITE);
  layer_props[PROP_LAYER_Y_ALIGN] =
    g_param_spec_enum ("y-align",
                       P_("Vertical Alignment"),
                       P_("Vertical alignment for the actor "
                          "inside the layout manager"),
                       CLUTTER_TYPE_BIN_ALIGNMENT,
                       CLUTTER_BIN_ALIGNMENT_CENTER,
                       CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class,
                                     PROP_LAYER_LAST,
                                     layer_props);
 }
 static void
 clutter_bin_layer_init (ClutterBinLayer *layer)
 {
  layer->x_align = CLUTTER_BIN_ALIGNMENT_CENTER;
  layer->y_align = CLUTTER_BIN_ALIGNMENT_CENTER;
 }
 /*
 * ClutterBinLayout
 */
 static void
 set_x_align (ClutterBinLayout    *self,
             ClutterBinAlignment  alignment)
 {
  ClutterBinLayoutPrivate *priv = self->priv;
  if (priv->x_align != alignment)
    {
      ClutterLayoutManager *manager;
      priv->x_align = alignment;
      manager = CLUTTER_LAYOUT_MANAGER (self);
      clutter_layout_manager_layout_changed (manager);
      g_object_notify_by_pspec (G_OBJECT (self), bin_props[PROP_X_ALIGN]);
    }
 }
 static void
 set_y_align (ClutterBinLayout    *self,
             ClutterBinAlignment  alignment)
 {
  ClutterBinLayoutPrivate *priv = self->priv;
  if (priv->y_align != alignment)
    {
      ClutterLayoutManager *manager;
      priv->y_align = alignment;
      manager = CLUTTER_LAYOUT_MANAGER (self);
      clutter_layout_manager_layout_changed (manager);
      g_object_notify_by_pspec (G_OBJECT (self), bin_props[PROP_Y_ALIGN]);
    }
 }
 static void
 clutter_bin_layout_get_preferred_width (ClutterLayoutManager *manager,
                                        ClutterContainer     *container,
                                        gfloat                for_height,
                                        gfloat               *min_width_p,
                                        gfloat               *nat_width_p)
 {
  ClutterActor *actor = CLUTTER_ACTOR (container);
  ClutterActorIter iter;
  ClutterActor *child;
  gfloat min_width, nat_width;
  min_width = nat_width = 0.0;
  clutter_actor_iter_init (&iter, actor);
  while (clutter_actor_iter_next (&iter, &child))
    {
      gfloat minimum, natural;
      if (!clutter_actor_is_visible (child))
        continue;
      clutter_actor_get_preferred_width (child, for_height,
                                         &minimum,
                                         &natural);
      min_width = MAX (min_width, minimum);
      nat_width = MAX (nat_width, natural);
    }
  if (min_width_p)
    *min_width_p = min_width;
  if (nat_width_p)
    *nat_width_p = nat_width;
 }
 static void
 clutter_bin_layout_get_preferred_height (ClutterLayoutManager *manager,
                                         ClutterContainer     *container,
                                         gfloat                for_width,
                                         gfloat               *min_height_p,
                                         gfloat               *nat_height_p)
 {
  ClutterActor *actor = CLUTTER_ACTOR (container);
  ClutterActorIter iter;
  ClutterActor *child;
  gfloat min_height, nat_height;
  min_height = nat_height = 0.0;
  clutter_actor_iter_init (&iter, actor);
  while (clutter_actor_iter_next (&iter, &child))
    {
      gfloat minimum, natural;
      if (!clutter_actor_is_visible (child))
        continue;
      clutter_actor_get_preferred_height (child, for_width,
                                          &minimum,
                                          &natural);
      min_height = MAX (min_height, minimum);
      nat_height = MAX (nat_height, natural);
    }
  if (min_height_p)
    *min_height_p = min_height;
  if (nat_height_p)
    *nat_height_p = nat_height;
 }
 static gdouble
 get_bin_alignment_factor (ClutterBinAlignment alignment,
                          ClutterTextDirection text_dir)
 {
  switch (alignment)
    {
    case CLUTTER_BIN_ALIGNMENT_CENTER:
      return 0.5;
    case CLUTTER_BIN_ALIGNMENT_START:
      return text_dir == CLUTTER_TEXT_DIRECTION_LTR ? 0.0 : 1.0;
    case CLUTTER_BIN_ALIGNMENT_END:
      return text_dir == CLUTTER_TEXT_DIRECTION_LTR ? 1.0 : 0.0;
    case CLUTTER_BIN_ALIGNMENT_FIXED:
    case CLUTTER_BIN_ALIGNMENT_FILL:
      return 0.0;
    }
  return 0.0;
 }
 static gdouble
 get_actor_align_factor (ClutterActorAlign alignment)
 {
  switch (alignment)
    {
    case CLUTTER_ACTOR_ALIGN_CENTER:
      return 0.5;
    case CLUTTER_ACTOR_ALIGN_START:
      return 0.0;
    case CLUTTER_ACTOR_ALIGN_END:
      return 1.0;
    case CLUTTER_ACTOR_ALIGN_FILL:
      return 0.0;
    }
  return 0.0;
 }
 static void
 clutter_bin_layout_allocate (ClutterLayoutManager   *manager,
                             ClutterContainer       *container,
                             const ClutterActorBox  *allocation,
                             ClutterAllocationFlags  flags)
 {
  gfloat allocation_x, allocation_y;
  gfloat available_w, available_h;
  ClutterActor *actor, *child;
  ClutterActorIter iter;
  clutter_actor_box_get_origin (allocation, &allocation_x, &allocation_y);
  clutter_actor_box_get_size (allocation, &available_w, &available_h);
  actor = CLUTTER_ACTOR (container);
  clutter_actor_iter_init (&iter, actor);
  while (clutter_actor_iter_next (&iter, &child))
    {
      ClutterLayoutMeta *meta;
      ClutterBinLayer *layer;
      ClutterActorBox child_alloc = { 0, };
      gdouble x_align, y_align;
      gboolean x_fill, y_fill, is_fixed_position_set;
      float fixed_x, fixed_y;
      if (!clutter_actor_is_visible (child))
        continue;
      meta = clutter_layout_manager_get_child_meta (manager,
                                                    container,
                                                    child);
      layer = CLUTTER_BIN_LAYER (meta);
      fixed_x = fixed_y = 0.f;
      g_object_get (child,
                    "fixed-position-set", &is_fixed_position_set,
                    "fixed-x", &fixed_x,
                    "fixed-y", &fixed_y,
                    NULL);
      /* XXX:2.0 - remove the FIXED alignment, and just use the fixed position
       * of the actor if one is set
       */
      if (is_fixed_position_set ||
          layer->x_align == CLUTTER_BIN_ALIGNMENT_FIXED)
 	{
          if (is_fixed_position_set)
            child_alloc.x1 = fixed_x;
          else
            child_alloc.x1 = clutter_actor_get_x (child);
 	}
      else
        child_alloc.x1 = allocation_x;
      if (is_fixed_position_set ||
          layer->y_align == CLUTTER_BIN_ALIGNMENT_FIXED)
 	{
 	  if (is_fixed_position_set)
            child_alloc.y1 = fixed_y;
          else
 	    child_alloc.y1 = clutter_actor_get_y (child);
 	}
      else
        child_alloc.y1 = allocation_y;
      child_alloc.x2 = allocation_x + available_w;
      child_alloc.y2 = allocation_y + available_h;
      if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_HORIZONTAL))
        {
          ClutterActorAlign align;
          align = clutter_actor_get_x_align (child);
          x_fill = align == CLUTTER_ACTOR_ALIGN_FILL;
          x_align = get_actor_align_factor (align);
        }
      else
        {
          ClutterTextDirection text_dir;
          x_fill = (layer->x_align == CLUTTER_BIN_ALIGNMENT_FILL);
          text_dir = clutter_actor_get_text_direction (child);
          if (!is_fixed_position_set)
            x_align = get_bin_alignment_factor (layer->x_align, text_dir);
          else
            x_align = 0.0;
        }
      if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_VERTICAL))
        {
          ClutterActorAlign align;
          align = clutter_actor_get_y_align (child);
          y_fill = align == CLUTTER_ACTOR_ALIGN_FILL;
          y_align = get_actor_align_factor (align);
        }
      else
        {
          y_fill = (layer->y_align == CLUTTER_BIN_ALIGNMENT_FILL);
          if (!is_fixed_position_set)
            y_align = get_bin_alignment_factor (layer->y_align,
                                                CLUTTER_TEXT_DIRECTION_LTR);
          else
            y_align = 0.0;
        }
      clutter_actor_allocate_align_fill (child, &child_alloc,
                                         x_align, y_align,
                                         x_fill, y_fill,
                                         flags);
    }
 }
 static GType
 clutter_bin_layout_get_child_meta_type (ClutterLayoutManager *manager)
 {
  return CLUTTER_TYPE_BIN_LAYER;
 }
 static ClutterLayoutMeta *
 clutter_bin_layout_create_child_meta (ClutterLayoutManager *manager,
                                      ClutterContainer     *container,
                                      ClutterActor         *actor)
 {
  ClutterBinLayoutPrivate *priv;
  priv = CLUTTER_BIN_LAYOUT (manager)->priv;
  return g_object_new (CLUTTER_TYPE_BIN_LAYER,
                       "container", container,
                       "actor", actor,
                       "manager", manager,
                       "x-align", priv->x_align,
                       "y_align", priv->y_align,
                       NULL);
 }
 static void
 clutter_bin_layout_set_container (ClutterLayoutManager *manager,
                                  ClutterContainer     *container)
 {
  ClutterBinLayoutPrivate *priv;
  ClutterLayoutManagerClass *parent_class;
  priv = CLUTTER_BIN_LAYOUT (manager)->priv;
  priv->container = container;
  parent_class = CLUTTER_LAYOUT_MANAGER_CLASS (clutter_bin_layout_parent_class);
  parent_class->set_container (manager, container);
 }
 static void
 clutter_bin_layout_set_property (GObject      *gobject,
                                 guint         prop_id,
                                 const GValue *value,
                                 GParamSpec   *pspec)
 {
  ClutterBinLayout *layout = CLUTTER_BIN_LAYOUT (gobject);
  switch (prop_id)
    {
    case PROP_X_ALIGN:
      set_x_align (layout, g_value_get_enum (value));
      break;
    case PROP_Y_ALIGN:
      set_y_align (layout, g_value_get_enum (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bin_layout_get_property (GObject    *gobject,
                                 guint       prop_id,
                                 GValue     *value,
                                 GParamSpec *pspec)
 {
  ClutterBinLayoutPrivate *priv;
  priv = CLUTTER_BIN_LAYOUT (gobject)->priv;
  switch (prop_id)
    {
    case PROP_X_ALIGN:
      g_value_set_enum (value, priv->x_align);
      break;
    case PROP_Y_ALIGN:
      g_value_set_enum (value, priv->y_align);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bin_layout_class_init (ClutterBinLayoutClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterLayoutManagerClass *layout_class =
    CLUTTER_LAYOUT_MANAGER_CLASS (klass);
  /**
   * ClutterBinLayout:x-align:
   *
   * The default horizontal alignment policy for actors managed
   * by the #ClutterBinLayout
   *
   * Since: 1.2
   *
   * Deprecated: 1.12: Use the #ClutterActor:x-expand and the
   *   #ClutterActor:x-align properties on #ClutterActor instead.
   */
  bin_props[PROP_X_ALIGN] =
    g_param_spec_enum ("x-align",
                       P_("Horizontal Alignment"),
                       P_("Default horizontal alignment for the actors "
                          "inside the layout manager"),
                       CLUTTER_TYPE_BIN_ALIGNMENT,
                       CLUTTER_BIN_ALIGNMENT_CENTER,
                       CLUTTER_PARAM_READWRITE);
  /**
   * ClutterBinLayout:y-align:
   *
   * The default vertical alignment policy for actors managed
   * by the #ClutterBinLayout
   *
   * Since: 1.2
   *
   * Deprecated: 1.12: Use the #ClutterActor:y-expand and the
   *   #ClutterActor:y-align properties on #ClutterActor instead.
   */
  bin_props[PROP_Y_ALIGN] =
    g_param_spec_enum ("y-align",
                       P_("Vertical Alignment"),
                       P_("Default vertical alignment for the actors "
                          "inside the layout manager"),
                       CLUTTER_TYPE_BIN_ALIGNMENT,
                       CLUTTER_BIN_ALIGNMENT_CENTER,
                       CLUTTER_PARAM_READWRITE);
  gobject_class->set_property = clutter_bin_layout_set_property;
  gobject_class->get_property = clutter_bin_layout_get_property;
  g_object_class_install_properties (gobject_class, PROP_LAST, bin_props);
  layout_class->get_preferred_width = clutter_bin_layout_get_preferred_width;
  layout_class->get_preferred_height = clutter_bin_layout_get_preferred_height;
  layout_class->allocate = clutter_bin_layout_allocate;
  layout_class->create_child_meta = clutter_bin_layout_create_child_meta;
  layout_class->get_child_meta_type = clutter_bin_layout_get_child_meta_type;
  layout_class->set_container = clutter_bin_layout_set_container;
 }
 static void
 clutter_bin_layout_init (ClutterBinLayout *self)
 {
  self->priv = clutter_bin_layout_get_instance_private (self);
  self->priv->x_align = CLUTTER_BIN_ALIGNMENT_CENTER;
  self->priv->y_align = CLUTTER_BIN_ALIGNMENT_CENTER;
 }
 /**
 * clutter_bin_layout_new:
 * @x_align: the default alignment policy to be used on the
 *   horizontal axis
 * @y_align: the default alignment policy to be used on the
 *   vertical axis
 *
 * Creates a new #ClutterBinLayout layout manager
 *
 * Return value: the newly created layout manager
 *
 * Since: 1.2
 */
 ClutterLayoutManager *
 clutter_bin_layout_new (ClutterBinAlignment x_align,
                        ClutterBinAlignment y_align)
 {
  return g_object_new (CLUTTER_TYPE_BIN_LAYOUT,
                       "x-align", x_align,
                       "y-align", y_align,
                       NULL);
 }
 /**
 * clutter_bin_layout_set_alignment:
 * @self: a #ClutterBinLayout
 * @child: (allow-none): a child of @container
 * @x_align: the horizontal alignment policy to be used for the @child
 *   inside @container
 * @y_align: the vertical aligment policy to be used on the @child
 *   inside @container
 *
 * Sets the horizontal and vertical alignment policies to be applied
 * to a @child of @self
 *
 * If @child is %NULL then the @x_align and @y_align values will
 * be set as the default alignment policies
 *
 * Since: 1.2
 *
 * Deprecated: 1.12: Use the #ClutterActor:x-align and
 *   #ClutterActor:y-align properties of #ClutterActor instead.
 */
 void
 clutter_bin_layout_set_alignment (ClutterBinLayout    *self,
                                  ClutterActor        *child,
                                  ClutterBinAlignment  x_align,
                                  ClutterBinAlignment  y_align)
 {
  ClutterBinLayoutPrivate *priv;
  ClutterLayoutManager *manager;
  ClutterLayoutMeta *meta;
  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
  g_return_if_fail (child == NULL || CLUTTER_IS_ACTOR (child));
  priv = self->priv;
  if (priv->container == NULL)
    {
      if (child == NULL)
        {
          set_x_align (self, x_align);
          set_y_align (self, y_align);
        }
      else
        g_warning ("The layout of type '%s' must be associated to "
                   "a ClutterContainer before setting the alignment "
                   "on its children",
                   G_OBJECT_TYPE_NAME (self));
      return;
    }
  manager = CLUTTER_LAYOUT_MANAGER (self);
  meta = clutter_layout_manager_get_child_meta (manager,
                                                priv->container,
                                                child);
  g_assert (CLUTTER_IS_BIN_LAYER (meta));
  set_layer_x_align (CLUTTER_BIN_LAYER (meta), x_align);
  set_layer_y_align (CLUTTER_BIN_LAYER (meta), y_align);
 }
 /**
 * clutter_bin_layout_get_alignment:
 * @self: a #ClutterBinLayout
 * @child: (allow-none): a child of @container
 * @x_align: (out) (allow-none): return location for the horizontal
 *   alignment policy
 * @y_align: (out) (allow-none): return location for the vertical
 *   alignment policy
 *
 * Retrieves the horizontal and vertical alignment policies for
 * a child of @self
 *
 * If @child is %NULL the default alignment policies will be returned
 * instead
 *
 * Since: 1.2
 *
 * Deprecated: 1.12: Use the #ClutterActor:x-align and the
 *   #ClutterActor:y-align properties of #ClutterActor instead.
 */
 void
 clutter_bin_layout_get_alignment (ClutterBinLayout    *self,
                                  ClutterActor        *child,
                                  ClutterBinAlignment *x_align,
                                  ClutterBinAlignment *y_align)
 {
  ClutterBinLayoutPrivate *priv;
  ClutterLayoutManager *manager;
  ClutterLayoutMeta *meta;
  ClutterBinLayer *layer;
  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
  priv = self->priv;
  if (priv->container == NULL)
    {
      if (child == NULL)
        {
          if (x_align)
            *x_align = priv->x_align;
          if (y_align)
            *y_align = priv->y_align;
        }
      else
        g_warning ("The layout of type '%s' must be associated to "
                   "a ClutterContainer before getting the alignment "
                   "of its children",
                   G_OBJECT_TYPE_NAME (self));
      return;
    }
  manager = CLUTTER_LAYOUT_MANAGER (self);
  meta = clutter_layout_manager_get_child_meta (manager,
                                                priv->container,
                                                child);
  g_assert (CLUTTER_IS_BIN_LAYER (meta));
  layer = CLUTTER_BIN_LAYER (meta);
  if (x_align)
    *x_align = layer->x_align;
  if (y_align)
    *y_align = layer->y_align;
 }
 /**
 * clutter_bin_layout_add:
 * @self: a #ClutterBinLayout
 * @child: a #ClutterActor
 * @x_align: horizontal alignment policy for @child
 * @y_align: vertical alignment policy for @child
 *
 * Adds a #ClutterActor to the container using @self and
 * sets the alignment policies for it
 *
 * This function is equivalent to clutter_container_add_actor()
 * and clutter_layout_manager_child_set_property() but it does not
 * require a pointer to the #ClutterContainer associated to the
 * #ClutterBinLayout
 *
 * Since: 1.2
 *
 * Deprecated: 1.12: Use clutter_actor_add_child() instead.
 */
 void
 clutter_bin_layout_add (ClutterBinLayout    *self,
                        ClutterActor        *child,
                        ClutterBinAlignment  x_align,
                        ClutterBinAlignment  y_align)
 {
  ClutterBinLayoutPrivate *priv;
  ClutterLayoutManager *manager;
  ClutterLayoutMeta *meta;
  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
  g_return_if_fail (CLUTTER_IS_ACTOR (child));
  priv = self->priv;
  if (priv->container == NULL)
    {
      g_warning ("The layout of type '%s' must be associated to "
                 "a ClutterContainer before adding children",
                 G_OBJECT_TYPE_NAME (self));
      return;
    }
  clutter_container_add_actor (priv->container, child);
  manager = CLUTTER_LAYOUT_MANAGER (self);
  meta = clutter_layout_manager_get_child_meta (manager,
                                                priv->container,
                                                child);
  g_assert (CLUTTER_IS_BIN_LAYER (meta));
  set_layer_x_align (CLUTTER_BIN_LAYER (meta), x_align);
  set_layer_y_align (CLUTTER_BIN_LAYER (meta), y_align);
 }
--- a/clutter/clutter/clutter-bin-layout.h
+++ b/clutter/clutter/clutter-bin-layout.h
@@ -1,86 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2009  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_BIN_LAYOUT_H__
 #define __CLUTTER_BIN_LAYOUT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-layout-manager.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BIN_LAYOUT                 (clutter_bin_layout_get_type ())
 #define CLUTTER_BIN_LAYOUT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIN_LAYOUT, ClutterBinLayout))
 #define CLUTTER_IS_BIN_LAYOUT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BIN_LAYOUT))
 #define CLUTTER_BIN_LAYOUT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BIN_LAYOUT, ClutterBinLayoutClass))
 #define CLUTTER_IS_BIN_LAYOUT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BIN_LAYOUT))
 #define CLUTTER_BIN_LAYOUT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BIN_LAYOUT, ClutterBinLayoutClass))
 typedef struct _ClutterBinLayout                ClutterBinLayout;
 typedef struct _ClutterBinLayoutPrivate         ClutterBinLayoutPrivate;
 typedef struct _ClutterBinLayoutClass           ClutterBinLayoutClass;
 /**
 * ClutterBinLayout:
 *
 * The #ClutterBinLayout structure contains only private data
 * and should be accessed using the provided API
 *
 * Since: 1.2
 */
 struct _ClutterBinLayout
 {
  /*< private >*/
  ClutterLayoutManager parent_instance;
  ClutterBinLayoutPrivate *priv;
 };
 /**
 * ClutterBinLayoutClass:
 *
 * The #ClutterBinLayoutClass structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.2
 */
 struct _ClutterBinLayoutClass
 {
  /*< private >*/
  ClutterLayoutManagerClass parent_class;
 };
 CLUTTER_AVAILABLE_IN_1_2
 GType clutter_bin_layout_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager *  clutter_bin_layout_new  (ClutterBinAlignment x_align,
                                                 ClutterBinAlignment y_align);
 G_END_DECLS
 #endif /* __CLUTTER_BIN_LAYOUT_H__ */
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -1,591 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-bind-constraint
 * @Title: ClutterBindConstraint
 * @Short_Description: A constraint binding the position or size of an actor
 *
 * #ClutterBindConstraint is a #ClutterConstraint that binds the
 * position or the size of the #ClutterActor to which it is applied
 * to the the position or the size of another #ClutterActor, or
 * "source".
 *
 * An offset can be applied to the constraint, to avoid overlapping. The offset
 * can also be animated. For instance, the following code will set up three
 * actors to be bound to the same origin:
 *
 * |[<!-- language="C" -->
 * // source
 * rect[0] = clutter_rectangle_new_with_color (&red_color);
 * clutter_actor_set_position (rect[0], x_pos, y_pos);
 * clutter_actor_set_size (rect[0], 100, 100);
 *
 * // second rectangle
 * rect[1] = clutter_rectangle_new_with_color (&green_color);
 * clutter_actor_set_size (rect[1], 100, 100);
 * clutter_actor_set_opacity (rect[1], 0);
 *
 * constraint = clutter_bind_constraint_new (rect[0], CLUTTER_BIND_X, 0.0);
 * clutter_actor_add_constraint_with_name (rect[1], "green-x", constraint);
 * constraint = clutter_bind_constraint_new (rect[0], CLUTTER_BIND_Y, 0.0);
 * clutter_actor_add_constraint_with_name (rect[1], "green-y", constraint);
 *
 * // third rectangle
 * rect[2] = clutter_rectangle_new_with_color (&blue_color);
 * clutter_actor_set_size (rect[2], 100, 100);
 * clutter_actor_set_opacity (rect[2], 0);
 *
 * constraint = clutter_bind_constraint_new (rect[0], CLUTTER_BIND_X, 0.0);
 * clutter_actor_add_constraint_with_name (rect[2], "blue-x", constraint);
 * constraint = clutter_bind_constraint_new (rect[0], CLUTTER_BIND_Y, 0.0);
 * clutter_actor_add_constraint_with_name (rect[2], "blue-y", constraint);
 * ]|
 *
 * The following code animates the second and third rectangles to "expand"
 * them horizontally from underneath the first rectangle:
 *
 * |[<!-- language="C" -->
 * clutter_actor_animate (rect[1], CLUTTER_EASE_OUT_CUBIC, 250,
 *                        "@constraints.green-x.offset", 100.0,
 *                        "opacity", 255,
 *                        NULL);
 * clutter_actor_animate (rect[2], CLUTTER_EASE_OUT_CUBIC, 250,
 *                        "@constraints.blue-x.offset", 200.0,
 *                        "opacity", 255,
 *                        NULL);
 * ]|
 *
 * #ClutterBindConstraint is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
 #include "clutter-bind-constraint.h"
 #include "clutter-actor-meta-private.h"
 #include "clutter-actor-private.h"
 #include "clutter-constraint.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-private.h"
 #define CLUTTER_BIND_CONSTRAINT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BIND_CONSTRAINT, ClutterBindConstraintClass))
 #define CLUTTER_IS_BIND_CONSTRAINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BIND_CONSTRAINT))
 #define CLUTTER_BIND_CONSTRAINT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BIND_CONSTRAINT, ClutterBindConstraintClass))
 struct _ClutterBindConstraint
 {
  ClutterConstraint parent_instance;
  ClutterActor *actor;
  ClutterActor *source;
  ClutterBindCoordinate coordinate;
  gfloat offset;
 };
 struct _ClutterBindConstraintClass
 {
  ClutterConstraintClass parent_class;
 };
 enum
 {
  PROP_0,
  PROP_SOURCE,
  PROP_COORDINATE,
  PROP_OFFSET,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE (ClutterBindConstraint,
               clutter_bind_constraint,
               CLUTTER_TYPE_CONSTRAINT);
 static void
 source_queue_relayout (ClutterActor          *source,
                       ClutterBindConstraint *bind)
 {
  if (bind->actor != NULL)
    _clutter_actor_queue_only_relayout (bind->actor);
 }
 static void
 source_destroyed (ClutterActor          *actor,
                  ClutterBindConstraint *bind)
 {
  bind->source = NULL;
 }
 static void
 clutter_bind_constraint_update_allocation (ClutterConstraint *constraint,
                                           ClutterActor      *actor,
                                           ClutterActorBox   *allocation)
 {
  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (constraint);
  gfloat source_width, source_height;
  gfloat actor_width, actor_height;
  ClutterVertex source_position = { 0., };
  if (bind->source == NULL)
    return;
  source_position.x = clutter_actor_get_x (bind->source);
  source_position.y = clutter_actor_get_y (bind->source);
  clutter_actor_get_size (bind->source, &source_width, &source_height);
  clutter_actor_box_get_size (allocation, &actor_width, &actor_height);
  switch (bind->coordinate)
    {
    case CLUTTER_BIND_X:
      allocation->x1 = source_position.x + bind->offset;
      allocation->x2 = allocation->x1 + actor_width;
      break;
    case CLUTTER_BIND_Y:
      allocation->y1 = source_position.y + bind->offset;
      allocation->y2 = allocation->y1 + actor_height;
      break;
    case CLUTTER_BIND_POSITION:
      allocation->x1 = source_position.x + bind->offset;
      allocation->y1 = source_position.y + bind->offset;
      allocation->x2 = allocation->x1 + actor_width;
      allocation->y2 = allocation->y1 + actor_height;
      break;
    case CLUTTER_BIND_WIDTH:
      allocation->x2 = allocation->x1 + source_width + bind->offset;
      break;
    case CLUTTER_BIND_HEIGHT:
      allocation->y2 = allocation->y1 + source_height + bind->offset;
      break;
    case CLUTTER_BIND_SIZE:
      allocation->x2 = allocation->x1 + source_width + bind->offset;
      allocation->y2 = allocation->y1 + source_height + bind->offset;
      break;
    case CLUTTER_BIND_ALL:
      allocation->x1 = source_position.x + bind->offset;
      allocation->y1 = source_position.y + bind->offset;
      allocation->x2 = allocation->x1 + source_width + bind->offset;
      allocation->y2 = allocation->y1 + source_height + bind->offset;
      break;
    default:
      g_assert_not_reached ();
      break;
    }
  clutter_actor_box_clamp_to_pixel (allocation);
 }
 static void
 clutter_bind_constraint_set_actor (ClutterActorMeta *meta,
                                   ClutterActor     *new_actor)
 {
  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (meta);
  ClutterActorMetaClass *parent;
  if (new_actor != NULL &&
      bind->source != NULL &&
      clutter_actor_contains (new_actor, bind->source))
    {
      g_warning (G_STRLOC ": The source actor '%s' is contained "
                 "by the actor '%s' associated to the constraint "
                 "'%s'",
                 _clutter_actor_get_debug_name (bind->source),
                 _clutter_actor_get_debug_name (new_actor),
                 _clutter_actor_meta_get_debug_name (meta));
      return;
    }
  /* store the pointer to the actor, for later use */
  bind->actor = new_actor;
  parent = CLUTTER_ACTOR_META_CLASS (clutter_bind_constraint_parent_class);
  parent->set_actor (meta, new_actor);
 }
 static void
 clutter_bind_constraint_dispose (GObject *gobject)
 {
  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (gobject);
  if (bind->source != NULL)
    {
      g_signal_handlers_disconnect_by_func (bind->source,
                                            G_CALLBACK (source_destroyed),
                                            bind);
      g_signal_handlers_disconnect_by_func (bind->source,
                                            G_CALLBACK (source_queue_relayout),
                                            bind);
      bind->source = NULL;
    }
  G_OBJECT_CLASS (clutter_bind_constraint_parent_class)->dispose (gobject);
 }
 static void
 clutter_bind_constraint_set_property (GObject      *gobject,
                                      guint         prop_id,
                                      const GValue *value,
                                      GParamSpec   *pspec)
 {
  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (gobject);
  switch (prop_id)
    {
    case PROP_SOURCE:
      clutter_bind_constraint_set_source (bind, g_value_get_object (value));
      break;
    case PROP_COORDINATE:
      clutter_bind_constraint_set_coordinate (bind, g_value_get_enum (value));
      break;
    case PROP_OFFSET:
      clutter_bind_constraint_set_offset (bind, g_value_get_float (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bind_constraint_get_property (GObject    *gobject,
                                      guint       prop_id,
                                      GValue     *value,
                                      GParamSpec *pspec)
 {
  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (gobject);
  switch (prop_id)
    {
    case PROP_SOURCE:
      g_value_set_object (value, bind->source);
      break;
    case PROP_COORDINATE:
      g_value_set_enum (value, bind->coordinate);
      break;
    case PROP_OFFSET:
      g_value_set_float (value, bind->offset);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_bind_constraint_class_init (ClutterBindConstraintClass *klass)
 {
  ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
  ClutterConstraintClass *constraint_class = CLUTTER_CONSTRAINT_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  gobject_class->set_property = clutter_bind_constraint_set_property;
  gobject_class->get_property = clutter_bind_constraint_get_property;
  gobject_class->dispose = clutter_bind_constraint_dispose;
  meta_class->set_actor = clutter_bind_constraint_set_actor;
  constraint_class->update_allocation = clutter_bind_constraint_update_allocation;
  /**
   * ClutterBindConstraint:source:
   *
   * The #ClutterActor used as the source for the binding.
   *
   * The #ClutterActor must not be contained inside the actor associated
   * to the constraint.
   *
   * Since: 1.4
   */
  obj_props[PROP_SOURCE] =
    g_param_spec_object ("source",
                         P_("Source"),
                         P_("The source of the binding"),
                         CLUTTER_TYPE_ACTOR,
                         CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  /**
   * ClutterBindConstraint:coordinate:
   *
   * The coordinate to be bound
   *
   * Since: 1.4
   */
  obj_props[PROP_COORDINATE] =
    g_param_spec_enum ("coordinate",
                       P_("Coordinate"),
                       P_("The coordinate to bind"),
                       CLUTTER_TYPE_BIND_COORDINATE,
                       CLUTTER_BIND_X,
                       CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  /**
   * ClutterBindConstraint:offset:
   *
   * The offset, in pixels, to be applied to the binding
   *
   * Since: 1.4
   */
  obj_props[PROP_OFFSET] =
    g_param_spec_float ("offset",
                        P_("Offset"),
                        P_("The offset in pixels to apply to the binding"),
                        -G_MAXFLOAT, G_MAXFLOAT,
                        0.0f,
                        CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT);
  g_object_class_install_properties (gobject_class,
                                     PROP_LAST,
                                     obj_props);
 }
 static void
 clutter_bind_constraint_init (ClutterBindConstraint *self)
 {
  self->actor = NULL;
  self->source = NULL;
  self->coordinate = CLUTTER_BIND_X;
  self->offset = 0.0f;
 }
 /**
 * clutter_bind_constraint_new:
 * @source: (allow-none): the #ClutterActor to use as the source of
 *   the binding, or %NULL
 * @coordinate: the coordinate to bind
 * @offset: the offset to apply to the binding, in pixels
 *
 * Creates a new constraint, binding a #ClutterActor's position to
 * the given @coordinate of the position of @source
 *
 * Return value: the newly created #ClutterBindConstraint
 *
 * Since: 1.4
 */
 ClutterConstraint *
 clutter_bind_constraint_new (ClutterActor          *source,
                             ClutterBindCoordinate  coordinate,
                             gfloat                 offset)
 {
  g_return_val_if_fail (source == NULL || CLUTTER_IS_ACTOR (source), NULL);
  return g_object_new (CLUTTER_TYPE_BIND_CONSTRAINT,
                       "source", source,
                       "coordinate", coordinate,
                       "offset", offset,
                       NULL);
 }
 /**
 * clutter_bind_constraint_set_source:
 * @constraint: a #ClutterBindConstraint
 * @source: (allow-none): a #ClutterActor, or %NULL to unset the source
 *
 * Sets the source #ClutterActor for the constraint
 *
 * Since: 1.4
 */
 void
 clutter_bind_constraint_set_source (ClutterBindConstraint *constraint,
                                    ClutterActor          *source)
 {
  ClutterActor *old_source, *actor;
  ClutterActorMeta *meta;
  g_return_if_fail (CLUTTER_IS_BIND_CONSTRAINT (constraint));
  g_return_if_fail (source == NULL || CLUTTER_IS_ACTOR (source));
  if (constraint->source == source)
    return;
  meta = CLUTTER_ACTOR_META (constraint);
  actor = clutter_actor_meta_get_actor (meta);
  if (source != NULL && actor != NULL)
    {
      if (clutter_actor_contains (actor, source))
        {
          g_warning (G_STRLOC ": The source actor '%s' is contained "
                     "by the actor '%s' associated to the constraint "
                     "'%s'",
                     _clutter_actor_get_debug_name (source),
                     _clutter_actor_get_debug_name (actor),
                     _clutter_actor_meta_get_debug_name (meta));
          return;
        }
    }
  old_source = constraint->source;
  if (old_source != NULL)
    {
      g_signal_handlers_disconnect_by_func (old_source,
                                            G_CALLBACK (source_destroyed),
                                            constraint);
      g_signal_handlers_disconnect_by_func (old_source,
                                            G_CALLBACK (source_queue_relayout),
                                            constraint);
    }
  constraint->source = source;
  if (constraint->source != NULL)
    {
      g_signal_connect (constraint->source, "queue-relayout",
                        G_CALLBACK (source_queue_relayout),
                        constraint);
      g_signal_connect (constraint->source, "destroy",
                        G_CALLBACK (source_destroyed),
                        constraint);
      if (constraint->actor != NULL)
        clutter_actor_queue_relayout (constraint->actor);
    }
  g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_SOURCE]);
 }
 /**
 * clutter_bind_constraint_get_source:
 * @constraint: a #ClutterBindConstraint
 *
 * Retrieves the #ClutterActor set using clutter_bind_constraint_set_source()
 *
 * Return value: (transfer none): a pointer to the source actor
 *
 * Since: 1.4
 */
 ClutterActor *
 clutter_bind_constraint_get_source (ClutterBindConstraint *constraint)
 {
  g_return_val_if_fail (CLUTTER_IS_BIND_CONSTRAINT (constraint), NULL);
  return constraint->source;
 }
 /**
 * clutter_bind_constraint_set_coordinate:
 * @constraint: a #ClutterBindConstraint
 * @coordinate: the coordinate to bind
 *
 * Sets the coordinate to bind in the constraint
 *
 * Since: 1.4
 */
 void
 clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
                                        ClutterBindCoordinate  coordinate)
 {
  g_return_if_fail (CLUTTER_IS_BIND_CONSTRAINT (constraint));
  if (constraint->coordinate == coordinate)
    return;
  constraint->coordinate = coordinate;
  if (constraint->actor != NULL)
    clutter_actor_queue_relayout (constraint->actor);
  g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_COORDINATE]);
 }
 /**
 * clutter_bind_constraint_get_coordinate:
 * @constraint: a #ClutterBindConstraint
 *
 * Retrieves the bound coordinate of the constraint
 *
 * Return value: the bound coordinate
 *
 * Since: 1.4
 */
 ClutterBindCoordinate
 clutter_bind_constraint_get_coordinate (ClutterBindConstraint *constraint)
 {
  g_return_val_if_fail (CLUTTER_IS_BIND_CONSTRAINT (constraint),
                        CLUTTER_BIND_X);
  return constraint->coordinate;
 }
 /**
 * clutter_bind_constraint_set_offset:
 * @constraint: a #ClutterBindConstraint
 * @offset: the offset to apply, in pixels
 *
 * Sets the offset to be applied to the constraint
 *
 * Since: 1.4
 */
 void
 clutter_bind_constraint_set_offset (ClutterBindConstraint *constraint,
                                    gfloat                 offset)
 {
  g_return_if_fail (CLUTTER_IS_BIND_CONSTRAINT (constraint));
  if (fabs (constraint->offset - offset) < 0.00001f)
    return;
  constraint->offset = offset;
  if (constraint->actor != NULL)
    clutter_actor_queue_relayout (constraint->actor);
  g_object_notify_by_pspec (G_OBJECT (constraint), obj_props[PROP_OFFSET]);
 }
 /**
 * clutter_bind_constraint_get_offset:
 * @constraint: a #ClutterBindConstraint
 *
 * Retrieves the offset set using clutter_bind_constraint_set_offset()
 *
 * Return value: the offset, in pixels
 *
 * Since: 1.4
 */
 gfloat
 clutter_bind_constraint_get_offset (ClutterBindConstraint *bind)
 {
  g_return_val_if_fail (CLUTTER_IS_BIND_CONSTRAINT (bind), 0.0);
  return bind->offset;
 }
--- a/clutter/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter/clutter-bind-constraint.h
@@ -1,77 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_BIND_CONSTRAINT_H__
 #define __CLUTTER_BIND_CONSTRAINT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-constraint.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BIND_CONSTRAINT    (clutter_bind_constraint_get_type ())
 #define CLUTTER_BIND_CONSTRAINT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIND_CONSTRAINT, ClutterBindConstraint))
 #define CLUTTER_IS_BIND_CONSTRAINT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BIND_CONSTRAINT))
 /**
 * ClutterBindConstraint:
 *
 * #ClutterBindConstraint is an opaque structure
 * whose members cannot be directly accessed
 *
 * Since: 1.4
 */
 typedef struct _ClutterBindConstraint           ClutterBindConstraint;
 typedef struct _ClutterBindConstraintClass      ClutterBindConstraintClass;
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_bind_constraint_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 ClutterConstraint *   clutter_bind_constraint_new            (ClutterActor          *source,
                                                              ClutterBindCoordinate  coordinate,
                                                              gfloat                 offset);
 CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_source     (ClutterBindConstraint *constraint,
                                                              ClutterActor          *source);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *        clutter_bind_constraint_get_source     (ClutterBindConstraint *constraint);
 CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
                                                              ClutterBindCoordinate  coordinate);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterBindCoordinate clutter_bind_constraint_get_coordinate (ClutterBindConstraint *constraint);
 CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_offset     (ClutterBindConstraint *constraint,
                                                              gfloat                 offset);
 CLUTTER_AVAILABLE_IN_1_4
 gfloat                clutter_bind_constraint_get_offset     (ClutterBindConstraint *constraint);
 G_END_DECLS
 #endif /* __CLUTTER_BIND_CONSTRAINT_H__ */
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -1,938 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2008  Intel Corporation.
 *
 * Authored By: Emmanuele Bassi <ebassi@linux.intel.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:clutter-binding-pool
 * @short_description: Pool for key bindings
 *
 * #ClutterBindingPool is a data structure holding a set of key bindings.
 * Each key binding associates a key symbol (eventually with modifiers)
 * to an action. A callback function is associated to each action.
 *
 * For a given key symbol and modifier mask combination there can be only one
 * action; for each action there can be only one callback. There can be
 * multiple actions with the same name, and the same callback can be used
 * to handle multiple key bindings.
 *
 * Actors requiring key bindings should create a new #ClutterBindingPool
 * inside their class initialization function and then install actions
 * like this:
 *
 * |[<!-- language="C" -->
 * static void
 * foo_class_init (FooClass *klass)
 * {
 *   ClutterBindingPool *binding_pool;
 *
 *   binding_pool = clutter_binding_pool_get_for_class (klass);
 *
 *   clutter_binding_pool_install_action (binding_pool, "move-up",
 *                                        CLUTTER_Up, 0,
 *                                        G_CALLBACK (foo_action_move_up),
 *                                        NULL, NULL);
 *   clutter_binding_pool_install_action (binding_pool, "move-up",
 *                                        CLUTTER_KP_Up, 0,
 *                                        G_CALLBACK (foo_action_move_up),
 *                                        NULL, NULL);
 * }
 * ]|
 *
 * The callback has a signature of:
 *
 * |[<!-- language="C" -->
 *    gboolean (* callback) (GObject             *instance,
 *                           const gchar         *action_name,
 *                           guint                key_val,
 *                           ClutterModifierType  modifiers,
 *                           gpointer             user_data);
 * ]|
 *
 * The actor should then override the #ClutterActor::key-press-event and
 * use clutter_binding_pool_activate() to match a #ClutterKeyEvent structure
 * to one of the actions:
 *
 * |[<!-- language="C" -->
 *   ClutterBindingPool *pool;
 *
 *   // retrieve the binding pool for the type of the actor
 *   pool = clutter_binding_pool_find (G_OBJECT_TYPE_NAME (actor));
 *
 *   // activate any callback matching the key symbol and modifiers
 *   // mask of the key event. the returned value can be directly
 *   // used to signal that the actor has handled the event.
 *   return clutter_binding_pool_activate (pool,
 *                                         key_event->keyval,
 *                                         key_event->modifier_state,
 *                                         G_OBJECT (actor));
 * ]|
 *
 * The clutter_binding_pool_activate() function will return %FALSE if
 * no action for the given key binding was found, if the action was
 * blocked (using clutter_binding_pool_block_action()) or if the
 * key binding handler returned %FALSE.
 *
 * #ClutterBindingPool is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-binding-pool.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #define CLUTTER_BINDING_POOL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), CLUTTER_TYPE_BINDING_POOL, ClutterBindingPoolClass))
 #define CLUTTER_IS_BINDING_POOL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_BINDING_POOL))
 #define CLUTTER_BINDING_POOL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CLUTTER_TYPE_BINDING_POOL, ClutterBindingPoolClass))
 #define BINDING_MOD_MASK        ((CLUTTER_SHIFT_MASK   | \
                                  CLUTTER_CONTROL_MASK | \
                                  CLUTTER_MOD1_MASK    | \
                                  CLUTTER_SUPER_MASK   | \
                                  CLUTTER_HYPER_MASK   | \
                                  CLUTTER_META_MASK)   | CLUTTER_RELEASE_MASK)
 typedef struct _ClutterBindingEntry     ClutterBindingEntry;
 static GSList *clutter_binding_pools = NULL;
 static GQuark  key_class_bindings = 0;
 struct _ClutterBindingPool
 {
  GObject parent_instance;
  gchar *name; /* interned string, do not free */
  GSList *entries;
  GHashTable *entries_hash;
 };
 struct _ClutterBindingPoolClass
 {
  GObjectClass parent_class;
 };
 struct _ClutterBindingEntry
 {
  gchar *name; /* interned string, do not free */
  guint key_val;
  ClutterModifierType modifiers;
  GClosure *closure;
  guint is_blocked  : 1;
 };
 enum
 {
  PROP_0,
  PROP_NAME,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE (ClutterBindingPool, clutter_binding_pool, G_TYPE_OBJECT);
 static guint
 binding_entry_hash (gconstpointer v)
 {
  const ClutterBindingEntry *e = v;
  guint h;
  h = e->key_val;
  h ^= e->modifiers;
  return h;
 }
 static gint
 binding_entry_compare (gconstpointer v1,
                       gconstpointer v2)
 {
  const ClutterBindingEntry *e1 = v1;
  const ClutterBindingEntry *e2 = v2;
  return (e1->key_val == e2->key_val && e1->modifiers == e2->modifiers);
 }
 static ClutterBindingEntry *
 binding_entry_new (const gchar         *name,
                   guint                key_val,
                   ClutterModifierType  modifiers)
 {
  ClutterBindingEntry *entry;
  modifiers = modifiers & BINDING_MOD_MASK;
  entry = g_slice_new (ClutterBindingEntry);
  entry->key_val = key_val;
  entry->modifiers = modifiers;
  entry->name = (gchar *) g_intern_string (name);
  entry->closure = NULL;
  entry->is_blocked = FALSE;
  return entry;
 }
 static ClutterBindingEntry *
 binding_pool_lookup_entry (ClutterBindingPool  *pool,
                           guint                key_val,
                           ClutterModifierType  modifiers)
 {
  ClutterBindingEntry lookup_entry = { 0, };
  lookup_entry.key_val = key_val;
  lookup_entry.modifiers = modifiers;
  return g_hash_table_lookup (pool->entries_hash, &lookup_entry);
 }
 static void
 binding_entry_free (gpointer data)
 {
  if (G_LIKELY (data))
    {
      ClutterBindingEntry *entry = data;
      g_closure_unref (entry->closure);
      g_slice_free (ClutterBindingEntry, entry);
    }
 }
 static void
 clutter_binding_pool_finalize (GObject *gobject)
 {
  ClutterBindingPool *pool = CLUTTER_BINDING_POOL (gobject);
  /* remove from the pools */
  clutter_binding_pools = g_slist_remove (clutter_binding_pools, pool);
  g_hash_table_destroy (pool->entries_hash);
  g_slist_foreach (pool->entries, (GFunc) binding_entry_free, NULL);
  g_slist_free (pool->entries);
  G_OBJECT_CLASS (clutter_binding_pool_parent_class)->finalize (gobject);
 }
 static void
 clutter_binding_pool_set_property (GObject      *gobject,
                                   guint         prop_id,
                                   const GValue *value,
                                   GParamSpec   *pspec)
 {
  ClutterBindingPool *pool = CLUTTER_BINDING_POOL (gobject);
  switch (prop_id)
    {
    case PROP_NAME:
      pool->name = (gchar *) g_intern_string (g_value_get_string (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_binding_pool_get_property (GObject    *gobject,
                                   guint       prop_id,
                                   GValue     *value,
                                   GParamSpec *pspec)
 {
  ClutterBindingPool *pool = CLUTTER_BINDING_POOL (gobject);
  switch (prop_id)
    {
    case PROP_NAME:
      g_value_set_string (value, pool->name);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_binding_pool_constructed (GObject *gobject)
 {
  ClutterBindingPool *pool = CLUTTER_BINDING_POOL (gobject);
  /* bad monkey! bad, bad monkey! */
  if (G_UNLIKELY (pool->name == NULL))
    g_critical ("No name set for ClutterBindingPool %p", pool);
  if (G_OBJECT_CLASS (clutter_binding_pool_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_binding_pool_parent_class)->constructed (gobject);
 }
 static void
 clutter_binding_pool_class_init (ClutterBindingPoolClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  gobject_class->constructed = clutter_binding_pool_constructed;
  gobject_class->set_property = clutter_binding_pool_set_property;
  gobject_class->get_property = clutter_binding_pool_get_property;
  gobject_class->finalize = clutter_binding_pool_finalize;
  /**
   * ClutterBindingPool:name:
   *
   * The unique name of the #ClutterBindingPool.
   *
   * Since: 1.0
   */
  obj_props[PROP_NAME] =
    g_param_spec_string ("name",
                         P_("Name"),
                         P_("The unique name of the binding pool"),
                         NULL,
                         CLUTTER_PARAM_READWRITE |
                         G_PARAM_CONSTRUCT_ONLY);
  g_object_class_install_properties (gobject_class,
                                     PROP_LAST,
                                     obj_props);
 }
 static void
 clutter_binding_pool_init (ClutterBindingPool *pool)
 {
  pool->name = NULL;
  pool->entries = NULL;
  pool->entries_hash = g_hash_table_new (binding_entry_hash,
                                         binding_entry_compare);
  clutter_binding_pools = g_slist_prepend (clutter_binding_pools, pool);
 }
 /**
 * clutter_binding_pool_new:
 * @name: the name of the binding pool
 *
 * Creates a new #ClutterBindingPool that can be used to store
 * key bindings for an actor. The @name must be a unique identifier
 * for the binding pool, so that clutter_binding_pool_find() will
 * be able to return the correct binding pool.
 *
 * Return value: the newly created binding pool with the given
 *   name. Use g_object_unref() when done.
 *
 * Since: 1.0
 */
 ClutterBindingPool *
 clutter_binding_pool_new (const gchar *name)
 {
  ClutterBindingPool *pool;
  g_return_val_if_fail (name != NULL, NULL);
  pool = clutter_binding_pool_find (name);
  if (G_UNLIKELY (pool))
    {
      g_warning ("A binding pool named '%s' is already present "
                 "in the binding pools list",
                 pool->name);
      return NULL;
    }
  return g_object_new (CLUTTER_TYPE_BINDING_POOL, "name", name, NULL);
 }
 /**
 * clutter_binding_pool_get_for_class:
 * @klass: a #GObjectClass pointer
 *
 * Retrieves the #ClutterBindingPool for the given #GObject class
 * and, eventually, creates it. This function is a wrapper around
 * clutter_binding_pool_new() and uses the class type name as the
 * unique name for the binding pool.
 *
 * Calling this function multiple times will return the same
 * #ClutterBindingPool.
 *
 * A binding pool for a class can also be retrieved using
 * clutter_binding_pool_find() with the class type name:
 *
 * |[
 *   pool = clutter_binding_pool_find (G_OBJECT_TYPE_NAME (instance));
 * ]|
 *
 * Return value: (transfer none): the binding pool for the given class.
 *   The returned #ClutterBindingPool is owned by Clutter and should not
 *   be freed directly
 *
 * Since: 1.0
 */
 ClutterBindingPool *
 clutter_binding_pool_get_for_class (gpointer klass)
 {
  ClutterBindingPool *pool;
  g_return_val_if_fail (G_IS_OBJECT_CLASS (klass), NULL);
  if (G_UNLIKELY (key_class_bindings == 0))
    key_class_bindings = g_quark_from_static_string ("clutter-bindings-set");
  pool = g_dataset_id_get_data (klass, key_class_bindings);
  if (pool)
    return pool;
  pool = clutter_binding_pool_new (G_OBJECT_CLASS_NAME (klass));
  g_dataset_id_set_data_full (klass, key_class_bindings,
                              pool,
                              g_object_unref);
  return pool;
 }
 /**
 * clutter_binding_pool_find:
 * @name: the name of the binding pool to find
 *
 * Finds the #ClutterBindingPool with @name.
 *
 * Return value: (transfer none): a pointer to the #ClutterBindingPool, or %NULL
 *
 * Since: 1.0
 */
 ClutterBindingPool *
 clutter_binding_pool_find (const gchar *name)
 {
  GSList *l;
  g_return_val_if_fail (name != NULL, NULL);
  for (l = clutter_binding_pools; l != NULL; l = l->next)
    {
      ClutterBindingPool *pool = l->data;
      if (g_str_equal (pool->name, (gpointer) name))
        return pool;
    }
  return NULL;
 }
 /**
 * clutter_binding_pool_install_action:
 * @pool: a #ClutterBindingPool
 * @action_name: the name of the action
 * @key_val: key symbol
 * @modifiers: bitmask of modifiers
 * @callback: (type Clutter.BindingActionFunc): function to be called
 *   when the action is activated
 * @data: data to be passed to @callback
 * @notify: function to be called when the action is removed
 *   from the pool
 *
 * Installs a new action inside a #ClutterBindingPool. The action
 * is bound to @key_val and @modifiers.
 *
 * The same action name can be used for multiple @key_val, @modifiers
 * pairs.
 *
 * When an action has been activated using clutter_binding_pool_activate()
 * the passed @callback will be invoked (with @data).
 *
 * Actions can be blocked with clutter_binding_pool_block_action()
 * and then unblocked using clutter_binding_pool_unblock_action().
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_install_action (ClutterBindingPool  *pool,
                                     const gchar         *action_name,
                                     guint                key_val,
                                     ClutterModifierType  modifiers,
                                     GCallback            callback,
                                     gpointer             data,
                                     GDestroyNotify       notify)
 {
  ClutterBindingEntry *entry;
  GClosure *closure;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (action_name != NULL);
  g_return_if_fail (key_val != 0);
  g_return_if_fail (callback != NULL);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (G_UNLIKELY (entry))
    {
      g_warning ("There already is an action '%s' for the given "
                 "key symbol of %d (modifiers: %d) installed inside "
                 "the binding pool.",
                 entry->name,
                 entry->key_val, entry->modifiers);
      return;
    }
  else
    entry = binding_entry_new (action_name, key_val, modifiers);
  closure = g_cclosure_new (callback, data, (GClosureNotify) notify);
  entry->closure = g_closure_ref (closure);
  g_closure_sink (closure);
  if (G_CLOSURE_NEEDS_MARSHAL (closure))
    {
      GClosureMarshal marshal;
      marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS;
      g_closure_set_marshal (closure, marshal);
    }
  pool->entries = g_slist_prepend (pool->entries, entry);
  g_hash_table_insert (pool->entries_hash, entry, entry);
 }
 /**
 * clutter_binding_pool_install_closure:
 * @pool: a #ClutterBindingPool
 * @action_name: the name of the action
 * @key_val: key symbol
 * @modifiers: bitmask of modifiers
 * @closure: a #GClosure
 *
 * A #GClosure variant of clutter_binding_pool_install_action().
 *
 * Installs a new action inside a #ClutterBindingPool. The action
 * is bound to @key_val and @modifiers.
 *
 * The same action name can be used for multiple @key_val, @modifiers
 * pairs.
 *
 * When an action has been activated using clutter_binding_pool_activate()
 * the passed @closure will be invoked.
 *
 * Actions can be blocked with clutter_binding_pool_block_action()
 * and then unblocked using clutter_binding_pool_unblock_action().
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_install_closure (ClutterBindingPool  *pool,
                                      const gchar         *action_name,
                                      guint                key_val,
                                      ClutterModifierType  modifiers,
                                      GClosure            *closure)
 {
  ClutterBindingEntry *entry;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (action_name != NULL);
  g_return_if_fail (key_val != 0);
  g_return_if_fail (closure != NULL);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (G_UNLIKELY (entry))
    {
      g_warning ("There already is an action '%s' for the given "
                 "key symbol of %d (modifiers: %d) installed inside "
                 "the binding pool.",
                 entry->name,
                 entry->key_val, entry->modifiers);
      return;
    }
  else
    entry = binding_entry_new (action_name, key_val, modifiers);
  entry->closure = g_closure_ref (closure);
  g_closure_sink (closure);
  if (G_CLOSURE_NEEDS_MARSHAL (closure))
    {
      GClosureMarshal marshal;
      marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS;
      g_closure_set_marshal (closure, marshal);
    }
  pool->entries = g_slist_prepend (pool->entries, entry);
  g_hash_table_insert (pool->entries_hash, entry, entry);
 }
 /**
 * clutter_binding_pool_override_action:
 * @pool: a #ClutterBindingPool
 * @key_val: key symbol
 * @modifiers: bitmask of modifiers
 * @callback: function to be called when the action is activated
 * @data: data to be passed to @callback
 * @notify: function to be called when the action is removed
 *   from the pool
 *
 * Allows overriding the action for @key_val and @modifiers inside a
 * #ClutterBindingPool. See clutter_binding_pool_install_action().
 *
 * When an action has been activated using clutter_binding_pool_activate()
 * the passed @callback will be invoked (with @data).
 *
 * Actions can be blocked with clutter_binding_pool_block_action()
 * and then unblocked using clutter_binding_pool_unblock_action().
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_override_action (ClutterBindingPool  *pool,
                                      guint                key_val,
                                      ClutterModifierType  modifiers,
                                      GCallback            callback,
                                      gpointer             data,
                                      GDestroyNotify       notify)
 {
  ClutterBindingEntry *entry;
  GClosure *closure;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (key_val != 0);
  g_return_if_fail (callback != NULL);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (G_UNLIKELY (entry == NULL))
    {
      g_warning ("There is no action for the given key symbol "
                 "of %d (modifiers: %d) installed inside the "
                 "binding pool.",
                 key_val, modifiers);
      return;
    }
  if (entry->closure)
    {
      g_closure_unref (entry->closure);
      entry->closure = NULL;
    }
  closure = g_cclosure_new (callback, data, (GClosureNotify) notify);
  entry->closure = g_closure_ref (closure);
  g_closure_sink (closure);
  if (G_CLOSURE_NEEDS_MARSHAL (closure))
    {
      GClosureMarshal marshal;
      marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS;
      g_closure_set_marshal (closure, marshal);
    }
 }
 /**
 * clutter_binding_pool_override_closure:
 * @pool: a #ClutterBindingPool
 * @key_val: key symbol
 * @modifiers: bitmask of modifiers
 * @closure: a #GClosure
 *
 * A #GClosure variant of clutter_binding_pool_override_action().
 *
 * Allows overriding the action for @key_val and @modifiers inside a
 * #ClutterBindingPool. See clutter_binding_pool_install_closure().
 *
 * When an action has been activated using clutter_binding_pool_activate()
 * the passed @callback will be invoked (with @data).
 *
 * Actions can be blocked with clutter_binding_pool_block_action()
 * and then unblocked using clutter_binding_pool_unblock_action().
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_override_closure (ClutterBindingPool  *pool,
                                       guint                key_val,
                                       ClutterModifierType  modifiers,
                                       GClosure            *closure)
 {
  ClutterBindingEntry *entry;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (key_val != 0);
  g_return_if_fail (closure != NULL);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (G_UNLIKELY (entry == NULL))
    {
      g_warning ("There is no action for the given key symbol "
                 "of %d (modifiers: %d) installed inside the "
                 "binding pool.",
                 key_val, modifiers);
      return;
    }
  if (entry->closure)
    {
      g_closure_unref (entry->closure);
      entry->closure = NULL;
    }
  entry->closure = g_closure_ref (closure);
  g_closure_sink (closure);
  if (G_CLOSURE_NEEDS_MARSHAL (closure))
    {
      GClosureMarshal marshal;
      marshal = _clutter_marshal_BOOLEAN__STRING_UINT_FLAGS;
      g_closure_set_marshal (closure, marshal);
    }
 }
 /**
 * clutter_binding_pool_find_action:
 * @pool: a #ClutterBindingPool
 * @key_val: a key symbol
 * @modifiers: a bitmask for the modifiers
 *
 * Retrieves the name of the action matching the given key symbol
 * and modifiers bitmask.
 *
 * Return value: the name of the action, if found, or %NULL. The
 *   returned string is owned by the binding pool and should never
 *   be modified or freed
 *
 * Since: 1.0
 */
 const gchar *
 clutter_binding_pool_find_action (ClutterBindingPool  *pool,
                                  guint                key_val,
                                  ClutterModifierType  modifiers)
 {
  ClutterBindingEntry *entry;
  g_return_val_if_fail (pool != NULL, NULL);
  g_return_val_if_fail (key_val != 0, NULL);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (!entry)
    return NULL;
  return entry->name;
 }
 /**
 * clutter_binding_pool_remove_action:
 * @pool: a #ClutterBindingPool
 * @key_val: a key symbol
 * @modifiers: a bitmask for the modifiers
 *
 * Removes the action matching the given @key_val, @modifiers pair,
 * if any exists.
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_remove_action (ClutterBindingPool  *pool,
                                    guint                key_val,
                                    ClutterModifierType  modifiers)
 {
  ClutterBindingEntry remove_entry = { 0, };
  GSList *l;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (key_val != 0);
  modifiers = modifiers & BINDING_MOD_MASK;
  remove_entry.key_val = key_val;
  remove_entry.modifiers = modifiers;
  for (l = pool->entries; l != NULL; l = l->data)
    {
      ClutterBindingEntry *e = l->data;
      if (e->key_val == remove_entry.key_val &&
          e->modifiers == remove_entry.modifiers)
        {
          pool->entries = g_slist_remove_link (pool->entries, l);
          break;
        }
    }
  g_hash_table_remove (pool->entries_hash, &remove_entry);
 }
 static gboolean
 clutter_binding_entry_invoke (ClutterBindingEntry *entry,
                              GObject             *gobject)
 {
  GValue params[4] = {
    G_VALUE_INIT,
    G_VALUE_INIT,
    G_VALUE_INIT,
    G_VALUE_INIT
  };
  GValue result = G_VALUE_INIT;
  gboolean retval = TRUE;
  g_value_init (&params[0], G_TYPE_OBJECT);
  g_value_set_object (&params[0], gobject);
  g_value_init (&params[1], G_TYPE_STRING);
  g_value_set_static_string (&params[1], entry->name);
  g_value_init (&params[2], G_TYPE_UINT);
  g_value_set_uint (&params[2], entry->key_val);
  g_value_init (&params[3], CLUTTER_TYPE_MODIFIER_TYPE);
  g_value_set_flags (&params[3], entry->modifiers);
  g_value_init (&result, G_TYPE_BOOLEAN);
  g_closure_invoke (entry->closure, &result, 4, params, NULL);
  retval = g_value_get_boolean (&result);
  g_value_unset (&result);
  g_value_unset (&params[0]);
  g_value_unset (&params[1]);
  g_value_unset (&params[2]);
  g_value_unset (&params[3]);
  return retval;
 }
 /**
 * clutter_binding_pool_activate:
 * @pool: a #ClutterBindingPool
 * @key_val: the key symbol
 * @modifiers: bitmask for the modifiers
 * @gobject: a #GObject
 *
 * Activates the callback associated to the action that is
 * bound to the @key_val and @modifiers pair.
 *
 * The callback has the following signature:
 *
 * |[
 *   void (* callback) (GObject             *gobject,
 *                      const gchar         *action_name,
 *                      guint                key_val,
 *                      ClutterModifierType  modifiers,
 *                      gpointer             user_data);
 * ]|
 *
 * Where the #GObject instance is @gobject and the user data
 * is the one passed when installing the action with
 * clutter_binding_pool_install_action().
 *
 * If the action bound to the @key_val, @modifiers pair has been
 * blocked using clutter_binding_pool_block_action(), the callback
 * will not be invoked, and this function will return %FALSE.
 *
 * Return value: %TRUE if an action was found and was activated
 *
 * Since: 1.0
 */
 gboolean
 clutter_binding_pool_activate (ClutterBindingPool  *pool,
                               guint                key_val,
                               ClutterModifierType  modifiers,
                               GObject             *gobject)
 {
  ClutterBindingEntry *entry = NULL;
  g_return_val_if_fail (pool != NULL, FALSE);
  g_return_val_if_fail (key_val != 0, FALSE);
  g_return_val_if_fail (G_IS_OBJECT (gobject), FALSE);
  modifiers = (modifiers & BINDING_MOD_MASK);
  entry = binding_pool_lookup_entry (pool, key_val, modifiers);
  if (!entry)
    return FALSE;
  if (!entry->is_blocked)
    return clutter_binding_entry_invoke (entry, gobject);
  return FALSE;
 }
 /**
 * clutter_binding_pool_block_action:
 * @pool: a #ClutterBindingPool
 * @action_name: an action name
 *
 * Blocks all the actions with name @action_name inside @pool.
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_block_action (ClutterBindingPool *pool,
                                   const gchar        *action_name)
 {
  GSList *l;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (action_name != NULL);
  for (l = pool->entries; l != NULL; l = l->next)
    {
      ClutterBindingEntry *entry = l->data;
      if (g_str_equal (entry->name, (gpointer) action_name))
        entry->is_blocked = TRUE;
    }
 }
 /**
 * clutter_binding_pool_unblock_action:
 * @pool: a #ClutterBindingPool
 * @action_name: an action name
 *
 * Unblockes all the actions with name @action_name inside @pool.
 *
 * Unblocking an action does not cause the callback bound to it to
 * be invoked in case clutter_binding_pool_activate() was called on
 * an action previously blocked with clutter_binding_pool_block_action().
 *
 * Since: 1.0
 */
 void
 clutter_binding_pool_unblock_action (ClutterBindingPool *pool,
                                     const gchar        *action_name)
 {
  GSList *l;
  g_return_if_fail (pool != NULL);
  g_return_if_fail (action_name != NULL);
  for (l = pool->entries; l != NULL; l = l->next)
    {
      ClutterBindingEntry *entry = l->data;
      if (g_str_equal (entry->name, (gpointer) action_name))
        entry->is_blocked = FALSE;
    }
 }
--- a/clutter/clutter/clutter-binding-pool.h
+++ b/clutter/clutter/clutter-binding-pool.h
@@ -1,135 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2008  Intel Corporation.
 *
 * Authored By: Emmanuele Bassi <ebassi@linux.intel.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_BINDING_POOL_H__
 #define __CLUTTER_BINDING_POOL_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <glib-object.h>
 #include <clutter/clutter-event.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BINDING_POOL       (clutter_binding_pool_get_type ())
 #define CLUTTER_BINDING_POOL(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BINDING_POOL, ClutterBindingPool))
 #define CLUTTER_IS_BINDING_POOL(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BINDING_POOL))
 /**
 * ClutterBindingPool:
 *
 * Container of key bindings. The #ClutterBindingPool struct is
 * private.
 *
 * Since: 1.0
 */
 typedef struct _ClutterBindingPool      ClutterBindingPool;
 typedef struct _ClutterBindingPoolClass ClutterBindingPoolClass;
 /**
 * ClutterBindingActionFunc:
 * @gobject: a #GObject
 * @action_name: the name of the action
 * @key_val: the key symbol
 * @modifiers: bitmask of the modifier flags
 * @user_data: data passed to the function
 *
 * The prototype for the callback function registered with
 * clutter_binding_pool_install_action() and invoked by
 * clutter_binding_pool_activate().
 *
 * Return value: the function should return %TRUE if the key
 *   binding has been handled, and return %FALSE otherwise
 *
 * Since: 1.0
 */
 typedef gboolean (* ClutterBindingActionFunc) (GObject             *gobject,
                                               const gchar         *action_name,
                                               guint                key_val,
                                               ClutterModifierType  modifiers,
                                               gpointer             user_data);
 CLUTTER_AVAILABLE_IN_1_0
 GType clutter_binding_pool_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_new              (const gchar         *name);
 CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_get_for_class    (gpointer             klass);
 CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_find             (const gchar         *name);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_install_action   (ClutterBindingPool  *pool,
                                                             const gchar         *action_name,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GCallback            callback,
                                                             gpointer             data,
                                                             GDestroyNotify       notify);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_install_closure  (ClutterBindingPool  *pool,
                                                             const gchar         *action_name,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GClosure            *closure);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_override_action  (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GCallback            callback,
                                                             gpointer             data,
                                                             GDestroyNotify       notify);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_override_closure (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GClosure            *closure);
 CLUTTER_AVAILABLE_IN_1_0
 const gchar *         clutter_binding_pool_find_action      (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_remove_action    (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers);
 CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_binding_pool_activate         (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GObject             *gobject);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_block_action     (ClutterBindingPool  *pool,
                                                             const gchar         *action_name);
 CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_unblock_action   (ClutterBindingPool  *pool,
                                                             const gchar         *action_name);
 G_END_DECLS
 #endif /* __CLUTTER_BINDING_POOL_H__ */
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -1,278 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-blur-effect
 * @short_description: A blur effect
 * @see_also: #ClutterEffect, #ClutterOffscreenEffect
 *
 * #ClutterBlurEffect is a sub-class of #ClutterEffect that allows blurring a
 * actor and its contents.
 *
 * #ClutterBlurEffect is available since Clutter 1.4
 */
 #define CLUTTER_BLUR_EFFECT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
 #define CLUTTER_IS_BLUR_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
 #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-blur-effect.h"
 #include "cogl/cogl.h"
 #include "clutter-debug.h"
 #include "clutter-offscreen-effect.h"
 #include "clutter-private.h"
 #define BLUR_PADDING    2
 /* FIXME - lame shader; we should really have a decoupled
 * horizontal/vertical two pass shader for the gaussian blur
 */
 static const gchar *box_blur_glsl_declarations =
 "uniform vec2 pixel_step;\n";
 #define SAMPLE(offx, offy) \
  "cogl_texel += texture2D (cogl_sampler, cogl_tex_coord.st + pixel_step * " \
  "vec2 (" G_STRINGIFY (offx) ", " G_STRINGIFY (offy) "));\n"
 static const gchar *box_blur_glsl_shader =
 "  cogl_texel = texture2D (cogl_sampler, cogl_tex_coord.st);\n"
  SAMPLE (-1.0, -1.0)
  SAMPLE ( 0.0, -1.0)
  SAMPLE (+1.0, -1.0)
  SAMPLE (-1.0,  0.0)
  SAMPLE (+1.0,  0.0)
  SAMPLE (-1.0, +1.0)
  SAMPLE ( 0.0, +1.0)
  SAMPLE (+1.0, +1.0)
 "  cogl_texel /= 9.0;\n";
 #undef SAMPLE
 struct _ClutterBlurEffect
 {
  ClutterOffscreenEffect parent_instance;
  /* a back pointer to our actor, so that we can query it */
  ClutterActor *actor;
  gint pixel_step_uniform;
  gint tex_width;
  gint tex_height;
  CoglPipeline *pipeline;
 };
 struct _ClutterBlurEffectClass
 {
  ClutterOffscreenEffectClass parent_class;
  CoglPipeline *base_pipeline;
 };
 G_DEFINE_TYPE (ClutterBlurEffect,
               clutter_blur_effect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);
 static gboolean
 clutter_blur_effect_pre_paint (ClutterEffect *effect)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (effect);
  ClutterEffectClass *parent_class;
  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
    return FALSE;
  self->actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
  if (self->actor == NULL)
    return FALSE;
  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
    {
      /* if we don't have support for GLSL shaders then we
       * forcibly disable the ActorMeta
       */
      g_warning ("Unable to use the ShaderEffect: the graphics hardware "
                 "or the current GL driver does not implement support "
                 "for the GLSL shading language.");
      clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE);
      return FALSE;
    }
  parent_class = CLUTTER_EFFECT_CLASS (clutter_blur_effect_parent_class);
  if (parent_class->pre_paint (effect))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
      CoglHandle texture;
      texture = clutter_offscreen_effect_get_texture (offscreen_effect);
      self->tex_width = cogl_texture_get_width (texture);
      self->tex_height = cogl_texture_get_height (texture);
      if (self->pixel_step_uniform > -1)
        {
          gfloat pixel_step[2];
          pixel_step[0] = 1.0f / self->tex_width;
          pixel_step[1] = 1.0f / self->tex_height;
          cogl_pipeline_set_uniform_float (self->pipeline,
                                           self->pixel_step_uniform,
                                           2, /* n_components */
                                           1, /* count */
                                           pixel_step);
        }
      cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
      return TRUE;
    }
  else
    return FALSE;
 }
 static void
 clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (effect);
  guint8 paint_opacity;
  paint_opacity = clutter_actor_get_paint_opacity (self->actor);
  cogl_pipeline_set_color4ub (self->pipeline,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
  cogl_pop_source ();
 }
 static gboolean
 clutter_blur_effect_get_paint_volume (ClutterEffect      *effect,
                                      ClutterPaintVolume *volume)
 {
  gfloat cur_width, cur_height;
  ClutterVertex origin;
  clutter_paint_volume_get_origin (volume, &origin);
  cur_width = clutter_paint_volume_get_width (volume);
  cur_height = clutter_paint_volume_get_height (volume);
  origin.x -= BLUR_PADDING;
  origin.y -= BLUR_PADDING;
  cur_width += 2 * BLUR_PADDING;
  cur_height += 2 * BLUR_PADDING;
  clutter_paint_volume_set_origin (volume, &origin);
  clutter_paint_volume_set_width (volume, cur_width);
  clutter_paint_volume_set_height (volume, cur_height);
  return TRUE;
 }
 static void
 clutter_blur_effect_dispose (GObject *gobject)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (gobject);
  if (self->pipeline != NULL)
    {
      cogl_object_unref (self->pipeline);
      self->pipeline = NULL;
    }
  G_OBJECT_CLASS (clutter_blur_effect_parent_class)->dispose (gobject);
 }
 static void
 clutter_blur_effect_class_init (ClutterBlurEffectClass *klass)
 {
  ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterOffscreenEffectClass *offscreen_class;
  gobject_class->dispose = clutter_blur_effect_dispose;
  effect_class->pre_paint = clutter_blur_effect_pre_paint;
  effect_class->get_paint_volume = clutter_blur_effect_get_paint_volume;
  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
  offscreen_class->paint_target = clutter_blur_effect_paint_target;
 }
 static void
 clutter_blur_effect_init (ClutterBlurEffect *self)
 {
  ClutterBlurEffectClass *klass = CLUTTER_BLUR_EFFECT_GET_CLASS (self);
  if (G_UNLIKELY (klass->base_pipeline == NULL))
    {
      CoglSnippet *snippet;
      CoglContext *ctx =
        clutter_backend_get_cogl_context (clutter_get_default_backend ());
      klass->base_pipeline = cogl_pipeline_new (ctx);
      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
                                  box_blur_glsl_declarations,
                                  NULL);
      cogl_snippet_set_replace (snippet, box_blur_glsl_shader);
      cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet);
      cogl_object_unref (snippet);
      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
                                            0, /* layer number */
                                            COGL_TEXTURE_TYPE_2D);
    }
  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
  self->pixel_step_uniform =
    cogl_pipeline_get_uniform_location (self->pipeline, "pixel_step");
 }
 /**
 * clutter_blur_effect_new:
 *
 * Creates a new #ClutterBlurEffect to be used with
 * clutter_actor_add_effect()
 *
 * Return value: the newly created #ClutterBlurEffect or %NULL
 *
 * Since: 1.4
 */
 ClutterEffect *
 clutter_blur_effect_new (void)
 {
  return g_object_new (CLUTTER_TYPE_BLUR_EFFECT, NULL);
 }
--- a/clutter/clutter/clutter-blur-effect.h
+++ b/clutter/clutter/clutter-blur-effect.h
@@ -1,59 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_BLUR_EFFECT_H__
 #define __CLUTTER_BLUR_EFFECT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-effect.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BLUR_EFFECT        (clutter_blur_effect_get_type ())
 #define CLUTTER_BLUR_EFFECT(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffect))
 #define CLUTTER_IS_BLUR_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BLUR_EFFECT))
 /**
 * ClutterBlurEffect:
 *
 * #ClutterBlurEffect is an opaque structure
 * whose members cannot be accessed directly
 *
 * Since: 1.4
 */
 typedef struct _ClutterBlurEffect       ClutterBlurEffect;
 typedef struct _ClutterBlurEffectClass  ClutterBlurEffectClass;
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_blur_effect_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_blur_effect_new (void);
 G_END_DECLS
 #endif /* __CLUTTER_BLUR_EFFECT_H__ */
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
--- a/clutter/clutter/clutter-box-layout.h
+++ b/clutter/clutter/clutter-box-layout.h
@@ -1,168 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2009  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 *
 * Based on the NBTK NbtkBoxLayout actor by:
 *   Thomas Wood <thomas.wood@intel.com>
 */
 #ifndef __CLUTTER_BOX_LAYOUT_H__
 #define __CLUTTER_BOX_LAYOUT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-layout-manager.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BOX_LAYOUT                 (clutter_box_layout_get_type ())
 #define CLUTTER_BOX_LAYOUT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BOX_LAYOUT, ClutterBoxLayout))
 #define CLUTTER_IS_BOX_LAYOUT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BOX_LAYOUT))
 #define CLUTTER_BOX_LAYOUT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BOX_LAYOUT, ClutterBoxLayoutClass))
 #define CLUTTER_IS_BOX_LAYOUT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BOX_LAYOUT))
 #define CLUTTER_BOX_LAYOUT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BOX_LAYOUT, ClutterBoxLayoutClass))
 typedef struct _ClutterBoxLayout                ClutterBoxLayout;
 typedef struct _ClutterBoxLayoutPrivate         ClutterBoxLayoutPrivate;
 typedef struct _ClutterBoxLayoutClass           ClutterBoxLayoutClass;
 /**
 * ClutterBoxLayout:
 *
 * The #ClutterBoxLayout structure contains only private data
 * and should be accessed using the provided API
 *
 * Since: 1.2
 */
 struct _ClutterBoxLayout
 {
  /*< private >*/
  ClutterLayoutManager parent_instance;
  ClutterBoxLayoutPrivate *priv;
 };
 /**
 * ClutterBoxLayoutClass:
 *
 * The #ClutterBoxLayoutClass structure contains only private
 * data and should be accessed using the provided API
 *
 * Since: 1.2
 */
 struct _ClutterBoxLayoutClass
 {
  /*< private >*/
  ClutterLayoutManagerClass parent_class;
 };
 CLUTTER_AVAILABLE_IN_1_2
 GType clutter_box_layout_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager *  clutter_box_layout_new                 (void);
 CLUTTER_AVAILABLE_IN_1_12
 void                    clutter_box_layout_set_orientation      (ClutterBoxLayout    *layout,
                                                                 ClutterOrientation   orientation);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterOrientation      clutter_box_layout_get_orientation      (ClutterBoxLayout    *layout);
 CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_spacing          (ClutterBoxLayout    *layout,
                                                                 guint                spacing);
 CLUTTER_AVAILABLE_IN_1_2
 guint                   clutter_box_layout_get_spacing          (ClutterBoxLayout    *layout);
 CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_homogeneous      (ClutterBoxLayout    *layout,
                                                                 gboolean             homogeneous);
 CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_box_layout_get_homogeneous      (ClutterBoxLayout    *layout);
 CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_pack_start       (ClutterBoxLayout    *layout,
                                                                 gboolean             pack_start);
 CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_box_layout_get_pack_start       (ClutterBoxLayout    *layout);
 CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_set_orientation)
 void                    clutter_box_layout_set_vertical         (ClutterBoxLayout    *layout,
                                                                 gboolean             vertical);
 CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_get_orientation)
 gboolean                clutter_box_layout_get_vertical         (ClutterBoxLayout    *layout);
 CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_pack                 (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             expand,
                                                                 gboolean             x_fill,
                                                                 gboolean             y_fill,
                                                                 ClutterBoxAlignment  x_align,
                                                                 ClutterBoxAlignment  y_align);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_alignment        (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 ClutterBoxAlignment  x_align,
                                                                 ClutterBoxAlignment  y_align);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_get_alignment        (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 ClutterBoxAlignment *x_align,
                                                                 ClutterBoxAlignment *y_align);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_fill             (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             x_fill,
                                                                 gboolean             y_fill);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_get_fill             (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean            *x_fill,
                                                                 gboolean            *y_fill);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_expand           (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             expand);
 CLUTTER_DEPRECATED_IN_1_12
 gboolean                clutter_box_layout_get_expand           (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_use_animations   (ClutterBoxLayout    *layout,
                                                                 gboolean             animate);
 CLUTTER_DEPRECATED_IN_1_12
 gboolean                clutter_box_layout_get_use_animations   (ClutterBoxLayout    *layout);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_easing_mode      (ClutterBoxLayout    *layout,
                                                                 gulong               mode);
 CLUTTER_DEPRECATED_IN_1_12
 gulong                  clutter_box_layout_get_easing_mode      (ClutterBoxLayout    *layout);
 CLUTTER_DEPRECATED_IN_1_12
 void                    clutter_box_layout_set_easing_duration  (ClutterBoxLayout    *layout,
                                                                 guint                msecs);
 CLUTTER_DEPRECATED_IN_1_12
 guint                   clutter_box_layout_get_easing_duration  (ClutterBoxLayout    *layout);
 G_END_DECLS
 #endif /* __CLUTTER_BOX_LAYOUT_H__ */
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -1,657 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010-2012 Inclusive Design Research Centre, OCAD University.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Joseph Scheuhammer <clown@alum.mit.edu>
 */
 /**
 * SECTION:clutter-brightness-contrast-effect
 * @short_description: Increase/decrease brightness and/or contrast of actor.
 * @see_also: #ClutterEffect, #ClutterOffscreenEffect
 *
 * #ClutterBrightnessContrastEffect is a sub-class of #ClutterEffect that
 * changes the overall brightness of a #ClutterActor.
 *
 * #ClutterBrightnessContrastEffect is available since Clutter 1.10
 */
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
 #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-brightness-contrast-effect.h"
 #include <cogl/cogl.h>
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-offscreen-effect.h"
 #include "clutter-private.h"
 struct _ClutterBrightnessContrastEffect
 {
  ClutterOffscreenEffect parent_instance;
  /* Brightness and contrast changes. */
  gfloat brightness_red;
  gfloat brightness_green;
  gfloat brightness_blue;
  gfloat contrast_red;
  gfloat contrast_green;
  gfloat contrast_blue;
  gint brightness_multiplier_uniform;
  gint brightness_offset_uniform;
  gint contrast_uniform;
  gint tex_width;
  gint tex_height;
  CoglPipeline *pipeline;
 };
 struct _ClutterBrightnessContrastEffectClass
 {
  ClutterOffscreenEffectClass parent_class;
  CoglPipeline *base_pipeline;
 };
 /* Brightness effects in GLSL.
 */
 static const gchar *brightness_contrast_decls =
  "uniform vec3 brightness_multiplier;\n"
  "uniform vec3 brightness_offset;\n"
  "uniform vec3 contrast;\n";
 static const gchar *brightness_contrast_source =
  /* Apply the brightness. The brightness_offset is multiplied by the
     alpha to keep the color pre-multiplied */
  "cogl_color_out.rgb = (cogl_color_out.rgb * brightness_multiplier +\n"
  "                      brightness_offset * cogl_color_out.a);\n"
  /* Apply the contrast */
  "cogl_color_out.rgb = ((cogl_color_out.rgb - 0.5 * cogl_color_out.a) *\n"
  "                      contrast + 0.5 * cogl_color_out.a);\n";
 static const ClutterColor no_brightness_change = { 0x7f, 0x7f, 0x7f, 0xff };
 static const ClutterColor no_contrast_change = { 0x7f, 0x7f, 0x7f, 0xff };
 static const gfloat no_change = 0.0f;
 enum
 {
  PROP_0,
  PROP_BRIGHTNESS,
  PROP_CONTRAST,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE (ClutterBrightnessContrastEffect,
               clutter_brightness_contrast_effect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);
 static gboolean
 will_have_no_effect (ClutterBrightnessContrastEffect *self)
 {
  return (self->brightness_red == no_change &&
          self->brightness_green == no_change &&
          self->brightness_blue == no_change &&
          self->contrast_red == no_change &&
          self->contrast_green == no_change &&
          self->contrast_blue == no_change);
 }
 static gboolean
 clutter_brightness_contrast_effect_pre_paint (ClutterEffect *effect)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
  ClutterEffectClass *parent_class;
  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
    return FALSE;
  if (will_have_no_effect (self))
    return FALSE;
  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
    {
      /* if we don't have support for GLSL shaders then we
       * forcibly disable the ActorMeta
       */
      g_warning ("Unable to use the ClutterBrightnessContrastEffect: the "
                 "graphics hardware or the current GL driver does not "
                 "implement support for the GLSL shading language. The "
                 "effect will be disabled.");
      clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE);
      return FALSE;
    }
  parent_class =
    CLUTTER_EFFECT_CLASS (clutter_brightness_contrast_effect_parent_class);
  if (parent_class->pre_paint (effect))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
      CoglHandle texture;
      texture = clutter_offscreen_effect_get_texture (offscreen_effect);
      self->tex_width = cogl_texture_get_width (texture);
      self->tex_height = cogl_texture_get_height (texture);
      cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
      return TRUE;
    }
  else
    return FALSE;
 }
 static void
 clutter_brightness_contrast_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
  ClutterActor *actor;
  guint8 paint_opacity;
  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
  paint_opacity = clutter_actor_get_paint_opacity (actor);
  cogl_pipeline_set_color4ub (self->pipeline,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
  cogl_pop_source ();
 }
 static void
 clutter_brightness_contrast_effect_dispose (GObject *gobject)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (gobject);
  if (self->pipeline != NULL)
    {
      cogl_object_unref (self->pipeline);
      self->pipeline = NULL;
    }
  G_OBJECT_CLASS (clutter_brightness_contrast_effect_parent_class)->dispose (gobject);
 }
 static void
 clutter_brightness_contrast_effect_set_property (GObject      *gobject,
                                                 guint        prop_id,
                                                 const GValue *value,
                                                 GParamSpec   *pspec)
 {
  ClutterBrightnessContrastEffect *effect = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (gobject);
  switch (prop_id)
    {
    case PROP_BRIGHTNESS:
      {
        const ClutterColor *color = clutter_value_get_color (value);
        clutter_brightness_contrast_effect_set_brightness_full (effect,
                                                                color->red / 127.0f - 1.0f,
                                                                color->green / 127.0f - 1.0f,
                                                                color->blue / 127.0f - 1.0f);
      }
      break;
    case PROP_CONTRAST:
      {
        const ClutterColor *color = clutter_value_get_color (value);
        clutter_brightness_contrast_effect_set_contrast_full (effect,
                                                              color->red / 127.0f - 1.0f,
                                                              color->green / 127.0f - 1.0f,
                                                              color->blue / 127.0f - 1.0f);
      }
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_brightness_contrast_effect_get_property (GObject    *gobject,
                                                 guint      prop_id,
                                                 GValue     *value,
                                                 GParamSpec *pspec)
 {
  ClutterBrightnessContrastEffect *effect = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (gobject);
  ClutterColor color;
  switch (prop_id)
    {
    case PROP_BRIGHTNESS:
      {
        color.red = (effect->brightness_red + 1.0f) * 127.0f;
        color.green = (effect->brightness_green + 1.0f) * 127.0f;
        color.blue = (effect->brightness_blue + 1.0f) * 127.0f;
        color.alpha = 0xff;
        clutter_value_set_color (value, &color);
      }
      break;
    case PROP_CONTRAST:
      {
        color.red = (effect->contrast_red + 1.0f) * 127.0f;
        color.green = (effect->contrast_green + 1.0f) * 127.0f;
        color.blue = (effect->contrast_blue + 1.0f) * 127.0f;
        color.alpha = 0xff;
        clutter_value_set_color (value, &color);
      }
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_brightness_contrast_effect_class_init (ClutterBrightnessContrastEffectClass *klass)
 {
  ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterOffscreenEffectClass *offscreen_class;
  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
  offscreen_class->paint_target = clutter_brightness_contrast_effect_paint_target;
  effect_class->pre_paint = clutter_brightness_contrast_effect_pre_paint;
  gobject_class->set_property = clutter_brightness_contrast_effect_set_property;
  gobject_class->get_property = clutter_brightness_contrast_effect_get_property;
  gobject_class->dispose = clutter_brightness_contrast_effect_dispose;
  /**
   * ClutterBrightnessContrastEffect:brightness:
   *
   * The brightness change to apply to the effect.
   *
   * This property uses a #ClutterColor to represent the changes to each
   * color channel. The range is [ 0, 255 ], with 127 as the value used
   * to indicate no change; values smaller than 127 indicate a decrease
   * in brightness, and values larger than 127 indicate an increase in
   * brightness.
   *
   * Since: 1.10
   */
  obj_props[PROP_BRIGHTNESS] =
    clutter_param_spec_color ("brightness",
                              P_("Brightness"),
                              P_("The brightness change to apply"),
                              &no_brightness_change,
                              CLUTTER_PARAM_READWRITE);
  /**
   * ClutterBrightnessContrastEffect:contrast:
   *
   * The contrast change to apply to the effect.
   *
   * This property uses a #ClutterColor to represent the changes to each
   * color channel. The range is [ 0, 255 ], with 127 as the value used
   * to indicate no change; values smaller than 127 indicate a decrease
   * in contrast, and values larger than 127 indicate an increase in
   * contrast.
   *
   * Since: 1.10
   */
  obj_props[PROP_CONTRAST] =
    clutter_param_spec_color ("contrast",
                              P_("Contrast"),
                              P_("The contrast change to apply"),
                              &no_contrast_change,
                              CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
 }
 static void
 get_brightness_values (gfloat  value,
                       gfloat *multiplier,
                       gfloat *offset)
 {
  if (value < 0.0f)
    {
      *multiplier = 1.0f + value;
      *offset = 0.0f;
    }
  else
    {
      *multiplier = 1.0f - value;
      *offset = value;
    }
 }
 static inline void
 update_uniforms (ClutterBrightnessContrastEffect *self)
 {
  if (self->brightness_multiplier_uniform > -1 &&
      self->brightness_offset_uniform > -1)
    {
      float brightness_multiplier[3];
      float brightness_offset[3];
      get_brightness_values (self->brightness_red,
                             brightness_multiplier + 0,
                             brightness_offset + 0);
      get_brightness_values (self->brightness_green,
                             brightness_multiplier + 1,
                             brightness_offset + 1);
      get_brightness_values (self->brightness_blue,
                             brightness_multiplier + 2,
                             brightness_offset + 2);
      cogl_pipeline_set_uniform_float (self->pipeline,
                                       self->brightness_multiplier_uniform,
                                       3, /* n_components */
                                       1, /* count */
                                       brightness_multiplier);
      cogl_pipeline_set_uniform_float (self->pipeline,
                                       self->brightness_offset_uniform,
                                       3, /* n_components */
                                       1, /* count */
                                       brightness_offset);
    }
  if (self->contrast_uniform > -1)
    {
      float contrast[3] = {
        tan ((self->contrast_red + 1) * G_PI_4),
        tan ((self->contrast_green + 1) * G_PI_4),
        tan ((self->contrast_blue + 1) * G_PI_4)
      };
      cogl_pipeline_set_uniform_float (self->pipeline,
                                       self->contrast_uniform,
                                       3, /* n_components */
                                       1, /* count */
                                       contrast);
    }
 }
 static void
 clutter_brightness_contrast_effect_init (ClutterBrightnessContrastEffect *self)
 {
  ClutterBrightnessContrastEffectClass *klass;
  self->brightness_red = no_change;
  self->brightness_green = no_change;
  self->brightness_blue = no_change;
  self->contrast_red = no_change;
  self->contrast_green = no_change;
  self->contrast_blue = no_change;
  klass = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS (self);
  if (G_UNLIKELY (klass->base_pipeline == NULL))
    {
      CoglSnippet *snippet;
      CoglContext *ctx =
        clutter_backend_get_cogl_context (clutter_get_default_backend ());
      klass->base_pipeline = cogl_pipeline_new (ctx);
      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
                                  brightness_contrast_decls,
                                  brightness_contrast_source);
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);
      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
                                            0, /* layer number */
                                            COGL_TEXTURE_TYPE_2D);
    }
  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
  self->brightness_multiplier_uniform =
    cogl_pipeline_get_uniform_location (self->pipeline,
                                        "brightness_multiplier");
  self->brightness_offset_uniform =
    cogl_pipeline_get_uniform_location (self->pipeline,
                                        "brightness_offset");
  self->contrast_uniform =
    cogl_pipeline_get_uniform_location (self->pipeline, "contrast");
  update_uniforms (self);
 }
 /**
 * clutter_brightness_contrast_effect_new:
 *
 * Creates a new #ClutterBrightnessContrastEffect to be used with
 * clutter_actor_add_effect()
 *
 * Return value: (transfer full): the newly created
 *   #ClutterBrightnessContrastEffect or %NULL.  Use g_object_unref() when
 *   done.
 *
 * Since: 1.10
 */
 ClutterEffect *
 clutter_brightness_contrast_effect_new (void)
 {
  return g_object_new (CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, NULL);
 }
 /**
 * clutter_brightness_contrast_effect_set_brightness_full:
 * @effect: a #ClutterBrightnessContrastEffect
 * @red: red component of the change in brightness
 * @green: green component of the change in brightness
 * @blue: blue component of the change in brightness
 *
 * The range for each component is [-1.0, 1.0] where 0.0 designates no change,
 * values below 0.0 mean a decrease in brightness, and values above indicate
 * an increase.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_set_brightness_full (ClutterBrightnessContrastEffect *effect,
                                                        gfloat                           red,
                                                        gfloat                           green,
                                                        gfloat                           blue)
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
  if (red == effect->brightness_red &&
      green == effect->brightness_green &&
      blue == effect->brightness_blue)
    return;
  effect->brightness_red = red;
  effect->brightness_green = green;
  effect->brightness_blue = blue;
  update_uniforms (effect);
  clutter_effect_queue_repaint (CLUTTER_EFFECT (effect));
  g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_BRIGHTNESS]);
 }
 /**
 * clutter_brightness_contrast_effect_get_brightness:
 * @effect: a #ClutterBrightnessContrastEffect
 * @red: (out) (allow-none): return location for red component of the
 *    change in brightness
 * @green: (out) (allow-none): return location for green component of the
 *    change in brightness
 * @blue: (out) (allow-none): return location for blue component of the
 *    change in brightness
 *
 * Retrieves the change in brightness used by @effect.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_get_brightness (ClutterBrightnessContrastEffect *effect,
                                                   gfloat                          *red,
                                                   gfloat                          *green,
                                                   gfloat                          *blue)
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
  if (red != NULL)
    *red = effect->brightness_red;
  if (green != NULL)
    *green = effect->brightness_green;
  if (blue != NULL)
    *blue = effect->brightness_blue;
 }
 /**
 * clutter_brightness_contrast_effect_set_brightness:
 * @effect: a #ClutterBrightnessContrastEffect
 * @brightness:  the brightness change for all three components (r, g, b)
 *
 * The range of @brightness is [-1.0, 1.0], where 0.0 designates no change;
 * a value below 0.0 indicates a decrease in brightness; and a value
 * above 0.0 indicates an increase of brightness.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_set_brightness (ClutterBrightnessContrastEffect *effect,
                                                   gfloat                           brightness)
 {
  clutter_brightness_contrast_effect_set_brightness_full (effect,
                                                          brightness,
                                                          brightness,
                                                          brightness);
 }
 /**
 * clutter_brightness_contrast_effect_set_contrast_full:
 * @effect: a #ClutterBrightnessContrastEffect
 * @red: red component of the change in contrast
 * @green: green component of the change in contrast
 * @blue: blue component of the change in contrast
 *
 * The range for each component is [-1.0, 1.0] where 0.0 designates no change,
 * values below 0.0 mean a decrease in contrast, and values above indicate
 * an increase.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_set_contrast_full (ClutterBrightnessContrastEffect *effect,
                                                      gfloat                          red,
                                                      gfloat                          green,
                                                      gfloat                          blue)
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
  if (red == effect->contrast_red &&
      green == effect->contrast_green &&
      blue == effect->contrast_blue)
    return;
  effect->contrast_red = red;
  effect->contrast_green = green;
  effect->contrast_blue = blue;
  update_uniforms (effect);
  clutter_effect_queue_repaint (CLUTTER_EFFECT (effect));
  g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_CONTRAST]);
 }
 /**
 * clutter_brightness_contrast_effect_get_contrast:
 * @effect: a #ClutterBrightnessContrastEffect
 * @red: (out) (allow-none): return location for red component of the
 *    change in contrast
 * @green: (out) (allow-none): return location for green component of the
 *    change in contrast
 * @blue: (out) (allow-none): return location for blue component of the
 *    change in contrast
 *
 * Retrieves the contrast value used by @effect.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_get_contrast (ClutterBrightnessContrastEffect *effect,
                                                 gfloat                          *red,
                                                 gfloat                          *green,
                                                 gfloat                          *blue)
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));
  if (red != NULL)
    *red = effect->contrast_red;
  if (green != NULL)
    *green = effect->contrast_green;
  if (blue != NULL)
    *blue = effect->contrast_blue;
 }
 /**
 * clutter_brightness_contrast_effect_set_contrast:
 * @effect: a #ClutterBrightnessContrastEffect
 * @contrast: contrast change for all three channels
 *
 * The range for @contrast is [-1.0, 1.0], where 0.0 designates no change;
 * a value below 0.0 indicates a decrease in contrast; and a value above
 * 0.0 indicates an increase.
 *
 * Since: 1.10
 */
 void
 clutter_brightness_contrast_effect_set_contrast (ClutterBrightnessContrastEffect *effect,
                                                 gfloat                           contrast)
 {
  clutter_brightness_contrast_effect_set_contrast_full (effect,
                                                        contrast,
                                                        contrast,
                                                        contrast);
 }
--- a/clutter/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter/clutter-brightness-contrast-effect.h
@@ -1,88 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010-2012 Inclusive Design Research Centre, OCAD University.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Joseph Scheuhammer <clown@alum.mit.edu>
 */
 #ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
 #define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-color.h>
 #include <clutter/clutter-effect.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT     (clutter_brightness_contrast_effect_get_type ())
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffect))
 #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT(obj)  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
 /**
 * ClutterBrightnessContrastEffect:
 *
 * #ClutterBrightnessContrastEffect is an opaque structure
 * whose members cannot be directly accessed
 *
 * Since: 1.10
 */
 typedef struct _ClutterBrightnessContrastEffect         ClutterBrightnessContrastEffect;
 typedef struct _ClutterBrightnessContrastEffectClass    ClutterBrightnessContrastEffectClass;
 CLUTTER_AVAILABLE_IN_1_10
 GType clutter_brightness_contrast_effect_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_10
 ClutterEffect * clutter_brightness_contrast_effect_new                          (void);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_brightness_full          (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            red,
                                                                                 float                            green,
                                                                                 float                            blue);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            brightness);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_get_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                 float                           *red,
                                                                                 float                           *green,
                                                                                 float                           *blue);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_contrast_full            (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            red,
                                                                                 float                            green,
                                                                                 float                            blue);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            contrast);
 CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_get_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                 float                           *red,
                                                                                 float                           *green,
                                                                                 float                           *blue);
 G_END_DECLS
 #endif /* __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__ */
--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@@ -1,92 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2012 Intel Corporation
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:clutter-cairo
 * @Title: Cairo integration
 * @Short_Description: Functions for interoperating with Cairo
 *
 * Clutter provides some utility functions for using Cairo.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-cairo.h"
 #include "clutter-color.h"
 /**
 * clutter_cairo_set_source_color:
 * @cr: a Cairo context
 * @color: a #ClutterColor
 *
 * Utility function for setting the source color of @cr using
 * a #ClutterColor. This function is the equivalent of:
 *
 * |[
 *   cairo_set_source_rgba (cr,
 *                          color->red / 255.0,
 *                          color->green / 255.0,
 *                          color->blue / 255.0,
 *                          color->alpha / 255.0);
 * ]|
 *
 * Since: 1.0
 */
 void
 clutter_cairo_set_source_color (cairo_t            *cr,
                                const ClutterColor *color)
 {
  g_return_if_fail (cr != NULL);
  g_return_if_fail (color != NULL);
  if (color->alpha == 0xff)
    cairo_set_source_rgb (cr,
                          color->red / 255.0,
                          color->green / 255.0,
                          color->blue / 255.0);
  else
    cairo_set_source_rgba (cr,
                           color->red / 255.0,
                           color->green / 255.0,
                           color->blue / 255.0,
                           color->alpha / 255.0);
 }
 /**
 * clutter_cairo_clear:
 * @cr: a Cairo context
 *
 * Utility function to clear a Cairo context.
 *
 * Since: 1.12
 */
 void
 clutter_cairo_clear (cairo_t *cr)
 {
  cairo_save (cr);
  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
  cairo_paint (cr);
  cairo_restore (cr);
 }
--- a/clutter/clutter/clutter-cairo.h
+++ b/clutter/clutter/clutter-cairo.h
@@ -1,61 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2012 Intel Corporation
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_CAIRO_H__
 #define __CLUTTER_CAIRO_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 /**
 * CLUTTER_CAIRO_FORMAT_ARGB32:
 *
 * The #CoglPixelFormat to be used when uploading image data from
 * and to a Cairo image surface using %CAIRO_FORMAT_ARGB32 and
 * %CAIRO_FORMAT_RGB24 as #cairo_format_t.
 *
 * Since: 1.8
 */
 /* Cairo stores the data in native byte order as ARGB but Cogl's pixel
 * formats specify the actual byte order. Therefore we need to use a
 * different format depending on the architecture
 */
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 #define CLUTTER_CAIRO_FORMAT_ARGB32     (COGL_PIXEL_FORMAT_BGRA_8888_PRE)
 #else
 #define CLUTTER_CAIRO_FORMAT_ARGB32     (COGL_PIXEL_FORMAT_ARGB_8888_PRE)
 #endif
 CLUTTER_AVAILABLE_IN_1_12
 void    clutter_cairo_clear             (cairo_t               *cr);
 CLUTTER_AVAILABLE_IN_1_0
 void    clutter_cairo_set_source_color  (cairo_t               *cr,
                                         const ClutterColor    *color);
 G_END_DECLS
 #endif /* __CLUTTER_CAIRO_H__ */
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -1,716 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2012  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-canvas
 * @Title: ClutterCanvas
 * @Short_Description: Content for 2D painting
 * @See_Also: #ClutterContent
 *
 * The #ClutterCanvas class is a #ClutterContent implementation that allows
 * drawing using the Cairo API on a 2D surface.
 *
 * In order to draw on a #ClutterCanvas, you should connect a handler to the
 * #ClutterCanvas::draw signal; the signal will receive a #cairo_t context
 * that can be used to draw. #ClutterCanvas will emit the #ClutterCanvas::draw
 * signal when invalidated using clutter_content_invalidate().
 *
 * See [canvas.c](https://git.gnome.org/browse/clutter/tree/examples/canvas.c?h=clutter-1.18)
 * for an example of how to use #ClutterCanvas.
 *
 * #ClutterCanvas is available since Clutter 1.10.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <cogl/cogl.h>
 #include <cairo-gobject.h>
 #include "clutter-canvas.h"
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-actor-private.h"
 #include "clutter-backend.h"
 #include "clutter-cairo.h"
 #include "clutter-color.h"
 #include "clutter-content-private.h"
 #include "clutter-debug.h"
 #include "clutter-marshal.h"
 #include "clutter-paint-node.h"
 #include "clutter-paint-nodes.h"
 #include "clutter-private.h"
 #include "clutter-settings.h"
 struct _ClutterCanvasPrivate
 {
  cairo_t *cr;
  int width;
  int height;
  CoglTexture *texture;
  gboolean dirty;
  CoglBitmap *buffer;
  int scale_factor;
  guint scale_factor_set : 1;
 };
 enum
 {
  PROP_0,
  PROP_WIDTH,
  PROP_HEIGHT,
  PROP_SCALE_FACTOR,
  PROP_SCALE_FACTOR_SET,
  LAST_PROP
 };
 static GParamSpec *obj_props[LAST_PROP] = { NULL, };
 enum
 {
  DRAW,
  LAST_SIGNAL
 };
 static guint canvas_signals[LAST_SIGNAL] = { 0, };
 static void clutter_content_iface_init (ClutterContentIface *iface);
 G_DEFINE_TYPE_WITH_CODE (ClutterCanvas, clutter_canvas, G_TYPE_OBJECT,
                         G_ADD_PRIVATE (ClutterCanvas)
                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                clutter_content_iface_init))
 static void
 clutter_cairo_context_draw_marshaller (GClosure     *closure,
                                       GValue       *return_value,
                                       guint         n_param_values,
                                       const GValue *param_values,
                                       gpointer      invocation_hint,
                                       gpointer      marshal_data)
 {
  cairo_t *cr = g_value_get_boxed (&param_values[1]);
  cairo_save (cr);
  _clutter_marshal_BOOLEAN__BOXED_INT_INT (closure,
                                           return_value,
                                           n_param_values,
                                           param_values,
                                           invocation_hint,
                                           marshal_data);
  cairo_restore (cr);
 }
 static void
 clutter_canvas_finalize (GObject *gobject)
 {
  ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv;
  if (priv->buffer != NULL)
    {
      cogl_object_unref (priv->buffer);
      priv->buffer = NULL;
    }
  g_clear_pointer (&priv->texture, cogl_object_unref);
  G_OBJECT_CLASS (clutter_canvas_parent_class)->finalize (gobject);
 }
 static void
 clutter_canvas_set_property (GObject      *gobject,
                             guint         prop_id,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
  ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv;
  switch (prop_id)
    {
    case PROP_WIDTH:
      {
        gint new_size = g_value_get_int (value);
        if (priv->width != new_size)
          {
            priv->width = new_size;
            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
          }
      }
      break;
    case PROP_HEIGHT:
      {
        gint new_size = g_value_get_int (value);
        if (priv->height != new_size)
          {
            priv->height = new_size;
            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
          }
      }
      break;
    case PROP_SCALE_FACTOR:
      clutter_canvas_set_scale_factor (CLUTTER_CANVAS (gobject),
                                       g_value_get_int (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_canvas_get_property (GObject    *gobject,
                             guint       prop_id,
                             GValue     *value,
                             GParamSpec *pspec)
 {
  ClutterCanvasPrivate *priv = CLUTTER_CANVAS (gobject)->priv;
  switch (prop_id)
    {
    case PROP_WIDTH:
      g_value_set_int (value, priv->width);
      break;
    case PROP_HEIGHT:
      g_value_set_int (value, priv->height);
      break;
    case PROP_SCALE_FACTOR:
      if (priv->scale_factor_set)
        g_value_set_int (value, priv->scale_factor);
      else
        g_value_set_int (value, -1);
      break;
    case PROP_SCALE_FACTOR_SET:
      g_value_set_boolean (value, priv->scale_factor_set);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_canvas_class_init (ClutterCanvasClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  /**
   * ClutterCanvas:width:
   *
   * The width of the canvas.
   *
   * Since: 1.10
   */
  obj_props[PROP_WIDTH] =
    g_param_spec_int ("width",
                      P_("Width"),
                      P_("The width of the canvas"),
                      -1, G_MAXINT,
                      -1,
                      G_PARAM_READWRITE |
                      G_PARAM_STATIC_STRINGS);
  /**
   * ClutterCanvas:height:
   *
   * The height of the canvas.
   *
   * Since: 1.10
   */
  obj_props[PROP_HEIGHT] =
    g_param_spec_int ("height",
                      P_("Height"),
                      P_("The height of the canvas"),
                      -1, G_MAXINT,
                      -1,
                      G_PARAM_READWRITE |
                      G_PARAM_STATIC_STRINGS);
  /**
   * ClutterCanvas:scale-factor-set:
   *
   * Whether the #ClutterCanvas:scale-factor property is set.
   *
   * If the #ClutterCanvas:scale-factor-set property is %FALSE
   * then #ClutterCanvas will use the #ClutterSettings:window-scaling-factor
   * property.
   *
   * Since: 1.18
   */
  obj_props[PROP_SCALE_FACTOR_SET] =
    g_param_spec_boolean ("scale-factor-set",
                          P_("Scale Factor Set"),
                          P_("Whether the scale-factor property is set"),
                          FALSE,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
  /**
   * ClutterCanvas:scale-factor:
   *
   * The scaling factor to be applied to the Cairo surface used for
   * drawing.
   *
   * If #ClutterCanvas:scale-factor is set to a negative value, the
   * value of the #ClutterSettings:window-scaling-factor property is
   * used instead.
   *
   * Use #ClutterCanvas:scale-factor-set to check if the scale factor
   * is set.
   *
   * Since: 1.18
   */
  obj_props[PROP_SCALE_FACTOR] =
    g_param_spec_int ("scale-factor",
                      P_("Scale Factor"),
                      P_("The scaling factor for the surface"),
                      -1, 1000,
                      -1,
                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
  /**
   * ClutterCanvas::draw:
   * @canvas: the #ClutterCanvas that emitted the signal
   * @cr: the Cairo context used to draw
   * @width: the width of the @canvas
   * @height: the height of the @canvas
   *
   * The #ClutterCanvas::draw signal is emitted each time a canvas is
   * invalidated.
   *
   * It is safe to connect multiple handlers to this signal: each
   * handler invocation will be automatically protected by cairo_save()
   * and cairo_restore() pairs.
   *
   * Return value: %TRUE if the signal emission should stop, and
   *   %FALSE otherwise
   *
   * Since: 1.10
   */
  canvas_signals[DRAW] =
    g_signal_new (I_("draw"),
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (ClutterCanvasClass, draw),
                  _clutter_boolean_handled_accumulator, NULL,
                  clutter_cairo_context_draw_marshaller,
                  G_TYPE_BOOLEAN, 3,
                  CAIRO_GOBJECT_TYPE_CONTEXT,
                  G_TYPE_INT,
                  G_TYPE_INT);
  gobject_class->set_property = clutter_canvas_set_property;
  gobject_class->get_property = clutter_canvas_get_property;
  gobject_class->finalize = clutter_canvas_finalize;
  g_object_class_install_properties (gobject_class, LAST_PROP, obj_props);
 }
 static void
 clutter_canvas_init (ClutterCanvas *self)
 {
  self->priv = clutter_canvas_get_instance_private (self);
  self->priv->width = -1;
  self->priv->height = -1;
  self->priv->scale_factor = -1;
 }
 static void
 clutter_canvas_paint_content (ClutterContent   *content,
                              ClutterActor     *actor,
                              ClutterPaintNode *root)
 {
  ClutterCanvas *self = CLUTTER_CANVAS (content);
  ClutterCanvasPrivate *priv = self->priv;
  ClutterPaintNode *node;
  if (priv->buffer == NULL)
    return;
  if (priv->dirty)
    g_clear_pointer (&priv->texture, cogl_object_unref);
  if (priv->texture == NULL)
    priv->texture = cogl_texture_new_from_bitmap (priv->buffer,
                                                  COGL_TEXTURE_NO_SLICING,
                                                  CLUTTER_CAIRO_FORMAT_ARGB32);
  if (priv->texture == NULL)
    return;
  node = clutter_actor_create_texture_paint_node (actor, priv->texture);
  clutter_paint_node_set_name (node, "Canvas Content");
  clutter_paint_node_add_child (root, node);
  clutter_paint_node_unref (node);
  priv->dirty = FALSE;
 }
 static void
 clutter_canvas_emit_draw (ClutterCanvas *self)
 {
  ClutterCanvasPrivate *priv = self->priv;
  int real_width, real_height;
  cairo_surface_t *surface;
  gboolean mapped_buffer;
  unsigned char *data;
  CoglBuffer *buffer;
  int window_scale = 1;
  gboolean res;
  cairo_t *cr;
  g_assert (priv->height > 0 && priv->width > 0);
  priv->dirty = TRUE;
  if (priv->scale_factor_set)
    window_scale = priv->scale_factor;
  else
    g_object_get (clutter_settings_get_default (),
                  "window-scaling-factor", &window_scale,
                  NULL);
  real_width = priv->width * window_scale;
  real_height = priv->height * window_scale;
  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d (real: %d x %d, scale: %d)",
                priv->width, priv->height,
                real_width, real_height,
                window_scale);
  if (priv->buffer == NULL)
    {
      CoglContext *ctx;
      ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
      priv->buffer = cogl_bitmap_new_with_size (ctx,
                                                real_width,
                                                real_height,
                                                CLUTTER_CAIRO_FORMAT_ARGB32);
    }
  buffer = COGL_BUFFER (cogl_bitmap_get_buffer (priv->buffer));
  if (buffer == NULL)
    return;
  cogl_buffer_set_update_hint (buffer, COGL_BUFFER_UPDATE_HINT_DYNAMIC);
  data = cogl_buffer_map (buffer,
                          COGL_BUFFER_ACCESS_READ_WRITE,
                          COGL_BUFFER_MAP_HINT_DISCARD);
  if (data != NULL)
    {
      int bitmap_stride = cogl_bitmap_get_rowstride (priv->buffer);
      surface = cairo_image_surface_create_for_data (data,
                                                     CAIRO_FORMAT_ARGB32,
                                                     real_width,
                                                     real_height,
                                                     bitmap_stride);
      mapped_buffer = TRUE;
    }
  else
    {
      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
                                            real_width,
                                            real_height);
      mapped_buffer = FALSE;
    }
  cairo_surface_set_device_scale (surface, window_scale, window_scale);
  self->priv->cr = cr = cairo_create (surface);
  g_signal_emit (self, canvas_signals[DRAW], 0,
                 cr, priv->width, priv->height,
                 &res);
 #ifdef CLUTTER_ENABLE_DEBUG
  if (_clutter_diagnostic_enabled () && cairo_status (cr))
    {
      g_warning ("Drawing failed for <ClutterCanvas>[%p]: %s",
                 self,
                 cairo_status_to_string (cairo_status (cr)));
    }
 #endif
  self->priv->cr = NULL;
  cairo_destroy (cr);
  if (mapped_buffer)
    cogl_buffer_unmap (buffer);
  else
    {
      int size = cairo_image_surface_get_stride (surface) * priv->height;
      cogl_buffer_set_data (buffer,
                            0,
                            cairo_image_surface_get_data (surface),
                            size);
    }
  cairo_surface_destroy (surface);
 }
 static void
 clutter_canvas_invalidate (ClutterContent *content)
 {
  ClutterCanvas *self = CLUTTER_CANVAS (content);
  ClutterCanvasPrivate *priv = self->priv;
  if (priv->buffer != NULL)
    {
      cogl_object_unref (priv->buffer);
      priv->buffer = NULL;
    }
  if (priv->width <= 0 || priv->height <= 0)
    return;
  clutter_canvas_emit_draw (self);
 }
 static gboolean
 clutter_canvas_get_preferred_size (ClutterContent *content,
                                   gfloat         *width,
                                   gfloat         *height)
 {
  ClutterCanvasPrivate *priv = CLUTTER_CANVAS (content)->priv;
  if (priv->width < 0 || priv->height < 0)
    return FALSE;
  if (width != NULL)
    *width = priv->width;
  if (height != NULL)
    *height = priv->height;
  return TRUE;
 }
 static void
 clutter_content_iface_init (ClutterContentIface *iface)
 {
  iface->invalidate = clutter_canvas_invalidate;
  iface->paint_content = clutter_canvas_paint_content;
  iface->get_preferred_size = clutter_canvas_get_preferred_size;
 }
 /**
 * clutter_canvas_new:
 *
 * Creates a new instance of #ClutterCanvas.
 *
 * You should call clutter_canvas_set_size() to set the size of the canvas.
 *
 * You should call clutter_content_invalidate() every time you wish to
 * draw the contents of the canvas.
 *
 * Return value: (transfer full): The newly allocated instance of
 *   #ClutterCanvas. Use g_object_unref() when done.
 *
 * Since: 1.10
 */
 ClutterContent *
 clutter_canvas_new (void)
 {
  return g_object_new (CLUTTER_TYPE_CANVAS, NULL);
 }
 static gboolean
 clutter_canvas_invalidate_internal (ClutterCanvas *canvas,
                                    int            width,
                                    int            height)
 {
  gboolean width_changed = FALSE, height_changed = FALSE;
  gboolean res = FALSE;
  GObject *obj;
  obj = G_OBJECT (canvas);
  g_object_freeze_notify (obj);
  if (canvas->priv->width != width)
    {
      canvas->priv->width = width;
      width_changed = TRUE;
      g_object_notify_by_pspec (obj, obj_props[PROP_WIDTH]);
    }
  if (canvas->priv->height != height)
    {
      canvas->priv->height = height;
      height_changed = TRUE;
      g_object_notify_by_pspec (obj, obj_props[PROP_HEIGHT]);
    }
  if (width_changed || height_changed)
    {
      clutter_content_invalidate (CLUTTER_CONTENT (canvas));
      res = TRUE;
    }
  g_object_thaw_notify (obj);
  return res;
 }
 /**
 * clutter_canvas_set_size:
 * @canvas: a #ClutterCanvas
 * @width: the width of the canvas, in pixels
 * @height: the height of the canvas, in pixels
 *
 * Sets the size of the @canvas, and invalidates the content.
 *
 * This function will cause the @canvas to be invalidated only
 * if the size of the canvas surface has changed.
 *
 * If you want to invalidate the contents of the @canvas when setting
 * the size, you can use the return value of the function to conditionally
 * call clutter_content_invalidate():
 *
 * |[
 *   if (!clutter_canvas_set_size (canvas, width, height))
 *     clutter_content_invalidate (CLUTTER_CONTENT (canvas));
 * ]|
 *
 * Return value: this function returns %TRUE if the size change
 *   caused a content invalidation, and %FALSE otherwise
 *
 * Since: 1.10
 */
 gboolean
 clutter_canvas_set_size (ClutterCanvas *canvas,
                         int            width,
                         int            height)
 {
  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), FALSE);
  g_return_val_if_fail (width >= -1 && height >= -1, FALSE);
  return clutter_canvas_invalidate_internal (canvas, width, height);
 }
 /**
 * clutter_canvas_set_scale_factor:
 * @canvas: a #ClutterCanvas
 * @scale: the scale factor, or -1 for the default
 *
 * Sets the scaling factor for the Cairo surface used by @canvas.
 *
 * This function should rarely be used.
 *
 * The default scaling factor of a #ClutterCanvas content uses the
 * #ClutterSettings:window-scaling-factor property, which is set by
 * the windowing system. By using this function it is possible to
 * override that setting.
 *
 * Changing the scale factor will invalidate the @canvas.
 *
 * Since: 1.18
 */
 void
 clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
                                 int            scale)
 {
  ClutterCanvasPrivate *priv;
  GObject *obj;
  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
  g_return_if_fail (scale != 0);
  priv = canvas->priv;
  if (scale < 0)
    {
      if (!priv->scale_factor_set)
        return;
      priv->scale_factor_set = FALSE;
      priv->scale_factor = -1;
    }
  else
    {
      if (priv->scale_factor_set && priv->scale_factor == scale)
        return;
      priv->scale_factor_set = TRUE;
      priv->scale_factor = scale;
    }
  clutter_content_invalidate (CLUTTER_CONTENT (canvas));
  obj = G_OBJECT (canvas);
  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR]);
  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR_SET]);
 }
 /**
 * clutter_canvas_get_scale_factor:
 * @canvas: a #ClutterCanvas
 *
 * Retrieves the scaling factor of @canvas, as set using
 * clutter_canvas_set_scale_factor().
 *
 * Return value: the scaling factor, or -1 if the @canvas
 *   uses the default from #ClutterSettings
 *
 * Since: 1.18
 */
 int
 clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
 {
  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1);
  if (!canvas->priv->scale_factor_set)
    return -1;
  return canvas->priv->scale_factor;
 }
--- a/clutter/clutter/clutter-canvas.h
+++ b/clutter/clutter/clutter-canvas.h
@@ -1,106 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2012  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_CANVAS_H__
 #define __CLUTTER_CANVAS_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_CANVAS             (clutter_canvas_get_type ())
 #define CLUTTER_CANVAS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CANVAS, ClutterCanvas))
 #define CLUTTER_IS_CANVAS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CANVAS))
 #define CLUTTER_CANVAS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CANVAS, ClutterCanvasClass))
 #define CLUTTER_IS_CANVAS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CANVAS))
 #define CLUTTER_CANVAS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CANVAS, ClutterCanvasClass))
 typedef struct _ClutterCanvas           ClutterCanvas;
 typedef struct _ClutterCanvasPrivate    ClutterCanvasPrivate;
 typedef struct _ClutterCanvasClass      ClutterCanvasClass;
 /**
 * ClutterCanvas:
 *
 * The #ClutterCanvas structure contains
 * private data and should only be accessed using the provided
 * API.
 *
 * Since: 1.10
 */
 struct _ClutterCanvas
 {
  /*< private >*/
  GObject parent_instance;
  ClutterCanvasPrivate *priv;
 };
 /**
 * ClutterCanvasClass:
 * @draw: class handler for the #ClutterCanvas::draw signal
 *
 * The #ClutterCanvasClass structure contains
 * private data.
 *
 * Since: 1.10
 */
 struct _ClutterCanvasClass
 {
  /*< private >*/
  GObjectClass parent_class;
  /*< public >*/
  gboolean (* draw) (ClutterCanvas *canvas,
                     cairo_t       *cr,
                     int            width,
                     int            height);
  /*< private >*/
  gpointer _padding[16];
 };
 CLUTTER_AVAILABLE_IN_1_10
 GType clutter_canvas_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_10
 ClutterContent *        clutter_canvas_new                      (void);
 CLUTTER_AVAILABLE_IN_1_10
 gboolean                clutter_canvas_set_size                 (ClutterCanvas *canvas,
                                                                 int            width,
                                                                 int            height);
 CLUTTER_AVAILABLE_IN_1_18
 void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
                                                                 int            scale);
 CLUTTER_AVAILABLE_IN_1_18
 int                     clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);
 G_END_DECLS
 #endif /* __CLUTTER_CANVAS_H__ */
--- a/clutter/clutter/clutter-child-meta.c
+++ b/clutter/clutter/clutter-child-meta.c
@@ -1,192 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Matthew Allum  <mallum@openedhand.com>
 *             Jorn Baayen  <jorn@openedhand.com>
 *             Emmanuele Bassi  <ebassi@openedhand.com>
 *             Tomas Frydrych <tf@openedhand.com>
 *             Øyvind Kolås <ok@openedhand.com>
 *
 * Copyright (C) 2008 OpenedHand
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:clutter-child-meta
 * @short_description: Wrapper for actors inside a container
 *
 * #ClutterChildMeta is a wrapper object created by #ClutterContainer
 * implementations in order to store child-specific data and properties.
 *
 * A #ClutterChildMeta wraps a #ClutterActor inside a #ClutterContainer.
 *
 * #ClutterChildMeta is available since Clutter 0.8
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-child-meta.h"
 #include "clutter-container.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 G_DEFINE_ABSTRACT_TYPE (ClutterChildMeta, clutter_child_meta, G_TYPE_OBJECT);
 enum
 {
  PROP_0,
  PROP_CONTAINER,
  PROP_ACTOR,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 static void
 clutter_child_meta_set_property (GObject      *object,
                                 guint         prop_id,
                                 const GValue *value,
                                 GParamSpec   *pspec)
 {
  ClutterChildMeta *child_meta = CLUTTER_CHILD_META (object);
  switch (prop_id) 
    {
    case PROP_CONTAINER:
      child_meta->container = g_value_get_object (value);
      break;
    case PROP_ACTOR:
      child_meta->actor = g_value_get_object (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
    }
 }
 static void 
 clutter_child_meta_get_property (GObject    *object,
                                 guint       prop_id,
                                 GValue     *value,
                                 GParamSpec *pspec)
 {
  ClutterChildMeta *child_meta = CLUTTER_CHILD_META (object);
  switch (prop_id) 
    {
    case PROP_CONTAINER:
      g_value_set_object (value, child_meta->container);
      break;
    case PROP_ACTOR:
      g_value_set_object (value, child_meta->actor);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_child_meta_class_init (ClutterChildMetaClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  gobject_class->set_property = clutter_child_meta_set_property;
  gobject_class->get_property = clutter_child_meta_get_property;
  /**
   * ClutterChildMeta:container:
   *
   * The #ClutterContainer that created this #ClutterChildMeta.
   *
   * Since: 0.8
   */
  obj_props[PROP_CONTAINER] =
    g_param_spec_object ("container",
                         P_("Container"),
                         P_("The container that created this data"),
                         CLUTTER_TYPE_CONTAINER,
                         G_PARAM_CONSTRUCT_ONLY |
                         CLUTTER_PARAM_READWRITE);
  /**
   * ClutterChildMeta:actor:
   *
   * The #ClutterActor being wrapped by this #ClutterChildMeta
   *
   * Since: 0.8
   */
  obj_props[PROP_ACTOR] =
    g_param_spec_object ("actor",
                         P_("Actor"),
                         P_("The actor wrapped by this data"),
                         CLUTTER_TYPE_ACTOR,
                         G_PARAM_CONSTRUCT_ONLY |
                         CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class,
                                     PROP_LAST,
                                     obj_props);
 }
 static void
 clutter_child_meta_init (ClutterChildMeta *self)
 {
 }
 /**
 * clutter_child_meta_get_container:
 * @data: a #ClutterChildMeta
 *
 * Retrieves the container using @data
 *
 * Return value: (transfer none): a #ClutterContainer
 *
 * Since: 0.8
 */
 ClutterContainer *
 clutter_child_meta_get_container (ClutterChildMeta *data)
 {
  g_return_val_if_fail (CLUTTER_IS_CHILD_META (data), NULL);
  return data->container;
 }
 /**
 * clutter_child_meta_get_actor:
 * @data: a #ClutterChildMeta
 *
 * Retrieves the actor wrapped by @data
 *
 * Return value: (transfer none): a #ClutterActor
 *
 * Since: 0.8
 */
 ClutterActor *
 clutter_child_meta_get_actor (ClutterChildMeta *data)
 {
  g_return_val_if_fail (CLUTTER_IS_CHILD_META (data), NULL);
  return data->actor;
 }
--- a/clutter/clutter/clutter-child-meta.h
+++ b/clutter/clutter/clutter-child-meta.h
@@ -1,122 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By Matthew Allum  <mallum@openedhand.com>
 *             Jorn Baayen  <jorn@openedhand.com>
 *             Emmanuele Bassi  <ebassi@openedhand.com>
 *             Tomas Frydrych <tf@openedhand.com>
 *             Øyvind Kolås <ok@openedhand.com>
 *
 * Copyright (C) 2008 OpenedHand
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_CHILD_META_H__
 #define __CLUTTER_CHILD_META_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <glib-object.h>
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_CHILD_META                 (clutter_child_meta_get_type ())
 #define CLUTTER_CHILD_META(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CHILD_META, ClutterChildMeta))
 #define CLUTTER_CHILD_META_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CHILD_META, ClutterChildMetaClass))
 #define CLUTTER_IS_CHILD_META(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CHILD_META))
 #define CLUTTER_IS_CHILD_META_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CHILD_META))
 #define CLUTTER_CHILD_META_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CHILD_META, ClutterChildMetaClass))
 typedef struct _ClutterChildMetaClass           ClutterChildMetaClass;
 /**
 * ClutterChildMeta:
 * @container: the container handling this data
 * @actor: the actor wrapped by this data
 * 
 * Base interface for container specific state for child actors. A child
 * data is meant to be used when you need to keep track of information
 * about each individual child added to a container.
 *
 * In order to use it you should create your own subclass of
 * #ClutterChildMeta and set the #ClutterContainerIface child_meta_type
 * interface member to your subclass type, like:
 *
 * |[
 * static void
 * my_container_iface_init (ClutterContainerIface *iface)
 * {
 *   // set the rest of the #ClutterContainer vtable
 *
 *   container_iface->child_meta_type  = MY_TYPE_CHILD_META;
 * }
 * ]|
 *
 * This will automatically create a #ClutterChildMeta of type
 * `MY_TYPE_CHILD_META` for every actor that is added to the container.
 *
 * The child data for an actor can be retrieved using the
 * clutter_container_get_child_meta() function.
 * 
 * The properties of the data and your subclass can be manipulated with
 * clutter_container_child_set() and clutter_container_child_get() which
 * act like g_object_set() and g_object_get().
 *
 * You can provide hooks for your own storage as well as control the
 * instantiation by overriding the #ClutterContainerIface virtual functions
 * #ClutterContainerIface.create_child_meta(), #ClutterContainerIface.destroy_child_meta(),
 * and #ClutterContainerIface.get_child_meta().
 *
 * Since: 0.8
 */
 struct _ClutterChildMeta
 {
  /*< private >*/
  GObject parent_instance;
  /*< public >*/
  ClutterContainer *container;
  ClutterActor *actor;
 };
 /**
 * ClutterChildMetaClass:
 *
 * The #ClutterChildMetaClass contains only private data
 *
 * Since: 0.8
 */
 struct _ClutterChildMetaClass
 {
  /*< private >*/
  GObjectClass parent_class;
 }; 
 CLUTTER_AVAILABLE_IN_ALL
 GType clutter_child_meta_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_ALL
 ClutterContainer *      clutter_child_meta_get_container        (ClutterChildMeta *data);
 CLUTTER_AVAILABLE_IN_ALL
 ClutterActor     *      clutter_child_meta_get_actor            (ClutterChildMeta *data);
 G_END_DECLS
 #endif /* __CLUTTER_CHILD_META_H__ */
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -1,831 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-click-action
 * @Title: ClutterClickAction
 * @Short_Description: Action for clickable actors
 *
 * #ClutterClickAction is a sub-class of #ClutterAction that implements
 * the logic for clickable actors, by using the low level events of
 * #ClutterActor, such as #ClutterActor::button-press-event and
 * #ClutterActor::button-release-event, to synthesize the high level
 * #ClutterClickAction::clicked signal.
 *
 * To use #ClutterClickAction you just need to apply it to a #ClutterActor
 * using clutter_actor_add_action() and connect to the
 * #ClutterClickAction::clicked signal:
 *
 * |[
 *   ClutterAction *action = clutter_click_action_new ();
 *
 *   clutter_actor_add_action (actor, action);
 *
 *   g_signal_connect (action, "clicked", G_CALLBACK (on_clicked), NULL);
 * ]|
 *
 * #ClutterClickAction also supports long press gestures: a long press is
 * activated if the pointer remains pressed within a certain threshold (as
 * defined by the #ClutterClickAction:long-press-threshold property) for a
 * minimum amount of time (as the defined by the
 * #ClutterClickAction:long-press-duration property).
 * The #ClutterClickAction::long-press signal is emitted multiple times,
 * using different #ClutterLongPressState values; to handle long presses
 * you should connect to the #ClutterClickAction::long-press signal and
 * handle the different states:
 *
 * |[
 *   static gboolean
 *   on_long_press (ClutterClickAction    *action,
 *                  ClutterActor          *actor,
 *                  ClutterLongPressState  state)
 *   {
 *     switch (state)
 *       {
 *       case CLUTTER_LONG_PRESS_QUERY:
 *         /&ast; return TRUE if the actor should support long press
 *          &ast; gestures, and FALSE otherwise; this state will be
 *          &ast; emitted on button presses
 *          &ast;/
 *         return TRUE;
 *
 *       case CLUTTER_LONG_PRESS_ACTIVATE:
 *         /&ast; this state is emitted if the minimum duration has
 *          &ast; been reached without the gesture being cancelled.
 *          &ast; the return value is not used
 *          &ast;/
 *         return TRUE;
 *
 *       case CLUTTER_LONG_PRESS_CANCEL:
 *         /&ast; this state is emitted if the long press was cancelled;
 *          &ast; for instance, the pointer went outside the actor or the
 *          &ast; allowed threshold, or the button was released before
 *          &ast; the minimum duration was reached. the return value is
 *          &ast; not used
 *          &ast;/
 *         return FALSE;
 *       }
 *   }
 * ]|
 *
 * #ClutterClickAction is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-click-action.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 struct _ClutterClickActionPrivate
 {
  ClutterActor *stage;
  guint event_id;
  guint capture_id;
  guint long_press_id;
  gint long_press_threshold;
  gint long_press_duration;
  gint drag_threshold;
  guint press_button;
  gint press_device_id;
  ClutterEventSequence *press_sequence;
  ClutterModifierType modifier_state;
  gfloat press_x;
  gfloat press_y;
  guint is_held    : 1;
  guint is_pressed : 1;
 };
 enum
 {
  PROP_0,
  PROP_HELD,
  PROP_PRESSED,
  PROP_LONG_PRESS_THRESHOLD,
  PROP_LONG_PRESS_DURATION,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 enum
 {
  CLICKED,
  LONG_PRESS,
  LAST_SIGNAL
 };
 static guint click_signals[LAST_SIGNAL] = { 0, };
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterClickAction, clutter_click_action, CLUTTER_TYPE_ACTION)
 /* forward declaration */
 static gboolean on_captured_event (ClutterActor       *stage,
                                   ClutterEvent       *event,
                                   ClutterClickAction *action);
 static inline void
 click_action_set_pressed (ClutterClickAction *action,
                          gboolean            is_pressed)
 {
  ClutterClickActionPrivate *priv = action->priv;
  is_pressed = !!is_pressed;
  if (priv->is_pressed == is_pressed)
    return;
  priv->is_pressed = is_pressed;
  g_object_notify_by_pspec (G_OBJECT (action), obj_props[PROP_PRESSED]);
 }
 static inline void
 click_action_set_held (ClutterClickAction *action,
                       gboolean            is_held)
 {
  ClutterClickActionPrivate *priv = action->priv;
  is_held = !!is_held;
  if (priv->is_held == is_held)
    return;
  priv->is_held = is_held;
  g_object_notify_by_pspec (G_OBJECT (action), obj_props[PROP_HELD]);
 }
 static gboolean
 click_action_emit_long_press (gpointer data)
 {
  ClutterClickAction *action = data;
  ClutterClickActionPrivate *priv = action->priv;
  ClutterActor *actor;
  gboolean result;
  priv->long_press_id = 0;
  actor = clutter_actor_meta_get_actor (data);
  g_signal_emit (action, click_signals[LONG_PRESS], 0,
                 actor,
                 CLUTTER_LONG_PRESS_ACTIVATE,
                 &result);
  if (priv->capture_id != 0)
    {
      g_signal_handler_disconnect (priv->stage, priv->capture_id);
      priv->capture_id = 0;
    }
  click_action_set_pressed (action, FALSE);
  click_action_set_held (action, FALSE);
  return FALSE;
 }
 static inline void
 click_action_query_long_press (ClutterClickAction *action)
 {
  ClutterClickActionPrivate *priv = action->priv;
  ClutterActor *actor;
  gboolean result = FALSE;
  gint timeout;
  if (priv->long_press_duration < 0)
    {
      ClutterSettings *settings = clutter_settings_get_default ();
      g_object_get (settings,
                    "long-press-duration", &timeout,
                    NULL);
    }
  else
    timeout = priv->long_press_duration;
  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
  g_signal_emit (action, click_signals[LONG_PRESS], 0,
                 actor,
                 CLUTTER_LONG_PRESS_QUERY,
                 &result);
  if (result)
    {
      priv->long_press_id =
        clutter_threads_add_timeout (timeout,
                                     click_action_emit_long_press,
                                     action);
    }
 }
 static inline void
 click_action_cancel_long_press (ClutterClickAction *action)
 {
  ClutterClickActionPrivate *priv = action->priv;
  if (priv->long_press_id != 0)
    {
      ClutterActor *actor;
      gboolean result;
      actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
      g_source_remove (priv->long_press_id);
      priv->long_press_id = 0;
      g_signal_emit (action, click_signals[LONG_PRESS], 0,
                     actor,
                     CLUTTER_LONG_PRESS_CANCEL,
                     &result);
    }
 }
 static gboolean
 on_event (ClutterActor       *actor,
          ClutterEvent       *event,
          ClutterClickAction *action)
 {
  ClutterClickActionPrivate *priv = action->priv;
  gboolean has_button = TRUE;
  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
    return CLUTTER_EVENT_PROPAGATE;
  switch (clutter_event_type (event))
    {
    case CLUTTER_TOUCH_BEGIN:
      has_button = FALSE;
    case CLUTTER_BUTTON_PRESS:
      if (has_button && clutter_event_get_click_count (event) != 1)
        return CLUTTER_EVENT_PROPAGATE;
      if (priv->is_held)
        return CLUTTER_EVENT_STOP;
      if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
        return CLUTTER_EVENT_PROPAGATE;
      priv->press_button = has_button ? clutter_event_get_button (event) : 0;
      priv->press_device_id = clutter_event_get_device_id (event);
      priv->press_sequence = clutter_event_get_event_sequence (event);
      priv->modifier_state = clutter_event_get_state (event);
      clutter_event_get_coords (event, &priv->press_x, &priv->press_y);
      if (priv->long_press_threshold < 0)
        {
          ClutterSettings *settings = clutter_settings_get_default ();
          g_object_get (settings,
                        "dnd-drag-threshold", &priv->drag_threshold,
                        NULL);
        }
      else
        priv->drag_threshold = priv->long_press_threshold;
      if (priv->stage == NULL)
        priv->stage = clutter_actor_get_stage (actor);
      priv->capture_id = g_signal_connect_after (priv->stage, "captured-event",
                                                 G_CALLBACK (on_captured_event),
                                                 action);
      click_action_set_pressed (action, TRUE);
      click_action_set_held (action, TRUE);
      click_action_query_long_press (action);
      break;
    case CLUTTER_ENTER:
      click_action_set_pressed (action, priv->is_held);
      break;
    case CLUTTER_LEAVE:
      click_action_set_pressed (action, priv->is_held);
      click_action_cancel_long_press (action);
      break;
    default:
      break;
    }
  return CLUTTER_EVENT_PROPAGATE;
 }
 static gboolean
 on_captured_event (ClutterActor       *stage,
                   ClutterEvent       *event,
                   ClutterClickAction *action)
 {
  ClutterClickActionPrivate *priv = action->priv;
  ClutterActor *actor;
  ClutterModifierType modifier_state;
  gboolean has_button = TRUE;
  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
  switch (clutter_event_type (event))
    {
    case CLUTTER_TOUCH_END:
      has_button = FALSE;
    case CLUTTER_BUTTON_RELEASE:
      if (!priv->is_held)
        return CLUTTER_EVENT_STOP;
      if ((has_button && clutter_event_get_button (event) != priv->press_button) ||
          (has_button && clutter_event_get_click_count (event) != 1) ||
          clutter_event_get_device_id (event) != priv->press_device_id ||
          clutter_event_get_event_sequence (event) != priv->press_sequence)
        return CLUTTER_EVENT_PROPAGATE;
      click_action_set_held (action, FALSE);
      click_action_cancel_long_press (action);
      /* disconnect the capture */
      if (priv->capture_id != 0)
        {
          g_signal_handler_disconnect (priv->stage, priv->capture_id);
          priv->capture_id = 0;
        }
      if (priv->long_press_id != 0)
        {
          g_source_remove (priv->long_press_id);
          priv->long_press_id = 0;
        }
      if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
        return CLUTTER_EVENT_PROPAGATE;
      /* exclude any button-mask so that we can compare
       * the press and release states properly */
      modifier_state = clutter_event_get_state (event) &
                       ~(CLUTTER_BUTTON1_MASK |
                         CLUTTER_BUTTON2_MASK |
                         CLUTTER_BUTTON3_MASK |
                         CLUTTER_BUTTON4_MASK |
                         CLUTTER_BUTTON5_MASK);
      /* if press and release states don't match we
       * simply ignore modifier keys. i.e. modifier keys
       * are expected to be pressed throughout the whole
       * click */
      if (modifier_state != priv->modifier_state)
        priv->modifier_state = 0;
      click_action_set_pressed (action, FALSE);
      g_signal_emit (action, click_signals[CLICKED], 0, actor);
      break;
    case CLUTTER_MOTION:
    case CLUTTER_TOUCH_UPDATE:
      {
        gfloat motion_x, motion_y;
        gfloat delta_x, delta_y;
        if (clutter_event_get_device_id (event) != priv->press_device_id ||
            clutter_event_get_event_sequence (event) != priv->press_sequence)
          return CLUTTER_EVENT_PROPAGATE;
        if (!priv->is_held)
          return CLUTTER_EVENT_PROPAGATE;
        clutter_event_get_coords (event, &motion_x, &motion_y);
        delta_x = ABS (motion_x - priv->press_x);
        delta_y = ABS (motion_y - priv->press_y);
        if (delta_x > priv->drag_threshold ||
            delta_y > priv->drag_threshold)
          click_action_cancel_long_press (action);
      }
      break;
    default:
      break;
    }
  return CLUTTER_EVENT_STOP;
 }
 static void
 clutter_click_action_set_actor (ClutterActorMeta *meta,
                                ClutterActor     *actor)
 {
  ClutterClickAction *action = CLUTTER_CLICK_ACTION (meta);
  ClutterClickActionPrivate *priv = action->priv;
  if (priv->event_id != 0)
    {
      ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
      if (old_actor != NULL)
        g_signal_handler_disconnect (old_actor, priv->event_id);
      priv->event_id = 0;
    }
  if (priv->capture_id != 0)
    {
      if (priv->stage != NULL)
        g_signal_handler_disconnect (priv->stage, priv->capture_id);
      priv->capture_id = 0;
      priv->stage = NULL;
    }
  if (priv->long_press_id != 0)
    {
      g_source_remove (priv->long_press_id);
      priv->long_press_id = 0;
    }
  click_action_set_pressed (action, FALSE);
  click_action_set_held (action, FALSE);
  if (actor != NULL)
    priv->event_id = g_signal_connect (actor, "event",
                                       G_CALLBACK (on_event),
                                       action);
  CLUTTER_ACTOR_META_CLASS (clutter_click_action_parent_class)->set_actor (meta, actor);
 }
 static void
 clutter_click_action_set_property (GObject      *gobject,
                                   guint         prop_id,
                                   const GValue *value,
                                   GParamSpec   *pspec)
 {
  ClutterClickActionPrivate *priv = CLUTTER_CLICK_ACTION (gobject)->priv;
  switch (prop_id)
    {
    case PROP_LONG_PRESS_DURATION:
      priv->long_press_duration = g_value_get_int (value);
      break;
    case PROP_LONG_PRESS_THRESHOLD:
      priv->long_press_threshold = g_value_get_int (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_click_action_get_property (GObject    *gobject,
                                   guint       prop_id,
                                   GValue     *value,
                                   GParamSpec *pspec)
 {
  ClutterClickActionPrivate *priv = CLUTTER_CLICK_ACTION (gobject)->priv;
  switch (prop_id)
    {
    case PROP_HELD:
      g_value_set_boolean (value, priv->is_held);
      break;
    case PROP_PRESSED:
      g_value_set_boolean (value, priv->is_pressed);
      break;
    case PROP_LONG_PRESS_DURATION:
      g_value_set_int (value, priv->long_press_duration);
      break;
    case PROP_LONG_PRESS_THRESHOLD:
      g_value_set_int (value, priv->long_press_threshold);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_click_action_dispose (GObject *gobject)
 {
  ClutterClickActionPrivate *priv = CLUTTER_CLICK_ACTION (gobject)->priv;
  if (priv->event_id)
    {
      g_signal_handler_disconnect (clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)),
                                   priv->event_id);
      priv->event_id = 0;
    }
  if (priv->capture_id)
    {
      g_signal_handler_disconnect (priv->stage, priv->capture_id);
      priv->capture_id = 0;
    }
  if (priv->long_press_id)
    {
      g_source_remove (priv->long_press_id);
      priv->long_press_id = 0;
    }
  G_OBJECT_CLASS (clutter_click_action_parent_class)->dispose (gobject);
 }
 static void
 clutter_click_action_class_init (ClutterClickActionClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
  meta_class->set_actor = clutter_click_action_set_actor;
  gobject_class->dispose = clutter_click_action_dispose;
  gobject_class->set_property = clutter_click_action_set_property;
  gobject_class->get_property = clutter_click_action_get_property;
  /**
   * ClutterClickAction:pressed:
   *
   * Whether the clickable actor should be in "pressed" state
   *
   * Since: 1.4
   */
  obj_props[PROP_PRESSED] =
    g_param_spec_boolean ("pressed",
                          P_("Pressed"),
                          P_("Whether the clickable should be in pressed state"),
                          FALSE,
                          CLUTTER_PARAM_READABLE);
  /**
   * ClutterClickAction:held:
   *
   * Whether the clickable actor has the pointer grabbed
   *
   * Since: 1.4
   */
  obj_props[PROP_HELD] =
    g_param_spec_boolean ("held",
                          P_("Held"),
                          P_("Whether the clickable has a grab"),
                          FALSE,
                          CLUTTER_PARAM_READABLE);
  /**
   * ClutterClickAction:long-press-duration:
   *
   * The minimum duration of a press for it to be recognized as a long
   * press gesture, in milliseconds.
   *
   * A value of -1 will make the #ClutterClickAction use the value of
   * the #ClutterSettings:long-press-duration property.
   *
   * Since: 1.8
   */
  obj_props[PROP_LONG_PRESS_DURATION] =
    g_param_spec_int ("long-press-duration",
                      P_("Long Press Duration"),
                      P_("The minimum duration of a long press to recognize the gesture"),
                      -1, G_MAXINT,
                      -1,
                      CLUTTER_PARAM_READWRITE);
  /**
   * ClutterClickAction:long-press-threshold:
   *
   * The maximum allowed distance that can be covered (on both axes) before
   * a long press gesture is cancelled, in pixels.
   *
   * A value of -1 will make the #ClutterClickAction use the value of
   * the #ClutterSettings:dnd-drag-threshold property.
   *
   * Since: 1.8
   */
  obj_props[PROP_LONG_PRESS_THRESHOLD] =
    g_param_spec_int ("long-press-threshold",
                      P_("Long Press Threshold"),
                      P_("The maximum threshold before a long press is cancelled"),
                      -1, G_MAXINT,
                      -1,
                      CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class,
                                     PROP_LAST,
                                     obj_props);
  /**
   * ClutterClickAction::clicked:
   * @action: the #ClutterClickAction that emitted the signal
   * @actor: the #ClutterActor attached to the @action
   *
   * The ::clicked signal is emitted when the #ClutterActor to which
   * a #ClutterClickAction has been applied should respond to a
   * pointer button press and release events
   *
   * Since: 1.4
   */
  click_signals[CLICKED] =
    g_signal_new (I_("clicked"),
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterClickActionClass, clicked),
                  NULL, NULL,
                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
  /**
   * ClutterClickAction::long-press:
   * @action: the #ClutterClickAction that emitted the signal
   * @actor: the #ClutterActor attached to the @action
   * @state: the long press state
   *
   * The ::long-press signal is emitted during the long press gesture
   * handling.
   *
   * This signal can be emitted multiple times with different states.
   *
   * The %CLUTTER_LONG_PRESS_QUERY state will be emitted on button presses,
   * and its return value will determine whether the long press handling
   * should be initiated. If the signal handlers will return %TRUE, the
   * %CLUTTER_LONG_PRESS_QUERY state will be followed either by a signal
   * emission with the %CLUTTER_LONG_PRESS_ACTIVATE state if the long press
   * constraints were respected, or by a signal emission with the
   * %CLUTTER_LONG_PRESS_CANCEL state if the long press was cancelled.
   *
   * It is possible to forcibly cancel a long press detection using
   * clutter_click_action_release().
   *
   * Return value: Only the %CLUTTER_LONG_PRESS_QUERY state uses the
   *   returned value of the handler; other states will ignore it
   *
   * Since: 1.8
   */
  click_signals[LONG_PRESS] =
    g_signal_new (I_("long-press"),
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterClickActionClass, long_press),
                  NULL, NULL,
                  _clutter_marshal_BOOLEAN__OBJECT_ENUM,
                  G_TYPE_BOOLEAN, 2,
                  CLUTTER_TYPE_ACTOR,
                  CLUTTER_TYPE_LONG_PRESS_STATE);
 }
 static void
 clutter_click_action_init (ClutterClickAction *self)
 {
  self->priv = clutter_click_action_get_instance_private (self);
  self->priv->long_press_threshold = -1;
  self->priv->long_press_duration = -1;
 }
 /**
 * clutter_click_action_new:
 *
 * Creates a new #ClutterClickAction instance
 *
 * Return value: the newly created #ClutterClickAction
 *
 * Since: 1.4
 */
 ClutterAction *
 clutter_click_action_new (void)
 {
  return g_object_new (CLUTTER_TYPE_CLICK_ACTION, NULL);
 }
 /**
 * clutter_click_action_release:
 * @action: a #ClutterClickAction
 *
 * Emulates a release of the pointer button, which ungrabs the pointer
 * and unsets the #ClutterClickAction:pressed state.
 *
 * This function will also cancel the long press gesture if one was
 * initiated.
 *
 * This function is useful to break a grab, for instance after a certain
 * amount of time has passed.
 *
 * Since: 1.4
 */
 void
 clutter_click_action_release (ClutterClickAction *action)
 {
  ClutterClickActionPrivate *priv;
  g_return_if_fail (CLUTTER_IS_CLICK_ACTION (action));
  priv = action->priv;
  if (!priv->is_held)
    return;
  /* disconnect the capture */
  if (priv->capture_id != 0)
    {
      g_signal_handler_disconnect (priv->stage, priv->capture_id);
      priv->capture_id = 0;
    }
  click_action_cancel_long_press (action);
  click_action_set_held (action, FALSE);
  click_action_set_pressed (action, FALSE);
 }
 /**
 * clutter_click_action_get_button:
 * @action: a #ClutterClickAction
 *
 * Retrieves the button that was pressed.
 *
 * Return value: the button value
 *
 * Since: 1.4
 */
 guint
 clutter_click_action_get_button (ClutterClickAction *action)
 {
  g_return_val_if_fail (CLUTTER_IS_CLICK_ACTION (action), 0);
  return action->priv->press_button;
 }
 /**
 * clutter_click_action_get_state:
 * @action: a #ClutterClickAction
 *
 * Retrieves the modifier state of the click action.
 *
 * Return value: the modifier state parameter, or 0
 *
 * Since: 1.6
 */
 ClutterModifierType
 clutter_click_action_get_state (ClutterClickAction *action)
 {
  g_return_val_if_fail (CLUTTER_IS_CLICK_ACTION (action), 0);
  return action->priv->modifier_state;
 }
 /**
 * clutter_click_action_get_coords:
 * @action: a #ClutterClickAction
 * @press_x: (out): return location for the X coordinate, or %NULL
 * @press_y: (out): return location for the Y coordinate, or %NULL
 *
 * Retrieves the screen coordinates of the button press.
 *
 * Since: 1.8
 */
 void
 clutter_click_action_get_coords (ClutterClickAction *action,
                                 gfloat             *press_x,
                                 gfloat             *press_y)
 {
  g_return_if_fail (CLUTTER_IS_ACTION (action));
  if (press_x != NULL)
    *press_x = action->priv->press_x;
  if (press_y != NULL)
    *press_y = action->priv->press_y;
 }
--- a/clutter/clutter/clutter-click-action.h
+++ b/clutter/clutter/clutter-click-action.h
@@ -1,120 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 *
 * Inspired by the StClickable class in GNOME Shell, written by:
 *   Colin Walters <walters@verbum.org>
 */
 #ifndef __CLUTTER_CLICK_ACTION_H__
 #define __CLUTTER_CLICK_ACTION_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-action.h>
 #include <clutter/clutter-event.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_CLICK_ACTION               (clutter_click_action_get_type ())
 #define CLUTTER_CLICK_ACTION(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CLICK_ACTION, ClutterClickAction))
 #define CLUTTER_IS_CLICK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CLICK_ACTION))
 #define CLUTTER_CLICK_ACTION_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CLICK_ACTION, ClutterClickActionClass))
 #define CLUTTER_IS_CLICK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CLICK_ACTION))
 #define CLUTTER_CLICK_ACTION_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CLICK_ACTION, ClutterClickActionClass))
 typedef struct _ClutterClickAction              ClutterClickAction;
 typedef struct _ClutterClickActionPrivate       ClutterClickActionPrivate;
 typedef struct _ClutterClickActionClass         ClutterClickActionClass;
 /**
 * ClutterClickAction:
 *
 * The #ClutterClickAction structure contains
 * only private data and should be accessed using the provided API
 *
 * Since: 1.4
 */
 struct _ClutterClickAction
 {
  /*< private >*/
  ClutterAction parent_instance;
  ClutterClickActionPrivate *priv;
 };
 /**
 * ClutterClickActionClass:
 * @clicked: class handler for the #ClutterClickAction::clicked signal
 * @long_press: class handler for the #ClutterClickAction::long-press signal
 *
 * The #ClutterClickActionClass structure
 * contains only private data
 *
 * Since: 1.4
 */
 struct _ClutterClickActionClass
 {
  /*< private >*/
  ClutterActionClass parent_class;
  /*< public >*/
  void     (* clicked)    (ClutterClickAction    *action,
                           ClutterActor          *actor);
  gboolean (* long_press) (ClutterClickAction    *action,
                           ClutterActor          *actor,
                           ClutterLongPressState  state);
  /*< private >*/
  void (* _clutter_click_action1) (void);
  void (* _clutter_click_action2) (void);
  void (* _clutter_click_action3) (void);
  void (* _clutter_click_action4) (void);
  void (* _clutter_click_action5) (void);
  void (* _clutter_click_action6) (void);
  void (* _clutter_click_action7) (void);
 };
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_click_action_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 ClutterAction *        clutter_click_action_new        (void);
 CLUTTER_AVAILABLE_IN_1_4
 guint                  clutter_click_action_get_button (ClutterClickAction *action);
 CLUTTER_AVAILABLE_IN_1_4
 ClutterModifierType    clutter_click_action_get_state  (ClutterClickAction *action);
 CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_click_action_get_coords (ClutterClickAction *action,
                                                        gfloat             *press_x,
                                                        gfloat             *press_y);
 CLUTTER_AVAILABLE_IN_1_4
 void                   clutter_click_action_release    (ClutterClickAction *action);
 G_END_DECLS
 #endif /* __CLUTTER_CLICK_ACTION_H__ */
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -1,454 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2008  Intel Corporation.
 *
 * Authored By: Robert Bragg <robert@linux.intel.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 /**
 * SECTION:clutter-clone
 * @short_description: An actor that displays a clone of a source actor
 *
 * #ClutterClone is a #ClutterActor which draws with the paint
 * function of another actor, scaled to fit its own allocation.
 *
 * #ClutterClone can be used to efficiently clone any other actor.
 *
 * Unlike clutter_texture_new_from_actor(), #ClutterClone does not require
 * the presence of support for FBOs in the underlying GL or GLES
 * implementation.
 *
 * #ClutterClone is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-actor-private.h"
 #include "clutter-clone.h"
 #include "clutter-debug.h"
 #include "clutter-main.h"
 #include "clutter-paint-volume-private.h"
 #include "clutter-private.h"
 #include "cogl/cogl.h"
 struct _ClutterClonePrivate
 {
  ClutterActor *clone_source;
  gulong source_destroy_id;
 };
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterClone, clutter_clone, CLUTTER_TYPE_ACTOR)
 enum
 {
  PROP_0,
  PROP_SOURCE,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 static void clutter_clone_set_source_internal (ClutterClone *clone,
 					       ClutterActor *source);
 static void
 clutter_clone_get_preferred_width (ClutterActor *self,
                                   gfloat        for_height,
                                   gfloat       *min_width_p,
                                   gfloat       *natural_width_p)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
  ClutterActor *clone_source = priv->clone_source;
  if (clone_source == NULL)
    {
      if (min_width_p)
        *min_width_p = 0;
      if (natural_width_p)
        *natural_width_p = 0;
    }
  else
    clutter_actor_get_preferred_width (clone_source,
                                       for_height,
                                       min_width_p,
                                       natural_width_p);
 }
 static void
 clutter_clone_get_preferred_height (ClutterActor *self,
                                    gfloat        for_width,
                                    gfloat       *min_height_p,
                                    gfloat       *natural_height_p)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
  ClutterActor *clone_source = priv->clone_source;
  if (clone_source == NULL)
    {
      if (min_height_p)
        *min_height_p = 0;
      if (natural_height_p)
        *natural_height_p = 0;
    }
  else
    clutter_actor_get_preferred_height (clone_source,
                                        for_width,
                                        min_height_p,
                                        natural_height_p);
 }
 static void
 clutter_clone_apply_transform (ClutterActor *self, CoglMatrix *matrix)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
  ClutterActorBox box, source_box;
  gfloat x_scale, y_scale;
  /* First chain up and apply all the standard ClutterActor
   * transformations... */
  CLUTTER_ACTOR_CLASS (clutter_clone_parent_class)->apply_transform (self,
                                                                     matrix);
  /* if we don't have a source, nothing else to do */
  if (priv->clone_source == NULL)
    return;
  /* get our allocated size */
  clutter_actor_get_allocation_box (self, &box);
  /* and get the allocated size of the source */
  clutter_actor_get_allocation_box (priv->clone_source, &source_box);
  /* We need to scale what the clone-source actor paints to fill our own
   * allocation...
   */
  x_scale = clutter_actor_box_get_width (&box)
          / clutter_actor_box_get_width (&source_box);
  y_scale = clutter_actor_box_get_height (&box)
          / clutter_actor_box_get_height (&source_box);
  cogl_matrix_scale (matrix, x_scale, y_scale, x_scale);
 }
 static void
 clutter_clone_paint (ClutterActor *actor)
 {
  ClutterClone *self = CLUTTER_CLONE (actor);
  ClutterClonePrivate *priv = self->priv;
  gboolean was_unmapped = FALSE;
  if (priv->clone_source == NULL)
    return;
  CLUTTER_NOTE (PAINT, "painting clone actor '%s'",
                _clutter_actor_get_debug_name (actor));
  /* The final bits of magic:
   * - We need to override the paint opacity of the actor with our own
   *   opacity.
   * - We need to inform the actor that it's in a clone paint (for the function
   *   clutter_actor_is_in_clone_paint())
   * - We need to stop clutter_actor_paint applying the model view matrix of
   *   the clone source actor.
   */
  _clutter_actor_set_in_clone_paint (priv->clone_source, TRUE);
  clutter_actor_set_opacity_override (priv->clone_source,
                                       clutter_actor_get_paint_opacity (actor));
  _clutter_actor_set_enable_model_view_transform (priv->clone_source, FALSE);
  if (!clutter_actor_is_mapped (priv->clone_source))
    {
      _clutter_actor_set_enable_paint_unmapped (priv->clone_source, TRUE);
      was_unmapped = TRUE;
    }
  /* If the source isn't ultimately parented to a toplevel, it can't be
   * realized or painted.
   */
  if (clutter_actor_is_realized (priv->clone_source))
    {
      _clutter_actor_push_clone_paint ();
      clutter_actor_paint (priv->clone_source);
      _clutter_actor_pop_clone_paint ();
    }
  if (was_unmapped)
    _clutter_actor_set_enable_paint_unmapped (priv->clone_source, FALSE);
  _clutter_actor_set_enable_model_view_transform (priv->clone_source, TRUE);
  clutter_actor_set_opacity_override (priv->clone_source, -1);
  _clutter_actor_set_in_clone_paint (priv->clone_source, FALSE);
 }
 static gboolean
 clutter_clone_get_paint_volume (ClutterActor       *actor,
                                ClutterPaintVolume *volume)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (actor)->priv;
  const ClutterPaintVolume *source_volume;
  /* if the source is not set the paint volume is defined to be empty */
  if (priv->clone_source == NULL)
    return TRUE;
  /* query the volume of the source actor and simply masquarade it as
   * the clones volume... */
  source_volume = clutter_actor_get_paint_volume (priv->clone_source);
  if (source_volume == NULL)
    return FALSE;
  _clutter_paint_volume_set_from_volume (volume, source_volume);
  _clutter_paint_volume_set_reference_actor (volume, actor);
  return TRUE;
 }
 static gboolean
 clutter_clone_has_overlaps (ClutterActor *actor)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (actor)->priv;
  /* The clone has overlaps iff the source has overlaps */
  if (priv->clone_source == NULL)
    return FALSE;
  return clutter_actor_has_overlaps (priv->clone_source);
 }
 static void
 clutter_clone_allocate (ClutterActor           *self,
                        const ClutterActorBox  *box,
                        ClutterAllocationFlags  flags)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
  ClutterActorClass *parent_class;
  /* chain up */
  parent_class = CLUTTER_ACTOR_CLASS (clutter_clone_parent_class);
  parent_class->allocate (self, box, flags);
  if (priv->clone_source == NULL)
    return;
 #if 0
  /* XXX - this is wrong: ClutterClone cannot clone unparented
   * actors, as it will break all invariants
   */
  /* we act like a "foster parent" for the source we are cloning;
   * if the source has not been parented we have to force an
   * allocation on it, so that we can paint it correctly from
   * within our paint() implementation. since the actor does not
   * have a parent, and thus it won't be painted by the usual
   * paint cycle, we can safely give it as much size as it requires
   */
  if (clutter_actor_get_parent (priv->clone_source) == NULL)
    clutter_actor_allocate_preferred_size (priv->clone_source, flags);
 #endif
 }
 static void
 clutter_clone_set_property (GObject      *gobject,
                            guint         prop_id,
                            const GValue *value,
                            GParamSpec   *pspec)
 {
  ClutterClone *self = CLUTTER_CLONE (gobject);
  switch (prop_id)
    {
    case PROP_SOURCE:
      clutter_clone_set_source (self, g_value_get_object (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
  }
 }
 static void
 clutter_clone_get_property (GObject    *gobject,
                            guint       prop_id,
                            GValue     *value,
                            GParamSpec *pspec)
 {
  ClutterClonePrivate *priv = CLUTTER_CLONE (gobject)->priv;
  switch (prop_id)
    {
    case PROP_SOURCE:
      g_value_set_object (value, priv->clone_source);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_clone_dispose (GObject *gobject)
 {
  clutter_clone_set_source_internal (CLUTTER_CLONE (gobject), NULL);
  G_OBJECT_CLASS (clutter_clone_parent_class)->dispose (gobject);
 }
 static void
 clutter_clone_class_init (ClutterCloneClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
  actor_class->apply_transform = clutter_clone_apply_transform;
  actor_class->paint = clutter_clone_paint;
  actor_class->get_paint_volume = clutter_clone_get_paint_volume;
  actor_class->get_preferred_width = clutter_clone_get_preferred_width;
  actor_class->get_preferred_height = clutter_clone_get_preferred_height;
  actor_class->allocate = clutter_clone_allocate;
  actor_class->has_overlaps = clutter_clone_has_overlaps;
  gobject_class->dispose = clutter_clone_dispose;
  gobject_class->set_property = clutter_clone_set_property;
  gobject_class->get_property = clutter_clone_get_property;
  /**
   * ClutterClone:source:
   *
   * This property specifies the source actor being cloned.
   *
   * Since: 1.0
   */
  obj_props[PROP_SOURCE] =
    g_param_spec_object ("source",
                         P_("Source"),
                         P_("Specifies the actor to be cloned"),
                         CLUTTER_TYPE_ACTOR,
                         G_PARAM_CONSTRUCT |
                         CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
 }
 static void
 clutter_clone_init (ClutterClone *self)
 {
  self->priv = clutter_clone_get_instance_private (self);
 }
 /**
 * clutter_clone_new:
 * @source: a #ClutterActor, or %NULL
 *
 * Creates a new #ClutterActor which clones @source/
 *
 * Return value: the newly created #ClutterClone
 *
 * Since: 1.0
 */
 ClutterActor *
 clutter_clone_new (ClutterActor *source)
 {
  return g_object_new (CLUTTER_TYPE_CLONE, "source", source,  NULL);
 }
 static void
 on_source_destroyed (ClutterActor *source,
                     ClutterClone *self)
 {
  clutter_clone_set_source_internal (self, NULL);
 }
 static void
 clutter_clone_set_source_internal (ClutterClone *self,
 				   ClutterActor *source)
 {
  ClutterClonePrivate *priv = self->priv;
  if (priv->clone_source == source)
    return;
  if (priv->clone_source != NULL)
    {
      g_signal_handler_disconnect (priv->clone_source, priv->source_destroy_id);
      priv->source_destroy_id = 0;
      _clutter_actor_detach_clone (priv->clone_source, CLUTTER_ACTOR (self));
      g_object_unref (priv->clone_source);
      priv->clone_source = NULL;
    }
  if (source != NULL)
    {
      priv->clone_source = g_object_ref (source);
      _clutter_actor_attach_clone (priv->clone_source, CLUTTER_ACTOR (self));
      priv->source_destroy_id = g_signal_connect (priv->clone_source, "destroy",
                                                  G_CALLBACK (on_source_destroyed), self);
    }
  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SOURCE]);
  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
 /**
 * clutter_clone_set_source:
 * @self: a #ClutterClone
 * @source: (allow-none): a #ClutterActor, or %NULL
 *
 * Sets @source as the source actor to be cloned by @self.
 *
 * Since: 1.0
 */
 void
 clutter_clone_set_source (ClutterClone *self,
                          ClutterActor *source)
 {
  g_return_if_fail (CLUTTER_IS_CLONE (self));
  g_return_if_fail (source == NULL || CLUTTER_IS_ACTOR (source));
  clutter_clone_set_source_internal (self, source);
  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
 /**
 * clutter_clone_get_source:
 * @self: a #ClutterClone
 *
 * Retrieves the source #ClutterActor being cloned by @self.
 *
 * Return value: (transfer none): the actor source for the clone
 *
 * Since: 1.0
 */
 ClutterActor *
 clutter_clone_get_source (ClutterClone *self)
 {
  g_return_val_if_fail (CLUTTER_IS_CLONE (self), NULL);
  return self->priv->clone_source;
 }
--- a/clutter/clutter/clutter-clone.h
+++ b/clutter/clutter/clutter-clone.h
@@ -1,94 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2008  Intel Corporation.
 *
 * Authored By: Robert Bragg <robert@linux.intel.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_CLONE_H__
 #define __CLUTTER_CLONE_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-actor.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_CLONE              (clutter_clone_get_type())
 #define CLUTTER_CLONE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CLONE, ClutterClone))
 #define CLUTTER_CLONE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CLONE, ClutterCloneClass))
 #define CLUTTER_IS_CLONE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CLONE))
 #define CLUTTER_IS_CLONE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CLONE))
 #define CLUTTER_CLONE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CLONE, ClutterCloneClass))
 typedef struct _ClutterClone            ClutterClone;
 typedef struct _ClutterCloneClass       ClutterCloneClass;
 typedef struct _ClutterClonePrivate     ClutterClonePrivate;
 /**
 * ClutterClone:
 *
 * The #ClutterClone structure contains only private data
 * and should be accessed using the provided API
 *
 * Since: 1.0
 */
 struct _ClutterClone
 {
  /*< private >*/
  ClutterActor parent_instance;
  ClutterClonePrivate *priv;
 };
 /**
 * ClutterCloneClass:
 *
 * The #ClutterCloneClass structure contains only private data
 *
 * Since: 1.0
 */
 struct _ClutterCloneClass
 {
  /*< private >*/
  ClutterActorClass parent_class;
  /* padding for future expansion */
  void (*_clutter_actor_clone1) (void);
  void (*_clutter_actor_clone2) (void);
  void (*_clutter_actor_clone3) (void);
  void (*_clutter_actor_clone4) (void);
 };
 CLUTTER_AVAILABLE_IN_1_0
 GType clutter_clone_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *  clutter_clone_new               (ClutterActor *source);
 CLUTTER_AVAILABLE_IN_1_0
 void            clutter_clone_set_source        (ClutterClone *self,
                                                 ClutterActor *source);
 CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *  clutter_clone_get_source        (ClutterClone *self);
 G_END_DECLS
 #endif /* __CLUTTER_CLONE_H__ */
--- a/clutter/clutter/clutter-color-static.h
+++ b/clutter/clutter/clutter-color-static.h
@@ -1,79 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_COLOR_STATIC_H__
 #define __CLUTTER_COLOR_STATIC_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #define __CLUTTER_COLOR_SYM(x)          (clutter_color_get_static (CLUTTER_COLOR_##x))
 #define CLUTTER_COLOR_White             (__CLUTTER_COLOR_SYM (WHITE))
 #define CLUTTER_COLOR_Black             (__CLUTTER_COLOR_SYM (BLACK))
 #define CLUTTER_COLOR_Red               (__CLUTTER_COLOR_SYM (RED))
 #define CLUTTER_COLOR_DarkRed           (__CLUTTER_COLOR_SYM (DARK_RED))
 #define CLUTTER_COLOR_Green             (__CLUTTER_COLOR_SYM (GREEN))
 #define CLUTTER_COLOR_DarkGreen         (__CLUTTER_COLOR_SYM (DARK_GREEN))
 #define CLUTTER_COLOR_Blue              (__CLUTTER_COLOR_SYM (BLUE))
 #define CLUTTER_COLOR_DarkBlue          (__CLUTTER_COLOR_SYM (DARK_BLUE))
 #define CLUTTER_COLOR_Cyan              (__CLUTTER_COLOR_SYM (CYAN))
 #define CLUTTER_COLOR_DarkCyan          (__CLUTTER_COLOR_SYM (DARK_CYAN))
 #define CLUTTER_COLOR_Magenta           (__CLUTTER_COLOR_SYM (MAGENTA))
 #define CLUTTER_COLOR_DarkMagenta       (__CLUTTER_COLOR_SYM (DARK_MAGENTA))
 #define CLUTTER_COLOR_Yellow            (__CLUTTER_COLOR_SYM (YELLOW))
 #define CLUTTER_COLOR_DarkYellow        (__CLUTTER_COLOR_SYM (DARK_YELLOW))
 #define CLUTTER_COLOR_Gray              (__CLUTTER_COLOR_SYM (GRAY))
 #define CLUTTER_COLOR_DarkGray          (__CLUTTER_COLOR_SYM (DARK_GRAY))
 #define CLUTTER_COLOR_LightGray         (__CLUTTER_COLOR_SYM (LIGHT_GRAY))
 #define CLUTTER_COLOR_Butter            (__CLUTTER_COLOR_SYM (BUTTER))
 #define CLUTTER_COLOR_LightButter       (__CLUTTER_COLOR_SYM (BUTTER_LIGHT))
 #define CLUTTER_COLOR_DarkButter        (__CLUTTER_COLOR_SYM (BUTTER_DARK))
 #define CLUTTER_COLOR_Orange            (__CLUTTER_COLOR_SYM (ORANGE))
 #define CLUTTER_COLOR_LightOrange       (__CLUTTER_COLOR_SYM (ORANGE_LIGHT))
 #define CLUTTER_COLOR_DarkOrange        (__CLUTTER_COLOR_SYM (ORANGE_DARK))
 #define CLUTTER_COLOR_Chocolate         (__CLUTTER_COLOR_SYM (CHOCOLATE))
 #define CLUTTER_COLOR_LightChocolate    (__CLUTTER_COLOR_SYM (CHOCOLATE_LIGHT))
 #define CLUTTER_COLOR_DarkChocolate     (__CLUTTER_COLOR_SYM (CHOCOLATE_DARK))
 #define CLUTTER_COLOR_Chameleon         (__CLUTTER_COLOR_SYM (CHAMELEON))
 #define CLUTTER_COLOR_LightChameleon    (__CLUTTER_COLOR_SYM (CHAMELEON_LIGHT))
 #define CLUTTER_COLOR_DarkChameleon     (__CLUTTER_COLOR_SYM (CHAMELEON_DARK))
 #define CLUTTER_COLOR_SkyBlue           (__CLUTTER_COLOR_SYM (SKY_BLUE))
 #define CLUTTER_COLOR_LightSkyBlue      (__CLUTTER_COLOR_SYM (SKY_BLUE_LIGHT))
 #define CLUTTER_COLOR_DarkSkyBlue       (__CLUTTER_COLOR_SYM (SKY_BLUE_DARK))
 #define CLUTTER_COLOR_Plum              (__CLUTTER_COLOR_SYM (PLUM))
 #define CLUTTER_COLOR_LightPlum         (__CLUTTER_COLOR_SYM (PLUM_LIGHT))
 #define CLUTTER_COLOR_DarkPlum          (__CLUTTER_COLOR_SYM (PLUM_DARK))
 #define CLUTTER_COLOR_ScarletRed        (__CLUTTER_COLOR_SYM (SCARLET_RED))
 #define CLUTTER_COLOR_LightScarletRed   (__CLUTTER_COLOR_SYM (SCARLET_RED_LIGHT))
 #define CLUTTER_COLOR_DarkScarletRed    (__CLUTTER_COLOR_SYM (SCARLET_RED_DARK))
 #define CLUTTER_COLOR_Aluminium1        (__CLUTTER_COLOR_SYM (ALUMINIUM_1))
 #define CLUTTER_COLOR_Aluminium2        (__CLUTTER_COLOR_SYM (ALUMINIUM_2))
 #define CLUTTER_COLOR_Aluminium3        (__CLUTTER_COLOR_SYM (ALUMINIUM_3))
 #define CLUTTER_COLOR_Aluminium4        (__CLUTTER_COLOR_SYM (ALUMINIUM_4))
 #define CLUTTER_COLOR_Aluminium5        (__CLUTTER_COLOR_SYM (ALUMINIUM_5))
 #define CLUTTER_COLOR_Aluminium6        (__CLUTTER_COLOR_SYM (ALUMINIUM_6))
 #define CLUTTER_COLOR_Transparent       (__CLUTTER_COLOR_SYM (TRANSPARENT))
 #endif /* __CLUTTER_COLOR_STATIC_H__ */
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
--- a/clutter/clutter/clutter-color.h
+++ b/clutter/clutter/clutter-color.h
@@ -1,200 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Authored By: Matthew Allum  <mallum@openedhand.com>
 *              Emmanuele Bassi <ebassi@linux.intel.com>
 *
 * Copyright (C) 2006, 2007, 2008 OpenedHand
 * Copyright (C) 2009 Intel Corp.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_COLOR_H__
 #define __CLUTTER_COLOR_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-types.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_COLOR	(clutter_color_get_type ())
 /**
 * ClutterColor:
 * @red: red component, between 0 and 255
 * @green: green component, between 0 and 255
 * @blue: blue component, between 0 and 255
 * @alpha: alpha component, between 0 and 255
 *
 * Color representation.
 */
 struct _ClutterColor
 {
  /*< public >*/
  guint8 red;
  guint8 green;
  guint8 blue;
  guint8 alpha;
 };
 /**
 * CLUTTER_COLOR_INIT:
 * @r: value for the red channel, between 0 and 255
 * @g: value for the green channel, between 0 and 255
 * @b: value for the blue channel, between 0 and 255
 * @a: value for the alpha channel, between 0 and 255
 *
 * A macro that initializes a #ClutterColor, to be used when declaring it.
 *
 * Since: 1.12
 */
 #define CLUTTER_COLOR_INIT(r,g,b,a)     { (r), (g), (b), (a) }
 CLUTTER_AVAILABLE_IN_ALL
 GType clutter_color_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_ALL
 ClutterColor *clutter_color_new         (guint8              red,
                                         guint8              green,
                                         guint8              blue,
                                         guint8              alpha);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterColor *clutter_color_alloc       (void);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterColor *clutter_color_init        (ClutterColor       *color,
                                         guint8              red,
                                         guint8              green,
                                         guint8              blue,
                                         guint8              alpha);
 CLUTTER_AVAILABLE_IN_ALL
 ClutterColor *clutter_color_copy        (const ClutterColor *color);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_free        (ClutterColor       *color);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_add         (const ClutterColor *a,
                                         const ClutterColor *b,
                                         ClutterColor       *result);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_subtract    (const ClutterColor *a,
                                         const ClutterColor *b,
                                         ClutterColor       *result);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_lighten     (const ClutterColor *color,
                                         ClutterColor       *result);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_darken      (const ClutterColor *color,
                                         ClutterColor       *result);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_shade       (const ClutterColor *color,
                                         gdouble             factor,
                                         ClutterColor       *result);
 CLUTTER_AVAILABLE_IN_ALL
 gchar *       clutter_color_to_string   (const ClutterColor *color);
 CLUTTER_AVAILABLE_IN_1_0
 gboolean      clutter_color_from_string (ClutterColor       *color,
                                         const gchar        *str);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_to_hls      (const ClutterColor *color,
                                         gfloat             *hue,
 					 gfloat             *luminance,
 					 gfloat             *saturation);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_from_hls    (ClutterColor       *color,
                                         gfloat              hue,
                                         gfloat              luminance,
                                         gfloat              saturation);
 CLUTTER_AVAILABLE_IN_ALL
 guint32       clutter_color_to_pixel    (const ClutterColor *color);
 CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_from_pixel  (ClutterColor       *color,
                                         guint32             pixel);
 CLUTTER_AVAILABLE_IN_1_0
 guint         clutter_color_hash        (gconstpointer       v);
 CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_color_equal       (gconstpointer       v1,
                                         gconstpointer       v2);
 CLUTTER_AVAILABLE_IN_1_6
 void          clutter_color_interpolate (const ClutterColor *initial,
                                         const ClutterColor *final,
                                         gdouble             progress,
                                         ClutterColor       *result);
 #define CLUTTER_TYPE_PARAM_COLOR           (clutter_param_color_get_type ())
 #define CLUTTER_PARAM_SPEC_COLOR(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_COLOR, ClutterParamSpecColor))
 #define CLUTTER_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_COLOR))
 /**
 * CLUTTER_VALUE_HOLDS_COLOR:
 * @x: a #GValue
 *
 * Evaluates to %TRUE if @x holds a #ClutterColor<!-- -->.
 *
 * Since: 1.0
 */
 #define CLUTTER_VALUE_HOLDS_COLOR(x)       (G_VALUE_HOLDS ((x), CLUTTER_TYPE_COLOR))
 typedef struct _ClutterParamSpecColor  ClutterParamSpecColor;
 /**
 * ClutterParamSpecColor: (skip)
 * @default_value: default color value
 *
 * A #GParamSpec subclass for defining properties holding
 * a #ClutterColor.
 *
 * Since: 1.0
 */
 struct _ClutterParamSpecColor
 {
  /*< private >*/
  GParamSpec    parent_instance;
  /*< public >*/
  ClutterColor *default_value;
 };
 CLUTTER_AVAILABLE_IN_1_0
 void                    clutter_value_set_color         (GValue             *value,
                                                         const ClutterColor *color);
 CLUTTER_AVAILABLE_IN_1_0
 const ClutterColor *    clutter_value_get_color         (const GValue       *value);
 CLUTTER_AVAILABLE_IN_1_0
 GType clutter_param_color_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_0
 GParamSpec *    clutter_param_spec_color        (const gchar        *name,
                                                 const gchar        *nick,
                                                 const gchar        *blurb,
                                                 const ClutterColor *default_value,
                                                 GParamFlags         flags);
 CLUTTER_AVAILABLE_IN_1_6
 const ClutterColor *clutter_color_get_static (ClutterStaticColor color);
 G_END_DECLS
 #endif /* __CLUTTER_COLOR_H__ */
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -1,372 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 /**
 * SECTION:clutter-colorize-effect
 * @short_description: A colorization effect
 * @see_also: #ClutterEffect, #ClutterOffscreenEffect
 *
 * #ClutterColorizeEffect is a sub-class of #ClutterEffect that
 * colorizes an actor with the given tint.
 *
 * #ClutterColorizeEffect is available since Clutter 1.4
 */
 #define CLUTTER_COLORIZE_EFFECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
 #define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
 #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-colorize-effect.h"
 #include "cogl/cogl.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-offscreen-effect.h"
 #include "clutter-private.h"
 struct _ClutterColorizeEffect
 {
  ClutterOffscreenEffect parent_instance;
  /* the tint of the colorization */
  ClutterColor tint;
  gint tint_uniform;
  gint tex_width;
  gint tex_height;
  CoglPipeline *pipeline;
 };
 struct _ClutterColorizeEffectClass
 {
  ClutterOffscreenEffectClass parent_class;
  CoglPipeline *base_pipeline;
 };
 /* the magic gray vec3 has been taken from the NTSC conversion weights
 * as defined by:
 *
 *   "OpenGL Superbible, 4th Edition"
 *   -- Richard S. Wright Jr, Benjamin Lipchak, Nicholas Haemel
 *   Addison-Wesley
 */
 static const gchar *colorize_glsl_declarations =
 "uniform vec3 tint;\n";
 static const gchar *colorize_glsl_source =
 "float gray = dot (cogl_color_out.rgb, vec3 (0.299, 0.587, 0.114));\n"
 "cogl_color_out.rgb = gray * tint;\n";
 /* a lame sepia */
 static const ClutterColor default_tint = { 255, 204, 153, 255 };
 enum
 {
  PROP_0,
  PROP_TINT,
  PROP_LAST
 };
 static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE (ClutterColorizeEffect,
               clutter_colorize_effect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);
 static gboolean
 clutter_colorize_effect_pre_paint (ClutterEffect *effect)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect);
  ClutterEffectClass *parent_class;
  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
    return FALSE;
  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
    {
      /* if we don't have support for GLSL shaders then we
       * forcibly disable the ActorMeta
       */
      g_warning ("Unable to use the ShaderEffect: the graphics hardware "
                 "or the current GL driver does not implement support "
                 "for the GLSL shading language.");
      clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (effect), FALSE);
      return FALSE;
    }
  parent_class = CLUTTER_EFFECT_CLASS (clutter_colorize_effect_parent_class);
  if (parent_class->pre_paint (effect))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
      CoglHandle texture;
      texture = clutter_offscreen_effect_get_texture (offscreen_effect);
      self->tex_width = cogl_texture_get_width (texture);
      self->tex_height = cogl_texture_get_height (texture);
      cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
      return TRUE;
    }
  else
    return FALSE;
 }
 static void
 clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect);
  ClutterActor *actor;
  guint8 paint_opacity;
  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
  paint_opacity = clutter_actor_get_paint_opacity (actor);
  cogl_pipeline_set_color4ub (self->pipeline,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
  cogl_pop_source ();
 }
 static void
 clutter_colorize_effect_dispose (GObject *gobject)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (gobject);
  if (self->pipeline != NULL)
    {
      cogl_object_unref (self->pipeline);
      self->pipeline = NULL;
    }
  G_OBJECT_CLASS (clutter_colorize_effect_parent_class)->dispose (gobject);
 }
 static void
 clutter_colorize_effect_set_property (GObject      *gobject,
                                      guint         prop_id,
                                      const GValue *value,
                                      GParamSpec   *pspec)
 {
  ClutterColorizeEffect *effect = CLUTTER_COLORIZE_EFFECT (gobject);
  switch (prop_id)
    {
    case PROP_TINT:
      clutter_colorize_effect_set_tint (effect,
                                        clutter_value_get_color (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_colorize_effect_get_property (GObject    *gobject,
                                      guint       prop_id,
                                      GValue     *value,
                                      GParamSpec *pspec)
 {
  ClutterColorizeEffect *effect = CLUTTER_COLORIZE_EFFECT (gobject);
  switch (prop_id)
    {
    case PROP_TINT:
      clutter_value_set_color (value, &effect->tint);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
      break;
    }
 }
 static void
 clutter_colorize_effect_class_init (ClutterColorizeEffectClass *klass)
 {
  ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterOffscreenEffectClass *offscreen_class;
  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
  offscreen_class->paint_target = clutter_colorize_effect_paint_target;
  effect_class->pre_paint = clutter_colorize_effect_pre_paint;
  gobject_class->set_property = clutter_colorize_effect_set_property;
  gobject_class->get_property = clutter_colorize_effect_get_property;
  gobject_class->dispose = clutter_colorize_effect_dispose;
  /**
   * ClutterColorizeEffect:tint:
   *
   * The tint to apply to the actor
   *
   * Since: 1.4
   */
  obj_props[PROP_TINT] =
    clutter_param_spec_color ("tint",
                              P_("Tint"),
                              P_("The tint to apply"),
                              &default_tint,
                              CLUTTER_PARAM_READWRITE);
  g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
 }
 static void
 update_tint_uniform (ClutterColorizeEffect *self)
 {
  if (self->tint_uniform > -1)
    {
      float tint[3] = {
        self->tint.red / 255.0,
        self->tint.green / 255.0,
        self->tint.blue / 255.0
      };
      cogl_pipeline_set_uniform_float (self->pipeline,
                                       self->tint_uniform,
                                       3, /* n_components */
                                       1, /* count */
                                       tint);
    }
 }
 static void
 clutter_colorize_effect_init (ClutterColorizeEffect *self)
 {
  ClutterColorizeEffectClass *klass = CLUTTER_COLORIZE_EFFECT_GET_CLASS (self);
  if (G_UNLIKELY (klass->base_pipeline == NULL))
    {
      CoglSnippet *snippet;
      CoglContext *ctx =
        clutter_backend_get_cogl_context (clutter_get_default_backend ());
      klass->base_pipeline = cogl_pipeline_new (ctx);
      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,
                                  colorize_glsl_declarations,
                                  colorize_glsl_source);
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);
      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
                                            0, /* layer number */
                                            COGL_TEXTURE_TYPE_2D);
    }
  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
  self->tint_uniform =
    cogl_pipeline_get_uniform_location (self->pipeline, "tint");
  self->tint = default_tint;
  update_tint_uniform (self);
 }
 /**
 * clutter_colorize_effect_new:
 * @tint: the color to be used
 *
 * Creates a new #ClutterColorizeEffect to be used with
 * clutter_actor_add_effect()
 *
 * Return value: the newly created #ClutterColorizeEffect or %NULL
 *
 * Since: 1.4
 */
 ClutterEffect *
 clutter_colorize_effect_new (const ClutterColor *tint)
 {
  return g_object_new (CLUTTER_TYPE_COLORIZE_EFFECT,
                       "tint", tint,
                       NULL);
 }
 /**
 * clutter_colorize_effect_set_tint:
 * @effect: a #ClutterColorizeEffect
 * @tint: the color to be used
 *
 * Sets the tint to be used when colorizing
 *
 * Since: 1.4
 */
 void
 clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect,
                                  const ClutterColor    *tint)
 {
  g_return_if_fail (CLUTTER_IS_COLORIZE_EFFECT (effect));
  effect->tint = *tint;
  update_tint_uniform (effect);
  clutter_effect_queue_repaint (CLUTTER_EFFECT (effect));
  g_object_notify_by_pspec (G_OBJECT (effect), obj_props[PROP_TINT]);
 }
 /**
 * clutter_colorize_effect_get_tint:
 * @effect: a #ClutterColorizeEffect
 * @tint: (out caller-allocates): return location for the color used
 *
 * Retrieves the tint used by @effect
 *
 * Since: 1.4
 */
 void
 clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect,
                                  ClutterColor          *tint)
 {
  g_return_if_fail (CLUTTER_IS_COLORIZE_EFFECT (effect));
  g_return_if_fail (tint != NULL);
  *tint = effect->tint;
 }
--- a/clutter/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter/clutter-colorize-effect.h
@@ -1,67 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author:
 *   Emmanuele Bassi <ebassi@linux.intel.com>
 */
 #ifndef __CLUTTER_COLORIZE_EFFECT_H__
 #define __CLUTTER_COLORIZE_EFFECT_H__
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #include <clutter/clutter-color.h>
 #include <clutter/clutter-effect.h>
 G_BEGIN_DECLS
 #define CLUTTER_TYPE_COLORIZE_EFFECT    (clutter_colorize_effect_get_type ())
 #define CLUTTER_COLORIZE_EFFECT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffect))
 #define CLUTTER_IS_COLORIZE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_COLORIZE_EFFECT))
 /**
 * ClutterColorizeEffect:
 *
 * #ClutterColorizeEffect is an opaque structure
 * whose members cannot be directly accessed
 *
 * Since: 1.4
 */
 typedef struct _ClutterColorizeEffect           ClutterColorizeEffect;
 typedef struct _ClutterColorizeEffectClass      ClutterColorizeEffectClass;
 CLUTTER_AVAILABLE_IN_1_4
 GType clutter_colorize_effect_get_type (void) G_GNUC_CONST;
 CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_colorize_effect_new      (const ClutterColor *tint);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect,
                                                 const ClutterColor    *tint);
 CLUTTER_AVAILABLE_IN_1_4
 void           clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect,
                                                 ClutterColor          *tint);
 G_END_DECLS
 #endif /* __CLUTTER_COLORIZE_EFFECT_H__ */
--- a/clutter/clutter/clutter-config.h.in
+++ b/clutter/clutter/clutter-config.h.in
@@ -1,16 +0,0 @@
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 #ifndef __CLUTTER_CONFIG_H__
 #define __CLUTTER_CONFIG_H__
 #include <glib.h>
 G_BEGIN_DECLS
@CLUTTER_CONFIG_DEFINES@
 G_END_DECLS
 #endif /* __CLUTTER_CONFIG_H__ */
--- a/clutter/clutter/clutter-constraint-private.h
+++ b/clutter/clutter/clutter-constraint-private.h
@@ -1,42 +0,0 @@
 /*
 * Clutter.
 *
 * An OpenGL based 'interactive canvas' library.
 *
 * Copyright (C) 2010  Intel Corporation.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser 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
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __CLUTTER_CONSTRAINT_PRIVATE_H__
 #define __CLUTTER_CONSTRAINT_PRIVATE_H__
 #include "clutter-constraint.h"
 G_BEGIN_DECLS
 gboolean clutter_constraint_update_allocation (ClutterConstraint *constraint,
                                               ClutterActor      *actor,
                                               ClutterActorBox   *allocation);
 void clutter_constraint_update_preferred_size (ClutterConstraint  *constraint,
                                               ClutterActor       *actor,
                                               ClutterOrientation  direction,
                                               float               for_size,
                                               float              *minimum_size,
                                               float              *natural_size);
 G_END_DECLS
 #endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */
--- a/Show More
+++ b/Show More