Avoid restacking animating hidden actors

Since the stack passed to the compositor now accurately reflects the X stacking order, we need to treat hidden windows (which are at the bottom of the X stacking order) specially - when the compositor stacking order is synced, try to keep animating hidden actors in their old positions in the stack. http://bugzilla.gnome.org/show_bug.cgi?id=585984
Merge branch 'master' into override-redirect-exclusion
2009-06-27 09:58:45 -04:00 · 2009-06-19 11:42:03 -04:00 · 2009-06-17 14:23:57 -04:00 · 2009-06-17 13:40:42 -04:00 · 2009-06-16 09:56:43 -04:00 · 2009-06-16 09:56:42 -04:00
1770 changed files with 268645 additions and 576458 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
@ -1,106 +1,60 @@
-build-aux
+Makefile
+Makefile.in
+Makefile.in.in
+aclocal.m4
+autom4te.cache
 compile
+config.guess
 config.h
 config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
 ltmain.sh
 missing
-50-mutter-navigation.xml
-50-mutter-system.xml
-50-mutter-windows.xml
-mutter.desktop
-mutter-wayland.desktop
+.deps
+src/metacity-wm.desktop
 *.o
 *.a
 *.lo
 *.la
 .libs
 *.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
 POTFILES
-Makevars.template
-po/*.header
-po/*.pot
-po/*.sed
-po/*.sin
-Rules-quot
-libmutter.pc
-mutter
-mutter-restart-helper
-mutter-test-client
-mutter-test-runner
-mutter-test-unit-tests
-mutter-test-headless-start-test
-mutter-all.test
-org.gnome.mutter.gschema.valid
-org.gnome.mutter.gschema.xml
-org.gnome.mutter.wayland.gschema.valid
-org.gnome.mutter.wayland.gschema.xml
+50-metacity-desktop-key.xml
+50-metacity-key.xml
+inlinepixbufs.h
+libmetacity-private.pc
+metacity
+metacity-dialog
+metacity-theme-viewer
+metacity.desktop
+metacity.schemas
 testasyncgetprop
 testboxes
 testgradient
+metacity-grayscale
+metacity-mag
+metacity-message
+metacity-window-demo
+focus-window
+test-gravity
+test-resizing
+test-size-hints
+wm-tester
 INSTALL
-meta-enum-types.[ch]
-src/stamp-meta-enum-types.h
-src/meta-dbus-display-config.[ch]
-src/meta-dbus-idle-monitor.[ch]
-src/meta-dbus-login1.[ch]
-src/meta-dbus-remote-desktop.[ch]
-src/meta-dbus-screen-cast.[ch]
-src/gtk-primary-selection-protocol.c
-src/gtk-primary-selection-server-protocol.h
-src/gtk-shell-protocol.c
-src/gtk-shell-server-protocol.h
-src/xdg-shell-unstable-v*-protocol.c
-src/xdg-shell-unstable-v*-server-protocol.h
-src/pointer-gestures-unstable-v*-protocol.c
-src/pointer-gestures-unstable-v*-server-protocol.h
-src/relative-pointer-unstable-v*-protocol.c
-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/xdg-output-unstable-v1-protocol.c
-src/xdg-output-unstable-v1-server-protocol.h
-src/xwayland-keyboard-grab-unstable-v1-protocol.c
-src/xwayland-keyboard-grab-unstable-v1-server-protocol.h
-src/tablet-unstable-v*-protocol.c
-src/tablet-unstable-v*-server-protocol.h
-src/text-input-unstable-v*-protocol.c
-src/text-input-unstable-v*-server-protocol.h
-src/keyboard-shortcuts-inhibit-unstable-v*-protocol.c
-src/keyboard-shortcuts-inhibit-unstable-v*-server-protocol.h
-src/linux-dmabuf-unstable-v*-protocol.c
-src/linux-dmabuf-unstable-v*-server-protocol.h
-src/xdg-shell-protocol.c
-src/xdg-shell-server-protocol.h
-src/wayland-eglstream-controller-server-protocol.h
-src/meta/meta-version.h
-src/libmutter-*.pc
-doc/reference/*.args
-doc/reference/*.bak
-doc/reference/*.hierarchy
-doc/reference/*.interfaces
-doc/reference/*.prerequisites
-doc/reference/*.signals
-doc/reference/*.stamp
-doc/reference/html/
-doc/reference/xml/
-doc/reference/meta-decl-list.txt
-doc/reference/meta-decl.txt
-doc/reference/meta-overrides.txt
-doc/reference/meta-undeclared.txt
-doc/reference/meta-undocumented.txt
-doc/reference/meta-unused.txt
-doc/reference/meta-docs.sgml
-doc/reference/meta.types
-.dirstamp
-**/tags.*
-build/
-subprojects/sysprof/
+mkinstalldirs
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,372 +0,0 @@
-include:
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/ci-fairy.yml'
-
-stages:
- - review
- - prepare
- - code-review
- - build
- - test
- - analyze
- - deploy
-
-variables:
-  FDO_UPSTREAM_REPO: GNOME/mutter
-
-.mutter.fedora:34@common:
-  variables:
-    FDO_DISTRIBUTION_VERSION: 34
-    BASE_TAG: '2021-09-04.1'
-    FDO_DISTRIBUTION_PACKAGES:
-      asciidoc
-      clang
-      gcovr
-      gdm
-      gnome-shell
-      python3-dbusmock
-      sassc
-      uncrustify
-      xorg-x11-server-Xvfb
-
-    FDO_DISTRIBUTION_EXEC: |
-      dnf install -y 'dnf-command(builddep)' &&
-
-      dnf builddep -y mutter --setopt=install_weak_deps=False &&
-      dnf builddep -y gnome-shell --setopt=install_weak_deps=False &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.gnome.org/GNOME/glib.git \
-        main . 02742ef957b532789c003eef80ec7f51c370e3d5 &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \
-        41.alpha . &&
-
-      ./.gitlab-ci/install-meson-project.sh \
-        https://gitlab.gnome.org/GNOME/gjs.git \
-        1.69.2 . &&
-
-      rpm -e --nodeps gnome-bluetooth-libs-devel \
-                      mutter mutter-devel \
-                      gnome-shell &&
-
-      dnf clean all
-
-default:
-  # Cancel jobs if newer commits are pushed to the branch
-  interruptible: true
-  # Auto-retry jobs in case of infra failures
-  retry:
-    max: 1
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-
-.mutter.fedora:34@x86_64:
-  extends: .mutter.fedora:34@common
-  variables:
-    FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
-
-.mutter.fedora:34@aarch64:
-  extends: .mutter.fedora:34@common
-  variables:
-    FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
-  tags:
-    - aarch64
-
-workflow:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH'
-
-.pipline-guard: &pipline-guard
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_TAG'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
-    - when: 'manual'
-
-check-commit-log:
-  extends:
-    - .fdo.ci-fairy
-  stage: review
-  variables:
-    GIT_DEPTH: "100"
-  script:
-    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
-      then
-        ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
-      else
-        echo "Not a merge request" ;
-      fi
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - commit-message-junit-report.xml
-    reports:
-      junit: commit-message-junit-report.xml
-  <<: *pipline-guard
-
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: review
-  variables:
-    GIT_STRATEGY: none
-  script:
-    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
-      then
-        ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ;
-      else
-        echo "Not a merge request" ;
-      fi
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - check-merge-request-report.xml
-    reports:
-      junit: check-merge-request-report.xml
-  <<: *pipline-guard
-
-build-fedora-container@x86_64:
-  extends:
-    - .fdo.container-build@fedora@x86_64
-    - .mutter.fedora:34@x86_64
-  stage: prepare
-  needs:
-    - check-commit-log
-    - check-merge-request
-  variables:
-    GIT_STRATEGY: none
-
-build-fedora-container@aarch64:
-  extends:
-    - .fdo.container-build@fedora@aarch64
-    - .mutter.fedora:34@aarch64
-  stage: prepare
-  needs:
-    - check-commit-log
-    - check-merge-request
-  variables:
-    GIT_STRATEGY: none
-
-check-code-style:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  stage: code-review
-  needs:
-    - build-fedora-container@x86_64
-  script:
-    - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
-      then
-        git remote add target $CI_MERGE_REQUEST_PROJECT_URL.git ;
-        git fetch target $CI_MERGE_REQUEST_TARGET_BRANCH_NAME ;
-        export common_parent_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "target/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME") <(git rev-list --first-parent HEAD) | head -1) ;
-        python3 -u ./check-style.py --dry-run --sha $common_parent_sha ;
-      else
-        echo "Not a merge request" ;
-      fi
-  allow_failure: true
-
-.build-mutter:
-  extends:
-    - .fdo.distribution-image@fedora
-  stage: build
-  script:
-    - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
-    - meson compile -C build
-    - meson install -C build
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - build
-
-build-mutter@x86_64:
-  extends:
-    - .build-mutter
-    - .mutter.fedora:34@x86_64
-  needs:
-    - build-fedora-container@x86_64
-
-build-mutter@aarch64:
-  extends:
-    - .build-mutter
-    - .mutter.fedora:34@aarch64
-  needs:
-    - build-fedora-container@aarch64
-
-build-without-opengl-and-glx@x86_64:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  stage: build
-  needs:
-    - build-fedora-container@x86_64
-  script:
-    - meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
-    - meson compile -C build
-    - meson install -C build
-  artifacts:
-    paths:
-      - build/meson-logs
-
-build-without-native-backend-and-wayland@x86_64:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  stage: build
-  needs:
-    - build-fedora-container@x86_64
-  script:
-    - meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false -Dnative_tests=false --werror --prefix /usr
-    - meson compile -C build
-    - meson install -C build
-  artifacts:
-    paths:
-      - build/meson-logs
-
-.test-setup: &test-setup
-  variables:
-    XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
-    GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
-    MUTTER_DEBUG_DUMMY_MODE_SPECS: "800x600@10.0"
-    PIPEWIRE_DEBUG: 2
-    PIPEWIRE_LOG: "$CI_PROJECT_DIR/build/meson-logs/pipewire.log"
-    XVFB_SERVER_ARGS: "+iglx -noreset"
-    G_SLICE: "always-malloc"
-    MALLOC_CHECK_: "3"
-    NO_AT_BRIDGE: "1"
-  before_script:
-    - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
-    # Disable e.g. audio support to not dead lock screen cast tests
-    - rm -f /usr/share/pipewire/media-session.d/with-*
-    - mkdir -m 700 $XDG_RUNTIME_DIR
-    - pipewire & sleep 2
-
-.test-mutter:
-  extends:
-    - .fdo.distribution-image@fedora
-  <<: *test-setup
-  stage: test
-  script:
-    - dbus-run-session -- xvfb-run -a -s "$XVFB_SERVER_ARGS"
-        catchsegv meson test -C build --no-rebuild -t 10
-  artifacts:
-    expire_in: 1 day
-    reports:
-      junit: "build/meson-logs/testlog-catchsegv.junit.xml"
-    name: "mutter-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    when: always
-    paths:
-      - build
-
-test-mutter@x86_64:
-  extends:
-    - .test-mutter
-    - .mutter.fedora:34@x86_64
-  needs:
-    - build-mutter@x86_64
-
-test-mutter@aarch64:
-  extends:
-    - .test-mutter
-    - .mutter.fedora:34@aarch64
-  needs:
-    - build-mutter@aarch64
-
-.test-mutter-coverage:
-  extends:
-    - .fdo.distribution-image@fedora
-  stage: analyze
-  script:
-    - ninja -C build coverage
-    - cat build/meson-logs/coverage.txt
-  artifacts:
-    paths:
-      - build/meson-logs/coveragereport
-  coverage: '/^TOTAL.*\s+(\d+\%)$/'
-
-test-mutter-coverage@x86_64:
-  extends:
-    - .test-mutter-coverage
-    - .mutter.fedora:34@x86_64
-  needs:
-    - test-mutter@x86_64
-
-test-mutter-coverage@aarch64:
-  extends:
-    - .test-mutter-coverage
-    - .mutter.fedora:34@aarch64
-  needs:
-    - test-mutter@aarch64
-
-can-build-gnome-shell@x86_64:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  stage: test
-  needs:
-    - build-mutter@x86_64
-  before_script:
-    - meson install --no-rebuild -C build
-  script:
-    - .gitlab-ci/checkout-gnome-shell.sh
-    - meson gnome-shell gnome-shell/build --prefix /usr -Dman=false
-    - meson install -C gnome-shell/build
-
-test-mutter-coverity:
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $MUTTER_SCHEDULED_JOB == "coverity"'
-      when: always
-    - when: manual
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  needs:
-    - build-fedora-container@x86_64
-  stage: analyze
-  allow_failure: true
-  script:
-    - .gitlab-ci/download-coverity-tarball.sh
-    - CC=clang meson coverity-build -Dprofiler=false
-    - ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C coverity-build
-    - tar czf cov-int.tar.gz cov-int
-    - curl https://scan.coverity.com/builds?project=mutter
-      --form token=$COVERITY_TOKEN --form email=carlosg@gnome.org
-      --form file=@cov-int.tar.gz --form version="`git describe --tags`"
-      --form description="GitLab CI build"
-  cache:
-    key: coverity-tarball
-    paths:
-      - coverity
-
-dist-mutter:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .mutter.fedora:34@x86_64
-  <<: *test-setup
-  stage: deploy
-  needs:
-    - build-mutter@x86_64
-  script:
-    - dbus-run-session -- xvfb-run -a -s "$XVFB_SERVER_ARGS" meson dist -C build
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes:
-        - "**/meson.build"
-        - meson/*
-
-dist-mutter-tarball:
-  extends: dist-mutter
-  artifacts:
-    expose_as: 'Get tarball here'
-    paths:
-      - build/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz
-  rules:
-    - if: '$CI_COMMIT_TAG'
--- a/.gitlab-ci/checkout-gnome-shell.sh
+++ b/.gitlab-ci/checkout-gnome-shell.sh
@ -1,55 +0,0 @@
-#!/usr/bin/bash
-
-fetch() {
-  local remote=$1
-  local ref=$2
-
-  git fetch --quiet --depth=1 $remote $ref 2>/dev/null
-}
-
-gnome_shell_target=
-
-echo -n Cloning into gnome-shell ...
-if git clone --quiet --depth=1 https://gitlab.gnome.org/GNOME/gnome-shell.git; then
-  echo \ done
-else
-  echo \ failed
-  exit 1
-fi
-
-cd gnome-shell
-
-if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  merge_request_remote=${CI_MERGE_REQUEST_SOURCE_PROJECT_URL//mutter/gnome-shell}
-  merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-
-  echo -n Looking for $merge_request_branch on remote ...
-  if fetch $merge_request_remote $merge_request_branch; then
-    echo \ found
-    gnome_shell_target=FETCH_HEAD
-  else
-    echo \ not found
-
-    echo -n Looking for $CI_MERGE_REQUEST_TARGET_BRANCH_NAME instead ...
-    if fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME; then
-      echo \ found
-      gnome_shell_target=FETCH_HEAD
-    else
-      echo \ not found
-    fi
-  fi
-fi
-
-if [ -z "$gnome_shell_target" ]; then
-  echo -n Looking for $CI_COMMIT_REF_NAME on remote ...
-  if fetch origin $CI_COMMIT_REF_NAME; then
-    echo \ found
-    gnome_shell_target=FETCH_HEAD
-  else
-    echo \ not found
-    gnome_shell_target=HEAD
-    echo Using $gnome_shell_target instead
-  fi
-fi
-
-git checkout -q $gnome_shell_target
--- a/.gitlab-ci/commit-rules.yml
+++ b/.gitlab-ci/commit-rules.yml
@ -1,19 +0,0 @@
-patterns:
-  deny:
-    - regex: '^$CI_MERGE_REQUEST_PROJECT_URL/(-/)?merge_requests/$CI_MERGE_REQUEST_IID$'
-      message: Commit message must not contain a link to its own merge request
-    - regex: '^(meta-|Meta)'
-      message: Commit message subject should not be prefixed with 'meta-' or 'Meta'
-      where: subject
-    - regex: '^(clutter-|Clutter)'
-      message: Commit message subject should not be prefixed with 'clutter-' or 'Clutter', use 'clutter/' instead
-      where: subject
-    - regex: '^(cogl-|Cogl)'
-      message: Commit message subject should not be prefixed with 'cogl-' or 'Cogl', use 'cogl/' instead
-      where: subject
-    - regex: '^[^:]+: [a-z]'
-      message: "Commit message subject should be properly Capitalized. E.g.  'window: Marginalize extradicity'"
-      where: subject
-    - regex: '^\S*\.[ch]:'
-      message: Commit message subject prefix should not include .c, .h, etc.
-      where: subject
--- a/.gitlab-ci/download-coverity-tarball.sh
+++ b/.gitlab-ci/download-coverity-tarball.sh
@ -1,38 +0,0 @@
-#!/usr/bin/bash
-
-# We need a coverity token to fetch the tarball
-if [ -x $COVERITY_TOKEN ]
-then
-  echo "No coverity token. Run this job from a protected branch."
-  exit -1
-fi
-
-mkdir -p coverity
-
-# Download and check MD5 first
-curl https://scan.coverity.com/download/linux64 \
-  --data "token=$COVERITY_TOKEN&project=mutter&md5=1" \
-  --output /tmp/coverity_tool.md5
-
-diff /tmp/coverity_tool.md5 coverity/coverity_tool.md5 >/dev/null 2>&1
-
-if [ $? -eq 0 -a -d coverity/cov-analysis* ]
-then
-  echo "Coverity tarball is up-to-date"
-  exit 0
-fi
-
-# Download and extract coverity tarball
-curl https://scan.coverity.com/download/linux64 \
-  --data "token=$COVERITY_TOKEN&project=mutter" \
-  --output /tmp/coverity_tool.tgz
-
-rm -rf ./coverity/cov-analysis*
-
-tar zxf /tmp/coverity_tool.tgz -C coverity/
-if [ $? -eq 0 ]
-then
-  mv /tmp/coverity_tool.md5 coverity/
-fi
-
-rm /tmp/coverity_tool.tgz
--- a/.gitlab-ci/install-meson-project.sh
+++ b/.gitlab-ci/install-meson-project.sh
@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ $# -lt 3 ]]; then
-  echo Usage: $0 [options] [repo-url] [commit] [subdir]
-  echo  Options:
-  echo    -Dkey=val
-  exit 1
-fi
-
-MESON_OPTIONS=()
-
-while [[ $1 =~ ^-D ]]; do
-  MESON_OPTIONS+=( "$1" )
-  shift
-done
-
-REPO_URL="$1"
-TAG_OR_BRANCH="$2"
-SUBDIR="$3"
-COMMIT="$4"
-
-REPO_DIR="$(basename ${REPO_URL%.git})"
-
-git clone --depth 1 "$REPO_URL" -b "$TAG_OR_BRANCH"
-pushd "$REPO_DIR"
-pushd "$SUBDIR"
-
-if [ ! -z "$COMMIT" ]; then
-  git fetch origin "$COMMIT"
-  git checkout "$COMMIT"
-fi
-
-meson --prefix=/usr _build "${MESON_OPTIONS[@]}"
-meson install -C _build
-popd
-popd
-rm -rf "$REPO_DIR"
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@ -1,55 +0,0 @@
-<!-- 
-Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
-first to ensure that you create a clear and specific issue.
-->
-
-### Affected version
-
-<!--
-Provide at least the following information:
-* Your OS and version
-* Affected Mutter version
-* Does this issue appear in XOrg and/or Wayland
-->
-
-### Bug summary
-
-<!-- 
-Provide a short summary of the bug you encountered.
-->
-
-### Steps to reproduce
-
-<!-- 
-1. Step one
-2. Step two
-3. ...
-->
-
-### What happened
-
-<!-- 
-What did Mutter do that was unexpected?
-->
-
-### What did you expect to happen
-
-<!-- 
-What did you expect Mutter to do?
-->
-
-### Relevant logs, screenshots, screencasts etc.
-
-<!-- 
-If you have further information, such as technical documentation, logs,
-screenshots or screencasts related, please provide them here.
-
-If the bug is a crash, please obtain a stack trace with installed debug
-symbols (at least for GNOME Shell and Mutter) and attach it to
-this issue following the instructions on
-https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces.
-->
-
-
-<!-- Do not remove the following line. -->
-/label ~"1. Bug"
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@ -1,30 +0,0 @@
-<!-- 
-Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
-first to ensure that you create a clear and specific issue.
-->
-
-### Feature summary
-
-<!-- 
-Describe what you would like to be able to do with Mutter
-that you currently cannot do.
-->
-
-### How would you like it to work
-
-<!-- 
-If you can think of a way Mutter might be able to do this,
-let us know here.
-->
-
-### Relevant links, screenshots, screencasts etc.
-
-<!-- 
-If you have further information, such as technical documentation,
-code, mockups or a similar feature in another window managers,
-please provide them here.
-->
-
-
-<!-- Do not remove the following line. -->
-/label ~"1. Feature"
--- 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/41
+++ b/41
@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
    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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
--- 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+ >= 2.10 and GConf 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, GConf2-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/HACKING.md
+++ b/HACKING.md
@ -1,286 +0,0 @@
-# Style
-
-The coding style used is primarily the GNU flavor of the [GNOME coding
-style][gnome-coding-style], with some additions described below.
-
-## General
-
- * Use this code style on new code. When changing old code with a different
-   code style, feel free to also adjust it to use this code style.
-
- * Use regular C types and `stdint.h` types instead of GLib fundamental
-   types, except for `gboolean`, and `guint`/`gulong` for GSource IDs and
-   signal handler IDs. That means e.g. `uint64_t` instead of `guint64`, `int`
-   instead of `gint`, `unsigned int` instead of `guint` if unsignedness
-   is of importance, `uint8_t` instead of `guchar`, and so on.
-
- * Try to to limit line length to 80 characters, although it's not a
-   strict limit.
-
- * Usage of `g_autofree` and `g_autoptr` is encouraged. The style to use is
-
-    ```c
-    g_autofree char *text = NULL;
-    g_autoptr (MetaSomeThing) thing = NULL;
-
-    text = g_strdup_printf ("The text: %d", a_number);
-    thing = g_object_new (META_TYPE_SOME_THING,
-                          "text", text,
-                          NULL);
-    thinger_use_thing (rocket, thing);
-    ```
-
- * Declare variables at the top of the block they are used, but avoid
-   non-trivial logic among variable declarations. Non-trivial logic can be
-   getting a pointer that may be `NULL`, any kind of math, or anything
-   that may have side effects.
-
- * Instead of boolean arguments in functions, prefer enums or flags when
-   they're more expressive. The naming convention for flags is
-
-    ```c
-    typedef _MetaSomeThingFlags
-    {
-      META_SOME_THING_FLAG_NONE = 0,
-      META_SOME_THING_FLAG_ALTER_REALITY = 1 << 0,
-      META_SOME_THING_FLAG_MANIPULATE_PERCEPTION = 1 << 1,
-    } MetaSomeThingFlags;
-    ```
-
- * Use `g_new0 ()` etc. instead of `g_slice_new0 ()`.
-
- * Initialize and assign floating point variables (i.e. `float` or
-   `double`) using the form `floating_point = 3.14159` or `ratio = 2.0`.
-
-## Header (.h) files
-
- * The return type and `*` are separated by a space.
- * Function name starts one space after the last `*`.
- * Parenthesis comes one space after the function name.
-
-As an example, this is how functions in a header file should look like:
-
-```c
-gboolean meta_udev_is_drm_device (MetaUdev    *udev,
-                                  GUdevDevice *device);
-
-GList * meta_udev_list_drm_devices (MetaUdev  *udev,
-                                    GError   **error);
-
-MetaUdev * meta_udev_new (MetaBackendNative *backend_native);
-```
-
-## Source code
-
-Keep functions in the following order in source files:
-
-  1. GPL header
-  2. Enums
-  3. Structures
-  4. Function prototypes
-  5. `G_DEFINE_TYPE()`
-  6. Static variables
-  7. Auxiliary functions
-  8. Callbacks
-  9. Interface implementations
-  10. Parent vfunc overrides
-  11. class_init and init
-  12. Public API
-
-### Structures
-
-Each structure field has a space after their type name. Structure fields aren't
-aligned. For example:
-
-```c
-struct _MetaFooBar
-{
-  MetaFoo parent;
-
-  MetaBar *bar;
-  MetaSomething *something;
-};
-```
-
-### Function Prototypes
-
-Function prototypes must be formatted just like in header files.
-
-### Overrides
-
-When overriding parent class vfuncs, or implementing an interface, vfunc
-overrides should be named as a composition of the current class prefix,
-followed by the vfunc name. For example:
-
-
-```c
-static void
-meta_bar_spawn_unicorn (MetaParent *parent)
-{
-  /* ... */
-}
-
-static void
-meta_bar_dispose (GObject *object)
-{
-  /* ... */
-}
-
-static void
-meta_bar_finalize (GObject *object)
-{
-  /* ... */
-}
-
-static void
-meta_bar_class_init (MetaBarClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  MetaParentClass *parent_class = META_PARENT_CLASS (klass);
-
-  object_class->dispose = meta_bar_dispose;
-  object_class->finalize = meta_bar_finalize;
-
-  parent_class->spawn_unicorn = meta_bar_spawn_unicorn;
-}
-```
-
-### Interface Implementations
-
-When implementing interfaces, two groups of functions are involved: the init
-function, and the overrides.
-
-The interface init function is named after the interface type in snake case,
-followed by the `_iface_init` suffix. For example:
-
-
-```c
-static void meta_foo_iface_init (MetaFooInterface *foo_iface);
-
-G_DEFINE_TYPE_WITH_CODE (MetaBar, meta_bar, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (META_TYPE_FOO,
-                                                meta_foo_iface_init));
-```
-
-Then, when implementing each vfunc of the interface, follow the same pattern
-of the [Overrides](###Overrides) section. Here's an example:
-
-```c
-static void
-meta_bar_do_something (MetaFoo *foo)
-{
-  /* ... */
-}
-
-static void
-meta_foo_iface_init (MetaFooInterface *foo_iface)
-{
-  foo_iface->do_something = meta_bar_do_something;
-}
-```
-
-### Auxiliary Functions
-
-Auxiliary functions are above every other functions to minimize the number of
-function prototypes in the file. These functions often grow when factoring out
-the same code between two or more functions:
-
-```c
-static void
-do_something_on_data (Foo *data,
-                      Bar *bar)
-{
-  /* ... */
-}
-
-static void
-random_function (Foo *foo)
-{
-  do_something_on_data (foo, bar);
-}
-
-static void
-another_random_function (Foo *foo)
-{
-  do_something_on_data (foo, bar);
-}
-```
-
-Sometimes, however, auxiliary functions are created to break down otherwise
-large functions - in this case, it is appropriate to keep these auxiliary
-functions close to the function they are tightly related to.
-
-Auxiliary function names must have a verb in the imperative form, and should
-always perform an action over something. They usually don't have the class
-prefix (`meta_`, `clutter_`, or `cogl_`). For example:
-
-```c
-static void
-do_something_on_data (Foo *data,
-                      Bar *bar)
-{
-  /* ... */
-}
-```
-
-Exceptionally, when converting between types, auxiliary function names may
-have the class prefix to this rule. For example:
-
-```c
-static MetaFoo *
-meta_foo_from_bar (Bar *bar)
-{
-  /* ... */
-}
-```
-
-### Callback Functions
-
-Callback function names should have the name of the action in imperative
-form. They don't have any prefix, but have a `_func` suffix. For example:
-
-```c
-static void
-filter_something_func (Foo      *foo,
-                       Bar      *bar,
-                       gpointer  user_data)
-{
-  /* ... */
-}
-```
-
-### Signal Callbacks
-
-Signal callbacks generally have the signal name. They should be prefixed with
-`on_`, or suffixed with `_cb`, but not both. For example:
-
-```c
-static void
-on_realize (ClutterActor *actor,
-            gpointer      user_data)
-{
-  /* ... */
-}
-
-static void
-destroy_cb (ClutterActor *actor,
-            gpointer      user_data)
-{
-  /* ... */
-}
-```
-
-When the callback is named after the object that generated it, and the signal,
-then passive voice is used. For example:
-
-```c
-static void
-click_action_clicked_cb (ClutterClickAction *click_action,
-                         ClutterActor       *actor,
-                         gpointer            user_data)
-{
-  /* ... */
-}
-```
-
-[gnome-coding-style]: https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en
--- 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
@ -0,0 +1,6 @@
+
+SUBDIRS=src po doc
+
+EXTRA_DIST = HACKING MAINTAINERS rationales.txt
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
--- a/4121
+++ b/4121
--- a/425
+++ b/425
@ -0,0 +1,425 @@
+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.
+
+The first release of Metacity was version 2.3. Metacity has no need for
+your petty hangups about version numbers.
+
+The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
+2.10.x, 2.12.x, 2.14.x, 2.16.x.
+
+Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
+2.15.x, 2.17.x.
+
+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 also need GConf 1.2 (unless building a funky
+extra-small embedded metacity with --disable-gconf, see below).
+You need Clutter 0.9.3. 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 gconf-editor or gconftool or GNOME themes control
+   panel:
+     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
+     gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
+     gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
+     gconftool-2 --type=string --set /apps/metacity/general/theme Bright
+
+   See theme-format.txt for docs on the theme format. Use 
+   metacity-theme-viewer to preview themes.
+
+ - Change number of workspaces via gconf-editor or gconftool:
+     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
+
+   Can also change workspaces from GNOME 2 pager.
+
+ - Change focus mode:
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
+     gconftool-2 --type=string --set /apps/metacity/general/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:
+
+     unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
+   
+   Also try the GNOME keyboard shortcuts control panel, or
+   gconf-editor.
+
+ - 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/README.md
+++ b/README.md
@ -1,64 +0,0 @@
-# Mutter
-
-Mutter is a Wayland display server and X11 window manager and compositor library.
-
-When used as a Wayland display server, it runs on top of KMS and libinput. It
-implements the compositor side of the Wayland core protocol as well as various
-protocol extensions. It also has functionality related to running X11
-applications using Xwayland.
-
-When used on top of Xorg it acts as a X11 window manager and compositing manager.
-
-It contains functionality related to, among other things, window management,
-window compositing, focus tracking, workspace management, keybindings and
-monitor configuration.
-
-Internally it uses a fork of Cogl, a hardware acceleration abstraction library
-used to simplify usage of OpenGL pipelines, as well as a fork af Clutter, a
-scene graph and user interface toolkit.
-
-Mutter is used by, for example, GNOME Shell, the GNOME core user interface, and
-by  Gala, elementary OS's window manager. It can also be run standalone, using
-the  command "mutter", but just running plain mutter is only intended for
-debugging purposes.
-
-## Contributing
-
-To contribute, open merge requests at https://gitlab.gnome.org/GNOME/mutter.
-
-It can be useful to look at the documentation available at the
-[Wiki](https://gitlab.gnome.org/GNOME/mutter/-/wikis/home).
-
-## Coding style and conventions
-
-See [HACKING.md](./HACKING.md).
-
-## Git messages
-
-Commit messages should follow the [GNOME commit message
-guidelines](https://wiki.gnome.org/Git/CommitMessages). We require an URL
-to either an issue or a merge request in each commit. Try to always prefix
-commit subjects with a relevant topic, such as `compositor:` or
-`clutter/actor:`, and it's always better to write too much in the commit
-message body than too little.
-
-## Default branch
-
-The default development branch is `main`. If you still have a local
-checkout under the old name, use:
-```sh
-git checkout master
-git branch -m master main
-git fetch
-git branch --unset-upstream
-git branch -u origin/main
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
-```
-
-## License
-
-Mutter is distributed under the terms of the GNU General Public License,
-version 2 or later. See the [COPYING][license] file for detalis.
-
-[bug-tracker]: https://gitlab.gnome.org/GNOME/mutter/issues
-[license]: COPYING
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,22 @@
+#!/bin/bash
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="mutter"
+REQUIRED_AUTOMAKE_VERSION=1.10
+
+(test -f $srcdir/configure.in \
+  && test -d $srcdir/src) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level metacity directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from GNOME Subversion (or from"
+    echo "your distribution's package manager)."
+    exit 1
+}
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
--- a/check-style.py
+++ b/check-style.py
@ -1,138 +0,0 @@
-#!/bin/env python3
-
-import argparse
-import os
-import re
-import subprocess
-import sys
-import tempfile
-
-# Path relative to this script
-uncrustify_cfg = 'tools/uncrustify.cfg'
-
-def run_diff(sha):
-    proc = subprocess.Popen(["git", "diff", "-U0", "--function-context", sha, "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    files = proc.stdout.read().strip().decode('utf-8')
-    return files.split('\n')
-
-def find_chunks(diff):
-    file_entry_re = re.compile('^\+\+\+ b/(.*)$')
-    diff_chunk_re = re.compile('^@@ -\d+,\d+ \+(\d+),(\d+)')
-    file = None
-    chunks = []
-
-    for line in diff:
-        match = file_entry_re.match(line)
-        if match:
-            file = match.group(1)
-
-        match = diff_chunk_re.match(line)
-        if match:
-            start = int(match.group(1))
-            len = int(match.group(2))
-            end = start + len
-
-            if len > 0 and (file.endswith('.c') or file.endswith('.h') or file.endswith('.vala')):
-                chunks.append({ 'file': file, 'start': start, 'end': end })
-
-    return chunks
-
-def reformat_chunks(chunks, rewrite):
-    # Creates temp file with INDENT-ON/OFF comments
-    def create_temp_file(file, start, end):
-        with open(file) as f:
-            tmp = tempfile.NamedTemporaryFile()
-            tmp.write(b'/** *INDENT-OFF* **/\n')
-            for i, line in enumerate(f):
-                if i == start - 2:
-                    tmp.write(b'/** *INDENT-ON* **/\n')
-
-                tmp.write(bytes(line, 'utf-8'))
-
-                if i == end - 2:
-                    tmp.write(b'/** *INDENT-OFF* **/\n')
-
-            tmp.seek(0)
-
-        return tmp
-
-    # Removes uncrustify INDENT-ON/OFF helper comments
-    def remove_indent_comments(output):
-        tmp = tempfile.NamedTemporaryFile()
-
-        for line in output:
-            if line != b'/** *INDENT-OFF* **/\n' and line != b'/** *INDENT-ON* **/\n':
-                tmp.write(line)
-
-        tmp.seek(0)
-
-        return tmp
-
-    changed = None
-
-    for chunk in chunks:
-        # Add INDENT-ON/OFF comments
-        tmp = create_temp_file(chunk['file'], chunk['start'], chunk['end'])
-
-        # uncrustify chunk
-        proc = subprocess.Popen(["uncrustify", "-c", uncrustify_cfg, "-f", tmp.name], stdout=subprocess.PIPE)
-        reindented = proc.stdout.readlines()
-        proc.wait()
-        if proc.returncode != 0:
-            continue
-
-        tmp.close()
-
-        # Remove INDENT-ON/OFF comments
-        formatted = remove_indent_comments(reindented)
-
-        if dry_run is True:
-            # Show changes
-            proc = subprocess.Popen(["diff", "-up", "--color=always", chunk['file'], formatted.name], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            diff = proc.stdout.read().decode('utf-8')
-            if diff != '':
-                output = re.sub('\t', '↦\t', diff)
-                print(output)
-                changed = True
-        else:
-            # Apply changes
-            diff = subprocess.Popen(["diff", "-up", chunk['file'], formatted.name], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            patch = subprocess.Popen(["patch", chunk['file']], stdin=diff.stdout)
-            diff.stdout.close()
-            patch.communicate()
-
-        formatted.close()
-
-    return changed
-
-
-parser = argparse.ArgumentParser(description='Check code style.')
-parser.add_argument('--sha', metavar='SHA', type=str,
-                    help='SHA for the commit to compare HEAD with')
-parser.add_argument('--dry-run', '-d', type=bool,
-                    action=argparse.BooleanOptionalAction,
-                    help='Only print changes to stdout, do not change code')
-parser.add_argument('--rewrite', '-r', type=bool,
-                    action=argparse.BooleanOptionalAction,
-                    help='Whether to amend the result to the last commit (e.g. \'git rebase --exec "%(prog)s -r"\')')
-
-# Change CWD to script location, necessary for always locating the configuration file
-os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
-
-args = parser.parse_args()
-sha = args.sha or 'HEAD^'
-rewrite = args.rewrite
-dry_run = args.dry_run
-
-diff = run_diff(sha)
-chunks = find_chunks(diff)
-changed = reformat_chunks(chunks, rewrite)
-
-if dry_run is not True and rewrite is True:
-    proc = subprocess.Popen(["git", "commit", "--all", "--amend", "-C", "HEAD"], stdout=subprocess.DEVNULL)
-    os._exit(0)
-elif dry_run is True and changed is True:
-    print ("\nIssue the following command in your local tree to apply the suggested changes (needs uncrustify installed):\n\n $ git rebase origin/main --exec \"./check-style.py -r\" \n")
-    os._exit(-1)
-
-os._exit(0)
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@ -1,95 +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]
-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/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ñeiro <apinheiro@igalia.com>
-
-Cleaning ClutterText
-
-  * Removing superfluous g_return_if_fail
-  * Removing unused ClutterText::text-changed callback
-
-2010-07-05 Alejandro Piñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Adding -Wshadow option and solving warnings related
-
-
-2010-06-14 Alejandro Piñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Update TODO file
-
-Use Bugzilla to setting missing features.
-
-2010-06-01 Alejandro Piñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Added CallyClone example
-
-
-2010-05-13 Alejandro Piñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Added gail_misc_layout_get_run_attributes implementation
-
-Part of bug CB#2072 solution
-
-2010-04-14 Alejandro Piñ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ñeiro <apinheiro@igalia.com>
-
-Fixing the libdir directory in some examples
-
-
-2010-03-26 Alejandro Piñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Proper UTF-8 headers
-
-
-2010-02-25 Alejandro Piñ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ñeiro <apinheiro@igalia.com>
-
-Added .gitignore file
-
-
-2010-02-19 Alejandro Piñeiro <apinheiro@igalia.com>
-
-Release 1.1.1
-
-
-2010-02-19 Alejandro Piñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Update on configure.ac after autoupdate call
-
-
-2010-02-02 Alejandro Piñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Added AM_PROG_CC_C_O option to avoid a warning running configure
-
-
-2010-01-22 Alejandro Piñeiro <apinheiro@igalia.com>
-
-Fix clutter version required on the pc files
-
-
-2010-01-22 Alejandro Piñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Remove superfluous g_print on CallyStage
-
-
-2009-12-03 Alejandro Piñeiro <apinheiro@igalia.com>
-
-Use clutter_stage_manager_peek_stages to avoid a leak
-
-
-2009-12-03 Alejandro Piñeiro <apinheiro@igalia.com>
-
-Added ATK_STATE_SELECTABLE_TEXT management
-
-
-2009-11-26 Alejandro Piñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Modify cally-atkeditabletext-example.c to manage "activatable" status
-
-
-2009-11-24 Alejandro Piñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Remove ; from the CALLY_GET_CLUTTER_ACTOR macro
-
-
-2009-11-25 Alejandro Piñ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ñeiro <apinheiro@igalia.com>
-
-Adding new tips on CODING_STYLE
-
-
-2009-11-09 Alejandro Piñ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ñ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ñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Symplifying shave support.
-
-
-2009-09-25 Alejandro Piñ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ñ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ñ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ñ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ñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Fix clutter version required
-
-
-2009-06-23 Alejandro Piñ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ñeiro <apinheiro@igalia.com>
-
-Minor fixes
-
-  * Update TODO
-  * Fix .pc files, to use clutter-0.9 version
-
-2009-05-20 Alejandro Piñeiro <apinheiro@igalia.com>
-
-Library renamed from cail to cally
-
-
-2009-05-08 Alejandro Piñ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ñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Coding style review: cail-actor.c
-
-
-2009-04-21 Alejandro Piñeiro <apinheiro@igalia.com>
-
-2009-04-21 Alejandro Pinheiro <apinheiro@igalia.com>
-
-	* TODO: updated TODO file
-
-2009-04-21 Alejandro Piñeiro <apinheiro@igalia.com>
-
-2009-03-06 Alejandro Pinheiro <apinheiro@igalia.com>
-
-	* AUTHORS: update authors file to public release
-
-2009-03-06 Alejandro Piñ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ñ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ñ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ñ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ñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-Missing cail-rectangle.[ch] files, according 2009-02-23 entry at Changelog
-
-
-2009-02-23 Alejandro Piñ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ñ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ñ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ñ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ñ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ñ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ñeiro <apinheiro@igalia.com>
-
-2009-02-18 Alejandro Pinheiro <apinheiro@igalia.com>
-
-	* debian/control: updating dependencies
-
-2009-02-18 Alejandro Piñ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ñ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"
-
-/*
- * Auxiliary 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_EXPORT
-GType      cally_actor_get_type              (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-AtkObject* cally_actor_new                   (ClutterActor        *actor);
-
-CLUTTER_EXPORT
-guint      cally_actor_add_action            (CallyActor          *cally_actor,
-                                              const gchar         *action_name,
-                                              const gchar         *action_description,
-                                              const gchar         *action_keybinding,
-                                              CallyActionFunc      action_func);
-CLUTTER_EXPORT
-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_EXPORT
-gboolean   cally_actor_remove_action         (CallyActor          *cally_actor,
-                                              gint                 action_id);
-
-CLUTTER_EXPORT
-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_EXPORT
-GType      cally_clone_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-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-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_EXPORT
-gboolean cally_get_cally_initialized (void);
-CLUTTER_EXPORT
-gboolean cally_accessibility_init    (void);
-
-G_END_DECLS
-
-#endif /* __CALLY_MAIN_H__ */
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@ -1,292 +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 */
-  gulong stage_added_id;
-  gulong 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_clear_signal_handler (&root->priv->stage_added_id, stage_manager);
-
-  g_clear_signal_handler (&root->priv->stage_removed_id, stage_manager);
-
-  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_EXPORT
-GType      cally_root_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-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,266 +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);
-
-/* Auxiliary */
-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_ACTOR,
-                         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)
-        {
-          if (self->priv->key_focus != CLUTTER_ACTOR (stage))
-            {
-              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.
-       */
-      if (key_focus != CLUTTER_ACTOR (stage))
-        {
-          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 */
-}
-
-/* Auxiliary */
-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-actor.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 >*/
-  CallyActor parent;
-
-  CallyStagePrivate *priv;
-};
-
-/**
- * CallyStageClass:
- *
- * The <structname>CallyStageClass</structname> structure contains only
- * private data
- *
- * Since: 1.4
- */
-struct _CallyStageClass
-{
-  /*< private >*/
-  CallyActorClass parent_class;
-
-  /* padding for future expansion */
-  gpointer _padding_dummy[16];
-};
-
-CLUTTER_EXPORT
-GType      cally_stage_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-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_EXPORT
-GType      cally_text_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-AtkObject* cally_text_new      (ClutterActor *actor);
-
-G_END_DECLS
-
-#endif /* __CALLY_TEXT_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.
- */
-
-#include "clutter-build-config.h"
-
-#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 MUTTER_VERSION;
-}
-
-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);
-
-  g_slist_free (stage_list);
-}
-
-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_EXPORT
-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,97 +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.
- *
- */
-
-#include "clutter-build-config.h"
-
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
-#include "cally.h"
-
-#include "cally-actor.h"
-#include "cally-stage.h"
-#include "cally-text.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_STAGE, cally_stage, cally_stage_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_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_STAGE, cally_stage);
-  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text);
-  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,37 +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-main.h"
-#include "cally-root.h"
-#include "cally-stage.h"
-#include "cally-text.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,61 +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
- */
-
-#include "clutter-build-config.h"
-
-#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,91 +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 ())
-
-CLUTTER_EXPORT
-G_DECLARE_DERIVABLE_TYPE (ClutterAction, clutter_action,
-                          CLUTTER, ACTION, ClutterActorMeta);
-
-/**
- * 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);
-};
-
-/* ClutterActor API */
-CLUTTER_EXPORT
-void           clutter_actor_add_action            (ClutterActor  *self,
-                                                    ClutterAction *action);
-CLUTTER_EXPORT
-void           clutter_actor_add_action_with_name  (ClutterActor  *self,
-                                                    const gchar   *name,
-                                                    ClutterAction *action);
-CLUTTER_EXPORT
-void           clutter_actor_remove_action         (ClutterActor  *self,
-                                                    ClutterAction *action);
-CLUTTER_EXPORT
-void           clutter_actor_remove_action_by_name (ClutterActor  *self,
-                                                    const gchar   *name);
-CLUTTER_EXPORT
-ClutterAction *clutter_actor_get_action            (ClutterActor  *self,
-                                                    const gchar   *name);
-CLUTTER_EXPORT
-GList *        clutter_actor_get_actions           (ClutterActor  *self);
-CLUTTER_EXPORT
-void           clutter_actor_clear_actions         (ClutterActor  *self);
-
-CLUTTER_EXPORT
-gboolean       clutter_actor_has_actions           (ClutterActor  *self);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_ACTION_H__ */
--- a/clutter/clutter/clutter-actor-box-private.h
+++ b/clutter/clutter/clutter-actor-box-private.h
@ -1,12 +0,0 @@
-#ifndef __CLUTTER_ACTOR_BOX_PRIVATE_H__
-#define __CLUTTER_ACTOR_BOX_PRIVATE_H__
-
-#include <clutter/clutter-types.h>
-
-G_BEGIN_DECLS
-
-void _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_ACTOR_BOX_PRIVATE_H__ */
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@ -1,647 +0,0 @@
-#include "clutter-build-config.h"
-
-#include <math.h>
-
-#include "clutter-types.h"
-#include "clutter-interval.h"
-#include "clutter-private.h"
-#include "clutter-actor-box-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_new0 (ClutterActorBox, 1);
-}
-
-/**
- * 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_memdup2 (box, sizeof (ClutterActorBox));
-
-  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_free (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
- * within @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 #graphene_point3d_t
- *
- * 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 graphene_point3d_t  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;
-}
-
-void
-_clutter_actor_box_enlarge_for_effects (ClutterActorBox *box)
-{
-  float width, height;
-
-  /* The aim here is that for a given rectangle defined with floating point
-   * coordinates we want to determine a stable quantized size in pixels
-   * that doesn't vary due to the original box's sub-pixel position.
-   *
-   * The reason this is important is because effects will use this
-   * API to determine the size of offscreen framebuffers and so for
-   * a fixed-size object that may be animated across the screen we
-   * want to make sure that the stage paint-box has an equally stable
-   * size so that effects aren't made to continuously re-allocate
-   * a corresponding fbo.
-   *
-   * The other thing we consider is that the calculation of this box is
-   * subject to floating point precision issues that might be slightly
-   * different to the precision issues involved with actually painting the
-   * actor, which might result in painting slightly leaking outside the
-   * user's calculated paint-volume. For this we simply aim to pad out the
-   * paint-volume by at least half a pixel all the way around.
-   */
-  width = box->x2 - box->x1;
-  height = box->y2 - box->y1;
-  width = CLUTTER_NEARBYINT (width);
-  height = CLUTTER_NEARBYINT (height);
-  /* XXX: NB the width/height may now be up to 0.5px too small so we
-   * must also pad by 0.25px all around to account for this. In total we
-   * must padd by at least 0.75px around all sides. */
-
-  /* XXX: The furthest that we can overshoot the bottom right corner by
-   * here is 1.75px in total if you consider that the 0.75 padding could
-   * just cross an integer boundary and so ceil will effectively add 1.
-   */
-  box->x2 = ceilf (box->x2 + 0.75);
-  box->y2 = ceilf (box->y2 + 0.75);
-
-  /* Now we redefine the top-left relative to the bottom right based on the
-   * rounded width/height determined above + a constant so that the overall
-   * size of the box will be stable and not dependent on the box's
-   * position.
-   *
-   * Adding 3px to the width/height will ensure we cover the maximum of
-   * 1.75px padding on the bottom/right and still ensure we have > 0.75px
-   * padding on the top/left.
-   */
-  box->x1 = box->x2 - width - 3;
-  box->y1 = box->y2 - height - 3;
-}
-
-/**
- * clutter_actor_box_scale:
- * @box: a #ClutterActorBox
- * @scale: scale factor for resizing this box
- *
- * Rescale the @box by provided @scale factor.
- *
- * Since: 1.6
- */
-void
-clutter_actor_box_scale (ClutterActorBox *box,
-                         gfloat           scale)
-{
-  g_return_if_fail (box != NULL);
-
-  box->x1 *= scale;
-  box->x2 *= scale;
-  box->y1 *= scale;
-  box->y2 *= scale;
-}
-
-/**
- * clutter_actor_box_is_initialized:
- * @box: a #ClutterActorBox
- *
- * Checks if @box has been initialized, a #ClutterActorBox is uninitialized
- * if it has a size of -1 at an origin of 0, 0.
- *
- * Returns: %TRUE if the box is uninitialized, %FALSE if it isn't
- */
-gboolean
-clutter_actor_box_is_initialized (ClutterActorBox *box)
-{
-  gboolean x1_uninitialized, x2_uninitialized;
-  gboolean y1_uninitialized, y2_uninitialized;
-
-  g_return_val_if_fail (box != NULL, TRUE);
-
-  x1_uninitialized = isinf (box->x1);
-  x2_uninitialized = isinf (box->x2) && signbit (box->x2);
-  y1_uninitialized = isinf (box->y1);
-  y2_uninitialized = isinf (box->y2) && signbit (box->y2);
-
-  return !x1_uninitialized || !x2_uninitialized ||
-         !y1_uninitialized || !y2_uninitialized;
-}
-
-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,723 +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
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-actor-meta-private.h"
-
-#include "clutter-debug.h"
-#include "clutter-private.h"
-
-struct _ClutterActorMetaPrivate
-{
-  ClutterActor *actor;
-  gulong 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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-
-  priv->actor = NULL;
-}
-
-static void
-clutter_actor_meta_real_set_actor (ClutterActorMeta *meta,
-                                   ClutterActor     *actor)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-
-  g_warn_if_fail (!priv->actor ||
-                  !CLUTTER_ACTOR_IN_PAINT (priv->actor));
-  g_warn_if_fail (!actor || !CLUTTER_ACTOR_IN_PAINT (actor));
-
-  if (priv->actor == actor)
-    return;
-
-  g_clear_signal_handler (&priv->destroy_id, priv->actor);
-
-  priv->actor = actor;
-
-  if (priv->actor != NULL)
-    priv->destroy_id = g_signal_connect (priv->actor, "destroy",
-                                         G_CALLBACK (on_actor_destroy),
-                                         meta);
-}
-
-static void
-clutter_actor_meta_real_set_enabled (ClutterActorMeta *meta,
-                                     gboolean          is_enabled)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-
-  g_warn_if_fail (!priv->actor ||
-                  !CLUTTER_ACTOR_IN_PAINT (priv->actor));
-
-  priv->is_enabled = is_enabled;
-
-  g_object_notify_by_pspec (G_OBJECT (meta), obj_props[PROP_ENABLED]);
-}
-
-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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (CLUTTER_ACTOR_META (gobject));
-
-  switch (prop_id)
-    {
-    case PROP_ACTOR:
-      g_value_set_object (value, priv->actor);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, priv->name);
-      break;
-
-    case PROP_ENABLED:
-      g_value_set_boolean (value, 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_get_instance_private (CLUTTER_ACTOR_META (gobject));
-
-  if (priv->actor != NULL)
-    g_clear_signal_handler (&priv->destroy_id, priv->actor);
-
-  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;
-  klass->set_enabled = clutter_actor_meta_real_set_enabled;
-
-  /**
-   * 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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (self);
-
-  priv->is_enabled = TRUE;
-  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)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-
-  if (g_strcmp0 (priv->name, name) == 0)
-    return;
-
-  g_free (priv->name);
-  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)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), NULL);
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-
-  return 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)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-  is_enabled = !!is_enabled;
-
-  if (priv->is_enabled == is_enabled)
-    return;
-
-  CLUTTER_ACTOR_META_GET_CLASS (meta)->set_enabled (meta, is_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)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), FALSE);
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-
-  return 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)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), NULL);
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-
-  return priv->actor;
-}
-
-void
-_clutter_actor_meta_set_priority (ClutterActorMeta *meta,
-                                  gint priority)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR_META (meta));
-
-  priv = clutter_actor_meta_get_instance_private (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 (priv->actor == NULL);
-
-  priv->priority = priority;
-}
-
-gint
-_clutter_actor_meta_get_priority (ClutterActorMeta *meta)
-{
-  ClutterActorMetaPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), 0);
-
-  priv = clutter_actor_meta_get_instance_private (meta);
-
-  return priv->priority;
-}
-
-gboolean
-_clutter_actor_meta_is_internal (ClutterActorMeta *meta)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-  gint priority = 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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-  GList *prev = NULL, *l;
-
-  if (priv->actor != NULL)
-    {
-      g_warning ("The meta of type '%s' with name '%s' is "
-                 "already attached to actor '%s'",
-                 G_OBJECT_TYPE_NAME (meta),
-                 priv->name != NULL
-                   ? priv->name
-                   : "<unknown>",
-                 clutter_actor_get_name (priv->actor) != NULL
-                   ? clutter_actor_get_name (priv->actor)
-                   : G_OBJECT_TYPE_NAME (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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-
-  if (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),
-                 priv->name != NULL
-                   ? 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_free_full (group->meta, g_object_unref);
-  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;
-      ClutterActorMetaPrivate *priv =
-        clutter_actor_meta_get_instance_private (meta);
-
-      if (g_strcmp0 (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)
-{
-  ClutterActorMetaPrivate *priv =
-    clutter_actor_meta_get_instance_private (meta);
-
-  return priv->name != NULL ? priv->name : G_OBJECT_TYPE_NAME (meta);
-}
--- a/clutter/clutter/clutter-actor-meta.h
+++ b/clutter/clutter/clutter-actor-meta.h
@ -1,100 +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 ())
-
-CLUTTER_EXPORT
-G_DECLARE_DERIVABLE_TYPE (ClutterActorMeta, clutter_actor_meta,
-                          CLUTTER, ACTOR_META, GInitiallyUnowned);
-
-typedef struct _ClutterActorMetaPrivate ClutterActorMetaPrivate;
-
-/**
- * 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);
-
-  void (* set_enabled) (ClutterActorMeta *meta,
-                        gboolean          is_enabled);
-
-  /*< 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);
-};
-
-CLUTTER_EXPORT
-void            clutter_actor_meta_set_name     (ClutterActorMeta *meta,
-                                                 const gchar      *name);
-CLUTTER_EXPORT
-const gchar *   clutter_actor_meta_get_name     (ClutterActorMeta *meta);
-CLUTTER_EXPORT
-void            clutter_actor_meta_set_enabled  (ClutterActorMeta *meta,
-                                                 gboolean          is_enabled);
-CLUTTER_EXPORT
-gboolean        clutter_actor_meta_get_enabled  (ClutterActorMeta *meta);
-
-CLUTTER_EXPORT
-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,276 +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 >
- * 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 _SizeRequest             SizeRequest;
-
-typedef struct _ClutterLayoutInfo       ClutterLayoutInfo;
-typedef struct _ClutterTransformInfo    ClutterTransformInfo;
-typedef struct _ClutterAnimationInfo    ClutterAnimationInfo;
-
-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 */
-  graphene_point_t fixed_pos;
-
-  ClutterMargin margin;
-
-  guint x_align : 4;
-  guint y_align : 4;
-
-  guint x_expand : 1;
-  guint y_expand : 1;
-
-  graphene_size_t minimum;
-  graphene_size_t 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 */
-  gdouble rx_angle;
-  gdouble ry_angle;
-  gdouble rz_angle;
-
-  /* scaling */
-  gdouble scale_x;
-  gdouble scale_y;
-  gdouble scale_z;
-
-  /* translation */
-  graphene_point3d_t translation;
-
-  /* z_position */
-  gfloat z_position;
-
-  /* transformation center */
-  graphene_point_t pivot;
-  gfloat pivot_z;
-
-  graphene_matrix_t transform;
-  guint transform_set : 1;
-
-  graphene_matrix_t 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,
-                                                                                         ...);
-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,
-                                                                                         graphene_matrix_t *matrix);
-void                            _clutter_actor_apply_relative_transformation_matrix     (ClutterActor      *self,
-                                                                                         ClutterActor      *ancestor,
-                                                                                         graphene_matrix_t *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_set_has_key_focus                        (ClutterActor *self,
-                                                                                         gboolean      has_key_focus);
-
-void                            _clutter_actor_queue_redraw_full                        (ClutterActor             *self,
-                                                                                         const ClutterPaintVolume *volume,
-                                                                                         ClutterEffect            *effect);
-
-void                            _clutter_actor_finish_queue_redraw                      (ClutterActor *self);
-
-gboolean                        _clutter_actor_set_default_paint_volume                 (ClutterActor       *self,
-                                                                                         GType               check_gtype,
-                                                                                         ClutterPaintVolume *volume);
-
-const char *                    _clutter_actor_get_debug_name                           (ClutterActor *self);
-
-void                            _clutter_actor_push_clone_paint                         (void);
-void                            _clutter_actor_pop_clone_paint                          (void);
-
-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_only_relayout                      (ClutterActor *actor);
-void                            clutter_actor_clear_stage_views_recursive               (ClutterActor *actor);
-
-float                           clutter_actor_get_real_resource_scale                   (ClutterActor *actor);
-
-ClutterPaintNode *              clutter_actor_create_texture_paint_node                 (ClutterActor *self,
-                                                                                         CoglTexture  *texture);
-
-void clutter_actor_finish_layout (ClutterActor *self,
-                                  int           phase);
-
-void clutter_actor_queue_immediate_relayout (ClutterActor *self);
-
-gboolean clutter_actor_is_painting_unmapped (ClutterActor *self);
-
-gboolean clutter_actor_get_redraw_clip (ClutterActor       *self,
-                                        ClutterPaintVolume *dst_old_pv,
-                                        ClutterPaintVolume *dst_new_pv);
-
-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,939 +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>
-#include <clutter/clutter-paint-context.h>
-#include <clutter/clutter-pick-context.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 \
-  (((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 \
-  (((ClutterActor*)(a))->flags &= ~(f))
-
-#define CLUTTER_ACTOR_IS_MAPPED(a) \
-  CLUTTER_MACRO_DEPRECATED_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_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_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_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
- * @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 setting the coordinates of an
- *   actor; it is used by clutter_actor_allocate(); when overriding this
- *   function without chaining up, clutter_actor_set_allocation() must be
- *   called and children must be allocated by the implementation, when
- *   chaining up though, those things will be done by the parent's
- *   implementation.
- * @apply_transform: virtual function, used when applying the transformations
- *   to an actor before painting it or when transforming coordinates or
- *   the allocation; if the transformation calculated by this function may
- *   have changed, the cached transformation must be invalidated by calling
- *   clutter_actor_invalidate_transform(); 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
- * @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 (* 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,
-                                 ClutterPaintContext   *paint_context);
-  void (* parent_set)           (ClutterActor          *actor,
-                                 ClutterActor          *old_parent);
-
-  void (* destroy)              (ClutterActor          *self);
-  void (* pick)                 (ClutterActor          *actor,
-                                 ClutterPickContext    *pick_context);
-
-  /* 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);
-
-  /* transformations */
-  void (* apply_transform)      (ClutterActor           *actor,
-                                 graphene_matrix_t      *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);
-  gboolean (* has_accessible)       (ClutterActor         *self);
-  void     (* resource_scale_changed) (ClutterActor *self);
-  float    (* calculate_resource_scale) (ClutterActor *self,
-                                         int           phase);
-
-  /*< private >*/
-  /* padding for future expansion */
-  gpointer _padding_dummy[25];
-};
-
-/**
- * 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_EXPORT
-GType clutter_actor_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_new                               (void);
-
-CLUTTER_EXPORT
-void                            clutter_actor_set_flags                         (ClutterActor                *self,
-                                                                                 ClutterActorFlags            flags);
-CLUTTER_EXPORT
-void                            clutter_actor_unset_flags                       (ClutterActor                *self,
-                                                                                 ClutterActorFlags            flags);
-CLUTTER_EXPORT
-ClutterActorFlags               clutter_actor_get_flags                         (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_show                              (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_hide                              (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_realize                           (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_unrealize                         (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_map                               (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_unmap                             (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_paint                             (ClutterActor                *self,
-                                                                                 ClutterPaintContext         *paint_context);
-CLUTTER_EXPORT
-void                            clutter_actor_continue_paint                    (ClutterActor                *self,
-                                                                                 ClutterPaintContext         *paint_context);
-CLUTTER_EXPORT
-void                            clutter_actor_pick                              (ClutterActor                *actor,
-                                                                                 ClutterPickContext          *pick_context);
-CLUTTER_EXPORT
-void                            clutter_actor_continue_pick                     (ClutterActor                *actor,
-                                                                                 ClutterPickContext          *pick_context);
-CLUTTER_EXPORT
-void                            clutter_actor_queue_redraw                      (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_queue_redraw_with_clip            (ClutterActor                *self,
-                                                                                 const cairo_rectangle_int_t *clip);
-CLUTTER_EXPORT
-void                            clutter_actor_queue_relayout                    (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_destroy                           (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_name                          (ClutterActor                *self,
-                                                                                 const gchar                 *name);
-CLUTTER_EXPORT
-const gchar *                   clutter_actor_get_name                          (ClutterActor                *self);
-CLUTTER_EXPORT
-AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_accessible                    (ClutterActor                *self);
-
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_visible                        (ClutterActor                *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_mapped                         (ClutterActor                *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_realized                       (ClutterActor                *self);
-
-/* Size negotiation */
-CLUTTER_EXPORT
-void                            clutter_actor_set_request_mode                  (ClutterActor                *self,
-                                                                                 ClutterRequestMode           mode);
-CLUTTER_EXPORT
-ClutterRequestMode              clutter_actor_get_request_mode                  (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_get_preferred_width               (ClutterActor                *self,
-                                                                                 gfloat                       for_height,
-                                                                                 gfloat                      *min_width_p,
-                                                                                 gfloat                      *natural_width_p);
-CLUTTER_EXPORT
-void                            clutter_actor_get_preferred_height              (ClutterActor                *self,
-                                                                                 gfloat                       for_width,
-                                                                                 gfloat                      *min_height_p,
-                                                                                 gfloat                      *natural_height_p);
-CLUTTER_EXPORT
-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_EXPORT
-void                            clutter_actor_allocate                          (ClutterActor                *self,
-                                                                                 const ClutterActorBox       *box);
-CLUTTER_EXPORT
-void                            clutter_actor_allocate_preferred_size           (ClutterActor                *self,
-                                                                                 float                        x,
-                                                                                 float                        y);
-CLUTTER_EXPORT
-void                            clutter_actor_allocate_available_size           (ClutterActor                *self,
-                                                                                 gfloat                       x,
-                                                                                 gfloat                       y,
-                                                                                 gfloat                       available_width,
-                                                                                 gfloat                       available_height);
-CLUTTER_EXPORT
-void                            clutter_actor_allocate_align_fill               (ClutterActor                *self,
-                                                                                 const ClutterActorBox       *box,
-                                                                                 gdouble                      x_align,
-                                                                                 gdouble                      y_align,
-                                                                                 gboolean                     x_fill,
-                                                                                 gboolean                     y_fill);
-CLUTTER_EXPORT
-void                            clutter_actor_set_allocation                    (ClutterActor                *self,
-                                                                                 const ClutterActorBox       *box);
-CLUTTER_EXPORT
-void                            clutter_actor_get_allocation_box                (ClutterActor                *self,
-                                                                                 ClutterActorBox             *box);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_allocation                    (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_size                          (ClutterActor                *self,
-                                                                                 gfloat                       width,
-                                                                                 gfloat                       height);
-CLUTTER_EXPORT
-void                            clutter_actor_get_size                          (ClutterActor                *self,
-                                                                                 gfloat                      *width,
-                                                                                 gfloat                      *height);
-CLUTTER_EXPORT
-void                            clutter_actor_set_position                      (ClutterActor                *self,
-                                                                                 gfloat                       x,
-                                                                                 gfloat                       y);
-CLUTTER_EXPORT
-gboolean clutter_actor_get_fixed_position (ClutterActor *self,
-                                           float        *x,
-                                           float        *y);
-CLUTTER_EXPORT
-void                            clutter_actor_get_position                      (ClutterActor                *self,
-                                                                                 gfloat                      *x,
-                                                                                 gfloat                      *y);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_fixed_position_set            (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_fixed_position_set            (ClutterActor                *self,
-                                                                                 gboolean                     is_set);
-CLUTTER_EXPORT
-void                            clutter_actor_move_by                           (ClutterActor                *self,
-                                                                                 gfloat                       dx,
-                                                                                 gfloat                       dy);
-
-/* Actor geometry */
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_width                         (ClutterActor                *self);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_height                        (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_width                         (ClutterActor                *self,
-                                                                                 gfloat                       width);
-CLUTTER_EXPORT
-void                            clutter_actor_set_height                        (ClutterActor                *self,
-                                                                                 gfloat                       height);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_x                             (ClutterActor                *self);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_y                             (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_x                             (ClutterActor                *self,
-                                                                                 gfloat                       x);
-CLUTTER_EXPORT
-void                            clutter_actor_set_y                             (ClutterActor                *self,
-                                                                                 gfloat                       y);
-CLUTTER_EXPORT
-void                            clutter_actor_set_z_position                    (ClutterActor                *self,
-                                                                                 gfloat                       z_position);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_z_position                    (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_layout_manager                (ClutterActor                *self,
-                                                                                 ClutterLayoutManager        *manager);
-CLUTTER_EXPORT
-ClutterLayoutManager *          clutter_actor_get_layout_manager                (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_x_align                       (ClutterActor                *self,
-                                                                                 ClutterActorAlign            x_align);
-CLUTTER_EXPORT
-ClutterActorAlign               clutter_actor_get_x_align                       (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_y_align                       (ClutterActor                *self,
-                                                                                 ClutterActorAlign            y_align);
-CLUTTER_EXPORT
-ClutterActorAlign               clutter_actor_get_y_align                       (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_margin_top                    (ClutterActor                *self,
-                                                                                 gfloat                       margin);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_margin_top                    (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_margin_bottom                 (ClutterActor                *self,
-                                                                                 gfloat                       margin);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_margin_bottom                 (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_margin_left                   (ClutterActor                *self,
-                                                                                 gfloat                       margin);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_margin_left                   (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_margin_right                  (ClutterActor                *self,
-                                                                                 gfloat                       margin);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_margin_right                  (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_margin                        (ClutterActor                *self,
-                                                                                 const ClutterMargin         *margin);
-CLUTTER_EXPORT
-void                            clutter_actor_get_margin                        (ClutterActor                *self,
-                                                                                 ClutterMargin               *margin);
-CLUTTER_EXPORT
-void                            clutter_actor_set_x_expand                      (ClutterActor                *self,
-                                                                                 gboolean                     expand);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_x_expand                      (ClutterActor                *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_y_expand                      (ClutterActor                *self,
-                                                                                 gboolean                     expand);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_y_expand                      (ClutterActor                *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_needs_expand                      (ClutterActor                *self,
-                                                                                 ClutterOrientation           orientation);
-
-/* Paint */
-CLUTTER_EXPORT
-void                            clutter_actor_set_clip                          (ClutterActor                *self,
-                                                                                 gfloat                       xoff,
-                                                                                 gfloat                       yoff,
-                                                                                 gfloat                       width,
-                                                                                 gfloat                       height);
-CLUTTER_EXPORT
-void                            clutter_actor_remove_clip                       (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_clip                          (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_get_clip                          (ClutterActor               *self,
-                                                                                 gfloat                     *xoff,
-                                                                                 gfloat                     *yoff,
-                                                                                 gfloat                     *width,
-                                                                                 gfloat                     *height);
-CLUTTER_EXPORT
-void                            clutter_actor_set_clip_to_allocation            (ClutterActor               *self,
-                                                                                 gboolean                    clip_set);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_clip_to_allocation            (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_opacity                       (ClutterActor               *self,
-                                                                                 guint8                      opacity);
-CLUTTER_EXPORT
-guint8                          clutter_actor_get_opacity                       (ClutterActor               *self);
-CLUTTER_EXPORT
-guint8                          clutter_actor_get_paint_opacity                 (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_paint_visibility              (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_offscreen_redirect            (ClutterActor               *self,
-                                                                                 ClutterOffscreenRedirect    redirect);
-CLUTTER_EXPORT
-ClutterOffscreenRedirect        clutter_actor_get_offscreen_redirect            (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_should_pick                       (ClutterActor               *self,
-                                                                                 ClutterPickContext         *pick_context);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_in_clone_paint                 (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
-                                                                                 ClutterActorBox            *box);
-
-CLUTTER_EXPORT
-float                           clutter_actor_get_resource_scale                (ClutterActor *self);
-
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);
-
-/* Content */
-CLUTTER_EXPORT
-void                            clutter_actor_set_content                       (ClutterActor               *self,
-                                                                                 ClutterContent             *content);
-CLUTTER_EXPORT
-ClutterContent *                clutter_actor_get_content                       (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_content_gravity               (ClutterActor               *self,
-                                                                                 ClutterContentGravity       gravity);
-CLUTTER_EXPORT
-ClutterContentGravity           clutter_actor_get_content_gravity               (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_content_scaling_filters       (ClutterActor               *self,
-                                                                                 ClutterScalingFilter        min_filter,
-                                                                                 ClutterScalingFilter        mag_filter);
-CLUTTER_EXPORT
-void                            clutter_actor_get_content_scaling_filters       (ClutterActor               *self,
-                                                                                 ClutterScalingFilter       *min_filter,
-                                                                                 ClutterScalingFilter       *mag_filter);
-CLUTTER_EXPORT
-void                            clutter_actor_set_content_repeat                (ClutterActor               *self,
-                                                                                 ClutterContentRepeat        repeat);
-CLUTTER_EXPORT
-ClutterContentRepeat            clutter_actor_get_content_repeat                (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_get_content_box                   (ClutterActor               *self,
-                                                                                 ClutterActorBox            *box);
-CLUTTER_EXPORT
-void                            clutter_actor_set_background_color              (ClutterActor               *self,
-                                                                                 const ClutterColor         *color);
-CLUTTER_EXPORT
-void                            clutter_actor_get_background_color              (ClutterActor               *self,
-                                                                                 ClutterColor               *color);
-CLUTTER_EXPORT
-const ClutterPaintVolume *      clutter_actor_get_paint_volume                  (ClutterActor               *self);
-CLUTTER_EXPORT
-const ClutterPaintVolume *      clutter_actor_get_transformed_paint_volume      (ClutterActor               *self,
-                                                                                 ClutterActor               *relative_to_ancestor);
-CLUTTER_EXPORT
-const ClutterPaintVolume *      clutter_actor_get_default_paint_volume          (ClutterActor               *self);
-
-/* Events */
-CLUTTER_EXPORT
-void                            clutter_actor_set_reactive                      (ClutterActor               *actor,
-                                                                                 gboolean                    reactive);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_reactive                      (ClutterActor               *actor);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_key_focus                     (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_grab_key_focus                    (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_event                             (ClutterActor               *actor,
-                                                                                 const ClutterEvent         *event,
-                                                                                 gboolean                    capture);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_pointer                       (ClutterActor               *self);
-
-/* Text */
-CLUTTER_EXPORT
-PangoContext *                  clutter_actor_get_pango_context                 (ClutterActor               *self);
-CLUTTER_EXPORT
-PangoContext *                  clutter_actor_create_pango_context              (ClutterActor               *self);
-CLUTTER_EXPORT
-PangoLayout *                   clutter_actor_create_pango_layout               (ClutterActor               *self,
-                                                                                 const gchar                *text);
-CLUTTER_EXPORT
-void                            clutter_actor_set_text_direction                (ClutterActor               *self,
-                                                                                 ClutterTextDirection        text_dir);
-CLUTTER_EXPORT
-ClutterTextDirection            clutter_actor_get_text_direction                (ClutterActor               *self);
-
-/* Actor hierarchy */
-CLUTTER_EXPORT
-void                            clutter_actor_add_child                         (ClutterActor               *self,
-                                                                                 ClutterActor               *child);
-CLUTTER_EXPORT
-void                            clutter_actor_insert_child_at_index             (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 gint                        index_);
-CLUTTER_EXPORT
-void                            clutter_actor_insert_child_above                (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 ClutterActor               *sibling);
-CLUTTER_EXPORT
-void                            clutter_actor_insert_child_below                (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 ClutterActor               *sibling);
-CLUTTER_EXPORT
-void                            clutter_actor_replace_child                     (ClutterActor               *self,
-                                                                                 ClutterActor               *old_child,
-                                                                                 ClutterActor               *new_child);
-CLUTTER_EXPORT
-void                            clutter_actor_remove_child                      (ClutterActor               *self,
-                                                                                 ClutterActor               *child);
-CLUTTER_EXPORT
-void                            clutter_actor_remove_all_children               (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_destroy_all_children              (ClutterActor               *self);
-CLUTTER_EXPORT
-GList *                         clutter_actor_get_children                      (ClutterActor               *self);
-CLUTTER_EXPORT
-gint                            clutter_actor_get_n_children                    (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_child_at_index                (ClutterActor               *self,
-                                                                                 gint                        index_);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_previous_sibling              (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_next_sibling                  (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_first_child                   (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_last_child                    (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterActor *                  clutter_actor_get_parent                        (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_contains                          (ClutterActor               *self,
-                                                                                 ClutterActor               *descendant);
-CLUTTER_EXPORT
-ClutterActor*                   clutter_actor_get_stage                         (ClutterActor               *actor);
-CLUTTER_EXPORT
-void                            clutter_actor_set_child_below_sibling           (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 ClutterActor               *sibling);
-CLUTTER_EXPORT
-void                            clutter_actor_set_child_above_sibling           (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 ClutterActor               *sibling);
-CLUTTER_EXPORT
-void                            clutter_actor_set_child_at_index                (ClutterActor               *self,
-                                                                                 ClutterActor               *child,
-                                                                                 gint                        index_);
-CLUTTER_EXPORT
-void                            clutter_actor_iter_init                         (ClutterActorIter           *iter,
-                                                                                 ClutterActor               *root);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_iter_next                         (ClutterActorIter           *iter,
-                                                                                 ClutterActor              **child);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_iter_prev                         (ClutterActorIter           *iter,
-                                                                                 ClutterActor              **child);
-CLUTTER_EXPORT
-void                            clutter_actor_iter_remove                       (ClutterActorIter           *iter);
-CLUTTER_EXPORT
-void                            clutter_actor_iter_destroy                      (ClutterActorIter           *iter);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_iter_is_valid                     (const ClutterActorIter     *iter);
-
-/* Transformations */
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_rotated                        (ClutterActor               *self);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_is_scaled                         (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_pivot_point                   (ClutterActor               *self,
-                                                                                 gfloat                      pivot_x,
-                                                                                 gfloat                      pivot_y);
-CLUTTER_EXPORT
-void                            clutter_actor_get_pivot_point                   (ClutterActor               *self,
-                                                                                 gfloat                     *pivot_x,
-                                                                                 gfloat                     *pivot_y);
-CLUTTER_EXPORT
-void                            clutter_actor_set_pivot_point_z                 (ClutterActor               *self,
-                                                                                 gfloat                      pivot_z);
-CLUTTER_EXPORT
-gfloat                          clutter_actor_get_pivot_point_z                 (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_rotation_angle                (ClutterActor               *self,
-                                                                                 ClutterRotateAxis           axis,
-                                                                                 gdouble                     angle);
-CLUTTER_EXPORT
-gdouble                         clutter_actor_get_rotation_angle                (ClutterActor               *self,
-                                                                                 ClutterRotateAxis           axis);
-CLUTTER_EXPORT
-void                            clutter_actor_set_scale                         (ClutterActor               *self,
-                                                                                 gdouble                     scale_x,
-                                                                                 gdouble                     scale_y);
-CLUTTER_EXPORT
-void                            clutter_actor_get_scale                         (ClutterActor               *self,
-                                                                                 gdouble                    *scale_x,
-                                                                                 gdouble                    *scale_y);
-CLUTTER_EXPORT
-void                            clutter_actor_set_scale_z                       (ClutterActor               *self,
-                                                                                 gdouble                     scale_z);
-CLUTTER_EXPORT
-gdouble                         clutter_actor_get_scale_z                       (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_translation                   (ClutterActor               *self,
-                                                                                 gfloat                      translate_x,
-                                                                                 gfloat                      translate_y,
-                                                                                 gfloat                      translate_z);
-CLUTTER_EXPORT
-void                            clutter_actor_get_translation                   (ClutterActor               *self,
-                                                                                 gfloat                     *translate_x,
-                                                                                 gfloat                     *translate_y,
-                                                                                 gfloat                     *translate_z);
-CLUTTER_EXPORT
-void                            clutter_actor_set_transform                     (ClutterActor               *self,
-                                                                                 const graphene_matrix_t    *transform);
-CLUTTER_EXPORT
-void                            clutter_actor_get_transform                     (ClutterActor               *self,
-                                                                                 graphene_matrix_t          *transform);
-CLUTTER_EXPORT
-void                            clutter_actor_set_child_transform               (ClutterActor               *self,
-                                                                                 const graphene_matrix_t    *transform);
-CLUTTER_EXPORT
-void                            clutter_actor_get_child_transform               (ClutterActor               *self,
-                                                                                 graphene_matrix_t          *transform);
-
-CLUTTER_EXPORT
-void                            clutter_actor_get_transformed_extents          (ClutterActor               *self,
-                                                                                graphene_rect_t            *rect);
-
-CLUTTER_EXPORT
-void                            clutter_actor_get_transformed_position          (ClutterActor               *self,
-                                                                                 gfloat                     *x,
-                                                                                 gfloat                     *y);
-CLUTTER_EXPORT
-void                            clutter_actor_get_transformed_size              (ClutterActor               *self,
-                                                                                 gfloat                     *width,
-                                                                                 gfloat                     *height);
-CLUTTER_EXPORT
-gboolean                        clutter_actor_transform_stage_point             (ClutterActor               *self,
-                                                                                 gfloat                      x,
-                                                                                 gfloat                      y,
-                                                                                 gfloat                     *x_out,
-                                                                                 gfloat                     *y_out);
-CLUTTER_EXPORT
-void                            clutter_actor_get_abs_allocation_vertices       (ClutterActor               *self,
-                                                                                 graphene_point3d_t         *verts);
-CLUTTER_EXPORT
-void                            clutter_actor_apply_transform_to_point          (ClutterActor               *self,
-                                                                                 const graphene_point3d_t   *point,
-                                                                                 graphene_point3d_t         *vertex);
-CLUTTER_EXPORT
-void                            clutter_actor_apply_relative_transform_to_point (ClutterActor               *self,
-                                                                                 ClutterActor               *ancestor,
-                                                                                 const graphene_point3d_t   *point,
-                                                                                 graphene_point3d_t         *vertex);
-
-/* Implicit animations */
-CLUTTER_EXPORT
-void                            clutter_actor_save_easing_state                 (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_restore_easing_state              (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_easing_mode                   (ClutterActor               *self,
-                                                                                 ClutterAnimationMode        mode);
-CLUTTER_EXPORT
-ClutterAnimationMode            clutter_actor_get_easing_mode                   (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_easing_duration               (ClutterActor               *self,
-                                                                                 guint                       msecs);
-CLUTTER_EXPORT
-guint                           clutter_actor_get_easing_duration               (ClutterActor               *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_easing_delay                  (ClutterActor               *self,
-                                                                                 guint                       msecs);
-CLUTTER_EXPORT
-guint                           clutter_actor_get_easing_delay                  (ClutterActor               *self);
-CLUTTER_EXPORT
-ClutterTransition *             clutter_actor_get_transition                    (ClutterActor               *self,
-                                                                                 const char                 *name);
-CLUTTER_EXPORT
-void                            clutter_actor_add_transition                    (ClutterActor               *self,
-                                                                                 const char                 *name,
-                                                                                 ClutterTransition          *transition);
-CLUTTER_EXPORT
-void                            clutter_actor_remove_transition                 (ClutterActor               *self,
-                                                                                 const char                 *name);
-CLUTTER_EXPORT
-void                            clutter_actor_remove_all_transitions            (ClutterActor               *self);
-
-
-CLUTTER_EXPORT
-gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
-CLUTTER_EXPORT
-void                            clutter_actor_set_opacity_override              (ClutterActor               *self,
-                                                                                 gint                        opacity);
-CLUTTER_EXPORT
-gint                            clutter_actor_get_opacity_override              (ClutterActor               *self);
-
-CLUTTER_EXPORT
-void                            clutter_actor_inhibit_culling                   (ClutterActor               *actor);
-CLUTTER_EXPORT
-void                            clutter_actor_uninhibit_culling                 (ClutterActor               *actor);
-
-/**
- * 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_EXPORT
-void                            clutter_actor_bind_model                        (ClutterActor               *self,
-                                                                                 GListModel                 *model,
-                                                                                 ClutterActorCreateChildFunc create_child_func,
-                                                                                 gpointer                    user_data,
-                                                                                 GDestroyNotify              notify);
-CLUTTER_EXPORT
-void                            clutter_actor_bind_model_with_properties        (ClutterActor               *self,
-                                                                                 GListModel                 *model,
-                                                                                 GType                       child_type,
-                                                                                 const char                 *first_model_property,
-                                                                                 ...);
-
-CLUTTER_EXPORT
-void clutter_actor_pick_box (ClutterActor          *self,
-                             ClutterPickContext    *pick_context,
-                             const ClutterActorBox *box);
-
-CLUTTER_EXPORT
-GList * clutter_actor_peek_stage_views (ClutterActor *self);
-
-CLUTTER_EXPORT
-void clutter_actor_invalidate_transform (ClutterActor *self);
-
-CLUTTER_EXPORT
-void clutter_actor_invalidate_paint_volume (ClutterActor *self);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_ACTOR_H__ */
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@ -1,640 +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
- */
-
-#include "clutter-build-config.h"
-
-#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;
-  graphene_point_t pivot;
-  gfloat factor;
-};
-
-struct _ClutterAlignConstraintClass
-{
-  ClutterConstraintClass parent_class;
-};
-
-enum
-{
-  PROP_0,
-
-  PROP_SOURCE,
-  PROP_ALIGN_AXIS,
-  PROP_PIVOT_POINT,
-  PROP_FACTOR,
-
-  PROP_LAST
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-G_DEFINE_TYPE (ClutterAlignConstraint,
-               clutter_align_constraint,
-               CLUTTER_TYPE_CONSTRAINT);
-
-static void
-source_queue_relayout (ClutterActor           *actor,
-                       ClutterAlignConstraint *align)
-{
-  if (align->actor != NULL)
-    _clutter_actor_queue_only_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 offset_x_start, offset_y_start;
-  gfloat pivot_x, pivot_y;
-
-  if (align->source == NULL)
-    return;
-
-  clutter_actor_box_get_size (allocation, &actor_width, &actor_height);
-
-  clutter_actor_get_size (align->source, &source_width, &source_height);
-
-  pivot_x = align->pivot.x == -1.f
-    ? align->factor
-    : align->pivot.x;
-  pivot_y = align->pivot.y == -1.f
-    ? align->factor
-    : align->pivot.y;
-
-  offset_x_start = pivot_x * -actor_width;
-  offset_y_start = pivot_y * -actor_height;
-
-  switch (align->align_axis)
-    {
-    case CLUTTER_ALIGN_X_AXIS:
-      allocation->x1 += offset_x_start + (source_width * align->factor);
-      allocation->x2 = allocation->x1 + actor_width;
-      break;
-
-    case CLUTTER_ALIGN_Y_AXIS:
-      allocation->y1 += offset_y_start + (source_height * align->factor);
-      allocation->y2 = allocation->y1 + actor_height;
-      break;
-
-    case CLUTTER_ALIGN_BOTH:
-      allocation->x1 += offset_x_start + (source_width * align->factor);
-      allocation->y1 += offset_y_start + (source_height * align->factor);
-      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_queue_relayout),
-                                            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_PIVOT_POINT:
-      clutter_align_constraint_set_pivot_point (align, g_value_get_boxed (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_PIVOT_POINT:
-      {
-        graphene_point_t point;
-
-        clutter_align_constraint_get_pivot_point (align, &point);
-
-        g_value_set_boxed (value, &point);
-      }
-      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:pivot-point:
-   *
-   * The pivot point used by the constraint. The pivot point is the
-   * point in the constraint actor around which the aligning is applied,
-   * with (0, 0) being the top left corner of the actor and (1, 1) the
-   * bottom right corner of the actor.
-   *
-   * For example, setting the pivot point to (0.5, 0.5) and using a factor
-   * of 1 for both axes will align the actors horizontal and vertical
-   * center point with the bottom right corner of the source actor.
-   *
-   * By default, the pivot point is set to (-1, -1), which means it's not
-   * used and the constrained actor will be aligned to always stay inside
-   * the source actor.
-   */
-  obj_props[PROP_PIVOT_POINT] =
-    g_param_spec_boxed ("pivot-point",
-                       P_("Pivot point"),
-                       P_("The pivot point"),
-                       GRAPHENE_TYPE_POINT,
-                       G_PARAM_READWRITE |
-                       G_PARAM_STATIC_STRINGS);
-
-  /**
-   * 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->pivot.x = -1.f;
-  self->pivot.y = -1.f;
-  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_queue_relayout),
-                                            align);
-    }
-
-  align->source = source;
-  if (align->source != NULL)
-    {
-      g_signal_connect (align->source, "queue-relayout",
-                        G_CALLBACK (source_queue_relayout),
-                        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_pivot_point:
- * @align: a #ClutterAlignConstraint
- * @pivot_point: A #GraphenePoint
- *
- * Sets the pivot point used by the constraint, the pivot point is the
- * point in the constraint actor around which the aligning is applied,
- * with (0, 0) being the top left corner of the actor and (1, 1) the
- * bottom right corner of the actor.
- *
- * If -1 is used, the pivot point is unset and the constrained actor
- * will be aligned to always stay inside the source actor.
- */
-void
-clutter_align_constraint_set_pivot_point (ClutterAlignConstraint *align,
-                                          const graphene_point_t *pivot_point)
-{
-  g_return_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align));
-  g_return_if_fail (pivot_point != NULL);
-  g_return_if_fail (pivot_point->x == -1.f ||
-                    (pivot_point->x >= 0.f && pivot_point->x <= 1.f));
-  g_return_if_fail (pivot_point->y == -1.f ||
-                    (pivot_point->y >= 0.f && pivot_point->y <= 1.f));
-
-  if (graphene_point_equal (&align->pivot, pivot_point))
-    return;
-
-  align->pivot = *pivot_point;
-
-  if (align->actor != NULL)
-    clutter_actor_queue_relayout (align->actor);
-
-  g_object_notify_by_pspec (G_OBJECT (align), obj_props[PROP_PIVOT_POINT]);
-}
-
-/**
- * clutter_align_constraint_get_pivot_point
- * @align: a #ClutterAlignConstraint
- * @pivot_point: (out caller-allocates): return location for a #GraphenePoint
- *
- * Gets the pivot point used by the constraint set with
- * clutter_align_constraint_set_pivot_point(). If no custom pivot
- * point is set, -1 is set.
- */
-void
-clutter_align_constraint_get_pivot_point (ClutterAlignConstraint *align,
-                                          graphene_point_t       *pivot_point)
-{
-  g_return_if_fail (CLUTTER_IS_ALIGN_CONSTRAINT (align));
-  g_return_if_fail (pivot_point != NULL);
-
-  *pivot_point = align->pivot;
-}
-
-/**
- * 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,83 +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_EXPORT
-GType clutter_align_constraint_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterConstraint *clutter_align_constraint_new            (ClutterActor           *source,
-                                                            ClutterAlignAxis        axis,
-                                                            gfloat                  factor);
-
-CLUTTER_EXPORT
-void               clutter_align_constraint_set_source     (ClutterAlignConstraint *align,
-                                                            ClutterActor           *source);
-CLUTTER_EXPORT
-ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *align);
-CLUTTER_EXPORT
-void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
-                                                            ClutterAlignAxis        axis);
-CLUTTER_EXPORT
-ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align);
-CLUTTER_EXPORT
-void               clutter_align_constraint_set_pivot_point (ClutterAlignConstraint *align,
-                                                             const graphene_point_t *pivot_point);
-CLUTTER_EXPORT
-void               clutter_align_constraint_get_pivot_point (ClutterAlignConstraint *align,
-                                                             graphene_point_t       *pivot_point);
-CLUTTER_EXPORT
-void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *align,
-                                                            gfloat                  factor);
-CLUTTER_EXPORT
-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,218 +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 an actor will animate a property.
- *
- * Each #ClutterAnimatable should implement the
- * #ClutterAnimatableInterface.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.
- *
- * #ClutterAnimatable is available since Clutter 1.0
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-animatable.h"
-#include "clutter-interval.h"
-#include "clutter-debug.h"
-#include "clutter-private.h"
-
-G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
-
-static void
-clutter_animatable_default_init (ClutterAnimatableInterface *iface)
-{
-}
-
-/**
- * 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)
-{
-  ClutterAnimatableInterface *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)
-{
-  ClutterAnimatableInterface *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)
-{
-  ClutterAnimatableInterface *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)
-{
-  ClutterAnimatableInterface *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);
-}
-
-/**
- * clutter_animatable_get_actor:
- * @animatable: a #ClutterAnimatable
- *
- * Get animated actor.
- *
- * Return value: (transfer none): a #ClutterActor
- */
-ClutterActor *
-clutter_animatable_get_actor (ClutterAnimatable *animatable)
-{
-  ClutterAnimatableInterface *iface;
-
-  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), NULL);
-
-  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
-
-  g_return_val_if_fail (iface->get_actor, NULL);
-
-  return iface->get_actor (animatable);
-}
--- a/clutter/clutter/clutter-animatable.h
+++ b/clutter/clutter/clutter-animatable.h
@ -1,102 +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 ())
-
-CLUTTER_EXPORT
-G_DECLARE_INTERFACE (ClutterAnimatable, clutter_animatable,
-                     CLUTTER, ANIMATABLE,
-                     GObject)
-
-/**
- * ClutterAnimatableInterface:
- * @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
- * @get_actor: virtual function for getting associated actor
- *
- * Since: 1.0
- */
-struct _ClutterAnimatableInterface
-{
-  /*< private >*/
-  GTypeInterface parent_iface;
-
-  /*< public >*/
-  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);
-  ClutterActor * (* get_actor)      (ClutterAnimatable *animatable);
-};
-
-CLUTTER_EXPORT
-GParamSpec *clutter_animatable_find_property     (ClutterAnimatable *animatable,
-                                                  const gchar       *property_name);
-CLUTTER_EXPORT
-void        clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
-                                                  const gchar       *property_name,
-                                                  GValue            *value);
-CLUTTER_EXPORT
-void        clutter_animatable_set_final_state   (ClutterAnimatable *animatable,
-                                                  const gchar       *property_name,
-                                                  const GValue      *value);
-CLUTTER_EXPORT
-gboolean    clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
-                                                  const gchar       *property_name,
-                                                  ClutterInterval   *interval,
-                                                  gdouble            progress,
-                                                  GValue            *value);
-
-CLUTTER_EXPORT
-ClutterActor * clutter_animatable_get_actor      (ClutterAnimatable *animatable);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_ANIMATABLE_H__ */
--- a/clutter/clutter/clutter-autocleanups.h
+++ b/clutter/clutter/clutter-autocleanups.h
@ -1,93 +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 (ClutterActor, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAlignConstraint, 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 (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 (ClutterDeformEffect, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, 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 (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 (ClutterPaintContext, clutter_paint_context_unref)
-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)
-
-#endif /* __GI_SCANNER__ */
-
-#endif /* __CLUTTER_AUTO_CLEANUPS_H__ */
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@ -1,147 +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-seat.h>
-#include <clutter/clutter-stage-window.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;
-
-  cairo_font_options_t *font_options;
-
-  gchar *font_name;
-
-  gfloat units_per_em;
-  gint32 units_serial;
-
-  float fallback_resource_scale;
-
-  ClutterStageWindow *stage_window;
-
-  ClutterInputMethod *input_method;
-};
-
-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_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);
-
-  gboolean              (* translate_event)    (ClutterBackend     *backend,
-                                                gpointer            native,
-                                                ClutterEvent       *event);
-
-  ClutterSeat *         (* get_default_seat)   (ClutterBackend *backend);
-
-  gboolean              (* is_display_server)  (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);
-
-CLUTTER_EXPORT
-gboolean                _clutter_backend_translate_event                (ClutterBackend         *backend,
-                                                                         gpointer                native,
-                                                                         ClutterEvent           *event);
-
-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);
-
-void                    clutter_set_allowed_drivers                     (const char             *drivers);
-
-CLUTTER_EXPORT
-ClutterStageWindow *    clutter_backend_get_stage_window                (ClutterBackend         *backend);
-
-CLUTTER_EXPORT
-void clutter_backend_set_fallback_resource_scale (ClutterBackend *backend,
-                                                  float           fallback_resource_scale);
-
-float clutter_backend_get_fallback_resource_scale (ClutterBackend *backend);
-
-gboolean clutter_backend_is_display_server (ClutterBackend *backend);
-
-CLUTTER_EXPORT
-void clutter_backend_destroy (ClutterBackend *backend);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_BACKEND_PRIVATE_H__ */
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@ -1,884 +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 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/>.
- */
-
-/**
- * SECTION:clutter-backend
- * @short_description: Backend abstraction
- *
- * Clutter can be compiled against different backends. Each backend
- * has to implement a set of functions, in order to be used by Clutter.
- *
- * #ClutterBackend is the base class abstracting the various implementation;
- * it provides a basic API to query the backend for generic information
- * and settings.
- *
- * #ClutterBackend is available since Clutter 0.4
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-backend-private.h"
-#include "clutter-debug.h"
-#include "clutter-event-private.h"
-#include "clutter-marshal.h"
-#include "clutter-mutter.h"
-#include "clutter-private.h"
-#include "clutter-stage-manager-private.h"
-#include "clutter-stage-private.h"
-#include "clutter-stage-window.h"
-
-#include <cogl/cogl.h>
-
-#define DEFAULT_FONT_NAME       "Sans 10"
-
-enum
-{
-  RESOLUTION_CHANGED,
-  FONT_CHANGED,
-  SETTINGS_CHANGED,
-
-  LAST_SIGNAL
-};
-
-G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT)
-
-static guint backend_signals[LAST_SIGNAL] = { 0, };
-
-static void
-clutter_backend_dispose (GObject *gobject)
-{
-  ClutterBackend *backend = CLUTTER_BACKEND (gobject);
-
-  /* clear the events still in the queue of the main context */
-  _clutter_clear_events_queue ();
-
-  g_clear_object (&backend->dummy_onscreen);
-  if (backend->stage_window)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (backend->stage_window),
-                                    (gpointer *) &backend->stage_window);
-      backend->stage_window = NULL;
-    }
-
-  g_clear_pointer (&backend->cogl_source, g_source_destroy);
-  g_clear_pointer (&backend->font_name, g_free);
-  g_clear_pointer (&backend->font_options, cairo_font_options_destroy);
-  g_clear_object (&backend->input_method);
-
-  G_OBJECT_CLASS (clutter_backend_parent_class)->dispose (gobject);
-}
-
-static gfloat
-get_units_per_em (ClutterBackend       *backend,
-                  PangoFontDescription *font_desc)
-{
-  gfloat units_per_em = -1.0;
-  gboolean free_font_desc = FALSE;
-  gdouble dpi;
-
-  dpi = clutter_backend_get_resolution (backend);
-
-  if (font_desc == NULL)
-    {
-      ClutterSettings *settings;
-      gchar *font_name = NULL;
-
-      settings = clutter_settings_get_default ();
-      g_object_get (settings, "font-name", &font_name, NULL);
-
-      if (G_LIKELY (font_name != NULL && *font_name != '\0'))
-        {
-          font_desc = pango_font_description_from_string (font_name);
-          free_font_desc = TRUE;
-
-          g_free (font_name);
-        }
-    }
-
-  if (font_desc != NULL)
-    {
-      gdouble font_size = 0;
-      gint pango_size;
-      gboolean is_absolute;
-
-      pango_size = pango_font_description_get_size (font_desc);
-      is_absolute = pango_font_description_get_size_is_absolute (font_desc);
-
-      /* "absolute" means "device units" (usually, pixels); otherwise,
-       * it means logical units (points)
-       */
-      if (is_absolute)
-        font_size = (gdouble) pango_size / PANGO_SCALE;
-      else
-        font_size = dpi * ((gdouble) pango_size / PANGO_SCALE) / 72.0f;
-
-      /* 10 points at 96 DPI is 13.3 pixels */
-      units_per_em = (1.2f * font_size) * dpi / 96.0f;
-    }
-  else
-    units_per_em = -1.0f;
-
-  if (free_font_desc)
-    pango_font_description_free (font_desc);
-
-  return units_per_em;
-}
-
-static void
-clutter_backend_real_resolution_changed (ClutterBackend *backend)
-{
-  ClutterMainContext *context;
-  ClutterSettings *settings;
-  gdouble resolution;
-  gint dpi;
-
-  settings = clutter_settings_get_default ();
-  g_object_get (settings, "font-dpi", &dpi, NULL);
-
-  if (dpi < 0)
-    resolution = 96.0;
-  else
-    resolution = dpi / 1024.0;
-
-  context = _clutter_context_get_default ();
-  if (context->font_map != NULL)
-    cogl_pango_font_map_set_resolution (context->font_map, resolution);
-
-  backend->units_per_em = get_units_per_em (backend, NULL);
-  backend->units_serial += 1;
-
-  CLUTTER_NOTE (BACKEND, "Units per em: %.2f", backend->units_per_em);
-}
-
-static void
-clutter_backend_real_font_changed (ClutterBackend *backend)
-{
-  backend->units_per_em = get_units_per_em (backend, NULL);
-  backend->units_serial += 1;
-
-  CLUTTER_NOTE (BACKEND, "Units per em: %.2f", backend->units_per_em);
-}
-
-static gboolean
-clutter_backend_do_real_create_context (ClutterBackend  *backend,
-                                        CoglDriver       driver_id,
-                                        GError         **error)
-{
-  ClutterBackendClass *klass;
-  CoglSwapChain *swap_chain;
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-
-  swap_chain = NULL;
-
-  CLUTTER_NOTE (BACKEND, "Creating Cogl renderer");
-  backend->cogl_renderer = klass->get_renderer (backend, error);
-
-  if (backend->cogl_renderer == NULL)
-    goto error;
-
-  CLUTTER_NOTE (BACKEND, "Connecting the renderer");
-  cogl_renderer_set_driver (backend->cogl_renderer, driver_id);
-  if (!cogl_renderer_connect (backend->cogl_renderer, error))
-    goto error;
-
-  CLUTTER_NOTE (BACKEND, "Creating Cogl swap chain");
-  swap_chain = cogl_swap_chain_new ();
-
-  CLUTTER_NOTE (BACKEND, "Creating Cogl display");
-  if (klass->get_display != NULL)
-    {
-      backend->cogl_display = klass->get_display (backend,
-                                                  backend->cogl_renderer,
-                                                  swap_chain,
-                                                  error);
-    }
-  else
-    {
-      CoglOnscreenTemplate *tmpl;
-      gboolean res;
-
-      tmpl = cogl_onscreen_template_new (swap_chain);
-
-      /* XXX: I have some doubts that this is a good design.
-       *
-       * Conceptually should we be able to check an onscreen_template
-       * without more details about the CoglDisplay configuration?
-       */
-      res = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
-                                                   tmpl,
-                                                   error);
-
-      if (!res)
-        goto error;
-
-      backend->cogl_display = cogl_display_new (backend->cogl_renderer, tmpl);
-
-      /* the display owns the template */
-      cogl_object_unref (tmpl);
-    }
-
-  if (backend->cogl_display == NULL)
-    goto error;
-
-  CLUTTER_NOTE (BACKEND, "Setting up the display");
-  if (!cogl_display_setup (backend->cogl_display, error))
-    goto error;
-
-  CLUTTER_NOTE (BACKEND, "Creating the Cogl context");
-  backend->cogl_context = cogl_context_new (backend->cogl_display, error);
-  if (backend->cogl_context == NULL)
-    goto error;
-
-  /* the display owns the renderer and the swap chain */
-  cogl_object_unref (backend->cogl_renderer);
-  cogl_object_unref (swap_chain);
-
-  return TRUE;
-
-error:
-  if (backend->cogl_display != NULL)
-    {
-      cogl_object_unref (backend->cogl_display);
-      backend->cogl_display = NULL;
-    }
-
-  if (backend->cogl_renderer != NULL)
-    {
-      cogl_object_unref (backend->cogl_renderer);
-      backend->cogl_renderer = NULL;
-    }
-
-  if (swap_chain != NULL)
-    cogl_object_unref (swap_chain);
-
-  return FALSE;
-}
-
-static const struct {
-  const char *driver_name;
-  const char *driver_desc;
-  CoglDriver driver_id;
-} all_known_drivers[] = {
-  { "gl3", "OpenGL 3.2 core profile", COGL_DRIVER_GL3 },
-  { "gl", "OpenGL legacy profile", COGL_DRIVER_GL },
-  { "gles2", "OpenGL ES 2.0", COGL_DRIVER_GLES2 },
-  { "any", "Default Cogl driver", COGL_DRIVER_ANY },
-};
-
-static const char *allowed_drivers;
-
-static gboolean
-clutter_backend_real_create_context (ClutterBackend  *backend,
-                                     GError         **error)
-{
-  GError *internal_error = NULL;
-  const char *drivers_list;
-  char **known_drivers;
-  gboolean allow_any;
-  int i;
-
-  if (backend->cogl_context != NULL)
-    return TRUE;
-
-  if (allowed_drivers == NULL)
-    allowed_drivers = CLUTTER_DRIVERS;
-
-  allow_any = strstr (allowed_drivers, "*") != NULL;
-
-  drivers_list = g_getenv ("CLUTTER_DRIVER");
-  if (drivers_list == NULL)
-    drivers_list = allowed_drivers;
-
-  known_drivers = g_strsplit (drivers_list, ",", 0);
-
-  for (i = 0; backend->cogl_context == NULL && known_drivers[i] != NULL; i++)
-    {
-      const char *driver_name = known_drivers[i];
-      gboolean is_any = g_str_equal (driver_name, "*");
-      int j;
-
-      for (j = 0; j < G_N_ELEMENTS (all_known_drivers); j++)
-        {
-          if (!allow_any && !is_any && !strstr (driver_name, all_known_drivers[j].driver_name))
-            continue;
-
-          if ((allow_any && is_any) ||
-              (is_any && strstr (allowed_drivers, all_known_drivers[j].driver_name)) ||
-              g_str_equal (all_known_drivers[j].driver_name, driver_name))
-            {
-              CLUTTER_NOTE (BACKEND, "Checking for the %s driver", all_known_drivers[j].driver_desc);
-
-              if (clutter_backend_do_real_create_context (backend, all_known_drivers[j].driver_id, &internal_error))
-                break;
-
-              if (internal_error)
-                {
-                  CLUTTER_NOTE (BACKEND, "Unable to use the %s driver: %s",
-                                all_known_drivers[j].driver_desc,
-                                internal_error->message);
-                  g_clear_error (&internal_error);
-                }
-            }
-        }
-    }
-
-  g_strfreev (known_drivers);
-
-  if (backend->cogl_context == NULL)
-    {
-      if (internal_error != NULL)
-        g_propagate_error (error, internal_error);
-      else
-        g_set_error_literal (error, CLUTTER_INIT_ERROR,
-                             CLUTTER_INIT_ERROR_BACKEND,
-                             "Unable to initialize the Clutter backend: no available drivers found.");
-
-      return FALSE;
-    }
-
-  backend->cogl_source = cogl_glib_source_new (backend->cogl_context, G_PRIORITY_DEFAULT);
-  g_source_attach (backend->cogl_source, NULL);
-
-  return TRUE;
-}
-
-static ClutterFeatureFlags
-clutter_backend_real_get_features (ClutterBackend *backend)
-{
-  ClutterFeatureFlags flags = 0;
-
-  if (cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_MULTIPLE_ONSCREEN))
-    {
-      CLUTTER_NOTE (BACKEND, "Cogl supports multiple onscreen framebuffers");
-      flags |= CLUTTER_FEATURE_STAGE_MULTIPLE;
-    }
-  else
-    {
-      CLUTTER_NOTE (BACKEND, "Cogl only supports one onscreen framebuffer");
-      flags |= CLUTTER_FEATURE_STAGE_STATIC;
-    }
-
-  if (cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT))
-    {
-      CLUTTER_NOTE (BACKEND, "Cogl supports swap buffers complete events");
-      flags |= CLUTTER_FEATURE_SWAP_EVENTS;
-    }
-
-  return flags;
-}
-
-static ClutterBackend * (* custom_backend_func) (void);
-
-void
-clutter_set_custom_backend_func (ClutterBackend *(* func) (void))
-{
-  custom_backend_func = func;
-}
-
-ClutterBackend *
-_clutter_create_backend (void)
-{
-  ClutterBackend *retval;
-
-  g_return_val_if_fail (custom_backend_func, NULL);
-
-  retval = custom_backend_func ();
-  if (!retval)
-    g_error ("Failed to create custom backend.");
-
-  return retval;
-}
-
-static void
-clutter_backend_class_init (ClutterBackendClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = clutter_backend_dispose;
-
-  /**
-   * ClutterBackend::resolution-changed:
-   * @backend: the #ClutterBackend that emitted the signal
-   *
-   * The ::resolution-changed signal is emitted each time the font
-   * resolutions has been changed through #ClutterSettings.
-   *
-   * Since: 1.0
-   */
-  backend_signals[RESOLUTION_CHANGED] =
-    g_signal_new (I_("resolution-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (ClutterBackendClass, resolution_changed),
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
-  /**
-   * ClutterBackend::font-changed:
-   * @backend: the #ClutterBackend that emitted the signal
-   *
-   * The ::font-changed signal is emitted each time the font options
-   * have been changed through #ClutterSettings.
-   *
-   * Since: 1.0
-   */
-  backend_signals[FONT_CHANGED] =
-    g_signal_new (I_("font-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (ClutterBackendClass, font_changed),
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
-  /**
-   * ClutterBackend::settings-changed:
-   * @backend: the #ClutterBackend that emitted the signal
-   *
-   * The ::settings-changed signal is emitted each time the #ClutterSettings
-   * properties have been changed.
-   *
-   * Since: 1.4
-   */
-  backend_signals[SETTINGS_CHANGED] =
-    g_signal_new (I_("settings-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (ClutterBackendClass, settings_changed),
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
-  klass->resolution_changed = clutter_backend_real_resolution_changed;
-  klass->font_changed = clutter_backend_real_font_changed;
-
-  klass->create_context = clutter_backend_real_create_context;
-  klass->get_features = clutter_backend_real_get_features;
-}
-
-static void
-clutter_backend_init (ClutterBackend *self)
-{
-  self->units_per_em = -1.0;
-  self->units_serial = 1;
-
-  self->dummy_onscreen = NULL;
-
-  self->fallback_resource_scale = 1.f;
-}
-
-void
-_clutter_backend_add_options (ClutterBackend *backend,
-                              GOptionGroup   *group)
-{
-  ClutterBackendClass *klass;
-
-  g_assert (CLUTTER_IS_BACKEND (backend));
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->add_options)
-    klass->add_options (backend, group);
-}
-
-gboolean
-_clutter_backend_pre_parse (ClutterBackend  *backend,
-                            GError         **error)
-{
-  ClutterBackendClass *klass;
-
-  g_assert (CLUTTER_IS_BACKEND (backend));
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->pre_parse)
-    return klass->pre_parse (backend, error);
-
-  return TRUE;
-}
-
-gboolean
-_clutter_backend_post_parse (ClutterBackend  *backend,
-                             GError         **error)
-{
-  ClutterBackendClass *klass;
-
-  g_assert (CLUTTER_IS_BACKEND (backend));
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->post_parse)
-    return klass->post_parse (backend, error);
-
-  return TRUE;
-}
-
-ClutterStageWindow *
-_clutter_backend_create_stage (ClutterBackend  *backend,
-                               ClutterStage    *wrapper,
-                               GError         **error)
-{
-  ClutterBackendClass *klass;
-  ClutterStageWindow *stage_window;
-
-  g_assert (CLUTTER_IS_BACKEND (backend));
-  g_assert (CLUTTER_IS_STAGE (wrapper));
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->create_stage != NULL)
-    stage_window = klass->create_stage (backend, wrapper, error);
-  else
-    stage_window = NULL;
-
-  if (stage_window == NULL)
-    return NULL;
-
-  g_assert (CLUTTER_IS_STAGE_WINDOW (stage_window));
-
-  backend->stage_window = stage_window;
-  g_object_add_weak_pointer (G_OBJECT (backend->stage_window),
-                             (gpointer *) &backend->stage_window);
-
-  return stage_window;
-}
-
-gboolean
-_clutter_backend_create_context (ClutterBackend  *backend,
-                                 GError         **error)
-{
-  ClutterBackendClass *klass;
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-
-  return klass->create_context (backend, error);
-}
-
-ClutterFeatureFlags
-_clutter_backend_get_features (ClutterBackend *backend)
-{
-  ClutterBackendClass *klass;
-  GError *error;
-
-  g_assert (CLUTTER_IS_BACKEND (backend));
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-
-  /* we need to have a context here; so we create the
-   * GL context first and the ask for features. if the
-   * context already exists this should be a no-op
-   */
-  error = NULL;
-  if (klass->create_context != NULL)
-    {
-      gboolean res;
-
-      res = klass->create_context (backend, &error);
-      if (!res)
-        {
-          if (error)
-            {
-              g_critical ("Unable to create a context: %s", error->message);
-              g_error_free (error);
-            }
-          else
-            g_critical ("Unable to create a context: unknown error");
-
-          return 0;
-        }
-    }
-
-  if (klass->get_features)
-    return klass->get_features (backend);
-  
-  return 0;
-}
-
-gfloat
-_clutter_backend_get_units_per_em (ClutterBackend       *backend,
-                                   PangoFontDescription *font_desc)
-{
-  /* recompute for the font description, but do not cache the result */
-  if (font_desc != NULL)
-    return get_units_per_em (backend, font_desc);
-
-  if (backend->units_per_em < 0)
-    backend->units_per_em = get_units_per_em (backend, NULL);
-
-  return backend->units_per_em;
-}
-
-/**
- * clutter_get_default_backend:
- *
- * Retrieves the default #ClutterBackend used by Clutter. The
- * #ClutterBackend holds backend-specific configuration options.
- *
- * Return value: (transfer none): the default backend. You should
- *   not ref or unref the returned object. Applications should rarely
- *   need to use this.
- *
- * Since: 0.4
- */
-ClutterBackend *
-clutter_get_default_backend (void)
-{
-  ClutterMainContext *clutter_context;
-
-  clutter_context = _clutter_context_get_default ();
-
-  return clutter_context->backend;
-}
-
-/**
- * clutter_backend_get_resolution:
- * @backend: a #ClutterBackend
- *
- * Gets the resolution for font handling on the screen.
- *
- * The resolution is a scale factor between points specified in a
- * #PangoFontDescription and cairo units. The default value is 96.0,
- * meaning that a 10 point font will be 13 units
- * high (10 * 96. / 72. = 13.3).
- *
- * Clutter will set the resolution using the current backend when
- * initializing; the resolution is also stored in the
- * #ClutterSettings:font-dpi property.
- *
- * Return value: the current resolution, or -1 if no resolution
- *   has been set.
- *
- * Since: 0.4
- */
-gdouble
-clutter_backend_get_resolution (ClutterBackend *backend)
-{
-  ClutterSettings *settings;
-  gint resolution;
-
-  g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), -1.0);
-
-  settings = clutter_settings_get_default ();
-  g_object_get (settings, "font-dpi", &resolution, NULL);
-
-  if (resolution < 0)
-    return 96.0;
-
-  return resolution / 1024.0;
-}
-
-/**
- * clutter_backend_set_font_options:
- * @backend: a #ClutterBackend
- * @options: Cairo font options for the backend, or %NULL
- *
- * Sets the new font options for @backend. The #ClutterBackend will
- * copy the #cairo_font_options_t.
- *
- * If @options is %NULL, the first following call to
- * clutter_backend_get_font_options() will return the default font
- * options for @backend.
- *
- * This function is intended for actors creating a Pango layout
- * using the PangoCairo API.
- *
- * Since: 0.8
- */
-void
-clutter_backend_set_font_options (ClutterBackend             *backend,
-                                  const cairo_font_options_t *options)
-{
-  g_return_if_fail (CLUTTER_IS_BACKEND (backend));
-
-  if (backend->font_options != options)
-    {
-      if (backend->font_options)
-        cairo_font_options_destroy (backend->font_options);
-
-      if (options)
-        backend->font_options = cairo_font_options_copy (options);
-      else
-        backend->font_options = NULL;
-
-      g_signal_emit (backend, backend_signals[FONT_CHANGED], 0);
-    }
-}
-
-/**
- * clutter_backend_get_font_options:
- * @backend: a #ClutterBackend
- *
- * Retrieves the font options for @backend.
- *
- * Return value: (transfer none): the font options of the #ClutterBackend.
- *   The returned #cairo_font_options_t is owned by the backend and should
- *   not be modified or freed
- *
- * Since: 0.8
- */
-const cairo_font_options_t *
-clutter_backend_get_font_options (ClutterBackend *backend)
-{
-  g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL);
-
-  if (G_LIKELY (backend->font_options))
-    return backend->font_options;
-
-  backend->font_options = cairo_font_options_create ();
-
-  cairo_font_options_set_hint_style (backend->font_options, CAIRO_HINT_STYLE_NONE);
-  cairo_font_options_set_subpixel_order (backend->font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
-  cairo_font_options_set_antialias (backend->font_options, CAIRO_ANTIALIAS_DEFAULT);
-
-  g_signal_emit (backend, backend_signals[FONT_CHANGED], 0);
-
-  return backend->font_options;
-}
-
-gint32
-_clutter_backend_get_units_serial (ClutterBackend *backend)
-{
-  return backend->units_serial;
-}
-
-gboolean
-_clutter_backend_translate_event (ClutterBackend *backend,
-                                  gpointer        native,
-                                  ClutterEvent   *event)
-{
-  return CLUTTER_BACKEND_GET_CLASS (backend)->translate_event (backend,
-                                                               native,
-                                                               event);
-}
-
-/**
- * clutter_backend_get_cogl_context: (skip)
- * @backend: a #ClutterBackend
- *
- * Retrieves the #CoglContext associated with the given clutter
- * @backend. A #CoglContext is required when using some of the
- * experimental 2.0 Cogl API.
- *
- * Since CoglContext is itself experimental API this API should
- * be considered experimental too.
- *
- * This API is not yet supported on OSX because OSX still
- * uses the stub Cogl winsys and the Clutter backend doesn't
- * explicitly create a CoglContext.
- *
- * Return value: (transfer none): The #CoglContext associated with @backend.
- *
- * Since: 1.8
- * Stability: unstable
- */
-CoglContext *
-clutter_backend_get_cogl_context (ClutterBackend *backend)
-{
-  return backend->cogl_context;
-}
-
-void
-clutter_set_allowed_drivers (const char *drivers)
-{
-  if (_clutter_context_is_initialized ())
-    {
-      g_warning ("Clutter has already been initialized.\n");
-      return;
-    }
-
-  allowed_drivers = g_strdup (drivers);
-}
-
-/**
- * clutter_backend_get_input_method:
- * @backend: the #CLutterBackend
- *
- * Returns the input method used by Clutter
- *
- * Returns: (transfer none): the input method
- **/
-ClutterInputMethod *
-clutter_backend_get_input_method (ClutterBackend *backend)
-{
-  return backend->input_method;
-}
-
-/**
- * clutter_backend_set_input_method:
- * @backend: the #ClutterBackend
- * @method: the input method
- *
- * Sets the input method to be used by Clutter
- **/
-void
-clutter_backend_set_input_method (ClutterBackend     *backend,
-                                  ClutterInputMethod *method)
-{
-  g_set_object (&backend->input_method, method);
-}
-
-ClutterStageWindow *
-clutter_backend_get_stage_window (ClutterBackend *backend)
-{
-  return backend->stage_window;
-}
-
-/**
- * clutter_backend_get_default_seat:
- * @backend: the #ClutterBackend
- *
- * Returns the default seat
- *
- * Returns: (transfer none): the default seat
- **/
-ClutterSeat *
-clutter_backend_get_default_seat (ClutterBackend *backend)
-{
-  g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL);
-
-  return CLUTTER_BACKEND_GET_CLASS (backend)->get_default_seat (backend);
-}
-
-void
-clutter_backend_set_fallback_resource_scale (ClutterBackend *backend,
-                                             float           fallback_resource_scale)
-{
-  backend->fallback_resource_scale = fallback_resource_scale;
-}
-
-float
-clutter_backend_get_fallback_resource_scale (ClutterBackend *backend)
-{
-  return backend->fallback_resource_scale;
-}
-
-gboolean
-clutter_backend_is_display_server (ClutterBackend *backend)
-{
-  return CLUTTER_BACKEND_GET_CLASS (backend)->is_display_server (backend);
-}
-
-void
-clutter_backend_destroy (ClutterBackend *backend)
-{
-  g_object_run_dispose (G_OBJECT (backend));
-  g_object_unref (backend);
-}
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@ -1,86 +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-keymap.h>
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-seat.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_EXPORT
-GType clutter_backend_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterBackend *                clutter_get_default_backend             (void);
-
-CLUTTER_EXPORT
-gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);
-
-CLUTTER_EXPORT
-void                            clutter_backend_set_font_options        (ClutterBackend             *backend,
-                                                                         const cairo_font_options_t *options);
-CLUTTER_EXPORT
-const cairo_font_options_t *    clutter_backend_get_font_options        (ClutterBackend             *backend);
-
-CLUTTER_EXPORT
-CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);
-
-CLUTTER_EXPORT
-ClutterInputMethod *            clutter_backend_get_input_method        (ClutterBackend             *backend);
-
-CLUTTER_EXPORT
-void                            clutter_backend_set_input_method        (ClutterBackend             *backend,
-                                                                         ClutterInputMethod         *method);
-CLUTTER_EXPORT
-ClutterSeat *                   clutter_backend_get_default_seat        (ClutterBackend             *backend);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_BACKEND_H__ */
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@ -1,103 +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/>.
- */
-
-/**
- * SECTION:clutter-geometric-types
- * @Title: Base geometric types
- * @Short_Description: Common geometric data types used by Clutter
- *
- * Clutter defines a set of geometric data structures that are commonly used
- * across the whole API.
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-types.h"
-#include "clutter-private.h"
-
-#include <math.h>
-
-#define FLOAT_EPSILON   (1e-15)
-
-
-
-/*
- * ClutterMargin
- */
-
-/**
- * clutter_margin_new:
- *
- * Creates a new #ClutterMargin.
- *
- * Return value: (transfer full): a newly allocated #ClutterMargin. Use
- *   clutter_margin_free() to free the resources associated with it when
- *   done.
- *
- * Since: 1.10
- */
-ClutterMargin *
-clutter_margin_new (void)
-{
-  return g_new0 (ClutterMargin, 1);
-}
-
-/**
- * clutter_margin_copy:
- * @margin_: a #ClutterMargin
- *
- * Creates a new #ClutterMargin and copies the contents of @margin_ into
- * the newly created structure.
- *
- * Return value: (transfer full): a copy of the #ClutterMargin.
- *
- * Since: 1.10
- */
-ClutterMargin *
-clutter_margin_copy (const ClutterMargin *margin_)
-{
-  if (G_LIKELY (margin_ != NULL))
-    return g_memdup2 (margin_, sizeof (ClutterMargin));
-
-  return NULL;
-}
-
-/**
- * clutter_margin_free:
- * @margin_: a #ClutterMargin
- *
- * Frees the resources allocated by clutter_margin_new() and
- * clutter_margin_copy().
- *
- * Since: 1.10
- */
-void
-clutter_margin_free (ClutterMargin *margin_)
-{
-  if (G_LIKELY (margin_ != NULL))
-    g_free (margin_);
-}
-
-G_DEFINE_BOXED_TYPE (ClutterMargin, clutter_margin,
-                     clutter_margin_copy,
-                     clutter_margin_free)
--- 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 -- representation 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_new0 (ClutterBezier, 1);
-}
-
-void
-_clutter_bezier_free (ClutterBezier * b)
-{
-  if (G_LIKELY (b))
-    {
-      g_free (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 precision; 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 precision 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 precision (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 coefficients 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);
-
-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,698 +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
- */
-
-#include "clutter-build-config.h"
-
-#include <math.h>
-
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
-#include "clutter-actor-private.h"
-#include "clutter-animatable.h"
-#include "clutter-bin-layout.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)
-{
-  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);
-    }
-}
-
-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);
-}
--- 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_EXPORT
-GType clutter_bin_layout_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-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,648 +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_actor_new ();
- * clutter_actor_set_background_color (rect[0], &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_actor_new ();
- * clutter_actor_set_background_color (rect[1], &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_actor_new ();
- * clutter_actor_set_background_color (rect[2], &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
- */
-
-#include "clutter-build-config.h"
-
-#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_preferred_size (ClutterConstraint  *constraint,
-                                               ClutterActor       *actor,
-                                               ClutterOrientation  direction,
-                                               float               for_size,
-                                               float              *minimum_size,
-                                               float              *natural_size)
-{
-  ClutterBindConstraint *bind = CLUTTER_BIND_CONSTRAINT (constraint);
-  float source_min, source_nat;
-
-  if (bind->source == NULL)
-    return;
-
-  /* only these bindings affect the preferred size */
-  if (!(bind->coordinate == CLUTTER_BIND_WIDTH ||
-        bind->coordinate == CLUTTER_BIND_HEIGHT ||
-        bind->coordinate == CLUTTER_BIND_SIZE ||
-        bind->coordinate == CLUTTER_BIND_ALL))
-    return;
-
-  if (clutter_actor_contains (bind->source, actor))
-    return;
-
-  switch (direction)
-    {
-    case CLUTTER_ORIENTATION_HORIZONTAL:
-      if (bind->coordinate != CLUTTER_BIND_HEIGHT)
-        {
-          clutter_actor_get_preferred_width (bind->source, for_size,
-                                             &source_min,
-                                             &source_nat);
-
-          *minimum_size = source_min;
-          *natural_size = source_nat;
-        }
-      break;
-
-    case CLUTTER_ORIENTATION_VERTICAL:
-      if (bind->coordinate != CLUTTER_BIND_WIDTH)
-        {
-          clutter_actor_get_preferred_height (bind->source, for_size,
-                                              &source_min,
-                                              &source_nat);
-
-          *minimum_size = source_min;
-          *natural_size = source_nat;
-        }
-      break;
-    }
-}
-
-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;
-  graphene_point3d_t source_position;
-
-  source_position = GRAPHENE_POINT3D_INIT (0.f, 0.f, 0.f);
-
-  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;
-  constraint_class->update_preferred_size = clutter_bind_constraint_update_preferred_size;
-
-  /**
-   * 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_EXPORT
-GType clutter_bind_constraint_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterConstraint *   clutter_bind_constraint_new            (ClutterActor          *source,
-                                                              ClutterBindCoordinate  coordinate,
-                                                              gfloat                 offset);
-
-CLUTTER_EXPORT
-void                  clutter_bind_constraint_set_source     (ClutterBindConstraint *constraint,
-                                                              ClutterActor          *source);
-CLUTTER_EXPORT
-ClutterActor *        clutter_bind_constraint_get_source     (ClutterBindConstraint *constraint);
-CLUTTER_EXPORT
-void                  clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
-                                                              ClutterBindCoordinate  coordinate);
-CLUTTER_EXPORT
-ClutterBindCoordinate clutter_bind_constraint_get_coordinate (ClutterBindConstraint *constraint);
-CLUTTER_EXPORT
-void                  clutter_bind_constraint_set_offset     (ClutterBindConstraint *constraint,
-                                                              gfloat                 offset);
-CLUTTER_EXPORT
-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,935 +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
- */
-
-#include "clutter-build-config.h"
-
-#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_new0 (ClutterBindingEntry, 1);
-  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_free (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_free_full (pool->entries, (GDestroyNotify) binding_entry_free);
-
-  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_EXPORT
-GType clutter_binding_pool_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterBindingPool *  clutter_binding_pool_new              (const gchar         *name);
-CLUTTER_EXPORT
-ClutterBindingPool *  clutter_binding_pool_get_for_class    (gpointer             klass);
-CLUTTER_EXPORT
-ClutterBindingPool *  clutter_binding_pool_find             (const gchar         *name);
-
-CLUTTER_EXPORT
-void                  clutter_binding_pool_install_action   (ClutterBindingPool  *pool,
-                                                             const gchar         *action_name,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers,
-                                                             GCallback            callback,
-                                                             gpointer             data,
-                                                             GDestroyNotify       notify);
-CLUTTER_EXPORT
-void                  clutter_binding_pool_install_closure  (ClutterBindingPool  *pool,
-                                                             const gchar         *action_name,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers,
-                                                             GClosure            *closure);
-CLUTTER_EXPORT
-void                  clutter_binding_pool_override_action  (ClutterBindingPool  *pool,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers,
-                                                             GCallback            callback,
-                                                             gpointer             data,
-                                                             GDestroyNotify       notify);
-CLUTTER_EXPORT
-void                  clutter_binding_pool_override_closure (ClutterBindingPool  *pool,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers,
-                                                             GClosure            *closure);
-
-CLUTTER_EXPORT
-const gchar *         clutter_binding_pool_find_action      (ClutterBindingPool  *pool,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers);
-CLUTTER_EXPORT
-void                  clutter_binding_pool_remove_action    (ClutterBindingPool  *pool,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers);
-
-CLUTTER_EXPORT
-gboolean              clutter_binding_pool_activate         (ClutterBindingPool  *pool,
-                                                             guint                key_val,
-                                                             ClutterModifierType  modifiers,
-                                                             GObject             *gobject);
-
-CLUTTER_EXPORT
-void                  clutter_binding_pool_block_action     (ClutterBindingPool  *pool,
-                                                             const gchar         *action_name);
-CLUTTER_EXPORT
-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,243 +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))
-
-#include "clutter-build-config.h"
-
-#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;
-
-  CoglPipeline *pipeline;
-};
-
-struct _ClutterBlurEffectClass
-{
-  ClutterOffscreenEffectClass parent_class;
-
-  CoglPipeline *base_pipeline;
-};
-
-G_DEFINE_TYPE (ClutterBlurEffect,
-               clutter_blur_effect,
-               CLUTTER_TYPE_OFFSCREEN_EFFECT);
-
-static CoglPipeline *
-clutter_blur_effect_create_pipeline (ClutterOffscreenEffect *effect,
-                                     CoglTexture            *texture)
-{
-  ClutterBlurEffect *blur_effect = CLUTTER_BLUR_EFFECT (effect);
-
-  if (blur_effect->pixel_step_uniform > -1)
-    {
-      float pixel_step[2];
-      int tex_width, tex_height;
-
-      tex_width = cogl_texture_get_width (texture);
-      tex_height = cogl_texture_get_height (texture);
-
-      pixel_step[0] = 1.0f / tex_width;
-      pixel_step[1] = 1.0f / tex_height;
-
-      cogl_pipeline_set_uniform_float (blur_effect->pipeline,
-                                       blur_effect->pixel_step_uniform,
-                                       2, /* n_components */
-                                       1, /* count */
-                                       pixel_step);
-    }
-
-  cogl_pipeline_set_layer_texture (blur_effect->pipeline, 0, texture);
-
-  return cogl_object_ref (blur_effect->pipeline);
-}
-
-static gboolean
-clutter_blur_effect_pre_paint (ClutterEffect       *effect,
-                               ClutterPaintNode    *node,
-                               ClutterPaintContext *paint_context)
-{
-  ClutterEffectClass *parent_class;
-
-  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);
-  return parent_class->pre_paint (effect, node, paint_context);
-}
-
-static gboolean
-clutter_blur_effect_modify_paint_volume (ClutterEffect      *effect,
-                                         ClutterPaintVolume *volume)
-{
-  gfloat cur_width, cur_height;
-  graphene_point3d_t 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->modify_paint_volume = clutter_blur_effect_modify_paint_volume;
-
-  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-  offscreen_class->create_pipeline = clutter_blur_effect_create_pipeline;
-}
-
-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);
-    }
-
-  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_EXPORT
-GType clutter_blur_effect_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterEffect *clutter_blur_effect_new (void);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_BLUR_EFFECT_H__ */
--- a/clutter/clutter/clutter-blur-private.h
+++ b/clutter/clutter/clutter-blur-private.h
@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2020 Endless OS Foundation, LLC
- *
- * 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_BLUR_PRIVATE_H
-#define CLUTTER_BLUR_PRIVATE_H
-
-#include <glib-object.h>
-
-#include <cogl/cogl.h>
-
-G_BEGIN_DECLS
-
-typedef struct _ClutterBlur ClutterBlur;
-
-ClutterBlur * clutter_blur_new (CoglTexture *texture,
-                                float        sigma);
-
-void clutter_blur_apply (ClutterBlur *blur);
-
-CoglTexture * clutter_blur_get_texture (ClutterBlur *blur);
-
-void clutter_blur_free (ClutterBlur *blur);
-
-G_END_DECLS
-
-#endif /* CLUTTER_BLUR_PRIVATE_H */
--- a/clutter/clutter/clutter-blur.c
+++ b/clutter/clutter/clutter-blur.c
@ -1,431 +0,0 @@
-/*
- * Copyright (C) 2020 Endless OS Foundation, LLC
- *
- * 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-blur-private.h"
-
-#include "clutter-backend.h"
-
-/**
- * SECTION:clutter-blur
- * @short_description: Blur textures
- *
- * #ClutterBlur is a moderately fast gaussian blur implementation.
- *
- * # Optimizations
- *
- * There are a number of optimizations in place to make this blur implementation
- * real-time. All in all, the implementation performs best when using large
- * blur-radii that allow downscaling the texture to smaller sizes, at small
- * radii where no downscaling is possible this can easily halve the framerate.
- *
- * ## Multipass
- *
- * It is implemented in 2 passes: vertical and horizontal.
- *
- * ## Downscaling
- *
- * #ClutterBlur uses dynamic downscaling to speed up blurring. Downscaling
- * happens in factors of 2 (the image is downscaled either by 2, 4, 8, 16, …)
- * and depends on the blur radius, the texture size, among others.
- *
- * The texture is drawn into a downscaled framebuffer; the blur passes are
- * applied on the downscaled texture contents; and finally, the blurred
- * contents are drawn
- * upscaled again.
- *
- * ## Hardware Interpolation
- *
- * This blur implementation cuts down the number of sampling operations by
- * exploiting the hardware interpolation that is performed when sampling between
- * pixel boundaries. This technique is described at:
- *
- * http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
- *
- * ## Incremental gauss-factor calculation
- *
- * The kernel values for the gaussian kernel are computed incrementally instead
- * of running the expensive calculations multiple times inside the blur shader.
- * The implementation is based on the algorithm presented by K. Turkowski in
- * GPU Gems 3, chapter 40:
- *
- * https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch40.html
- *
- */
-
-static const char *gaussian_blur_glsl_declarations =
-"uniform float sigma;                                                      \n"
-"uniform float pixel_step;                                                 \n"
-"uniform vec2 direction;                                                   \n";
-
-static const char *gaussian_blur_glsl =
-"  vec2 uv = vec2 (cogl_tex_coord.st);                                     \n"
-"                                                                          \n"
-"  vec3 gauss_coefficient;                                                 \n"
-"  gauss_coefficient.x = 1.0 / (sqrt (2.0 * 3.14159265) * sigma);          \n"
-"  gauss_coefficient.y = exp (-0.5 / (sigma * sigma));                     \n"
-"  gauss_coefficient.z = gauss_coefficient.y * gauss_coefficient.y;        \n"
-"                                                                          \n"
-"  float gauss_coefficient_total = gauss_coefficient.x;                    \n"
-"                                                                          \n"
-"  vec4 ret = texture2D (cogl_sampler, uv) * gauss_coefficient.x;          \n"
-"  gauss_coefficient.xy *= gauss_coefficient.yz;                           \n"
-"                                                                          \n"
-"  int n_steps = int (ceil (1.5 * sigma)) * 2;                             \n"
-"                                                                          \n"
-"  for (int i = 1; i <= n_steps; i += 2) {                                 \n"
-"    float coefficient_subtotal = gauss_coefficient.x;                     \n"
-"    gauss_coefficient.xy *= gauss_coefficient.yz;                         \n"
-"    coefficient_subtotal += gauss_coefficient.x;                          \n"
-"                                                                          \n"
-"    float gauss_ratio = gauss_coefficient.x / coefficient_subtotal;       \n"
-"                                                                          \n"
-"    float foffset = float (i) + gauss_ratio;                              \n"
-"    vec2 offset = direction * foffset * pixel_step;                       \n"
-"                                                                          \n"
-"    ret += texture2D (cogl_sampler, uv + offset) * coefficient_subtotal;  \n"
-"    ret += texture2D (cogl_sampler, uv - offset) * coefficient_subtotal;  \n"
-"                                                                          \n"
-"    gauss_coefficient_total += 2.0 * coefficient_subtotal;                \n"
-"    gauss_coefficient.xy *= gauss_coefficient.yz;                         \n"
-"  }                                                                       \n"
-"                                                                          \n"
-"  cogl_texel = ret / gauss_coefficient_total;                             \n";
-
-#define MIN_DOWNSCALE_SIZE 256.f
-#define MAX_SIGMA 6.f
-
-enum
-{
-  VERTICAL,
-  HORIZONTAL,
-};
-
-typedef struct
-{
-  CoglFramebuffer *framebuffer;
-  CoglPipeline *pipeline;
-  CoglTexture *texture;
-  int orientation;
-} BlurPass;
-
-struct _ClutterBlur
-{
-  CoglTexture *source_texture;
-  float sigma;
-  float downscale_factor;
-
-  BlurPass pass[2];
-};
-
-static CoglPipeline*
-create_blur_pipeline (void)
-{
-  static CoglPipelineKey blur_pipeline_key = "clutter-blur-pipeline-private";
-  CoglContext *ctx =
-    clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  CoglPipeline *blur_pipeline;
-
-  blur_pipeline =
-    cogl_context_get_named_pipeline (ctx, &blur_pipeline_key);
-
-  if (G_UNLIKELY (blur_pipeline == NULL))
-    {
-      CoglSnippet *snippet;
-
-      blur_pipeline = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_null_texture (blur_pipeline, 0);
-      cogl_pipeline_set_layer_filters (blur_pipeline,
-                                       0,
-                                       COGL_PIPELINE_FILTER_LINEAR,
-                                       COGL_PIPELINE_FILTER_LINEAR);
-      cogl_pipeline_set_layer_wrap_mode (blur_pipeline,
-                                         0,
-                                         COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE);
-
-      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
-                                  gaussian_blur_glsl_declarations,
-                                  NULL);
-      cogl_snippet_set_replace (snippet, gaussian_blur_glsl);
-      cogl_pipeline_add_layer_snippet (blur_pipeline, 0, snippet);
-      cogl_object_unref (snippet);
-
-      cogl_context_set_named_pipeline (ctx, &blur_pipeline_key, blur_pipeline);
-    }
-
-  return cogl_pipeline_copy (blur_pipeline);
-}
-
-static void
-update_blur_uniforms (ClutterBlur *blur,
-                      BlurPass    *pass)
-{
-  gboolean vertical = pass->orientation == VERTICAL;
-  int sigma_uniform;
-  int pixel_step_uniform;
-  int direction_uniform;
-
-  pixel_step_uniform =
-    cogl_pipeline_get_uniform_location (pass->pipeline, "pixel_step");
-  if (pixel_step_uniform > -1)
-    {
-      float pixel_step;
-
-      if (vertical)
-        pixel_step = 1.f / cogl_texture_get_height (pass->texture);
-      else
-        pixel_step = 1.f / cogl_texture_get_width (pass->texture);
-
-      cogl_pipeline_set_uniform_1f (pass->pipeline,
-                                    pixel_step_uniform,
-                                    pixel_step);
-    }
-
-  sigma_uniform = cogl_pipeline_get_uniform_location (pass->pipeline, "sigma");
-  if (sigma_uniform > -1)
-    {
-      cogl_pipeline_set_uniform_1f (pass->pipeline,
-                                    sigma_uniform,
-                                    blur->sigma / blur->downscale_factor);
-    }
-
-  direction_uniform =
-    cogl_pipeline_get_uniform_location (pass->pipeline, "direction");
-  if (direction_uniform > -1)
-    {
-      gboolean horizontal = !vertical;
-      float direction[2] = {
-        horizontal,
-        vertical,
-      };
-
-      cogl_pipeline_set_uniform_float (pass->pipeline,
-                                       direction_uniform,
-                                       2, 1,
-                                       direction);
-    }
-}
-
-static gboolean
-create_fbo (ClutterBlur *blur,
-            BlurPass    *pass)
-{
-  CoglContext *ctx =
-    clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  float scaled_height;
-  float scaled_width;
-  float height;
-  float width;
-
-  g_clear_pointer (&pass->texture, cogl_object_unref);
-  g_clear_object (&pass->framebuffer);
-
-  width = cogl_texture_get_width (blur->source_texture);
-  height = cogl_texture_get_height (blur->source_texture);
-  scaled_width = floorf (width / blur->downscale_factor);
-  scaled_height = floorf (height / blur->downscale_factor);
-
-  pass->texture = COGL_TEXTURE (cogl_texture_2d_new_with_size (ctx,
-                                                               scaled_width,
-                                                               scaled_height));
-  if (!pass->texture)
-    return FALSE;
-
-  pass->framebuffer =
-    COGL_FRAMEBUFFER (cogl_offscreen_new_with_texture (pass->texture));
-  if (!pass->framebuffer)
-    {
-      g_warning ("%s: Unable to create an Offscreen buffer", G_STRLOC);
-      return FALSE;
-    }
-
-  cogl_framebuffer_orthographic (pass->framebuffer,
-                                 0.0, 0.0,
-                                 scaled_width,
-                                 scaled_height,
-                                 0.0, 1.0);
-  return TRUE;
-}
-
-static gboolean
-setup_blur_pass (ClutterBlur *blur,
-                 BlurPass    *pass,
-                 int          orientation,
-                 CoglTexture *texture)
-{
-  pass->orientation = orientation;
-  pass->pipeline = create_blur_pipeline ();
-  cogl_pipeline_set_layer_texture (pass->pipeline, 0, texture);
-
-  if (!create_fbo (blur, pass))
-    return FALSE;
-
-  update_blur_uniforms (blur, pass);
-  return TRUE;
-}
-
-static float
-calculate_downscale_factor (float width,
-                            float height,
-                            float sigma)
-{
-  float downscale_factor = 1.f;
-  float scaled_width = width;
-  float scaled_height = height;
-  float scaled_sigma = sigma;
-
-  /* This is the algorithm used by Firefox; keep downscaling until either the
-   * blur radius is lower than the threshold, or the downscaled texture is too
-   * small.
-   */
-  while (scaled_sigma > MAX_SIGMA &&
-         scaled_width > MIN_DOWNSCALE_SIZE &&
-         scaled_height > MIN_DOWNSCALE_SIZE)
-    {
-      downscale_factor *= 2.f;
-
-      scaled_width = width / downscale_factor;
-      scaled_height = height / downscale_factor;
-      scaled_sigma = sigma / downscale_factor;
-    }
-
-  return downscale_factor;
-}
-
-static void
-apply_blur_pass (BlurPass *pass)
-{
-  CoglColor transparent;
-
-  cogl_color_init_from_4ub (&transparent, 0, 0, 0, 0);
-
-  cogl_framebuffer_clear (pass->framebuffer,
-                          COGL_BUFFER_BIT_COLOR,
-                          &transparent);
-
-  cogl_framebuffer_draw_rectangle (pass->framebuffer,
-                                   pass->pipeline,
-                                   0, 0,
-                                   cogl_texture_get_width (pass->texture),
-                                   cogl_texture_get_height (pass->texture));
-}
-
-static void
-clear_blur_pass (BlurPass *pass)
-{
-  g_clear_pointer (&pass->pipeline, cogl_object_unref);
-  g_clear_pointer (&pass->texture, cogl_object_unref);
-  g_clear_object (&pass->framebuffer);
-}
-
-/**
- * clutter_blur_new:
- * @texture: a #CoglTexture
- * @sigma: blur sigma
- *
- * Creates a new #ClutterBlur.
- *
- * Returns: (transfer full) (nullable): A newly created #ClutterBlur
- */
-ClutterBlur *
-clutter_blur_new (CoglTexture *texture,
-                  float        sigma)
-{
-  ClutterBlur *blur;
-  unsigned int height;
-  unsigned int width;
-  BlurPass *hpass;
-  BlurPass *vpass;
-
-  g_return_val_if_fail (texture != NULL, NULL);
-  g_return_val_if_fail (sigma >= 0.0, NULL);
-
-  width = cogl_texture_get_width (texture);
-  height = cogl_texture_get_height (texture);
-
-  blur = g_new0 (ClutterBlur, 1);
-  blur->sigma = sigma;
-  blur->source_texture = cogl_object_ref (texture);
-  blur->downscale_factor = calculate_downscale_factor (width, height, sigma);
-
-  if (G_APPROX_VALUE (sigma, 0.0, FLT_EPSILON))
-    goto out;
-
-  vpass = &blur->pass[VERTICAL];
-  hpass = &blur->pass[HORIZONTAL];
-
-  if (!setup_blur_pass (blur, vpass, VERTICAL, texture) ||
-      !setup_blur_pass (blur, hpass, HORIZONTAL, vpass->texture))
-    {
-      clutter_blur_free (blur);
-      return NULL;
-    }
-
-out:
-  return g_steal_pointer (&blur);
-}
-
-/**
- * clutter_blur_apply:
- * @blur: a #ClutterBlur
- *
- * Applies the blur. The resulting texture can be retrieved by
- * clutter_blur_get_texture().
- */
-void
-clutter_blur_apply (ClutterBlur *blur)
-{
-  if (G_APPROX_VALUE (blur->sigma, 0.0, FLT_EPSILON))
-    return;
-
-  apply_blur_pass (&blur->pass[VERTICAL]);
-  apply_blur_pass (&blur->pass[HORIZONTAL]);
-}
-
-/**
- * clutter_blur_get_texture:
- * @blur: a #ClutterBlur
- *
- * Retrieves the texture where the blurred contents are stored. The
- * contents are undefined until clutter_blur_apply() is called.
- *
- * Returns: (transfer none): a #CoglTexture
- */
-CoglTexture *
-clutter_blur_get_texture (ClutterBlur *blur)
-{
-  if (G_APPROX_VALUE (blur->sigma, 0.0, FLT_EPSILON))
-    return blur->source_texture;
-  else
-    return blur->pass[HORIZONTAL].texture;
-}
-
-/**
- * clutter_blur_free:
- * @blur: A #ClutterBlur
- *
- * Frees @blur.
- */
-void
-clutter_blur_free (ClutterBlur *blur)
-{
-  g_assert (blur);
-
-  clear_blur_pass (&blur->pass[VERTICAL]);
-  clear_blur_pass (&blur->pass[HORIZONTAL]);
-  cogl_clear_object (&blur->source_texture);
-  g_free (blur);
-}
--- 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,110 +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_EXPORT
-GType clutter_box_layout_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterLayoutManager *  clutter_box_layout_new                 (void);
-
-CLUTTER_EXPORT
-void                    clutter_box_layout_set_orientation      (ClutterBoxLayout    *layout,
-                                                                 ClutterOrientation   orientation);
-CLUTTER_EXPORT
-ClutterOrientation      clutter_box_layout_get_orientation      (ClutterBoxLayout    *layout);
-
-CLUTTER_EXPORT
-void                    clutter_box_layout_set_spacing          (ClutterBoxLayout    *layout,
-                                                                 guint                spacing);
-CLUTTER_EXPORT
-guint                   clutter_box_layout_get_spacing          (ClutterBoxLayout    *layout);
-CLUTTER_EXPORT
-void                    clutter_box_layout_set_homogeneous      (ClutterBoxLayout    *layout,
-                                                                 gboolean             homogeneous);
-CLUTTER_EXPORT
-gboolean                clutter_box_layout_get_homogeneous      (ClutterBoxLayout    *layout);
-CLUTTER_EXPORT
-void                    clutter_box_layout_set_pack_start       (ClutterBoxLayout    *layout,
-                                                                 gboolean             pack_start);
-CLUTTER_EXPORT
-gboolean                clutter_box_layout_get_pack_start       (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,623 +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))
-
-#include "clutter-build-config.h"
-
-#include <math.h>
-
-#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;
-
-  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 (G_APPROX_VALUE (self->brightness_red, no_change, FLT_EPSILON) &&
-          G_APPROX_VALUE (self->brightness_green, no_change, FLT_EPSILON) &&
-          G_APPROX_VALUE (self->brightness_blue, no_change, FLT_EPSILON) &&
-          G_APPROX_VALUE (self->contrast_red, no_change, FLT_EPSILON) &&
-          G_APPROX_VALUE (self->contrast_green, no_change, FLT_EPSILON) &&
-          G_APPROX_VALUE (self->contrast_blue, no_change, FLT_EPSILON));
-}
-
-static CoglPipeline *
-clutter_brightness_contrast_effect_create_pipeline (ClutterOffscreenEffect *effect,
-                                                    CoglTexture            *texture)
-{
-  ClutterBrightnessContrastEffect *self =
-    CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
-
-  cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
-
-  return cogl_object_ref (self->pipeline);
-}
-
-static gboolean
-clutter_brightness_contrast_effect_pre_paint (ClutterEffect       *effect,
-                                              ClutterPaintNode    *node,
-                                              ClutterPaintContext *paint_context)
-{
-  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
-  ClutterEffectClass *parent_class;
-
-  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);
-
-  return parent_class->pre_paint (effect, node, paint_context);
-}
-
-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->create_pipeline = clutter_brightness_contrast_effect_create_pipeline;
-
-  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);
-    }
-
-  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 (G_APPROX_VALUE (red, effect->brightness_red, FLT_EPSILON) &&
-      G_APPROX_VALUE (green, effect->brightness_green, FLT_EPSILON) &&
-      G_APPROX_VALUE (blue, effect->brightness_blue, FLT_EPSILON))
-    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 (G_APPROX_VALUE (red, effect->contrast_red, FLT_EPSILON) &&
-      G_APPROX_VALUE (green, effect->contrast_green, FLT_EPSILON) &&
-      G_APPROX_VALUE (blue, effect->contrast_blue, FLT_EPSILON))
-    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_EXPORT
-GType clutter_brightness_contrast_effect_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterEffect * clutter_brightness_contrast_effect_new                          (void);
-
-CLUTTER_EXPORT
-void            clutter_brightness_contrast_effect_set_brightness_full          (ClutterBrightnessContrastEffect *effect,
-                                                                                 float                            red,
-                                                                                 float                            green,
-                                                                                 float                            blue);
-CLUTTER_EXPORT
-void            clutter_brightness_contrast_effect_set_brightness               (ClutterBrightnessContrastEffect *effect,
-                                                                                 float                            brightness);
-CLUTTER_EXPORT
-void            clutter_brightness_contrast_effect_get_brightness               (ClutterBrightnessContrastEffect *effect,
-                                                                                 float                           *red,
-                                                                                 float                           *green,
-                                                                                 float                           *blue);
-
-CLUTTER_EXPORT
-void            clutter_brightness_contrast_effect_set_contrast_full            (ClutterBrightnessContrastEffect *effect,
-                                                                                 float                            red,
-                                                                                 float                            green,
-                                                                                 float                            blue);
-CLUTTER_EXPORT
-void            clutter_brightness_contrast_effect_set_contrast                 (ClutterBrightnessContrastEffect *effect,
-                                                                                 float                            contrast);
-CLUTTER_EXPORT
-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-build-config.h.meson
+++ b/clutter/clutter/clutter-build-config.h.meson
@ -1,8 +0,0 @@
-/* Mutter version */
-#mesondefine MUTTER_VERSION
-
-/* List of Cogl drivers */
-#mesondefine CLUTTER_DRIVERS
-
-/* Supports PangoFt2 */
-#mesondefine HAVE_PANGO_FT2
--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@ -1,90 +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.
- */
-
-#include "clutter-build-config.h"
-
-#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_EXPORT
-void    clutter_cairo_clear             (cairo_t               *cr);
-CLUTTER_EXPORT
-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,644 +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.
- */
-
-#include "clutter-build-config.h"
-
-#include <math.h>
-#include <cogl/cogl.h>
-#include <cairo-gobject.h>
-
-#include "clutter-canvas.h"
-
-#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;
-  float scale_factor;
-
-  CoglTexture *texture;
-  gboolean dirty;
-
-  CoglBitmap *buffer;
-};
-
-enum
-{
-  PROP_0,
-
-  PROP_WIDTH,
-  PROP_HEIGHT,
-  PROP_SCALE_FACTOR,
-
-  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 (ClutterContentInterface *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:
-      {
-        gfloat new_scale_factor = g_value_get_float (value);
-
-        if (priv->scale_factor != new_scale_factor)
-          {
-            priv->scale_factor = new_scale_factor;
-
-            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
-          }
-      }
-      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:
-      g_value_set_float (value, priv->scale_factor);
-      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:
-   *
-   * The height of the canvas.
-   */
-  obj_props[PROP_SCALE_FACTOR] =
-    g_param_spec_float ("scale-factor",
-                        P_("Scale Factor"),
-                        P_("The Scale factor of the canvas"),
-                        0.01f, G_MAXFLOAT,
-                        1.0f,
-                        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.0f;
-}
-
-static void
-clutter_canvas_paint_content (ClutterContent      *content,
-                              ClutterActor        *actor,
-                              ClutterPaintNode    *root,
-                              ClutterPaintContext *paint_context)
-{
-  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_static_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;
-  gboolean res;
-  cairo_t *cr;
-
-  g_assert (priv->height > 0 && priv->width > 0);
-
-  priv->dirty = TRUE;
-
-  real_width = ceilf (priv->width * priv->scale_factor);
-  real_height = ceilf (priv->height * priv->scale_factor);
-
-  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d",
-                priv->width, priv->height);
-
-  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,
-                                  priv->scale_factor,
-                                  priv->scale_factor);
-
-  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 = ceilf (priv->width * priv->scale_factor);
-
-  if (height != NULL)
-    *height = ceilf (priv->height * priv->scale_factor);
-
-  return TRUE;
-}
-
-static void
-clutter_content_iface_init (ClutterContentInterface *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 integer scaling factor of the canvas
- *
- * Sets the scaling factor of the @canvas, and invalidates the content.
- *
- * This function will cause the @canvas to be invalidated only
- * if the scale factor of the canvas surface has changed.
- */
-void
-clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
-                                 float          scale)
-{
-  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
-  g_return_if_fail (scale > 0.0f);
-
-  if (canvas->priv->scale_factor != scale)
-    {
-      canvas->priv->scale_factor = scale;
-
-      g_object_freeze_notify (G_OBJECT (canvas));
-      clutter_content_invalidate (CLUTTER_CONTENT (canvas));
-      g_object_thaw_notify (G_OBJECT (canvas));
-
-      g_object_notify_by_pspec (G_OBJECT (canvas), obj_props[PROP_SCALE_FACTOR]);
-    }
-}
-
-/**
- * clutter_canvas_get_scale_factor:
- * @canvas: a #ClutterCanvas
- *
- * Gets the scale factor of the @canvas.
- *
- * Return value: the current @canvas scale factor or -1 if invalid
- */
-float
-clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
-{
-  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1.0f);
-
-  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_EXPORT
-GType clutter_canvas_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterContent *        clutter_canvas_new                      (void);
-CLUTTER_EXPORT
-gboolean                clutter_canvas_set_size                 (ClutterCanvas *canvas,
-                                                                 int            width,
-                                                                 int            height);
-
-CLUTTER_EXPORT
-void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
-                                                                 float          scale);
-CLUTTER_EXPORT
-float                   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,191 +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
- */
-
-#include "clutter-build-config.h"
-
-#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_EXPORT
-GType clutter_child_meta_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterContainer *      clutter_child_meta_get_container        (ClutterChildMeta *data);
-CLUTTER_EXPORT
-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,850 +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
- */
-
-#include "clutter-build-config.h"
-
-#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;
-
-  gulong event_id;
-  gulong capture_id;
-  guint long_press_id;
-
-  gint long_press_threshold;
-  gint long_press_duration;
-  gint drag_threshold;
-
-  guint press_button;
-  ClutterInputDevice *press_device;
-  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 =
-    clutter_click_action_get_instance_private (action);
-
-  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 =
-    clutter_click_action_get_instance_private (action);
-
-  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 =
-    clutter_click_action_get_instance_private (action);
-  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);
-
-  g_clear_signal_handler (&priv->capture_id, priv->stage);
-
-  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 =
-    clutter_click_action_get_instance_private (action);
-  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)
-    {
-      g_clear_handle_id (&priv->long_press_id, g_source_remove);
-      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 =
-    clutter_click_action_get_instance_private (action);
-
-  if (priv->long_press_id != 0)
-    {
-      ClutterActor *actor;
-      gboolean result;
-
-      actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
-
-      g_clear_handle_id (&priv->long_press_id, g_source_remove);
-
-      g_signal_emit (action, click_signals[LONG_PRESS], 0,
-                     actor,
-                     CLUTTER_LONG_PRESS_CANCEL,
-                     &result);
-    }
-}
-
-static inline gboolean
-event_within_drag_threshold (ClutterClickAction *click_action,
-                             ClutterEvent       *event)
-{
-  ClutterClickActionPrivate *priv =
-    clutter_click_action_get_instance_private (click_action);
-  float motion_x, motion_y;
-  float delta_x, delta_y;
-
-  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);
-
-  return delta_x <= priv->drag_threshold && delta_y <= priv->drag_threshold;
-}
-
-static gboolean
-on_event (ClutterActor       *actor,
-          ClutterEvent       *event,
-          ClutterClickAction *action)
-{
-  ClutterClickActionPrivate *priv =
-    clutter_click_action_get_instance_private (action);
-  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 = clutter_event_get_device (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 =
-    clutter_click_action_get_instance_private (action);
-  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_CANCEL:
-      clutter_click_action_release (action);
-      break;
-
-    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 (event) != priv->press_device ||
-          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 */
-      g_clear_signal_handler (&priv->capture_id, priv->stage);
-
-      g_clear_handle_id (&priv->long_press_id, g_source_remove);
-
-      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);
-
-      if (event_within_drag_threshold (action, event))
-        g_signal_emit (action, click_signals[CLICKED], 0, actor);
-      break;
-
-    case CLUTTER_MOTION:
-    case CLUTTER_TOUCH_UPDATE:
-      {
-        if (clutter_event_get_device (event) != priv->press_device ||
-            clutter_event_get_event_sequence (event) != priv->press_sequence)
-          return CLUTTER_EVENT_PROPAGATE;
-
-        if (!priv->is_held)
-          return CLUTTER_EVENT_PROPAGATE;
-
-        if (!event_within_drag_threshold (action, event))
-          clutter_click_action_release (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 =
-    clutter_click_action_get_instance_private (action);
-
-  if (priv->event_id != 0)
-    {
-      ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
-
-      if (old_actor != NULL)
-        g_clear_signal_handler (&priv->event_id, old_actor);
-
-      priv->event_id = 0;
-    }
-
-  if (priv->capture_id != 0)
-    {
-      if (priv->stage != NULL)
-        g_clear_signal_handler (&priv->capture_id, priv->stage);
-
-      priv->capture_id = 0;
-      priv->stage = NULL;
-    }
-
-  g_clear_handle_id (&priv->long_press_id, g_source_remove);
-
-  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_enabled (ClutterActorMeta *meta,
-                                  gboolean          is_enabled)
-{
-  ClutterClickAction *click_action = CLUTTER_CLICK_ACTION (meta);
-  ClutterActorMetaClass *parent_class =
-    CLUTTER_ACTOR_META_CLASS (clutter_click_action_parent_class);
-
-  if (!is_enabled)
-    clutter_click_action_release (click_action);
-
-  parent_class->set_enabled (meta, is_enabled);
-}
-
-static void
-clutter_click_action_set_property (GObject      *gobject,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-{
-  ClutterClickActionPrivate *priv =
-    clutter_click_action_get_instance_private (CLUTTER_CLICK_ACTION (gobject));
-
-  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_get_instance_private (CLUTTER_CLICK_ACTION (gobject));
-
-  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_get_instance_private (CLUTTER_CLICK_ACTION (gobject));
-
-  g_clear_signal_handler (&priv->event_id,
-                          clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)));
-
-  g_clear_signal_handler (&priv->capture_id, priv->stage);
-
-  g_clear_handle_id (&priv->long_press_id, g_source_remove);
-
-  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;
-  meta_class->set_enabled = clutter_click_action_set_enabled;
-
-  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, NULL,
-                  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)
-{
-  ClutterClickActionPrivate *priv =
-    clutter_click_action_get_instance_private (self);
-
-  priv->long_press_threshold = -1;
-  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 = clutter_click_action_get_instance_private (action);
-
-  if (!priv->is_held)
-    return;
-
-  /* disconnect the capture */
-  g_clear_signal_handler (&priv->capture_id, priv->stage);
-
-  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)
-{
-  ClutterClickActionPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_CLICK_ACTION (action), 0);
-
-  priv = clutter_click_action_get_instance_private (action);
-
-  return 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)
-{
-  ClutterClickActionPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_CLICK_ACTION (action), 0);
-
-  priv = clutter_click_action_get_instance_private (action);
-
-  return 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)
-{
-  ClutterClickActionPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTION (action));
-
-  priv = clutter_click_action_get_instance_private (action);
-
-  if (press_x != NULL)
-    *press_x = priv->press_x;
-
-  if (press_y != NULL)
-    *press_y = priv->press_y;
-}
--- a/clutter/clutter/clutter-click-action.h
+++ b/clutter/clutter/clutter-click-action.h
@ -1,98 +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 ())
-
-CLUTTER_EXPORT
-G_DECLARE_DERIVABLE_TYPE (ClutterClickAction, clutter_click_action,
-                          CLUTTER, CLICK_ACTION, ClutterAction);
-
-typedef struct _ClutterClickActionPrivate ClutterClickActionPrivate;
-
-/**
- * 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_EXPORT
-ClutterAction *        clutter_click_action_new        (void);
-
-CLUTTER_EXPORT
-guint                  clutter_click_action_get_button (ClutterClickAction *action);
-CLUTTER_EXPORT
-ClutterModifierType    clutter_click_action_get_state  (ClutterClickAction *action);
-CLUTTER_EXPORT
-void                   clutter_click_action_get_coords (ClutterClickAction *action,
-                                                        gfloat             *press_x,
-                                                        gfloat             *press_y);
-
-CLUTTER_EXPORT
-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,469 +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
- */
-
-#include "clutter-build-config.h"
-
-#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;
-  float x_scale, y_scale;
-
-  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,
-                               graphene_matrix_t *matrix)
-{
-  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
-
-
-  if (priv->clone_source)
-    graphene_matrix_scale (matrix, priv->x_scale, priv->y_scale, 1.f);
-
-  CLUTTER_ACTOR_CLASS (clutter_clone_parent_class)->apply_transform (self,
-                                                                     matrix);
-}
-
-static void
-clutter_clone_paint (ClutterActor        *actor,
-                     ClutterPaintContext *paint_context)
-{
-  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, paint_context);
-      _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 masquerade 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)
-{
-  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
-  ClutterActorClass *parent_class;
-  ClutterActorBox source_box;
-  float x_scale, y_scale;
-
-  /* chain up */
-  parent_class = CLUTTER_ACTOR_CLASS (clutter_clone_parent_class);
-  parent_class->allocate (self, box);
-
-  if (priv->clone_source == NULL)
-    return;
-
-  /* ClutterActor delays allocating until the actor is shown; however
-   * we cannot paint it correctly in that case, so force an allocation.
-   */
-  if (clutter_actor_get_parent (priv->clone_source) != NULL &&
-      !clutter_actor_has_allocation (priv->clone_source))
-    {
-      float x = 0.f;
-      float y = 0.f;
-
-      clutter_actor_get_fixed_position (priv->clone_source, &x, &y);
-      clutter_actor_allocate_preferred_size (priv->clone_source, x, y);
-    }
-
-  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);
-
-  if (!G_APPROX_VALUE (priv->x_scale, x_scale, FLT_EPSILON) ||
-      !G_APPROX_VALUE (priv->y_scale, y_scale, FLT_EPSILON))
-    {
-      priv->x_scale = x_scale;
-      priv->y_scale = y_scale;
-      clutter_actor_invalidate_transform (CLUTTER_ACTOR (self));
-    }
-
-#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);
-#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);
-
-  self->priv->x_scale = 1.f;
-  self->priv->y_scale = 1.f;
-}
-
-/**
- * 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_clear_signal_handler (&priv->source_destroy_id, priv->clone_source);
-      _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_EXPORT
-GType clutter_clone_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterActor *  clutter_clone_new               (ClutterActor *source);
-CLUTTER_EXPORT
-void            clutter_clone_set_source        (ClutterClone *self,
-                                                 ClutterActor *source);
-CLUTTER_EXPORT
-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_EXPORT
-GType clutter_color_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterColor *clutter_color_new         (guint8              red,
-                                         guint8              green,
-                                         guint8              blue,
-                                         guint8              alpha);
-CLUTTER_EXPORT
-ClutterColor *clutter_color_alloc       (void);
-CLUTTER_EXPORT
-ClutterColor *clutter_color_init        (ClutterColor       *color,
-                                         guint8              red,
-                                         guint8              green,
-                                         guint8              blue,
-                                         guint8              alpha);
-CLUTTER_EXPORT
-ClutterColor *clutter_color_copy        (const ClutterColor *color);
-CLUTTER_EXPORT
-void          clutter_color_free        (ClutterColor       *color);
-
-CLUTTER_EXPORT
-void          clutter_color_add         (const ClutterColor *a,
-                                         const ClutterColor *b,
-                                         ClutterColor       *result);
-CLUTTER_EXPORT
-void          clutter_color_subtract    (const ClutterColor *a,
-                                         const ClutterColor *b,
-                                         ClutterColor       *result);
-CLUTTER_EXPORT
-void          clutter_color_lighten     (const ClutterColor *color,
-                                         ClutterColor       *result);
-CLUTTER_EXPORT
-void          clutter_color_darken      (const ClutterColor *color,
-                                         ClutterColor       *result);
-CLUTTER_EXPORT
-void          clutter_color_shade       (const ClutterColor *color,
-                                         gdouble             factor,
-                                         ClutterColor       *result);
-
-CLUTTER_EXPORT
-gchar *       clutter_color_to_string   (const ClutterColor *color);
-CLUTTER_EXPORT
-gboolean      clutter_color_from_string (ClutterColor       *color,
-                                         const gchar        *str);
-
-CLUTTER_EXPORT
-void          clutter_color_to_hls      (const ClutterColor *color,
-                                         gfloat             *hue,
-					 gfloat             *luminance,
-					 gfloat             *saturation);
-CLUTTER_EXPORT
-void          clutter_color_from_hls    (ClutterColor       *color,
-                                         gfloat              hue,
-                                         gfloat              luminance,
-                                         gfloat              saturation);
-
-CLUTTER_EXPORT
-guint32       clutter_color_to_pixel    (const ClutterColor *color);
-CLUTTER_EXPORT
-void          clutter_color_from_pixel  (ClutterColor       *color,
-                                         guint32             pixel);
-
-CLUTTER_EXPORT
-guint         clutter_color_hash        (gconstpointer       v);
-CLUTTER_EXPORT
-gboolean      clutter_color_equal       (gconstpointer       v1,
-                                         gconstpointer       v2);
-
-CLUTTER_EXPORT
-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_EXPORT
-void                    clutter_value_set_color         (GValue             *value,
-                                                         const ClutterColor *color);
-CLUTTER_EXPORT
-const ClutterColor *    clutter_value_get_color         (const GValue       *value);
-
-CLUTTER_EXPORT
-GType clutter_param_color_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-GParamSpec *    clutter_param_spec_color        (const gchar        *name,
-                                                 const gchar        *nick,
-                                                 const gchar        *blurb,
-                                                 const ClutterColor *default_value,
-                                                 GParamFlags         flags);
-
-CLUTTER_EXPORT
-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,335 +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))
-
-#include "clutter-build-config.h"
-
-#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;
-
-  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 CoglPipeline *
-clutter_colorize_effect_create_pipeline (ClutterOffscreenEffect *effect,
-                                         CoglTexture            *texture)
-{
-  ClutterColorizeEffect *colorize_effect = CLUTTER_COLORIZE_EFFECT (effect);
-
-  cogl_pipeline_set_layer_texture (colorize_effect->pipeline, 0, texture);
-
-  return cogl_object_ref (colorize_effect->pipeline);
-}
-
-static gboolean
-clutter_colorize_effect_pre_paint (ClutterEffect       *effect,
-                                   ClutterPaintNode    *node,
-                                   ClutterPaintContext *paint_context)
-{
-  ClutterEffectClass *parent_class;
-
-  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);
-  return parent_class->pre_paint (effect, node, paint_context);
-}
-
-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->create_pipeline = clutter_colorize_effect_create_pipeline;
-
-  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);
-    }
-
-  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_EXPORT
-GType clutter_colorize_effect_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterEffect *clutter_colorize_effect_new      (const ClutterColor *tint);
-
-CLUTTER_EXPORT
-void           clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect,
-                                                 const ClutterColor    *tint);
-CLUTTER_EXPORT
-void           clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect,
-                                                 ClutterColor          *tint);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_COLORIZE_EFFECT_H__ */
--- a/clutter/clutter/clutter-constraint-private.h
+++ b/clutter/clutter/clutter-constraint-private.h
@ -1,35 +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);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@ -1,250 +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-constraint
- * @Title: ClutterConstraint
- * @Short_Description: Abstract class for constraints on position or size
- * @See_Also: #ClutterAction
- *
- * #ClutterConstraint is a base abstract class for modifiers of a #ClutterActor
- * position or size.
- *
- * A #ClutterConstraint sub-class should contain the logic for modifying
- * the position or size of the #ClutterActor to which it is applied, by
- * updating the actor's allocation. Each #ClutterConstraint can change the
- * allocation of the actor to which they are applied by overriding the
- * #ClutterConstraintClass.update_allocation() virtual function.
- *
- * #ClutterConstraint is available since Clutter 1.4
- *
- * ## Using Constraints
- *
- * Constraints can be used with fixed layout managers, like
- * #ClutterFixedLayout, or with actors implicitly using a fixed layout
- * manager, like #ClutterGroup and #ClutterStage.
- *
- * Constraints provide a way to build user interfaces by using
- * relations between #ClutterActors, without explicit fixed
- * positioning and sizing, similarly to how fluid layout managers like
- * #ClutterBoxLayout lay out their children.
- *
- * Constraints are attached to a #ClutterActor, and are available
- * for inspection using clutter_actor_get_constraints().
- *
- * Clutter provides different implementation of the #ClutterConstraint
- * abstract class, for instance:
- *
- *  - #ClutterAlignConstraint, a constraint that can be used to align
- *  an actor to another one on either the horizontal or the vertical
- *  axis, using a normalized value between 0 and 1.
- *  - #ClutterBindConstraint, a constraint binds the X, Y, width or height
- *  of an actor to the corresponding position or size of a source actor,
- *  with or without an offset.
- *  - #ClutterSnapConstraint, a constraint that "snaps" together the edges
- *  of two #ClutterActors; if an actor uses two constraints on both its
- *  horizontal or vertical edges then it can also expand to fit the empty
- *  space.
- *
- * The [constraints example](https://git.gnome.org/browse/clutter/tree/examples/constraints.c?h=clutter-1.18)
- * uses various types of #ClutterConstraints to lay out three actors on a
- * resizable stage. Only the central actor has an explicit size, and no
- * actor has an explicit position.
- *
- *  - The #ClutterActor with #ClutterActor:name `layerA` is explicitly
- *  sized to 100 pixels by 25 pixels, and it's added to the #ClutterStage
- *  - two #ClutterAlignConstraints are used to anchor `layerA` to the
- *  center of the stage, by using 0.5 as the alignment #ClutterAlignConstraint:factor on
- *  both the X and Y axis
- *  - the #ClutterActor with #ClutterActor:name `layerB` is added to the
- *  #ClutterStage with no explicit size
- *  - the #ClutterActor:x and #ClutterActor:width of `layerB` are bound
- *  to the same properties of `layerA` using two #ClutterBindConstraint
- *  objects, thus keeping `layerB` aligned to `layerA`
- *  - the top edge of `layerB` is snapped together with the bottom edge
- *  of `layerA`; the bottom edge of `layerB` is also snapped together with
- *  the bottom edge of the #ClutterStage; an offset is  given to the two
- *  #ClutterSnapConstraintss to allow for some padding; since `layerB` is
- *  snapped between two different #ClutterActors, its height is stretched
- *  to match the gap
- *  - the #ClutterActor with #ClutterActor:name `layerC` mirrors `layerB`,
- *  snapping the top edge of the #ClutterStage to the top edge of `layerC`
- *  and the top edge of `layerA` to the bottom edge of `layerC`
- *
- * You can try resizing interactively the #ClutterStage and verify
- * that the three #ClutterActors maintain the same position and
- * size relative to each other, and to the #ClutterStage.
- *
- * It is important to note that Clutter does not avoid loops or
- * competing constraints; if two or more #ClutterConstraints
- * are operating on the same positional or dimensional attributes of an
- * actor, or if the constraints on two different actors depend on each
- * other, then the behavior is undefined.
- *
- * ## Implementing a ClutterConstraint
- *
- * Creating a sub-class of #ClutterConstraint requires the
- * implementation of the #ClutterConstraintClass.update_allocation()
- * virtual function.
- *
- * The `update_allocation()` virtual function is called during the
- * allocation sequence of a #ClutterActor, and allows any #ClutterConstraint
- * attached to that actor to modify the allocation before it is passed to
- * the actor's #ClutterActorClass.allocate() implementation.
- *
- * The #ClutterActorBox passed to the `update_allocation()` implementation
- * contains the original allocation of the #ClutterActor, plus the eventual
- * modifications applied by the other #ClutterConstraints, in the same order
- * the constraints have been applied to the actor.
- *
- * It is not necessary for a #ClutterConstraint sub-class to chain
- * up to the parent's implementation.
- *
- * If a #ClutterConstraint is parametrized - i.e. if it contains
- * properties that affect the way the constraint is implemented - it should
- * call clutter_actor_queue_relayout() on the actor to which it is attached
- * to whenever any parameter is changed. The actor to which it is attached
- * can be recovered at any point using clutter_actor_meta_get_actor().
- */
-
-#include "clutter-build-config.h"
-
-#include <string.h>
-
-#include "clutter-constraint-private.h"
-
-#include "clutter-actor.h"
-#include "clutter-actor-meta-private.h"
-#include "clutter-private.h"
-
-G_DEFINE_ABSTRACT_TYPE (ClutterConstraint,
-                        clutter_constraint,
-                        CLUTTER_TYPE_ACTOR_META);
-
-static void
-constraint_update_allocation (ClutterConstraint *constraint,
-                              ClutterActor      *actor,
-                              ClutterActorBox   *allocation)
-{
-}
-
-static void
-constraint_update_preferred_size (ClutterConstraint  *constraint,
-                                  ClutterActor       *actor,
-                                  ClutterOrientation  direction,
-                                  float               for_size,
-                                  float              *minimum_size,
-                                  float              *natural_size)
-{
-}
-
-static void
-clutter_constraint_set_enabled (ClutterActorMeta *meta,
-                                gboolean          is_enabled)
-{
-  ClutterActorMetaClass *parent_class =
-    CLUTTER_ACTOR_META_CLASS (clutter_constraint_parent_class);
-  ClutterActor *actor;
-
-  actor = clutter_actor_meta_get_actor (meta);
-  if (actor)
-    clutter_actor_queue_relayout (actor);
-
-  parent_class->set_enabled (meta, is_enabled);
-}
-
-static void
-clutter_constraint_class_init (ClutterConstraintClass *klass)
-{
-  ClutterActorMetaClass *actor_meta_class = CLUTTER_ACTOR_META_CLASS (klass);
-
-  actor_meta_class->set_enabled = clutter_constraint_set_enabled;
-
-  klass->update_allocation = constraint_update_allocation;
-  klass->update_preferred_size = constraint_update_preferred_size;
-}
-
-static void
-clutter_constraint_init (ClutterConstraint *self)
-{
-}
-
-/*< private >
- * clutter_constraint_update_allocation:
- * @constraint: a #ClutterConstraint
- * @actor: a #ClutterActor
- * @allocation: (inout): the allocation to modify
- *
- * Asks the @constraint to update the @allocation of a #ClutterActor.
- *
- * Returns: %TRUE if the allocation was updated
- */
-gboolean
-clutter_constraint_update_allocation (ClutterConstraint *constraint,
-                                      ClutterActor      *actor,
-                                      ClutterActorBox   *allocation)
-{
-  ClutterActorBox old_alloc;
-
-  g_return_val_if_fail (CLUTTER_IS_CONSTRAINT (constraint), FALSE);
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE);
-  g_return_val_if_fail (allocation != NULL, FALSE);
-
-  old_alloc = *allocation;
-
-  CLUTTER_CONSTRAINT_GET_CLASS (constraint)->update_allocation (constraint,
-                                                                actor,
-                                                                allocation);
-
-  return !clutter_actor_box_equal (allocation, &old_alloc);
-}
-
-/**
- * clutter_constraint_update_preferred_size:
- * @constraint: a #ClutterConstraint
- * @actor: a #ClutterActor
- * @direction: a #ClutterOrientation
- * @for_size: the size in the opposite direction
- * @minimum_size: (inout): the minimum size to modify
- * @natural_size: (inout): the natural size to modify
- *
- * Asks the @constraint to update the size request of a #ClutterActor.
- */
-void
-clutter_constraint_update_preferred_size (ClutterConstraint  *constraint,
-                                          ClutterActor       *actor,
-                                          ClutterOrientation  direction,
-                                          float               for_size,
-                                          float              *minimum_size,
-                                          float              *natural_size)
-{
-  g_return_if_fail (CLUTTER_IS_CONSTRAINT (constraint));
-  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-
-  CLUTTER_CONSTRAINT_GET_CLASS (constraint)->update_preferred_size (constraint, actor,
-                                                                    direction,
-                                                                    for_size,
-                                                                    minimum_size,
-                                                                    natural_size);
-}
--- a/clutter/clutter/clutter-constraint.h
+++ b/clutter/clutter/clutter-constraint.h
@ -1,137 +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_CONSTRAINT_H__
-#define __CLUTTER_CONSTRAINT_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_CONSTRAINT                 (clutter_constraint_get_type ())
-#define CLUTTER_CONSTRAINT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CONSTRAINT, ClutterConstraint))
-#define CLUTTER_IS_CONSTRAINT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CONSTRAINT))
-#define CLUTTER_CONSTRAINT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CONSTRAINT, ClutterConstraintClass))
-#define CLUTTER_IS_CONSTRAINT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CONSTRAINT))
-#define CLUTTER_CONSTRAINT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CONSTRAINT, ClutterConstraintClass))
-
-typedef struct _ClutterConstraintClass          ClutterConstraintClass;
-
-/**
- * ClutterConstraint:
- *
- * The #ClutterConstraint structure contains only
- * private data and should be accessed using the provided API
- *
- * Since: 1.4
- */
-struct _ClutterConstraint
-{
-  /*< private >*/
-  ClutterActorMeta parent_instance;
-};
-
-/**
- * ClutterConstraintClass:
- * @update_allocation: virtual function used to update the allocation
- *   of the #ClutterActor using the #ClutterConstraint
- * @update_preferred_size: virtual function used to update the preferred
- *   size of the #ClutterActor using the #ClutterConstraint; optional,
- *   since 1.22
- *
- * The #ClutterConstraintClass structure contains
- * only private data
- *
- * Since: 1.4
- */
-struct _ClutterConstraintClass
-{
-  /*< private >*/
-  ClutterActorMetaClass parent_class;
-
-  /*< public >*/
-  void (* update_allocation) (ClutterConstraint *constraint,
-                              ClutterActor      *actor,
-                              ClutterActorBox   *allocation);
-
-  void (* update_preferred_size) (ClutterConstraint  *constraint,
-                                  ClutterActor       *actor,
-                                  ClutterOrientation  direction,
-                                  float               for_size,
-                                  float              *minimum_size,
-                                  float              *natural_size);
-
-  /*< private >*/
-  void (* _clutter_constraint1) (void);
-  void (* _clutter_constraint2) (void);
-  void (* _clutter_constraint3) (void);
-  void (* _clutter_constraint4) (void);
-  void (* _clutter_constraint5) (void);
-  void (* _clutter_constraint6) (void);
-  void (* _clutter_constraint7) (void);
-};
-
-CLUTTER_EXPORT
-GType clutter_constraint_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-void clutter_constraint_update_preferred_size (ClutterConstraint  *constraint,
-                                               ClutterActor       *actor,
-                                               ClutterOrientation  direction,
-                                               float               for_size,
-                                               float              *minimum_size,
-                                               float              *natural_size);
-
-/* ClutterActor API */
-CLUTTER_EXPORT
-void               clutter_actor_add_constraint            (ClutterActor      *self,
-                                                            ClutterConstraint *constraint);
-CLUTTER_EXPORT
-void               clutter_actor_add_constraint_with_name  (ClutterActor      *self,
-                                                            const gchar       *name,
-                                                            ClutterConstraint *constraint);
-CLUTTER_EXPORT
-void               clutter_actor_remove_constraint         (ClutterActor      *self,
-                                                            ClutterConstraint *constraint);
-CLUTTER_EXPORT
-void               clutter_actor_remove_constraint_by_name (ClutterActor      *self,
-                                                            const gchar       *name);
-CLUTTER_EXPORT
-GList *            clutter_actor_get_constraints           (ClutterActor      *self);
-CLUTTER_EXPORT
-ClutterConstraint *clutter_actor_get_constraint            (ClutterActor      *self,
-                                                            const gchar       *name);
-CLUTTER_EXPORT
-void               clutter_actor_clear_constraints         (ClutterActor      *self);
-
-CLUTTER_EXPORT
-gboolean           clutter_actor_has_constraints           (ClutterActor      *self);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CONSTRAINT_H__ */
--- a/clutter/clutter/clutter-container-private.h
+++ b/clutter/clutter/clutter-container-private.h
@ -1,36 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright 2020 Red Hat, 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 __CLUTTER_CONTAINER_PRIVATE_H__
-#define __CLUTTER_CONTAINER_PRIVATE_H__
-
-#include <clutter/clutter-container.h>
-
-G_BEGIN_DECLS
-
-void _clutter_container_emit_actor_added   (ClutterContainer *container,
-                                            ClutterActor     *actor);
-void _clutter_container_emit_actor_removed (ClutterContainer *container,
-                                            ClutterActor     *actor);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CONTAINER_PRIVATE_H__ */
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
--- a/clutter/clutter/clutter-container.h
+++ b/clutter/clutter/clutter-container.h
@ -1,181 +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/>.
- *
- * ClutterContainer: Generic actor container interface.
- * Author: Emmanuele Bassi <ebassi@openedhand.com>
- */
-
-#ifndef __CLUTTER_CONTAINER_H__
-#define __CLUTTER_CONTAINER_H__
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-child-meta.h>
-#include <clutter/clutter-types.h>
-
-G_BEGIN_DECLS
-
-#define CLUTTER_TYPE_CONTAINER                  (clutter_container_get_type ())
-#define CLUTTER_CONTAINER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CONTAINER, ClutterContainer))
-#define CLUTTER_IS_CONTAINER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CONTAINER))
-#define CLUTTER_CONTAINER_GET_IFACE(obj)        (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_CONTAINER, ClutterContainerIface))
-
-typedef struct _ClutterContainerIface   ClutterContainerIface;
-
-/**
- * ClutterContainer:
- *
- * #ClutterContainer is an opaque structure whose members cannot be directly
- * accessed
- *
- * Since: 0.4
- */
-
-/**
- * ClutterContainerIface:
- * @add: virtual function for adding an actor to the container. This virtual
- *   function is deprecated, and it should not be overridden.
- * @remove: virtual function for removing an actor from the container. This
- *   virtual function is deprecated, and it should not be overridden.
- * @raise: virtual function for raising a child. This virtual function is
- *   deprecated and it should not be overridden.
- * @lower: virtual function for lowering a child. This virtual function is
- *   deprecated and it should not be overridden.
- * @sort_depth_order: virtual function for sorting the children of a
- *   container depending on their depth. This virtual function is deprecated
- *   and it should not be overridden.
- * @child_meta_type: The GType used for storing auxiliary information about
- *   each of the containers children.
- * @create_child_meta: virtual function that gets called for each added
- *   child, the function should instantiate an object of type
- *   #ClutterContainerIface::child_meta_type, set the container and actor
- *   fields in the instance and add the record to a data structure for
- *   subsequent access for #ClutterContainerIface::get_child_meta
- * @destroy_child_meta: virtual function that gets called when a child is
- *   removed; it should release all resources held by the record
- * @get_child_meta: return the record for a container child
- * @actor_added: class handler for #ClutterContainer::actor-added
- * @actor_removed: class handler for #ClutterContainer::actor-removed
- * @child_notify: class handler for #ClutterContainer::child-notify
- *
- * Base interface for container actors. The @add and @remove
- * virtual functions must be provided by any implementation; the other
- * virtual functions are optional.
- *
- * Since: 0.4
- */
-struct _ClutterContainerIface
-{
-  /*< private >*/
-  GTypeInterface g_iface;
-
-  /*< public >*/
-  void (* add)              (ClutterContainer *container,
-                             ClutterActor     *actor);
-  void (* remove)           (ClutterContainer *container,
-                             ClutterActor     *actor);
-
-  /* child stacking */
-  void (* raise)            (ClutterContainer *container,
-                             ClutterActor     *actor,
-                             ClutterActor     *sibling);
-  void (* lower)            (ClutterContainer *container,
-                             ClutterActor     *actor,
-                             ClutterActor     *sibling);
-  void (* sort_depth_order) (ClutterContainer *container);
-
-  /* ClutterChildMeta management */
-  GType                child_meta_type;
-  void              (* create_child_meta)  (ClutterContainer *container,
-                                            ClutterActor     *actor);
-  void              (* destroy_child_meta) (ClutterContainer *container,
-                                            ClutterActor     *actor);
-  ClutterChildMeta *(* get_child_meta)     (ClutterContainer *container,
-                                            ClutterActor     *actor);
-
-  /* signals */
-  void (* actor_added)   (ClutterContainer *container,
-                          ClutterActor     *actor);
-  void (* actor_removed) (ClutterContainer *container,
-                          ClutterActor     *actor);
-
-  void (* child_notify)  (ClutterContainer *container,
-                          ClutterActor     *child,
-                          GParamSpec       *pspec);
-};
-
-CLUTTER_EXPORT
-GType clutter_container_get_type (void) G_GNUC_CONST;
-
-CLUTTER_EXPORT
-ClutterActor *          clutter_container_find_child_by_name            (ClutterContainer *container,
-                                                                         const gchar      *child_name);
-
-CLUTTER_EXPORT
-GParamSpec *            clutter_container_class_find_child_property     (GObjectClass     *klass,
-                                                                         const gchar      *property_name);
-CLUTTER_EXPORT
-GParamSpec **           clutter_container_class_list_child_properties   (GObjectClass     *klass,
-                                                                         guint            *n_properties);
-
-CLUTTER_EXPORT
-void                    clutter_container_create_child_meta             (ClutterContainer *container,
-                                                                         ClutterActor     *actor);
-CLUTTER_EXPORT
-void                    clutter_container_destroy_child_meta            (ClutterContainer *container,
-                                                                         ClutterActor     *actor);
-CLUTTER_EXPORT
-ClutterChildMeta *      clutter_container_get_child_meta                (ClutterContainer *container,
-                                                                         ClutterActor     *actor);
-
-CLUTTER_EXPORT
-void                    clutter_container_child_set_property            (ClutterContainer *container,
-                                                                         ClutterActor     *child,
-                                                                         const gchar      * property,
-                                                                         const GValue     *value);
-CLUTTER_EXPORT
-void                    clutter_container_child_get_property            (ClutterContainer *container,
-                                                                         ClutterActor     *child,
-                                                                         const gchar      *property,
-                                                                         GValue           *value);
-CLUTTER_EXPORT
-void                    clutter_container_child_set                     (ClutterContainer *container,
-                                                                         ClutterActor     *actor,
-                                                                         const gchar      *first_prop,
-                                                                         ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_EXPORT
-void                    clutter_container_child_get                     (ClutterContainer *container,
-                                                                         ClutterActor     *actor,
-                                                                         const gchar      *first_prop,
-                                                                         ...) G_GNUC_NULL_TERMINATED;
-
-CLUTTER_EXPORT
-void                    clutter_container_child_notify                  (ClutterContainer *container,
-                                                                         ClutterActor     *child,
-                                                                         GParamSpec       *pspec);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CONTAINER_H__ */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	8a0de6dfd3	Avoid restacking animating hidden actors Since the stack passed to the compositor now accurately reflects the X stacking order, we need to treat hidden windows (which are at the bottom of the X stacking order) specially - when the compositor stacking order is synced, try to keep animating hidden actors in their old positions in the stack. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-27 09:58:45 -04:00
Owen W. Taylor	2bf0b2b6de	Merge branch 'master' into override-redirect-exclusion	2009-06-19 11:42:03 -04:00
Owen W. Taylor	eed2a2d324	Fix shadowing problem breaking MetaStackTracker A variable shadowing problem introduced in cleanup was causing queued elements to be removed too early. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-17 14:23:57 -04:00
Owen W. Taylor	9828007a02	Merge branch 'master' into override-redirect-exclusion Conflicts: src/core/bell.c	2009-06-17 13:40:42 -04:00
Owen W. Taylor	1f890672bb	Use MetaStackTracker to avoid a round-trip XQueryTree() With MetaStackTracker, it's no longer necessary to XQueryTree to get a reasonably-up-to-date view of the server stacking order. Add some comments explaining unclear aspects of raise_window_relative_to_managed_windows() and with future possible improvements. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-16 09:56:43 -04:00
Owen W. Taylor	ef966854d5	Don't do stacking for override-redirect windows Don't add override-redirect windows to MetaStack; we shouldn't be restacking them. Since we aren't stacking the override-redirect windows, we need to be careful that to ignore them when looking for the top managed window. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-16 09:56:42 -04:00
Owen W. Taylor	7309b6cfe3	Move compositor-stack handling to MetaStackTracker In order to properly track the stacking order for override-redirect windows, move meta_compositor_sync_stack() call into MetaStackTracker. In the new location, we sync the stack as a before-redraw idle function, rather then using the freeze-thaw facilities of MetaStack. This is simpler, and also properly compresses multiple stack changes on notifications received from the X server. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-16 09:56:42 -04:00
Owen W. Taylor	3705a224f0	Add better tracking of real stacking order Wedging override-redirect windows into the constraint code in stack.c results in Mutter getting confused about the stacking order of these windows with respect to other windows, and may also in some cases cause Mutter to restack override-redirect windows. core/stack-tracker.c core/stack-tracker.h: MetaStackTracker - combine events received from the X server with local changes we have made to come up with the best possible idea of what the stacking order is at any one point in time. core/screen.c core/screen-private.h: Create a MetaStackTracker for the screen. core/display.c: Feed relevant events to MetaStackTracker core/frame.c core/screen.c core/stack.c: When we make changes to the stacking order or add windows, record those changes immediatley in MetaStackTracker so we have the information without waiting for a round-trip. include/ui.h ui/ui.c: meta_ui_create_frame_window add a return value for the X request serial used to create the window. http://bugzilla.gnome.org/show_bug.cgi?id=585984	2009-06-16 09:56:42 -04:00
Owen W. Taylor	2ebedb822d	Avoid moving and resizing override-redirect windows Override-redirect windows should not be moved or resized by the window manager. - Mark override-redirect windows as already placed to avoid placing them when first shown. - Don't move-resize newly created override-redirect MetaWindow - Don't queue a resize on override-redirect windows when reading their WM_TRANSIENT_FOR hint. - Add g_return_if_fail (!window->override_redirect) to catch unexpected code paths that might result in override-redirect windows being moved or resized. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	d6576d9b70	Don't add override-redirect windows to workspaces Normally a window that is "on all workspaces", is also on a particular workspace (to deal with being unstuck.) This is pointless for override-redirect windows. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	6516c19ec5	Ignore client messages sent to override-redirect windows If someone asks us to close, maximize, etc, an override-redirect window, just ignore the request. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	5518fee61c	meta_screen_foreach_window(): Skip override-redirect windows Don't include override-redirect windows when iterating the windows in the screen. We don't need them for any of the current uses: - Queueing redraws and resizes on managed windows - Checking which windows should be added to a new workspace http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	ace0521cba	meta_display_list_windows: Exclude override-redirect Don't include override-redirect windows in the list return by meta_display_list_windows(), since we almost never want to handle them when considering "all window" for the display. Add a separate meta_display_list_all_windows() that includes override-redirect windows. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	0091a3aab5	Don't read most properties for override-redirect windows Skipping handling of properties for override redirect windows has two advantages: first it reduces the amount of work needed to get an override-redirect window (menu, tooltip, drag icon) onto the screen. But more importantly, it reduces the number of code-paths for an override-redirect to get into some code portion where it isn't expected. * Integrate the list of properties we load initially with the list of property hooks; this avoids having two separate lists that we have to keep in sync. * Add a flag to MetaWindowPropHooks to indicate whether the property should be handled for override-redirect windows; currently we load a) properties that identify the window - useful for debugging purposes b) WM_TRANSIENT_FOR (could be used to associate menus with toplevels.) * For properties that aren't always loaded through window-props.c, add !window->override checks to places that trigger loading, and add g_return_if_fail(!window->override) to the load functions as a double-check. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:42 -04:00
Owen W. Taylor	268b92a4ec	Add checks against inappropriate changes to override-redirect window Add g_return_if_fail() to check that window-management functions like meta_window_maximize() aren't called on override-redirect windows. This reveals that were were "unminimizing" override-redirect windows when adding them; avoid doing that. http://bugzilla.gnome.org/show_bug.cgi?id=582639	2009-06-16 09:56:41 -04:00
Owen W. Taylor	29bb4c27e3	Fix property notifications for certain properties If a property has a reload function, but the standard property-fetching mechanism isn't used (hooks->type == META_PROP_VALUE_INVALID), then the a logic error (introduced in January) caused the hook to never be run. This meant that changes to struts and icons weren't noticed. Same as: http://bugzilla.gnome.org/show_bug.cgi?id=572573 The fix here is different in detail from that applied to Metacity, but similar in spirit. http://bugzilla.gnome.org/show_bug.cgi?id=585980	2009-06-16 09:56:41 -04:00
Owen W. Taylor	bd3bdc51b9	Load NET_WM_USER_TIME from the right window On subsequent changes, if there is a NET_WM_USER_TIME_WINDOW, then read the property from that rather than from the main window. (Fix an accidental regression: the right Window was being computed but no longer passed in.) http://bugzilla.gnome.org/show_bug.cgi?id=585979	2009-06-16 09:56:41 -04:00
Owen W. Taylor	0123dab87a	Fix missing static for meta_window_show() Definition of meta_window_show() was missing static although it was forward-declared with static. http://bugzilla.gnome.org/show_bug.cgi?id=585978	2009-06-16 09:56:41 -04:00
Owen W. Taylor	413acc9574	Regularize main loop priorities If there is a client that is continually redrawing, then sources that are less-prioritized than CLUTTER_PRIORITY_REDRAW will never get run. This patch sorts out how all the different main loop sources fit in CLUTTER_PRIORITY_REDRAW. common.h: Document all the relevant priorities and how they fit in with each other. ui.h common.h: Move META_PRIORITY_RESIZE to to common.h with other priorities. src/core/window.c src/core/screen.c: Change calc-showing, update-icon, and update-work-area idles to be prioritized above redraws so they don't get starved. bell.c: Make the visual bell priority the same as the clutter redraw priority. delete.c: Use a G_PRIORITY_DEFAULT idle when responding to the dialog response; we want to handle it as soon as practical. http://bugzilla.gnome.org/show_bug.cgi?id=568874	2009-06-16 09:56:41 -04:00