compositor: Focus the no focus window during modal plugin operations

Modal operations are usually far from transient, so it makes sense to unfocus the currently focused window while the operation is going on. If no other window was focused and the window is still alive when the modal operation is finished, focus will be restored back. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/452
2019-02-19 18:09:01 +00:00
879 changed files with 56212 additions and 39141 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/mutter/master:v2
+image: registry.gitlab.gnome.org/gnome/mutter/master:v1

 stages:
 - review
@@ -7,8 +7,6 @@ stages:

 check-commit-log:
  stage: review
-  variables:
-    GIT_DEPTH: "100"
  script:
    - ./.gitlab-ci/check-commit-log.sh
  only:
@@ -17,21 +15,7 @@ check-commit-log:
 build-mutter:
  stage: build
  script:
-    - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
-    - ninja -C build
-    - ninja -C build install
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - build
-  only:
-    - merge_requests
-    - /^.*$/
-
-build-without-native-backend-and-wayland:
-  stage: build
-  script:
-    - meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false --werror --prefix /usr
+    - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror
    - ninja -C build
    - ninja -C build install
  artifacts:
@@ -49,31 +33,12 @@ test-mutter:
  variables:
    XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
    GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
-    G_SLICE: "always-malloc"
-    MALLOC_CHECK_: "3"
-    NO_AT_BRIDGE: "1"
-    MALLOC_PERTURB_: "123"
  script:
-    - dconf update
    - mkdir -m 700 $XDG_RUNTIME_DIR
    - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
    - >
      dbus-run-session -- xvfb-run -s '+iglx -noreset'
-      meson test -C build --no-rebuild -t 10 --verbose --no-stdsplit --print-errorlogs --wrap catchsegv
-  only:
-    - merge_requests
-    - /^.*$/
-
-can-build-gnome-shell:
-  stage: test
-  dependencies:
-    - build-mutter
-  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
-    - ninja -C gnome-shell/build install
+      meson test -C build --no-rebuild -t 10 --verbose --no-stdsplit --wrap catchsegv
  only:
    - merge_requests
    - /^.*$/
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,40 +1,17 @@
-# Rebuild and push with
-#
-#     cd .gitlab-ci/
-#     docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v2 .
-#     docker push registry.gitlab.gnome.org/gnome/mutter/master:v2
-#
-
-FROM fedora:30
+FROM fedora:29

 RUN dnf -y update && dnf -y upgrade && \
    dnf install -y 'dnf-command(builddep)' && \
-    dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
-    dnf copr enable -y jadahl/mutter-ci && \
-    dnf copr enable -y hergertme/sysprof-3 && \
-    dnf -y update && dnf -y upgrade && \
-
    dnf builddep -y mutter && \

    # Until Fedora catches up with meson build-deps
    dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \

-    # Until Fedora catches up with mesa bug fixes
-    dnf upgrade -y mesa-dri-drivers mesa-libEGL && \
-
    # For running unit tests
-    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \
+    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \

-    dnf install -y sysprof-devel && \
+    # Unpackaged versions
+    dnf install -y https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm https://copr-be.cloud.fedoraproject.org/results/jadahl/mutter-ci/fedora-29-x86_64/00848426-gsettings-desktop-schemas/gsettings-desktop-schemas-devel-3.30.1-1.20181206git918efdd69be53.fc29.x86_64.rpm && \

    dnf install -y intltool redhat-rpm-config make && \
-
-    # GNOME Shell
-    dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-    # New dep this cycle
-    dnf install -y 'pkgconfig(gnome-autoar-0)' && \
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \
-    dnf remove -y --noautoremove mutter mutter-devel && \
-
    dnf clean all
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -23,35 +23,9 @@ function commit_message_has_url() {
  return $?
 }

-function commit_message_subject_is_compliant() {
-  commit=$1
-  commit_message_subject=$(git show -s --format='format:%s' $commit)
-
-  if echo "$commit_message_subject" | grep -qe "\(^meta-\|^Meta\)"; then
-    echo " - message subject should not be prefixed with 'meta-' or 'Meta'"
-    return 1
-  fi
-
-  if echo "$commit_message_subject" | grep -qe "\.[ch]:"; then
-    echo " - message subject prefix should not include .c, .h, etc."
-    return 1
-  fi
-
-  return 0
-}
-
 for commit in $commits; do
-  commit_short=$(echo $commit | cut -c -8)
-
  if ! commit_message_has_url $commit; then
-    echo "Missing merge request or issue URL on commit $commit_short"
-    exit 1
-  fi
-
-  errors=$(commit_message_subject_is_compliant $commit)
-  if [ $? != 0 ]; then
-    echo "Commit message for $commit_short is not compliant:"
-    echo "$errors"
+    echo "Missing merge request or issue URL on commit $(echo $commit | cut -c -8)"
    exit 1
  fi
 done
--- a/.gitlab-ci/checkout-gnome-shell.sh
+++ b/.gitlab-ci/checkout-gnome-shell.sh
@@ -1,35 +0,0 @@
-#!/usr/bin/bash
-
-mutter_branch=$(git describe --contains --all HEAD)
-gnome_shell_target=
-
-git clone https://gitlab.gnome.org/GNOME/gnome-shell.git
-
-if [ $? -ne 0 ]; then
-  echo Checkout 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 Looking for $merge_request_branch on remote ...
-  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
-    gnome_shell_target=FETCH_HEAD
-  else
-    gnome_shell_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
-    echo Using $gnome_shell_target instead
-  fi
-fi
-
-if [ -z "$gnome_shell_target" ]; then
-  gnome_shell_target=$(git branch -r -l origin/$mutter_branch)
-  gnome_shell_target=${gnome_shell_target:-$(git branch -r -l ${mutter_branch#remotes/})}
-  gnome_shell_target=${gnome_shell_target:-origin/master}
-  echo Using $gnome_shell_target instead
-fi
-
-git checkout -q $gnome_shell_target
--- a/318
+++ b/318
@@ -1,321 +1,3 @@
-3.35.1
-======
-* Fix immediate screen blank after releaseing inhibitor [Tim; #573]
-* Respond to frame callbacks regardless of damage [Jonas; !839]
-* selection [Carlos; !842]
-* Fix Night Light on wayland [Jonas; !840]
-* Fix various copy+paste/DND regressions [Carlos; !848, #789, #842,
-  #793, #845, #854]
-* Misc. bug fixes and cleanups [Daniel, Marco, Jonas, Georges;
-  !841, !764, !837, !846]
-
-Contributors:
-  Marco Trevisan (Treviño), Carlos Garnacho, Tim Klocke,
-  Georges Basile Stavracas Neto, Daniel van Vugt, Jonas Ådahl
-
-3.34.1
-======
-* Fix startup of X11 session services on wayland [Carlos; #771]
-* Fix _NET_ACTIVE_WINDOW emission [Carlos; #751]
-* Fix initial view perspective [Marco; !803]
-* Fix screenshots and window animations when scaled [Robert; !758]
-* Re-enable coredumps when capabilities are set [Jonas; !811]
-* Fix scaling of DND surface actors [Robert; !780]
-* Optimize blitting of untransformed offscreen stage views [Olivier; !809, !820]
-* Fix freeze of pointer event delivery on X11 [Olivier; !821]
-* Fix scaling of stylus input coordinates with HiDPI [Dorian; !830]
-* Fix memory leak when using implicit animations [Jonas; !828]
-* Fix numlock state for native backend [Carlos; #769]
-* Fixed crashes [Marco, Olivier, Jonas Å.; !805, #823, !808, !825,
-  #844, !826, #779]
-* Misc. bug fixes and cleanups [Jonas Å., Georges, Jonas D., Michal, Daniel,
-  Iain, Adam, Marco, Carlos, Ting-Wei, Hans, Robert; !787, !795, !791, !797,
-  !772, !775, !799, !778, !785, !782, !796, #819, !814, !769, !817, !783, !786,
-  !829, !774, #822]
-
-Contributors:
-  Marco Trevisan (Treviño), Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
-  Hans de Goede, Adam Jackson, Ting-Wei Lan, Iain Lane, Michal Lazo,
-  Robert Mader, Georges Basile Stavracas Neto, Dorian Stoll, Daniel van Vugt,
-  Jonas Ådahl
-
-Translators:
-  Milo Casagrande [it], Nathan Follens [nl], Matej Urbančič [sl],
-  Ask Hjorth Larsen [da], Alan Mortensen [da], Jordi Mas [ca]
-
-3.34.0
-======
-* Fix xdg-output v3 support [Olivier; !771]
-* Fix crash when changing decoration state [Jonas; !773]
-* Add and remove connectors on hot-plug [Jonas; !743]
-
-Contributors:
-  Olivier Fourdan, Jonas Ådahl
-
-Translators:
-  Rafael Fontenelle [pt_BR], Gwan-gyeong Mun [ko], Christian Kirbach [de],
-  Claude Paroz [fr], Milo Casagrande [it], Emin Tufan Çetin [tr],
-  Ryuta Fujii [ja]
-
-3.33.92
-=======
-* Turn MetaShapedTexture into a ClutterContent implementation [Georges; !409]
-* Restore inhibit shortcut for overlay key [Olivier; #734]
-* Misc. pointer a11y improvements [Jonas D., Olivier; !746, !747, !745, !761]
-* Fix position of drag surfaces [Robert; !684]
-* Implement subsurface.place_below() for parents [Robert; !664]
-* Add meta_window_actor_get_image() [Jonas Å.; !752]
-* Revert faulty optimization from !719 [Jonas Å.; #735]
-* Add additional sysprof trace points [Jonas Å.; !757, !765]
-* Remove GLX "threaded swap wait" used on Nvidia [Daniel; !602]
-* Implement geometric picking [Daniel; !189]
-* Fix lost keyboard focus after DND [Olivier; #747]
-* Misc. bug fixes and cleanups [Florian, Carlos, Piotr, Hans, Georges, Robert,
-  Ray, Mart, Rémi; !740, !672, !749, !751, !753, !730, !755, !756, !750, !715,
-  #738944, !657, !768]
-
-Contributors:
-  Jonas Ådahl, Rémi Bernon, Piotr Drąg, Jonas Dreßler, Olivier Fourdan,
-  Carlos Garnacho, Hans de Goede, Robert Mader, Florian Müllner,
-  Georges Basile Stavracas Neto, Mart Raudsepp, Ray Strode, Daniel van Vugt
-
-Translators:
-  Piotr Drąg [pl], Марко Костић [sr], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
-  Balázs Úr [hu], Fran Dieguez [gl], Jordi Mas [ca], Anders Jonsson [sv],
-  Trần Ngọc Quân [vi], Tim Sabsch [de], Fabio Tomat [fur], Goran Vidović [hr],
-  Marek Černocký [cs]
-
-3.33.91
-=======
-* Fix primary selection copy and paste between X11 and wayland [Hans; #702]
-* Improve monitor hotplug support [Hans; !713]
-* Remove a source of frame skips [Daniel; !719]
-* Fix windows being lowered after unmaximizing with double click [Olivier; #88]
-* Remove Clutter API for global grabs [Jonas D.; !536]
-* Improve processing of incompressible events [Daniel; !711]
-* Add xdg-output v3 support [Olivier; !704]
-* Misc. bug fixes and cleanups [Jonas Å., Marco, Carlos, Adam, Albert, Niels,
-  Olivier, Florian; !722, !385, !728, !726, !500, !731, !727, !700, !735, !738]
-
-Contributors:
-  Jonas Ådahl, Albert Vaca Cintora, Jonas Dreßler, Olivier Fourdan,
-  Carlos Garnacho, Hans de Goede, Niels De Graef, Adam Jackson, Florian Müllner,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Asier Sarasua Garmendia [eu], Kukuh Syafaat [id], Florentina Mușat [ro],
-  Aurimas Černius [lt], Daniel Mustieles [es]
-
-3.33.90
-=======
-* Fix visibility of clones with hidden source [Florian; #683]
-* Reduce freezes when opening some popup windows [Carlos; #556]
-* Be more thorough when excluding obscured areas from painting [Carlos; !698]
-* Make it possible to start Xwayland on demand [Carlos; !709]
-* clutter: Expose layout_manager to transitions [Florian; !716]
-* Misc. bug fixes and cleanups [Mark, Florian, Iain, Niels, Carlos, Ray; !671,
-  !691, !694, !696, !703, !707, !697, !710, !708, !714, #719, !721]
-
-Contributors:
-  Mark Blakeney, Carlos Garnacho, Niels De Graef, Iain Lane, Florian Müllner,
-  Ray Strode
-
-Translators:
-  Asier Sarasua Garmendia [eu], Rafael Fontenelle [pt_BR], Fabio Tomat [fur],
-  Florentina Mușat [ro]
-
-3.33.4
-======
-* Discard page flip retries on hotplug [Jonas; !630]
-* Add xdg-output v2 support [Olivier; #645]
-* Restore DRM format fallbacks [Jonas; !662]
-* Don't emit ::size-changed when only position changed [Daniel; !568]
-* Expose workspace layout properties [Florian; !618]
-* Don't use grab modifiers when shortcuts are inhibited [Olivier; #642]
-* Fix stuttering due to unchanged power save mode notifications [Georges; !674]
-* Add API to reorder workspaces [Adam; !670]
-* Make picking a new focus window more reliable [Marco; !669]
-* Defer actor allocation till shown [Carlos; !677]
-* Try to use primary GPU for copy instead of glReadPixels [Pekka; !615]
-* Unset pointer focus when the cursor is hidden [Jonas D.; !448]
-* Fix modifier-drag on wayland subsurfaces [Robert; !604]
-* Fix background corruption on Nvidia after resuming from suspend [Daniel; !600]
-* Only grab the locate-pointer key when necessary [Olivier; !685, #647]
-* Misc. bug fixes and cleanups [Florian, Jonas, Daniel, Robert, Olivier,
-  Georges, Marco, Carlos, Emmanuele; !648, !650, !647, !656, !658, !637,
-  !663, !660, !659, !665, !666, !668, !667, #667, !676, !678, #672, !680,
-  !683, !688, !689, !687]
-
-Contributors:
-  Jonas Ådahl, Emmanuele Bassi, Adam Bieńkowski, Piotr Drąg, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Robert Mader, Florian Müllner,
-  Georges Basile Stavracas Neto, Pekka Paalanen, Marco Trevisan (Treviño),
-  Daniel van Vugt
-
-Translators:
-  Fabio Tomat [fur], Kukuh Syafaat [id]
-
-3.33.3
-======
-* Prepare for running Xwayland on demand [Carlos; !420]
-* Fix text selection color rendering [Florian; #494]
-* Fix black shadows when using fractional scaling [Robert; #609]
-* Honor startup sequence workspace on wayland [Carlos; gnome-shell#674]
-* Only emit 'grab-op-end` signal after dropping grabs [Marco; !596]
-* Add a Sysprof-based profiler [Jonas, Georges; !197, !603]
-* Relax "xwayland-allow-grabs" setting [Olivier; #597]
-* Implement locate-pointer accessibility feature [Olivier; !453]
-* Implement mouse accessibility [Olivier; !512]
-* Consolidate frame throttling [Daniel, Georges; !363]
-* Fix setting blank cursor under wayland [Jonas; #630]
-* Pixel-align OpenGL cursors [Jonas; !610]
-* Handle returning from fullscreen/maximization better [Jonas; !621]
-* Improve screencast support on multi-monitor systems [Georges; !623]
-* Fix running X11 applications with sudo under wayland [Hans; #643]
-* Implement toggle-keys notification [Olivier; #637]
-* Add initial KMS transactional support [Jonas; !525]
-* Improve finding new focus window when the old one is closed [Marco; #308]
-* Misc. bug fixes and cleanups [Jonas, Carlos, Marco, Florian, Pekka, Robert,
-  Douglas, Georges, Daniel, Emil, Niels, Hans, Olivier, Ting-Wei, Corentin;
-  !591, #398, !592, !581, !597, !598, !593, !497, #591, !545, gtk#1675, !601,
-  #568, !564, !605, !609, !115, !214, !611, !617, !616, !619, !624, !622, !627,
-  !628, !629, !632, !633, !631, !636, !639, !638, !634, !640, !529, !644, !590]
-
-Contributors:
-  Jonas Ådahl, Piotr Drąg, Olivier Fourdan, Carlos Garnacho, Hans de Goede,
-  Niels De Graef, Ting-Wei Lan, Robert Mader, Florian Müllner,
-  Georges Basile Stavracas Neto, Corentin Noël, Pekka Paalanen, Douglas R. Reno,
-  Marco Trevisan (Treviño), Emil Velikov, Daniel van Vugt
-
-Translators:
-  Balázs Úr [hu], Daniel Mustieles [es], Nathan Follens [nl], Goran Vidović [hr]
-
-3.33.2
-======
-* Fix rendering lag on Xorg [Daniel; !520, !281]
-* Misc. bug fixes and cleanups [Carlos, Marco, Jonas D., Florian, Niels,
-  Daniel, Benjamin, Jonas Å., Ignacio, Vasilis; #598, !576, !547, !578,
-  !583, !582, !469, !524, !119, !571, !584, !585, !586, #425]
-
-Contributors:
-  Jonas Ådahl, Benjamin Berg, Jonas Dreßler, Carlos Garnacho, Niels De Graef,
-  Vasilis Liaskovitis, Florian Müllner, Ignacio Casal Quinteiro,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Daniel Mustieles [es]
-
-3.33.1
-======
-* Remove unused APIs and outdated driver support
-  [Adam; !481, !468, !489, !487, !546]
-* Enable EGL_IMG_context_priority [Adam; !454]
-* Disable mouse keys with Numlock on [Olivier; #530]
-* Fix crash when restarting on X11 [Marco; #576]
-* Implement clipboard manager [Carlos; !320]
-* Fix spurious idle signals that prevent session unblank [Jonas Å.; !543]
-* Fix mapping of touchscreens that don't report dimensions [Carlos; #581]
-* Fix propagating fractional scaling factor [Robert; !537]
-* Add experimental RT scheduling support [Carlos; !460]
-* Misc. bug fixes and cleanups [Robert, Carlos, Olivier, Ray, Marco, Jonas D.,
-  Georges, Daniel V., Daniel M; !467, !504, !551, !552, #575, #556, !557, !442,
-  !562, !535, !548, #586, !567, !396, !422, !507]
-
-Contributors:
-  Jonas Ådahl, Piotr Drąg, Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
-  Adam Jackson, Robert Mader, Daniel García Moreno, Florian Müllner,
-  Georges Basile Stavracas Neto, Ray Strode, Marco Trevisan (Treviño),
-  Daniel van Vugt
-
-Translators:
-  Daniel Mustieles [es], Fabio Tomat [fur], Kukuh Syafaat [id]
-
-3.32.1
-======
-* Fix fallback app menu on wayland [Florian; #493]
-* Fix elogind support [Tom; !491]
-* Fix startup notifications not timing out [Carlos; #501]
-* Fix keyboard accessibility toggle from keys
-  [Olivier, Carlos; !501, #529, !531]
-* Fix touchscreen input on rotated displays [Carlos; #514]
-* Work around hangul text input bug [Carlos; #1365]
-* Fix blurry wallpaper scaling [Daniel; !505]
-* Fix placement of window menu when using fractional scaling [Jan; #527]
-* Fix repaint issues of offscreen effects on secondary monitors [Daniel; !511]
-* Fix windows not getting focus after launch [Daniel; #505]
-* Properly advertise support for 'underscan' property [Jonas; !507]
-* Improve power-saving handling [Jonas; !506]
-* Fix moving windows by super+touch [Jonas D.; !495]
-* Misc. bug fixes and cleanups [Benjamin, Florian, Adam, Marco, Pablo,
-  Erik, Jonas, Heiher, Pekka, Daniel, Olivier, Carlos; !478, !475, !480,
-  !482, #490, !488, #491, #480, !477, !496, !492, !485, !515, !519, !521,
-  !216, !538, #541, #523]
-
-Contributors:
-  Jonas Ådahl, Pablo Barciela, Benjamin Berg, Tom Briden, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Jan Alexander Steffens (heftig), Heiher,
-  Adam Jackson, Erik Kurzinger, Florian Müllner, Pekka Paalanen,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Khaled Hosny [ar], Goran Vidović [hr], Daniel Mustieles [es]
-
-3.32.0
-======
-* Fix deadlock when cancelling a theme sound [Andrea; !474]
-* Stop swizzling BGRA buffers (bye-bye inverted colors in screenshots
-  and animations) [Carlos; !486]
-
-Contributors:
-  Andrea Azzarone, Carlos Garnacho, Robert Mader
-
-3.31.92
-=======
-* Fix flicker of apps that use multiple SHM buffers [Jonas Å.; #199]
-* Don't disable page flips after temporary failues [Jonas Å.; #460]
-* Improve redraw performance [Carlos; !196]
-* Add cursor-mode support to window screencasting [Jonas Å.; !413]
-* Add back support for system-wide monitor configurations [Jonas Å.; !253]
-* Add fractional scaling support [Marco, Jonas Å.; !3]
-* Consider remapped keys when guessing keycode from keysym [Andrea; #443]
-* Stop turning on-screen-keyboard off on focus changes [Carlos; !432]
-* Fix crashes [Robert, Carlos, Jonas D., Florian; !447, #361, !426, #479]
-* Misc. bug fixes and cleanups [Benjamin, Adam, Olivier, Niels, Piotr; !457,
-  !452, !459, !380, !361, !461, !464, !471, !473, !463]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Benjamin Berg, Piotr Drąg, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Niels De Graef, Adam Jackson, Robert Mader,
-  Florian Müllner, Marco Trevisan (Treviño)
-
-Translators:
-  Milo Casagrande [it], Tim Sabsch [de], Trần Ngọc Quân [vi],
-  Gwan-gyeong Mun [ko], Марко Костић [sr], Daniel Mustieles [es],
-  Rūdolfs Mazurs [lv], Nathan Follens [nl]
-
-3.31.91
-=======
-* Fix infinite loop in EDID matching [Marco; #459]
-* wayland: Don't resetin text-input state prematurely [Carlos; !410]
-* wayland: Don't maximize windows if minimum size is too big [Olivier; #463]
-* Fix crash when using "restore shortcuts" without focus window [Olivier; #464]
-* Add flag parameter to grab accelerator API [Andrea; !169]
-* Reuse old CRTC if possible to avoid flicker on hotplug [Pekka, Emilio; #373]
-* Misc. bug fixes and cleanups [Marco, Jonas, Niels, Adam, Olivier; !436,
-  !421, #462, !439, !440, !444, !321, !445, !456]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Carlos Garnacho,
-  Niels De Graef, Adam Jackson, Emilio Pozuelo Monfort, Pekka Paalanen,
-  Marco Trevisan (Treviño)
-
-Translators:
-  Jiri Grönroos [fi], Charles Monzat [fr], Claude Paroz [fr], Fran Dieguez [gl],
-  Emin Tufan Çetin [tr], Aurimas Černius [lt], Anders Jonsson [sv],
-  Matej Urbančič [sl], Marek Cernocky [cs], Daniel Șerbănescu [ro],
-  Alan Mortensen [da], Baurzhan Muftakhidinov [kk], Yi-Jyun Pan [zh_TW],
-  Daniel Mustieles [es], Rafael Fontenelle [pt_BR]
-
 3.31.90
 =======
 * Fix support of extended characters in on-screen keyboard [Andrea; #109]
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -737,7 +737,11 @@ cally_actor_grab_focus (AtkComponent    *component)
 *
 * This gets the top level origin, it is, the position of the stage in
 * the global screen. You can see it as the absolute display position
- * of the stage. This is 0,0 for a compositor.
+ * of the stage.
+ *
+ * FIXME: only the case with x11 is implemented, other backends are
+ * required
+ *
 */
 void
 _cally_actor_get_top_level_origin (ClutterActor *actor,
@@ -745,11 +749,54 @@ _cally_actor_get_top_level_origin (ClutterActor *actor,
                                   gint         *yp)
 {
  /* default values */
+  gint x = 0;
+  gint y = 0;
+
+#ifdef CLUTTER_WINDOWING_X11
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    {
+      ClutterActor *stage      = NULL;
+      Display *display    = NULL;
+      Window root_window;
+      Window stage_window;
+      Window child;
+      gint return_val = 0;
+
+      stage = clutter_actor_get_stage (actor);
+
+      /* FIXME: what happens if you use another display with
+         clutter_backend_x11_set_display ?*/
+      display = clutter_x11_get_default_display ();
+      root_window = clutter_x11_get_root_window ();
+      stage_window = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+
+      return_val = XTranslateCoordinates (display, stage_window, root_window,
+                                          0, 0, &x, &y,
+                                          &child);
+
+      if (!return_val)
+        g_warning ("[x11] We were not able to get proper absolute "
+                   "position of the stage");
+    }
+  else
+#endif
+    {
+      static gboolean yet_warned = FALSE;
+
+      if (!yet_warned)
+        {
+          yet_warned = TRUE;
+
+          g_warning ("The current Clutter backend does not support using "
+                     "atk_component_get_extents() with ATK_XY_SCREEN.");
+        }
+    }
+
  if (xp)
-    *xp = 0;
+    *xp = x;

  if (yp)
-    *yp = 0;
+    *yp = y;
 }

 /* AtkAction implementation */
@@ -997,8 +1044,10 @@ _cally_actor_clean_action_list (CallyActor *cally_actor)

  if (priv->action_list)
    {
-      g_list_free_full (priv->action_list,
-                        (GDestroyNotify) _cally_actor_destroy_action_info);
+      g_list_foreach (priv->action_list,
+                      (GFunc) _cally_actor_destroy_action_info,
+                      NULL);
+      g_list_free (priv->action_list);
      priv->action_list = NULL;
    }
 }
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -594,27 +594,6 @@ _clutter_actor_box_enlarge_for_effects (ClutterActorBox *box)
  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;
-}
-
 G_DEFINE_BOXED_TYPE_WITH_CODE (ClutterActorBox, clutter_actor_box,
                               clutter_actor_box_copy,
                               clutter_actor_box_free,
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -577,7 +577,8 @@ _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);
+  g_list_foreach (group->meta, (GFunc) g_object_unref, NULL);
+  g_list_free (group->meta);
  group->meta = NULL;
 }

--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -53,8 +53,7 @@ typedef enum
 * Controls some options for how clutter_actor_traverse() iterates
 * through the graph.
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_TRAVERSE_DEPTH_FIRST   = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_BREADTH_FIRST = 1L<<1
 } ClutterActorTraverseFlags;
@@ -75,8 +74,7 @@ typedef enum
 * the continuing traversal. It may stop traversal completely, just
 * skip over children for the current actor or continue as normal.
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_TRAVERSE_VISIT_CONTINUE       = 1L<<0,
  CLUTTER_ACTOR_TRAVERSE_VISIT_SKIP_CHILDREN  = 1L<<1,
  CLUTTER_ACTOR_TRAVERSE_VISIT_BREAK          = 1L<<2
@@ -242,6 +240,9 @@ ClutterAnimationInfo *          _clutter_actor_get_animation_info
 ClutterTransition *             _clutter_actor_create_transition                        (ClutterActor *self,
                                                                                         GParamSpec   *pspec,
                                                                                         ...);
+ClutterTransition *             _clutter_actor_get_transition                           (ClutterActor *self,
+                                                                                         GParamSpec   *pspec);
+
 gboolean                        _clutter_actor_foreach_child                            (ClutterActor *self,
                                                                                         ClutterForeachCallback callback,
                                                                                         gpointer user_data);
@@ -282,6 +283,9 @@ void                            _clutter_actor_queue_redraw_full
                                                                                         const ClutterPaintVolume *volume,
                                                                                         ClutterEffect            *effect);

+ClutterPaintVolume *            _clutter_actor_get_queue_redraw_clip                    (ClutterActor       *self);
+void                            _clutter_actor_set_queue_redraw_clip                    (ClutterActor       *self,
+                                                                                         ClutterPaintVolume *clip_volume);
 void                            _clutter_actor_finish_queue_redraw                      (ClutterActor       *self,
                                                                                         ClutterPaintVolume *clip);

@@ -294,6 +298,8 @@ const gchar *                   _clutter_actor_get_debug_name
 void                            _clutter_actor_push_clone_paint                         (void);
 void                            _clutter_actor_pop_clone_paint                          (void);

+guint32                         _clutter_actor_get_pick_id                              (ClutterActor *self);
+
 void                            _clutter_actor_shader_pre_paint                         (ClutterActor *actor,
                                                                                         gboolean      repeat);
 void                            _clutter_actor_shader_post_paint                        (ClutterActor *actor);
@@ -310,11 +316,8 @@ void                            _clutter_actor_detach_clone
 void                            _clutter_actor_queue_redraw_on_clones                   (ClutterActor *actor);
 void                            _clutter_actor_queue_relayout_on_clones                 (ClutterActor *actor);
 void                            _clutter_actor_queue_only_relayout                      (ClutterActor *actor);
-void                            _clutter_actor_queue_update_resource_scale_recursive    (ClutterActor *actor);

 CoglFramebuffer *               _clutter_actor_get_active_framebuffer                   (ClutterActor *actor);
-gboolean                        _clutter_actor_get_real_resource_scale                  (ClutterActor *actor,
-                                                                                         float        *resource_scale);

 ClutterPaintNode *              clutter_actor_create_texture_paint_node                 (ClutterActor *self,
                                                                                         CoglTexture  *texture);
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -236,9 +236,8 @@ struct _ClutterActorClass
  void (* pick)                 (ClutterActor          *actor,
                                 const ClutterColor    *color);

-  gboolean (* queue_redraw)     (ClutterActor          *actor,
-                                 ClutterActor          *leaf_that_queued,
-                                 ClutterPaintVolume    *paint_volume);
+  void (* queue_redraw)         (ClutterActor          *actor,
+                                 ClutterActor          *leaf_that_queued);

  /* size negotiation */
  void (* get_preferred_width)  (ClutterActor           *self,
@@ -584,11 +583,6 @@ gboolean                        clutter_actor_is_in_clone_paint
 CLUTTER_EXPORT
 gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
-
-CLUTTER_EXPORT
-gboolean                        clutter_actor_get_resource_scale                (ClutterActor *self,
-                                                                                 gfloat       *resource_scale);
-
 CLUTTER_EXPORT
 gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);

@@ -902,10 +896,6 @@ void                            clutter_actor_bind_model_with_properties
                                                                                 const char                 *first_model_property,
                                                                                 ...);

-CLUTTER_EXPORT
-void clutter_actor_pick_box (ClutterActor          *self,
-                             const ClutterActorBox *box);
-
 G_END_DECLS

 #endif /* __CLUTTER_ACTOR_H__ */
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -30,7 +30,7 @@
 * to control how a #ClutterAnimation will animate a property.
 *
 * Each #ClutterAnimatable should implement the
- * #ClutterAnimatableInterface.interpolate_property() virtual function of the
+ * #ClutterAnimatableIface.interpolate_property() virtual function of the
 * interface to compute the animation state between two values of an interval
 * depending on a progress factor, expressed as a floating point value.
 *
@@ -57,6 +57,7 @@
 #include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"

+typedef ClutterAnimatableIface  ClutterAnimatableInterface;
 G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);

 static void
@@ -100,7 +101,7 @@ clutter_animatable_animate_property (ClutterAnimatable *animatable,
                                     gdouble            progress,
                                     GValue            *value)
 {
-  ClutterAnimatableInterface *iface;
+  ClutterAnimatableIface *iface;
  gboolean res;

  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
@@ -154,7 +155,7 @@ GParamSpec *
 clutter_animatable_find_property (ClutterAnimatable *animatable,
                                  const gchar       *property_name)
 {
-  ClutterAnimatableInterface *iface;
+  ClutterAnimatableIface *iface;

  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), NULL);
  g_return_val_if_fail (property_name != NULL, NULL);
@@ -184,7 +185,7 @@ clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
                                      const gchar       *property_name,
                                      GValue            *value)
 {
-  ClutterAnimatableInterface *iface;
+  ClutterAnimatableIface *iface;

  g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable));
  g_return_if_fail (property_name != NULL);
@@ -213,7 +214,7 @@ clutter_animatable_set_final_state (ClutterAnimatable *animatable,
                                    const gchar       *property_name,
                                    const GValue      *value)
 {
-  ClutterAnimatableInterface *iface;
+  ClutterAnimatableIface *iface;

  g_return_if_fail (CLUTTER_IS_ANIMATABLE (animatable));
  g_return_if_fail (property_name != NULL);
@@ -259,7 +260,7 @@ clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
                                      gdouble            progress,
                                      GValue            *value)
 {
-  ClutterAnimatableInterface *iface;
+  ClutterAnimatableIface *iface;

  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
  g_return_val_if_fail (property_name != NULL, FALSE);
--- a/clutter/clutter/clutter-animatable.h
+++ b/clutter/clutter/clutter-animatable.h
@@ -33,15 +33,24 @@

 G_BEGIN_DECLS

-#define CLUTTER_TYPE_ANIMATABLE (clutter_animatable_get_type ())
+#define CLUTTER_TYPE_ANIMATABLE                 (clutter_animatable_get_type ())
+#define CLUTTER_ANIMATABLE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatable))
+#define CLUTTER_IS_ANIMATABLE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ANIMATABLE))
+#define CLUTTER_ANIMATABLE_GET_IFACE(obj)       (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_ANIMATABLE, ClutterAnimatableIface))

-CLUTTER_EXPORT
-G_DECLARE_INTERFACE (ClutterAnimatable, clutter_animatable,
-                     CLUTTER, ANIMATABLE,
-                     GObject)
+typedef struct _ClutterAnimatableIface          ClutterAnimatableIface;

 /**
- * ClutterAnimatableInterface:
+ * ClutterAnimatable:
+ *
+ * #ClutterAnimatable is an opaque structure whose members cannot be directly
+ * accessed
+ *
+ * Since: 1.0
+ */
+
+/**
+ * ClutterAnimatableIface:
 * @animate_property: virtual function for custom interpolation of a
 *   property. This virtual function is deprecated
 * @find_property: virtual function for retrieving the #GParamSpec of
@@ -58,7 +67,7 @@ G_DECLARE_INTERFACE (ClutterAnimatable, clutter_animatable,
 *
 * Since: 1.0
 */
-struct _ClutterAnimatableInterface
+struct _ClutterAnimatableIface
 {
  /*< private >*/
  GTypeInterface parent_iface;
@@ -86,6 +95,9 @@ struct _ClutterAnimatableInterface
                                     GValue            *value);
 };

+CLUTTER_EXPORT
+GType clutter_animatable_get_type (void) G_GNUC_CONST;
+
 CLUTTER_EXPORT
 GParamSpec *clutter_animatable_find_property     (ClutterAnimatable *animatable,
                                                  const gchar       *property_name);
--- a/clutter/clutter/clutter-autocleanups.h
+++ b/clutter/clutter/clutter-autocleanups.h
@@ -34,6 +34,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActor, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorMeta, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAlignConstraint, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAnimatable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBackend, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterBindingPool, g_object_unref)
@@ -48,8 +49,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterClone, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColorizeEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterConstraint, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContainer, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterContent, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeformEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDesaturateEffect, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDeviceManager, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDragAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterDropAction, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterEffect, g_object_unref)
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -27,6 +27,8 @@
 #include <clutter/clutter-keymap.h>
 #include <clutter/clutter-stage-window.h>

+#include "clutter-event-translator.h"
+
 #define CLUTTER_BACKEND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
 #define CLUTTER_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND))
 #define CLUTTER_BACKEND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND, ClutterBackendClass))
@@ -56,7 +58,7 @@ struct _ClutterBackend
  gfloat units_per_em;
  gint32 units_serial;

-  ClutterStageWindow *stage_window;
+  GList *event_translators;

  ClutterInputMethod *input_method;

@@ -91,6 +93,12 @@ struct _ClutterBackendClass
                                                GError         **error);
  ClutterDeviceManager *(* get_device_manager) (ClutterBackend  *backend);

+  void                  (* copy_event_data)    (ClutterBackend     *backend,
+                                                const ClutterEvent *src,
+                                                ClutterEvent       *dest);
+  void                  (* free_event_data)    (ClutterBackend     *backend,
+                                                ClutterEvent       *event);
+
  gboolean              (* translate_event)    (ClutterBackend     *backend,
                                                gpointer            native,
                                                ClutterEvent       *event);
@@ -128,11 +136,17 @@ void                    _clutter_backend_copy_event_data                (Clutter
                                                                         ClutterEvent           *dest);
 void                    _clutter_backend_free_event_data                (ClutterBackend         *backend,
                                                                         ClutterEvent           *event);
-CLUTTER_EXPORT
 gboolean                _clutter_backend_translate_event                (ClutterBackend         *backend,
                                                                         gpointer                native,
                                                                         ClutterEvent           *event);

+CLUTTER_EXPORT
+void                    _clutter_backend_add_event_translator           (ClutterBackend         *backend,
+                                                                         ClutterEventTranslator *translator);
+
+void                    _clutter_backend_remove_event_translator        (ClutterBackend         *backend,
+                                                                         ClutterEventTranslator *translator);
+
 ClutterFeatureFlags     _clutter_backend_get_features                   (ClutterBackend         *backend);

 gfloat                  _clutter_backend_get_units_per_em               (ClutterBackend         *backend,
@@ -146,8 +160,7 @@ void                    _clutter_backend_reset_cogl_framebuffer         (Clutter

 void                    clutter_set_allowed_drivers                     (const char             *drivers);

-CLUTTER_EXPORT
-ClutterStageWindow *    clutter_backend_get_stage_window                (ClutterBackend         *backend);
+void                    clutter_try_set_windowing_backend               (const char             *drivers);

 G_END_DECLS

--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -62,6 +62,9 @@
 #ifdef CLUTTER_INPUT_X11
 #include "x11/clutter-backend-x11.h"
 #endif
+#ifdef CLUTTER_INPUT_EVDEV
+#include "evdev/clutter-device-manager-evdev.h"
+#endif
 #ifdef CLUTTER_WINDOWING_EGL
 #include "egl/clutter-backend-eglnative.h"
 #endif
@@ -101,12 +104,10 @@ clutter_backend_dispose (GObject *gobject)
  /* clear the events still in the queue of the main context */
  _clutter_clear_events_queue ();

+  /* remove all event translators */
+  g_clear_pointer (&backend->event_translators, g_list_free);
+
  g_clear_pointer (&backend->dummy_onscreen, cogl_object_unref);
-  if (backend->stage_window)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (backend->stage_window),
-                                    (gpointer *) &backend->stage_window);
-    }

  G_OBJECT_CLASS (clutter_backend_parent_class)->dispose (gobject);
 }
@@ -396,7 +397,7 @@ clutter_backend_real_create_context (ClutterBackend  *backend,
      else
        g_set_error_literal (error, CLUTTER_INIT_ERROR,
                             CLUTTER_INIT_ERROR_BACKEND,
-                             "Unable to initialize the Clutter backend: no available drivers found.");
+                            _("Unable to initialize the Clutter backend: no available drivers found."));

      return FALSE;
    }
@@ -525,7 +526,40 @@ _clutter_create_backend (void)
 static void
 clutter_backend_real_init_events (ClutterBackend *backend)
 {
-  g_error ("Unknown input backend");
+  const char *input_backend = NULL;
+
+  input_backend = g_getenv ("CLUTTER_INPUT_BACKEND");
+  if (input_backend != NULL)
+    input_backend = g_intern_string (input_backend);
+
+#ifdef CLUTTER_INPUT_X11
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
+      (input_backend == NULL || input_backend == I_(CLUTTER_INPUT_X11)))
+    {
+      _clutter_backend_x11_events_init (backend);
+    }
+  else
+#endif
+#ifdef CLUTTER_INPUT_EVDEV
+  /* Evdev can be used regardless of the windowing system */
+  if ((input_backend != NULL && strcmp (input_backend, CLUTTER_INPUT_EVDEV) == 0)
+#ifdef CLUTTER_WINDOWING_EGL
+      /* but we do want to always use it for EGL native */
+      || clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL)
+#endif
+      )
+    {
+      _clutter_events_evdev_init (backend);
+    }
+  else
+#endif
+  if (input_backend != NULL)
+    {
+      if (input_backend != I_(CLUTTER_INPUT_NULL))
+        g_error ("Unrecognized input backend '%s'", input_backend);
+    }
+  else
+    g_error ("Unknown input backend");
 }

 static ClutterDeviceManager *
@@ -552,6 +586,34 @@ clutter_backend_real_get_keymap (ClutterBackend *backend)
  return backend->keymap;
 }

+static gboolean
+clutter_backend_real_translate_event (ClutterBackend *backend,
+                                      gpointer        native,
+                                      ClutterEvent   *event)
+{
+  GList *l;
+
+  for (l = backend->event_translators;
+       l != NULL;
+       l = l->next)
+    {
+      ClutterEventTranslator *translator = l->data;
+      ClutterTranslateReturn retval;
+
+      retval = _clutter_event_translator_translate_event (translator,
+                                                          native,
+                                                          event);
+
+      if (retval == CLUTTER_TRANSLATE_QUEUE)
+        return TRUE;
+
+      if (retval == CLUTTER_TRANSLATE_REMOVE)
+        return FALSE;
+    }
+
+  return FALSE;
+}
+
 static void
 clutter_backend_class_init (ClutterBackendClass *klass)
 {
@@ -574,7 +636,8 @@ clutter_backend_class_init (ClutterBackendClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (ClutterBackendClass, resolution_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  /**
@@ -591,7 +654,8 @@ clutter_backend_class_init (ClutterBackendClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (ClutterBackendClass, font_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  /**
@@ -608,7 +672,8 @@ clutter_backend_class_init (ClutterBackendClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (ClutterBackendClass, settings_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  klass->resolution_changed = clutter_backend_real_resolution_changed;
@@ -616,6 +681,7 @@ clutter_backend_class_init (ClutterBackendClass *klass)

  klass->init_events = clutter_backend_real_init_events;
  klass->get_device_manager = clutter_backend_real_get_device_manager;
+  klass->translate_event = clutter_backend_real_translate_event;
  klass->create_context = clutter_backend_real_create_context;
  klass->get_features = clutter_backend_real_get_features;
  klass->get_keymap = clutter_backend_real_get_keymap;
@@ -695,10 +761,6 @@ _clutter_backend_create_stage (ClutterBackend  *backend,

  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;
 }

@@ -783,24 +845,37 @@ _clutter_backend_copy_event_data (ClutterBackend     *backend,
                                  const ClutterEvent *src,
                                  ClutterEvent       *dest)
 {
-  ClutterDeviceManagerClass *device_manager_class;
-  ClutterDeviceManager *device_manager;
+  ClutterEventExtenderInterface *iface;
+  ClutterBackendClass *klass;

-  device_manager = clutter_device_manager_get_default ();
-  device_manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  device_manager_class->copy_event_data (device_manager, src, dest);
+  klass = CLUTTER_BACKEND_GET_CLASS (backend);
+  if (CLUTTER_IS_EVENT_EXTENDER (backend->device_manager))
+    {
+      iface = CLUTTER_EVENT_EXTENDER_GET_IFACE (backend->device_manager);
+      iface->copy_event_data (CLUTTER_EVENT_EXTENDER (backend->device_manager),
+                              src, dest);
+    }
+  else if (klass->copy_event_data != NULL)
+    klass->copy_event_data (backend, src, dest);
 }

 void
 _clutter_backend_free_event_data (ClutterBackend *backend,
                                  ClutterEvent   *event)
 {
-  ClutterDeviceManagerClass *device_manager_class;
-  ClutterDeviceManager *device_manager;
+  ClutterEventExtenderInterface *iface;
+  ClutterBackendClass *klass;

-  device_manager = clutter_device_manager_get_default ();
-  device_manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  device_manager_class->free_event_data (device_manager, event);
+  klass = CLUTTER_BACKEND_GET_CLASS (backend);
+
+  if (CLUTTER_IS_EVENT_EXTENDER (backend->device_manager))
+    {
+      iface = CLUTTER_EVENT_EXTENDER_GET_IFACE (backend->device_manager);
+      iface->free_event_data (CLUTTER_EVENT_EXTENDER (backend->device_manager),
+                              event);
+    }
+  else if (klass->free_event_data != NULL)
+    klass->free_event_data (backend, event);
 }

 /**
@@ -946,6 +1021,28 @@ _clutter_backend_translate_event (ClutterBackend *backend,
                                                               event);
 }

+void
+_clutter_backend_add_event_translator (ClutterBackend         *backend,
+                                       ClutterEventTranslator *translator)
+{
+  if (g_list_find (backend->event_translators, translator) != NULL)
+    return;
+
+  backend->event_translators =
+    g_list_prepend (backend->event_translators, translator);
+}
+
+void
+_clutter_backend_remove_event_translator (ClutterBackend         *backend,
+                                          ClutterEventTranslator *translator)
+{
+  if (g_list_find (backend->event_translators, translator) == NULL)
+    return;
+
+  backend->event_translators =
+    g_list_remove (backend->event_translators, translator);
+}
+
 /**
 * clutter_backend_get_cogl_context: (skip)
 * @backend: a #ClutterBackend
@@ -997,6 +1094,61 @@ clutter_wayland_set_compositor_display (void *display)
 }
 #endif

+/**
+ * clutter_set_windowing_backend:
+ * @backend_type: a comma separated list of windowing backends
+ *
+ * Restricts Clutter to only use the specified backend or list of backends.
+ *
+ * You can use one of the `CLUTTER_WINDOWING_*` symbols, e.g.
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+ * ]|
+ *
+ * Will force Clutter to use the X11 windowing and input backend, and terminate
+ * if the X11 backend could not be initialized successfully.
+ *
+ * Since Clutter 1.26, you can also use a comma-separated list of windowing
+ * system backends to provide a fallback in case backends are not available or
+ * enabled, e.g.:
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend ("gdk,wayland,x11");
+ * ]|
+ *
+ * Will make Clutter test for the GDK, Wayland, and X11 backends in that order.
+ *
+ * You can use the `*` special value to ask Clutter to use the internally
+ * defined list of backends. For instance:
+ *
+ * |[<!-- language="C" -->
+ *   clutter_set_windowing_backend ("x11,wayland,*");
+ * ]|
+ *
+ * Will make Clutter test the X11 and Wayland backends, and then fall back
+ * to the internal list of available backends.
+ *
+ * This function must be called before the first API call to Clutter, including
+ * clutter_get_option_context()
+ *
+ * Since: 1.16
+ */
+void
+clutter_set_windowing_backend (const char *backend_type)
+{
+  g_return_if_fail (backend_type != NULL);
+
+  allowed_backends = g_strdup (backend_type);
+}
+
+void
+clutter_try_set_windowing_backend (const char *backend_type)
+{
+  if (allowed_backends == NULL)
+    clutter_set_windowing_backend (backend_type);
+}
+
 PangoDirection
 _clutter_backend_get_keymap_direction (ClutterBackend *backend)
 {
@@ -1014,7 +1166,7 @@ _clutter_backend_reset_cogl_framebuffer (ClutterBackend *backend)
 {
  if (backend->dummy_onscreen == COGL_INVALID_HANDLE)
    {
-      GError *internal_error = NULL;
+      CoglError *internal_error = NULL;

      backend->dummy_onscreen = cogl_onscreen_new (backend->cogl_context, 1, 1);

@@ -1022,7 +1174,7 @@ _clutter_backend_reset_cogl_framebuffer (ClutterBackend *backend)
                                      &internal_error))
        {
          g_critical ("Unable to create dummy onscreen: %s", internal_error->message);
-          g_error_free (internal_error);
+          cogl_error_free (internal_error);
          return;
        }
    }
@@ -1093,9 +1245,3 @@ clutter_backend_get_keymap (ClutterBackend *backend)
 {
  return CLUTTER_BACKEND_GET_CLASS (backend)->get_keymap (backend);
 }
-
-ClutterStageWindow *
-clutter_backend_get_stage_window (ClutterBackend *backend)
-{
-  return backend->stage_window;
-}
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -60,6 +60,9 @@ GType clutter_backend_get_type (void) G_GNUC_CONST;
 CLUTTER_EXPORT
 ClutterBackend *                clutter_get_default_backend             (void);

+CLUTTER_EXPORT
+void                            clutter_set_windowing_backend           (const char *backend_type);
+
 CLUTTER_EXPORT
 gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);

--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -570,68 +570,6 @@ G_DEFINE_BOXED_TYPE_WITH_CODE (ClutterPoint, clutter_point,
                               clutter_point_free,
                               CLUTTER_REGISTER_INTERVAL_PROGRESS (clutter_point_progress))

-static int
-clutter_point_compare_line (const ClutterPoint *p,
-                            const ClutterPoint *a,
-                            const ClutterPoint *b)
-{
-  float x1 = b->x - a->x;
-  float y1 = b->y - a->y;
-  float x2 = p->x - a->x;
-  float y2 = p->y - a->y;
-  float cross_z = x1 * y2 - y1 * x2;
-
-  if (cross_z > 0.f)
-    return 1;
-  else if (cross_z < 0.f)
-    return -1;
-  else
-    return 0;
-}
-
-/**
- * clutter_point_inside_quadrilateral:
- * @point: a #ClutterPoint to test
- * @vertices: array of vertices of the quadrilateral, in either clockwise or
- *            anticlockwise order.
- *
- * Determines whether a point is inside the convex quadrilateral provided,
- * or on any of its edges or vertices.
- *
- * Returns: %TRUE if @point is inside or touching the quadrilateral
- */
-gboolean
-clutter_point_inside_quadrilateral (const ClutterPoint *point,
-                                    const ClutterPoint *vertices)
-{
-  unsigned int i;
-  int first_side;
-
-  first_side = 0;
-
-  for (i = 0; i < 4; i++)
-    {
-      int side;
-
-      side = clutter_point_compare_line (point,
-                                         &vertices[i],
-                                         &vertices[(i + 1) % 4]);
-
-      if (side)
-        {
-          if (first_side == 0)
-            first_side = side;
-          else if (side != first_side)
-            return FALSE;
-        }
-    }
-
-  if (first_side == 0)
-    return FALSE;
-
-  return TRUE;
-}
-


 /*
@@ -1208,60 +1146,29 @@ clutter_rect_inset (ClutterRect *rect,
    rect->size.height = 0.f;
 }

-/**
- * clutter_rect_scale:
- * @rect: a #ClutterRect
- * @s_x: an horizontal scale value
- * @s_y: a vertical scale value
- *
- * Scale the rectangle coordinates and size by @s_x horizontally and
- * @s_y vertically.
- */
-void
-clutter_rect_scale (ClutterRect *rect,
-                    float        s_x,
-                    float        s_y)
-{
-  g_return_if_fail (rect != NULL);
-  g_return_if_fail (s_x > 0.f);
-  g_return_if_fail (s_y > 0.f);
-
-  clutter_rect_normalize_internal (rect);
-
-  rect->origin.x *= s_x;
-  rect->origin.y *= s_y;
-  rect->size.width *= s_x;
-  rect->size.height *= s_y;
-}
-
 /**
 * clutter_rect_clamp_to_pixel:
 * @rect: a #ClutterRect
 *
- * Rounds the origin of @rect downwards to the nearest integer, and recompute the
- * the size using the @rect origin and size rounded upwards to the nearest integer,
- * so that @rect is updated to the smallest rectangle capable of fully containing
- * the original, fractional rectangle in the coordinates space.
+ * Rounds the origin of @rect downwards to the nearest integer, and rounds
+ * the size of @rect upwards to the nearest integer, so that @rect is
+ * updated to the smallest rectangle capable of fully containing the
+ * original, fractional rectangle.
 *
 * Since: 1.12
 */
 void
 clutter_rect_clamp_to_pixel (ClutterRect *rect)
 {
-  float x2, y2;
-
  g_return_if_fail (rect != NULL);

  clutter_rect_normalize_internal (rect);

-  x2 = rect->origin.x + rect->size.width;
-  y2 = rect->origin.y + rect->size.height;
-
  rect->origin.x = floorf (rect->origin.x);
  rect->origin.y = floorf (rect->origin.y);

-  rect->size.width = ceilf (x2) - rect->origin.x;
-  rect->size.height = ceilf (y2) - rect->origin.y;
+  rect->size.width = ceilf (rect->size.width);
+  rect->size.height = ceilf (rect->size.height);
 }

 /**
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -235,7 +235,8 @@ clutter_binding_pool_finalize (GObject *gobject)

  g_hash_table_destroy (pool->entries_hash);

-  g_slist_free_full (pool->entries, (GDestroyNotify) binding_entry_free);
+  g_slist_foreach (pool->entries, (GFunc) binding_entry_free, NULL);
+  g_slist_free (pool->entries);

  G_OBJECT_CLASS (clutter_binding_pool_parent_class)->finalize (gobject);
 }
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -178,8 +178,8 @@ clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
 }

 static gboolean
-clutter_blur_effect_modify_paint_volume (ClutterEffect      *effect,
-                                         ClutterPaintVolume *volume)
+clutter_blur_effect_get_paint_volume (ClutterEffect      *effect,
+                                      ClutterPaintVolume *volume)
 {
  gfloat cur_width, cur_height;
  ClutterVertex origin;
@@ -223,7 +223,7 @@ clutter_blur_effect_class_init (ClutterBlurEffectClass *klass)
  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;
+  effect_class->get_paint_volume = clutter_blur_effect_get_paint_volume;

  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
  offscreen_class->paint_target = clutter_blur_effect_paint_target;
@@ -249,7 +249,9 @@ clutter_blur_effect_init (ClutterBlurEffect *self)
      cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -438,7 +438,9 @@ clutter_brightness_contrast_effect_init (ClutterBrightnessContrastEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -44,7 +44,6 @@

 #include "clutter-build-config.h"

-#include <math.h>
 #include <cogl/cogl.h>
 #include <cairo-gobject.h>

@@ -70,7 +69,6 @@ struct _ClutterCanvasPrivate

  int width;
  int height;
-  float scale_factor;

  CoglTexture *texture;
  gboolean dirty;
@@ -84,7 +82,6 @@ enum

  PROP_WIDTH,
  PROP_HEIGHT,
-  PROP_SCALE_FACTOR,

  LAST_PROP
 };
@@ -100,7 +97,7 @@ enum

 static guint canvas_signals[LAST_SIGNAL] = { 0, };

-static void clutter_content_iface_init (ClutterContentInterface *iface);
+static void clutter_content_iface_init (ClutterContentIface *iface);

 G_DEFINE_TYPE_WITH_CODE (ClutterCanvas, clutter_canvas, G_TYPE_OBJECT,
                         G_ADD_PRIVATE (ClutterCanvas)
@@ -181,19 +178,6 @@ clutter_canvas_set_property (GObject      *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;
@@ -218,10 +202,6 @@ clutter_canvas_get_property (GObject    *gobject,
      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;
@@ -265,19 +245,6 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
                      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:
@@ -324,7 +291,6 @@ clutter_canvas_init (ClutterCanvas *self)

  self->priv->width = -1;
  self->priv->height = -1;
-  self->priv->scale_factor = 1.0f;
 }

 static void
@@ -374,8 +340,8 @@ clutter_canvas_emit_draw (ClutterCanvas *self)

  priv->dirty = TRUE;

-  real_width = ceilf (priv->width * priv->scale_factor);
-  real_height = ceilf (priv->height * priv->scale_factor);
+  real_width = priv->width;
+  real_height = priv->height;

  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d",
                priv->width, priv->height);
@@ -421,10 +387,6 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
      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,
@@ -486,16 +448,16 @@ clutter_canvas_get_preferred_size (ClutterContent *content,
    return FALSE;

  if (width != NULL)
-    *width = ceilf (priv->width * priv->scale_factor);
+    *width = priv->width;

  if (height != NULL)
-    *height = ceilf (priv->height * priv->scale_factor);
+    *height = priv->height;

  return TRUE;
 }

 static void
-clutter_content_iface_init (ClutterContentInterface *iface)
+clutter_content_iface_init (ClutterContentIface *iface)
 {
  iface->invalidate = clutter_canvas_invalidate;
  iface->paint_content = clutter_canvas_paint_content;
@@ -598,48 +560,3 @@ clutter_canvas_set_size (ClutterCanvas *canvas,

  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
@@ -97,9 +97,9 @@ gboolean                clutter_canvas_set_size                 (ClutterCanvas *

 CLUTTER_EXPORT
 void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
-                                                                 float          scale);
+                                                                 int            scale);
 CLUTTER_EXPORT
-float                   clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);
+int                     clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);

 G_END_DECLS

--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -355,10 +355,6 @@ on_captured_event (ClutterActor       *stage,

  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:
@@ -666,7 +662,8 @@ clutter_click_action_class_init (ClutterClickActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterClickActionClass, clicked),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -252,13 +252,6 @@ clutter_clone_allocate (ClutterActor           *self,
  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))
-    clutter_actor_allocate_preferred_size (priv->clone_source, flags);
-
 #if 0
  /* XXX - this is wrong: ClutterClone cannot clone unparented
   * actors, as it will break all invariants
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -293,7 +293,9 @@ clutter_colorize_effect_init (ClutterColorizeEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -197,7 +197,8 @@ clutter_container_default_init (ClutterContainerInterface *iface)
                  iface_type,
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (ClutterContainerIface, actor_added),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
  /**
@@ -215,7 +216,8 @@ clutter_container_default_init (ClutterContainerInterface *iface)
                  iface_type,
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (ClutterContainerIface, actor_removed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -45,6 +45,8 @@
 #include "clutter-marshal.h"
 #include "clutter-private.h"

+typedef struct _ClutterContentIface     ClutterContentInterface;
+
 enum
 {
  ATTACHED,
@@ -128,8 +130,9 @@ clutter_content_default_init (ClutterContentInterface *iface)
    g_signal_new (I_("attached"),
                  G_TYPE_FROM_INTERFACE (iface),
                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (ClutterContentInterface, attached),
-                  NULL, NULL, NULL,
+                  G_STRUCT_OFFSET (ClutterContentIface, attached),
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

@@ -147,8 +150,9 @@ clutter_content_default_init (ClutterContentInterface *iface)
    g_signal_new (I_("detached"),
                  G_TYPE_FROM_INTERFACE (iface),
                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (ClutterContentInterface, detached),
-                  NULL, NULL, NULL,
+                  G_STRUCT_OFFSET (ClutterContentIface, detached),
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
 }
@@ -241,7 +245,7 @@ clutter_content_invalidate_size (ClutterContent *content)
 * is associated to a #ClutterContent, to set up a backpointer from
 * the @content to the @actor.
 *
- * This function will invoke the #ClutterContentInterface.attached() virtual
+ * This function will invoke the #ClutterContentIface.attached() virtual
 * function.
 */
 void
@@ -275,7 +279,7 @@ _clutter_content_attached (ClutterContent *content,
 * This function should be used internally every time a #ClutterActor
 * removes the association with a #ClutterContent.
 *
- * This function will invoke the #ClutterContentInterface.detached() virtual
+ * This function will invoke the #ClutterContentIface.detached() virtual
 * function.
 */
 void
@@ -304,7 +308,7 @@ _clutter_content_detached (ClutterContent *content,
 *
 * Creates the render tree for the @content and @actor.
 *
- * This function will invoke the #ClutterContentInterface.paint_content()
+ * This function will invoke the #ClutterContentIface.paint_content()
 * virtual function.
 */
 void
--- a/clutter/clutter/clutter-content.h
+++ b/clutter/clutter/clutter-content.h
@@ -33,13 +33,24 @@

 G_BEGIN_DECLS

-#define CLUTTER_TYPE_CONTENT (clutter_content_get_type ())
+#define CLUTTER_TYPE_CONTENT            (clutter_content_get_type ())
+#define CLUTTER_CONTENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CONTENT, ClutterContent))
+#define CLUTTER_IS_CONTENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CONTENT))
+#define CLUTTER_CONTENT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_CONTENT, ClutterContentIface))

-CLUTTER_EXPORT
-G_DECLARE_INTERFACE (ClutterContent, clutter_content, CLUTTER, CONTENT, GObject)
+typedef struct _ClutterContentIface     ClutterContentIface;

 /**
- * ClutterContentInterface:
+ * ClutterContent:
+ *
+ * The #ClutterContent structure is an opaque type
+ * whose members cannot be acccessed directly.
+ *
+ * Since: 1.10
+ */
+
+/**
+ * ClutterContentIface:
 * @get_preferred_size: virtual function; should be overridden by subclasses
 *   of #ClutterContent that have a natural size
 * @paint_content: virtual function; called each time the content needs to
@@ -51,12 +62,12 @@ G_DECLARE_INTERFACE (ClutterContent, clutter_content, CLUTTER, CONTENT, GObject)
 * @invalidate: virtual function; called each time a #ClutterContent state
 *   is changed.
 *
- * The #ClutterContentInterface structure contains only
+ * The #ClutterContentIface structure contains only
 * private data.
 *
 * Since: 1.10
 */
-struct _ClutterContentInterface
+struct _ClutterContentIface
 {
  /*< private >*/
  GTypeInterface g_iface;
@@ -79,6 +90,9 @@ struct _ClutterContentInterface
  void          (* invalidate_size)     (ClutterContent   *content);
 };

+CLUTTER_EXPORT
+GType clutter_content_get_type (void) G_GNUC_CONST;
+
 CLUTTER_EXPORT
 gboolean        clutter_content_get_preferred_size      (ClutterContent *content,
                                                         gfloat         *width,
--- a/clutter/clutter/clutter-debug.h
+++ b/clutter/clutter/clutter-debug.h
@@ -6,8 +6,7 @@

 G_BEGIN_DECLS

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_MISC                = 1 << 0,
  CLUTTER_DEBUG_ACTOR               = 1 << 1,
  CLUTTER_DEBUG_TEXTURE             = 1 << 2,
@@ -27,13 +26,12 @@ typedef enum
  CLUTTER_DEBUG_OOB_TRANSFORMS      = 1 << 16
 } ClutterDebugFlag;

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_NOP_PICKING         = 1 << 0,
+  CLUTTER_DEBUG_DUMP_PICK_BUFFERS   = 1 << 1
 } ClutterPickDebugFlag;

-typedef enum
-{
+typedef enum {
  CLUTTER_DEBUG_DISABLE_SWAP_EVENTS     = 1 << 0,
  CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS = 1 << 1,
  CLUTTER_DEBUG_REDRAWS                 = 1 << 2,
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -282,7 +282,6 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect)
  /* enable depth testing */
  cogl_depth_state_init (&depth_state);
  cogl_depth_state_set_test_enabled (&depth_state, TRUE);
-  cogl_depth_state_set_test_function (&depth_state, COGL_DEPTH_TEST_FUNCTION_LEQUAL);
  cogl_pipeline_set_depth_state (pipeline, &depth_state, NULL);

  /* enable backface culling if we have a back material */
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -7,17 +7,27 @@
 #include "deprecated/clutter-alpha.h"
 #include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"
+#include "deprecated/clutter-animator.h"
 #include "deprecated/clutter-behaviour.h"
 #include "deprecated/clutter-behaviour-depth.h"
+#include "deprecated/clutter-behaviour-ellipse.h"
 #include "deprecated/clutter-behaviour-opacity.h"
+#include "deprecated/clutter-behaviour-path.h"
+#include "deprecated/clutter-behaviour-rotate.h"
 #include "deprecated/clutter-behaviour-scale.h"
 #include "deprecated/clutter-bin-layout.h"
 #include "deprecated/clutter-box.h"
 #include "deprecated/clutter-cairo-texture.h"
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-group.h"
+#include "deprecated/clutter-input-device.h"
 #include "deprecated/clutter-keysyms.h"
+#include "deprecated/clutter-list-model.h"
+#include "deprecated/clutter-main.h"
+#include "deprecated/clutter-model.h"
 #include "deprecated/clutter-rectangle.h"
+#include "deprecated/clutter-score.h"
+#include "deprecated/clutter-shader.h"
 #include "deprecated/clutter-stage-manager.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-state.h"
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -297,7 +297,9 @@ clutter_desaturate_effect_init (ClutterDesaturateEffect *self)
      cogl_pipeline_add_snippet (klass->base_pipeline, snippet);
      cogl_object_unref (snippet);

-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0);
+      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
+                                            0, /* layer number */
+                                            COGL_TEXTURE_TYPE_2D);
    }

  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@@ -69,23 +69,6 @@ typedef struct _ClutterTouchInfo
  gfloat current_y;
 } ClutterTouchInfo;

-typedef struct _ClutterPtrA11yData
-{
-  int n_btn_pressed;
-  float current_x;
-  float current_y;
-
-  float dwell_x;
-  float dwell_y;
-  gboolean dwell_drag_started;
-  gboolean dwell_gesture_started;
-  guint dwell_timer;
-  guint dwell_position_timer;
-
-  guint secondary_click_timer;
-  gboolean secondary_click_triggered;
-} ClutterPtrA11yData;
-
 struct _ClutterInputDevice
 {
  GObject parent_instance;
@@ -160,10 +143,6 @@ struct _ClutterInputDevice

  guint has_cursor : 1;
  guint is_enabled : 1;
-
-  /* Accessiblity */
-  ClutterVirtualInputDevice *accessibility_virtual_device;
-  ClutterPtrA11yData *ptr_a11y_data;
 };

 typedef void (*ClutterEmitInputDeviceEvent) (ClutterEvent       *event,
@@ -188,21 +167,44 @@ struct _ClutterInputDeviceClass
  gboolean (* is_grouped) (ClutterInputDevice *device,
                           ClutterInputDevice *other_device);

+  gboolean (* get_physical_size) (ClutterInputDevice *device,
+                                  gdouble            *width,
+                                  gdouble            *height);
+
  /* Keyboard accessbility */
  void (* process_kbd_a11y_event) (ClutterEvent               *event,
                                   ClutterInputDevice         *device,
                                   ClutterEmitInputDeviceEvent emit_event_func);
 };

+/* Platform-dependent interface */
+typedef struct _ClutterEventExtender ClutterEventExtender;
+typedef struct _ClutterEventExtenderInterface ClutterEventExtenderInterface;
+
+#define CLUTTER_TYPE_EVENT_EXTENDER         (clutter_event_extender_get_type ())
+#define CLUTTER_EVENT_EXTENDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_EVENT_EXTENDER, ClutterEventExtender))
+#define CLUTTER_IS_EVENT_EXTENDER(o)	     (G_TYPE_CHECK_INSTANCE_TYPE ((o), CLUTTER_TYPE_EVENT_EXTENDER))
+#define CLUTTER_EVENT_EXTENDER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), CLUTTER_TYPE_EVENT_EXTENDER, ClutterEventExtenderInterface))
+
+struct _ClutterEventExtenderInterface
+{
+  GTypeInterface g_iface;
+
+  void (* copy_event_data) (ClutterEventExtender *event_extender,
+                            const ClutterEvent   *src,
+                            ClutterEvent         *dest);
+  void (* free_event_data) (ClutterEventExtender *event_extender,
+                            ClutterEvent         *event);
+};
+
+GType           clutter_event_extender_get_type        (void) G_GNUC_CONST;
+
 /* device manager */
-CLUTTER_EXPORT
 void            _clutter_device_manager_add_device              (ClutterDeviceManager *device_manager,
                                                                 ClutterInputDevice   *device);
-CLUTTER_EXPORT
 void            _clutter_device_manager_remove_device           (ClutterDeviceManager *device_manager,
                                                                 ClutterInputDevice   *device);
 void            _clutter_device_manager_update_devices          (ClutterDeviceManager *device_manager);
-CLUTTER_EXPORT
 void            _clutter_device_manager_select_stage_events     (ClutterDeviceManager *device_manager,
                                                                 ClutterStage         *stage);
 ClutterBackend *_clutter_device_manager_get_backend             (ClutterDeviceManager *device_manager);
@@ -210,35 +212,25 @@ ClutterBackend *_clutter_device_manager_get_backend             (ClutterDeviceMa
 void            _clutter_device_manager_compress_motion         (ClutterDeviceManager *device_manger,
                                                                 ClutterEvent         *event,
                                                                 const ClutterEvent   *to_discard);
-CLUTTER_EXPORT
-void            clutter_device_manager_ensure_a11y_state        (ClutterDeviceManager *device_manager);

 /* input device */
-CLUTTER_EXPORT
 gboolean        _clutter_input_device_has_sequence              (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence);
-CLUTTER_EXPORT
 void            _clutter_input_device_add_event_sequence        (ClutterInputDevice   *device,
                                                                 ClutterEvent         *event);
-CLUTTER_EXPORT
 void            _clutter_input_device_remove_event_sequence     (ClutterInputDevice   *device,
                                                                 ClutterEvent         *event);
-CLUTTER_EXPORT
 void            _clutter_input_device_set_coords                (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence,
                                                                 gfloat                x,
                                                                 gfloat                y,
                                                                 ClutterStage         *stage);
-CLUTTER_EXPORT
 void            _clutter_input_device_set_state                 (ClutterInputDevice   *device,
                                                                 ClutterModifierType   state);
-CLUTTER_EXPORT
 void            _clutter_input_device_set_time                  (ClutterInputDevice   *device,
                                                                 guint32               time_);
-CLUTTER_EXPORT
 void            _clutter_input_device_set_stage                 (ClutterInputDevice   *device,
                                                                 ClutterStage         *stage);
-CLUTTER_EXPORT
 ClutterStage *  _clutter_input_device_get_stage                 (ClutterInputDevice   *device);
 void            _clutter_input_device_set_actor                 (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence,
@@ -247,57 +239,44 @@ void            _clutter_input_device_set_actor                 (ClutterInputDev
 ClutterActor *  _clutter_input_device_update                    (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence,
                                                                 gboolean              emit_crossing);
-CLUTTER_EXPORT
 void            _clutter_input_device_set_n_keys                (ClutterInputDevice   *device,
                                                                 guint                 n_keys);
-CLUTTER_EXPORT
 guint           _clutter_input_device_add_axis                  (ClutterInputDevice   *device,
                                                                 ClutterInputAxis      axis,
                                                                 gdouble               min_value,
                                                                 gdouble               max_value,
                                                                 gdouble               resolution);
-CLUTTER_EXPORT
 void            _clutter_input_device_reset_axes                (ClutterInputDevice   *device);

-CLUTTER_EXPORT
 void            _clutter_input_device_set_associated_device     (ClutterInputDevice   *device,
                                                                 ClutterInputDevice   *associated);
-CLUTTER_EXPORT
 void            _clutter_input_device_add_slave                 (ClutterInputDevice   *master,
                                                                 ClutterInputDevice   *slave);
-CLUTTER_EXPORT
 void            _clutter_input_device_remove_slave              (ClutterInputDevice   *master,
                                                                 ClutterInputDevice   *slave);

-CLUTTER_EXPORT
 gboolean        _clutter_input_device_translate_axis            (ClutterInputDevice   *device,
                                                                 guint                 index_,
                                                                 gdouble               value,
                                                                 gdouble              *axis_value);

-CLUTTER_EXPORT
 void            _clutter_input_device_add_scroll_info           (ClutterInputDevice   *device,
                                                                 guint                 index_,
                                                                 ClutterScrollDirection direction,
                                                                 gdouble               increment);
-CLUTTER_EXPORT
 void            _clutter_input_device_reset_scroll_info         (ClutterInputDevice   *device);
-CLUTTER_EXPORT
 gboolean        _clutter_input_device_get_scroll_delta          (ClutterInputDevice   *device,
                                                                 guint                 index_,
                                                                 gdouble               value,
                                                                 ClutterScrollDirection *direction_p,
                                                                 gdouble                *delta_p);

-CLUTTER_EXPORT
 ClutterInputDeviceTool * clutter_input_device_lookup_tool       (ClutterInputDevice         *device,
                                                                 guint64                     serial,
                                                                 ClutterInputDeviceToolType  type);
-CLUTTER_EXPORT
 void            clutter_input_device_add_tool                   (ClutterInputDevice     *device,
                                                                 ClutterInputDeviceTool *tool);

-CLUTTER_EXPORT
 void            clutter_input_device_update_from_tool           (ClutterInputDevice     *device,
                                                                 ClutterInputDeviceTool *tool);

--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -47,7 +47,6 @@
 #include "clutter-stage-private.h"
 #include "clutter-virtual-input-device.h"
 #include "clutter-input-device-tool.h"
-#include "clutter-input-pointer-a11y-private.h"

 struct _ClutterDeviceManagerPrivate
 {
@@ -56,8 +55,6 @@ struct _ClutterDeviceManagerPrivate

  /* Keyboard a11y */
  ClutterKbdA11ySettings kbd_a11y_settings;
-  /* Pointer a11y */
-  ClutterPointerA11ySettings pointer_a11y_settings;
 };

 enum
@@ -78,9 +75,6 @@ enum
  TOOL_CHANGED,
  KBD_A11Y_MASK_CHANGED,
  KBD_A11Y_FLAGS_CHANGED,
-  PTR_A11Y_DWELL_CLICK_TYPE_CHANGED,
-  PTR_A11Y_TIMEOUT_STARTED,
-  PTR_A11Y_TIMEOUT_STOPPED,

  LAST_SIGNAL
 };
@@ -91,14 +85,22 @@ G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterDeviceManager,
                                     clutter_device_manager,
                                     G_TYPE_OBJECT)

+G_DEFINE_INTERFACE (ClutterEventExtender,
+                    clutter_event_extender,
+                    CLUTTER_TYPE_DEVICE_MANAGER)
+
+static void
+clutter_event_extender_default_init (ClutterEventExtenderInterface *iface)
+{
+}
+
 static void
 clutter_device_manager_set_property (GObject      *gobject,
                                     guint         prop_id,
                                     const GValue *value,
                                     GParamSpec   *pspec)
 {
-  ClutterDeviceManager *self = CLUTTER_DEVICE_MANAGER (gobject);
-  ClutterDeviceManagerPrivate *priv = clutter_device_manager_get_instance_private (self);
+  ClutterDeviceManagerPrivate *priv = CLUTTER_DEVICE_MANAGER (gobject)->priv;

  switch (prop_id)
    {
@@ -117,8 +119,7 @@ clutter_device_manager_get_property (GObject    *gobject,
                                     GValue     *value,
                                     GParamSpec *pspec)
 {
-  ClutterDeviceManager *self = CLUTTER_DEVICE_MANAGER (gobject);
-  ClutterDeviceManagerPrivate *priv = clutter_device_manager_get_instance_private (self);
+  ClutterDeviceManagerPrivate *priv = CLUTTER_DEVICE_MANAGER (gobject)->priv;

  switch (prop_id)
    {
@@ -164,7 +165,8 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_INPUT_DEVICE);

@@ -183,7 +185,8 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_INPUT_DEVICE);

@@ -236,74 +239,12 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                  G_TYPE_NONE, 2,
                  G_TYPE_UINT,
                  G_TYPE_UINT);
-
-  /**
-   * ClutterDeviceManager::ptr-a11y-dwell-click-type-changed:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @click_type: the new #ClutterPointerA11yDwellClickType mode
-   *
-   * The ::ptr-a11y-dwell-click-type-changed signal is emitted each time
-   * the ClutterPointerA11yDwellClickType mode is changed as the result
-   * of pointer accessibility operations.
-   */
-  manager_signals[PTR_A11Y_DWELL_CLICK_TYPE_CHANGED] =
-    g_signal_new (I_("ptr-a11y-dwell-click-type-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__FLAGS,
-                  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_POINTER_A11Y_DWELL_CLICK_TYPE);
-
-  /**
-   * ClutterDeviceManager::ptr-a11y-timeout-started:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @device: the core pointer #ClutterInputDevice
-   * @timeout_type: the type of timeout #ClutterPointerA11yTimeoutType
-   * @delay: the delay in ms before secondary-click is triggered.
-   *
-   * The ::ptr-a11y-timeout-started signal is emitted when a
-   * pointer accessibility timeout delay is started, so that upper
-   * layers can notify the user with some visual feedback.
-   */
-  manager_signals[PTR_A11Y_TIMEOUT_STARTED] =
-    g_signal_new (I_("ptr-a11y-timeout-started"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__OBJECT_FLAGS_UINT,
-                  G_TYPE_NONE, 3,
-                  CLUTTER_TYPE_INPUT_DEVICE,
-                  CLUTTER_TYPE_POINTER_A11Y_TIMEOUT_TYPE,
-                  G_TYPE_UINT);
-
-  /**
-   * ClutterDeviceManager::ptr-a11y-timeout-stopped:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @device: the core pointer #ClutterInputDevice
-   * @timeout_type: the type of timeout #ClutterPointerA11yTimeoutType
-   * @clicked: %TRUE if the timeout finished and triggered a click
-   *
-   * The ::ptr-a11y-timeout-stopped signal is emitted when a running
-   * pointer accessibility timeout delay is stopped, either because
-   * it's triggered at the end of the delay or cancelled, so that
-   * upper layers can notify the user with some visual feedback.
-   */
-  manager_signals[PTR_A11Y_TIMEOUT_STOPPED] =
-    g_signal_new (I_("ptr-a11y-timeout-stopped"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__OBJECT_FLAGS_BOOLEAN,
-                  G_TYPE_NONE, 3,
-                  CLUTTER_TYPE_INPUT_DEVICE,
-                  CLUTTER_TYPE_POINTER_A11Y_TIMEOUT_TYPE,
-                  G_TYPE_BOOLEAN);
 }

 static void
 clutter_device_manager_init (ClutterDeviceManager *self)
 {
+  self->priv = clutter_device_manager_get_instance_private (self);
 }

 /**
@@ -322,7 +263,7 @@ clutter_device_manager_get_default (void)
 {
  ClutterBackend *backend = clutter_get_default_backend ();

-  return CLUTTER_BACKEND_GET_CLASS (backend)->get_device_manager (backend);
+  return backend->device_manager;
 }

 /**
@@ -546,11 +487,9 @@ _clutter_device_manager_update_devices (ClutterDeviceManager *device_manager)
 ClutterBackend *
 _clutter_device_manager_get_backend (ClutterDeviceManager *manager)
 {
-  ClutterDeviceManagerPrivate *priv = clutter_device_manager_get_instance_private (manager);
-
  g_return_val_if_fail (CLUTTER_IS_DEVICE_MANAGER (manager), NULL);

-  return priv->backend;
+  return manager->priv->backend;
 }

 /**
@@ -607,25 +546,17 @@ _clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,
  manager_class->compress_motion (device_manager, event, to_discard);
 }

-void
-clutter_device_manager_ensure_a11y_state (ClutterDeviceManager *device_manager)
-{
-  ClutterInputDevice *core_pointer;
-
-  core_pointer = clutter_device_manager_get_core_device (device_manager,
-                                                         CLUTTER_POINTER_DEVICE);
-  if (core_pointer)
-    {
-      if (_clutter_is_input_pointer_a11y_enabled (core_pointer))
-        _clutter_input_pointer_a11y_add_device (core_pointer);
-    }
-}
-
 static gboolean
 are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
                             ClutterKbdA11ySettings *b)
 {
-  return (memcmp (a, b, sizeof (ClutterKbdA11ySettings)) == 0);
+  return (a->controls == b->controls &&
+          a->slowkeys_delay == b->slowkeys_delay &&
+          a->debounce_delay == b->debounce_delay &&
+          a->timeout_delay == b->timeout_delay &&
+          a->mousekeys_init_delay == b->mousekeys_init_delay &&
+          a->mousekeys_max_speed == b->mousekeys_max_speed &&
+          a->mousekeys_accel_time == b->mousekeys_accel_time);
 }

 void
@@ -633,14 +564,13 @@ clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_man
                                              ClutterKbdA11ySettings *settings)
 {
  ClutterDeviceManagerClass *manager_class;
-  ClutterDeviceManagerPrivate *priv = clutter_device_manager_get_instance_private (device_manager);

  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));

-  if (are_kbd_a11y_settings_equal (&priv->kbd_a11y_settings, settings))
+  if (are_kbd_a11y_settings_equal (&device_manager->priv->kbd_a11y_settings, settings))
    return;

-  priv->kbd_a11y_settings = *settings;
+  device_manager->priv->kbd_a11y_settings = *settings;

  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
  if (manager_class->apply_kbd_a11y_settings)
@@ -651,103 +581,7 @@ void
 clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
                                              ClutterKbdA11ySettings *settings)
 {
-  ClutterDeviceManagerPrivate *priv = clutter_device_manager_get_instance_private (device_manager);
-
  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));

-  *settings = priv->kbd_a11y_settings;
-}
-
-static gboolean
-are_pointer_a11y_settings_equal (ClutterPointerA11ySettings *a,
-                                 ClutterPointerA11ySettings *b)
-{
-  return (memcmp (a, b, sizeof (ClutterPointerA11ySettings)) == 0);
-}
-
-static void
-clutter_device_manager_enable_pointer_a11y (ClutterDeviceManager *device_manager)
-{
-  ClutterInputDevice *core_pointer;
-
-  core_pointer = clutter_device_manager_get_core_device (device_manager,
-                                                         CLUTTER_POINTER_DEVICE);
-
-  _clutter_input_pointer_a11y_add_device (core_pointer);
-}
-
-static void
-clutter_device_manager_disable_pointer_a11y (ClutterDeviceManager *device_manager)
-{
-  ClutterInputDevice *core_pointer;
-
-  core_pointer = clutter_device_manager_get_core_device (device_manager,
-                                                         CLUTTER_POINTER_DEVICE);
-
-  _clutter_input_pointer_a11y_remove_device (core_pointer);
-}
-
-/**
- * clutter_device_manager_set_pointer_a11y_settings:
- * @device_manager: a #ClutterDeviceManager
- * @settings: a pointer to a #ClutterPointerA11ySettings
- *
- * Sets the pointer accessibility settings
- **/
-void
-clutter_device_manager_set_pointer_a11y_settings (ClutterDeviceManager       *device_manager,
-                                                  ClutterPointerA11ySettings *settings)
-{
-  ClutterDeviceManagerPrivate *priv =
-    clutter_device_manager_get_instance_private (device_manager);
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  if (are_pointer_a11y_settings_equal (&priv->pointer_a11y_settings, settings))
-    return;
-
-  if (priv->pointer_a11y_settings.controls == 0 && settings->controls != 0)
-    clutter_device_manager_enable_pointer_a11y (device_manager);
-  else if (priv->pointer_a11y_settings.controls != 0 && settings->controls == 0)
-    clutter_device_manager_disable_pointer_a11y (device_manager);
-
-  priv->pointer_a11y_settings = *settings;
-}
-
-/**
- * clutter_device_manager_get_pointer_a11y_settings:
- * @device_manager: a #ClutterDeviceManager
- * @settings: a pointer to a #ClutterPointerA11ySettings
- *
- * Gets the current pointer accessibility settings
- **/
-void
-clutter_device_manager_get_pointer_a11y_settings (ClutterDeviceManager       *device_manager,
-                                                  ClutterPointerA11ySettings *settings)
-{
-  ClutterDeviceManagerPrivate *priv =
-    clutter_device_manager_get_instance_private (device_manager);
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  *settings = priv->pointer_a11y_settings;
-}
-
-/**
- * clutter_device_manager_set_pointer_a11y_dwell_click_type:
- * @device_manager: a #ClutterDeviceManager
- * @click_type: type of click as #ClutterPointerA11yDwellClickType
- *
- * Sets the dwell click type
- **/
-void
-clutter_device_manager_set_pointer_a11y_dwell_click_type (ClutterDeviceManager             *device_manager,
-                                                          ClutterPointerA11yDwellClickType  click_type)
-{
-  ClutterDeviceManagerPrivate *priv =
-    clutter_device_manager_get_instance_private (device_manager);
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  priv->pointer_a11y_settings.dwell_click_type = click_type;
+  *settings = device_manager->priv->kbd_a11y_settings;
 }
--- a/clutter/clutter/clutter-device-manager.h
+++ b/clutter/clutter/clutter-device-manager.h
@@ -33,12 +33,16 @@

 G_BEGIN_DECLS

-#define CLUTTER_TYPE_DEVICE_MANAGER (clutter_device_manager_get_type ())
-CLUTTER_EXPORT
-G_DECLARE_DERIVABLE_TYPE (ClutterDeviceManager, clutter_device_manager,
-                          CLUTTER, DEVICE_MANAGER, GObject)
+#define CLUTTER_TYPE_DEVICE_MANAGER             (clutter_device_manager_get_type ())
+#define CLUTTER_DEVICE_MANAGER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_DEVICE_MANAGER, ClutterDeviceManager))
+#define CLUTTER_IS_DEVICE_MANAGER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_DEVICE_MANAGER))
+#define CLUTTER_DEVICE_MANAGER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_DEVICE_MANAGER, ClutterDeviceManagerClass))
+#define CLUTTER_IS_DEVICE_MANAGER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DEVICE_MANAGER))
+#define CLUTTER_DEVICE_MANAGER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DEVICE_MANAGER, ClutterDeviceManagerClass))

+typedef struct _ClutterDeviceManager            ClutterDeviceManager;
 typedef struct _ClutterDeviceManagerPrivate     ClutterDeviceManagerPrivate;
+typedef struct _ClutterDeviceManagerClass       ClutterDeviceManagerClass;

 /**
 * ClutterVirtualDeviceType:
@@ -70,25 +74,19 @@ typedef struct _ClutterKbdA11ySettings
 } ClutterKbdA11ySettings;

 /**
- * ClutterPointerA11ySettings:
+ * ClutterDeviceManager:
 *
- * The #ClutterPointerA11ySettings structure contains pointer accessibility
- * settings
+ * The #ClutterDeviceManager structure contains only private data
 *
+ * Since: 1.2
 */
-typedef struct _ClutterPointerA11ySettings
+struct _ClutterDeviceManager
 {
-  ClutterPointerA11yFlags controls;
-  ClutterPointerA11yDwellClickType dwell_click_type;
-  ClutterPointerA11yDwellMode dwell_mode;
-  ClutterPointerA11yDwellDirection dwell_gesture_single;
-  ClutterPointerA11yDwellDirection dwell_gesture_double;
-  ClutterPointerA11yDwellDirection dwell_gesture_drag;
-  ClutterPointerA11yDwellDirection dwell_gesture_secondary;
-  gint secondary_click_delay;
-  gint dwell_delay;
-  gint dwell_threshold;
-} ClutterPointerA11ySettings;
+  /*< private >*/
+  GObject parent_instance;
+
+  ClutterDeviceManagerPrivate *priv;
+};

 /**
 * ClutterDeviceManagerClass:
@@ -123,18 +121,13 @@ struct _ClutterDeviceManagerClass
  /* Keyboard accessbility */
  void                (* apply_kbd_a11y_settings) (ClutterDeviceManager   *device_manger,
                                                   ClutterKbdA11ySettings *settings);
-
-  /* Event platform data */
-  void (* copy_event_data) (ClutterDeviceManager *device_manager,
-                            const ClutterEvent   *src,
-                            ClutterEvent         *dest);
-  void (* free_event_data) (ClutterDeviceManager *device_manager,
-                            ClutterEvent         *event);
-
  /* padding */
-  gpointer _padding[4];
+  gpointer _padding[6];
 };

+CLUTTER_EXPORT
+GType clutter_device_manager_get_type (void) G_GNUC_CONST;
+
 CLUTTER_EXPORT
 ClutterDeviceManager *clutter_device_manager_get_default     (void);
 CLUTTER_EXPORT
@@ -159,23 +152,10 @@ ClutterVirtualDeviceType clutter_device_manager_get_supported_virtual_device_typ
 CLUTTER_EXPORT
 void clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
                                                   ClutterKbdA11ySettings *settings);
-
 CLUTTER_EXPORT
 void clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
                                                   ClutterKbdA11ySettings *settings);

-CLUTTER_EXPORT
-void clutter_device_manager_set_pointer_a11y_settings (ClutterDeviceManager       *device_manager,
-                                                       ClutterPointerA11ySettings *settings);
-
-CLUTTER_EXPORT
-void clutter_device_manager_get_pointer_a11y_settings (ClutterDeviceManager       *device_manager,
-                                                       ClutterPointerA11ySettings *settings);
-
-CLUTTER_EXPORT
-void clutter_device_manager_set_pointer_a11y_dwell_click_type (ClutterDeviceManager             *device_manager,
-                                                               ClutterPointerA11yDwellClickType  click_type);
-
 G_END_DECLS

 #endif /* __CLUTTER_DEVICE_MANAGER_H__ */
--- a/clutter/clutter/clutter-drop-action.c
+++ b/clutter/clutter/clutter-drop-action.c
@@ -428,7 +428,8 @@ clutter_drop_action_class_init (ClutterDropActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterDropActionClass, over_in),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

@@ -447,7 +448,8 @@ clutter_drop_action_class_init (ClutterDropActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterDropActionClass, over_out),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

--- a/clutter/clutter/clutter-effect-private.h
+++ b/clutter/clutter/clutter-effect-private.h
@@ -7,7 +7,7 @@ G_BEGIN_DECLS

 gboolean        _clutter_effect_pre_paint               (ClutterEffect           *effect);
 void            _clutter_effect_post_paint              (ClutterEffect           *effect);
-gboolean        _clutter_effect_modify_paint_volume     (ClutterEffect           *effect,
+gboolean        _clutter_effect_get_paint_volume        (ClutterEffect           *effect,
                                                         ClutterPaintVolume      *volume);
 gboolean        _clutter_effect_has_custom_paint_volume (ClutterEffect           *effect);
 void            _clutter_effect_paint                   (ClutterEffect           *effect,
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -188,8 +188,8 @@ clutter_effect_real_post_paint (ClutterEffect *effect)
 }

 static gboolean
-clutter_effect_real_modify_paint_volume (ClutterEffect      *effect,
-                                         ClutterPaintVolume *volume)
+clutter_effect_real_get_paint_volume (ClutterEffect      *effect,
+                                      ClutterPaintVolume *volume)
 {
  return TRUE;
 }
@@ -252,7 +252,7 @@ clutter_effect_class_init (ClutterEffectClass *klass)

  klass->pre_paint = clutter_effect_real_pre_paint;
  klass->post_paint = clutter_effect_real_post_paint;
-  klass->modify_paint_volume = clutter_effect_real_modify_paint_volume;
+  klass->get_paint_volume = clutter_effect_real_get_paint_volume;
  klass->paint = clutter_effect_real_paint;
  klass->pick = clutter_effect_real_pick;
 }
@@ -297,14 +297,13 @@ _clutter_effect_pick (ClutterEffect           *effect,
 }

 gboolean
-_clutter_effect_modify_paint_volume (ClutterEffect      *effect,
-                                     ClutterPaintVolume *volume)
+_clutter_effect_get_paint_volume (ClutterEffect      *effect,
+                                  ClutterPaintVolume *volume)
 {
  g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE);
  g_return_val_if_fail (volume != NULL, FALSE);

-  return CLUTTER_EFFECT_GET_CLASS (effect)->modify_paint_volume (effect,
-                                                                 volume);
+  return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume (effect, volume);
 }

 gboolean
@@ -312,7 +311,7 @@ _clutter_effect_has_custom_paint_volume (ClutterEffect *effect)
 {
  g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE);

-  return CLUTTER_EFFECT_GET_CLASS (effect)->modify_paint_volume != clutter_effect_real_modify_paint_volume;
+  return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume != clutter_effect_real_get_paint_volume;
 }

 /**
--- a/clutter/clutter/clutter-effect.h
+++ b/clutter/clutter/clutter-effect.h
@@ -60,7 +60,7 @@ struct _ClutterEffect
 * ClutterEffectClass:
 * @pre_paint: virtual function
 * @post_paint: virtual function
- * @modify_paint_volume: virtual function
+ * @get_paint_volume: virtual function
 * @paint: virtual function
 * @pick: virtual function
 *
@@ -74,16 +74,16 @@ struct _ClutterEffectClass
  ClutterActorMetaClass parent_class;

  /*< public >*/
-  gboolean (* pre_paint)           (ClutterEffect           *effect);
-  void     (* post_paint)          (ClutterEffect           *effect);
+  gboolean (* pre_paint)        (ClutterEffect           *effect);
+  void     (* post_paint)       (ClutterEffect           *effect);

-  gboolean (* modify_paint_volume) (ClutterEffect           *effect,
-                                    ClutterPaintVolume      *volume);
+  gboolean (* get_paint_volume) (ClutterEffect           *effect,
+                                 ClutterPaintVolume      *volume);

-  void     (* paint)               (ClutterEffect           *effect,
-                                    ClutterEffectPaintFlags  flags);
-  void     (* pick)                (ClutterEffect           *effect,
-                                    ClutterEffectPaintFlags  flags);
+  void     (* paint)            (ClutterEffect           *effect,
+                                 ClutterEffectPaintFlags  flags);
+  void     (* pick)             (ClutterEffect           *effect,
+                                 ClutterEffectPaintFlags  flags);

  /*< private >*/
  void (* _clutter_effect4) (void);
--- a/clutter/clutter/clutter-enum-types.h.in
+++ b/clutter/clutter/clutter-enum-types.h.in
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
 /*** END file-header ***/

 /*** BEGIN file-production ***/
-/* enumerations from "@basename@" */
+/* enumerations from "@filename@" */
 /*** END file-production ***/

 /*** BEGIN value-header ***/
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -51,8 +51,7 @@ G_BEGIN_DECLS
 *
 * Deprecated: 1.22: Use the normalized #ClutterActor pivot point instead
 */
-typedef enum /*< prefix=CLUTTER_GRAVITY >*/
-{
+typedef enum { /*< prefix=CLUTTER_GRAVITY >*/
  CLUTTER_GRAVITY_NONE       = 0,
  CLUTTER_GRAVITY_NORTH,
  CLUTTER_GRAVITY_NORTH_EAST,
@@ -75,8 +74,7 @@ typedef enum /*< prefix=CLUTTER_GRAVITY >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER >*/
-{
+typedef enum { /*< prefix=CLUTTER >*/
  CLUTTER_X_AXIS,
  CLUTTER_Y_AXIS,
  CLUTTER_Z_AXIS
@@ -93,8 +91,7 @@ typedef enum /*< prefix=CLUTTER >*/
 *
 * Deprecated: 1.22
 */
-typedef enum /*< prefix=CLUTTER_ROTATE >*/
-{
+typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  CLUTTER_ROTATE_CW,
  CLUTTER_ROTATE_CCW
 } ClutterRotateDirection;
@@ -110,8 +107,7 @@ typedef enum /*< prefix=CLUTTER_ROTATE >*/
 *
 * Since: 0.8
 */
-typedef enum /*< prefix=CLUTTER_REQUEST >*/
-{
+typedef enum { /*< prefix=CLUTTER_REQUEST >*/
  CLUTTER_REQUEST_HEIGHT_FOR_WIDTH,
  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT,
  CLUTTER_REQUEST_CONTENT_SIZE
@@ -204,8 +200,7 @@ typedef enum /*< prefix=CLUTTER_REQUEST >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_CUSTOM_MODE = 0,

  /* linear */
@@ -277,6 +272,23 @@ typedef enum
  CLUTTER_ANIMATION_LAST
 } ClutterAnimationMode;

+/**
+ * ClutterFontFlags:
+ * @CLUTTER_FONT_MIPMAPPING: Set to use mipmaps for the glyph cache textures.
+ * @CLUTTER_FONT_HINTING: Set to enable hinting on the glyphs.
+ *
+ * Runtime flags to change the font quality. To be used with
+ * clutter_set_font_flags().
+ *
+ * Since: 1.0
+ *
+ * Deprecated: 1.22: Use #cairo_font_options_t instead
+ */
+typedef enum { /*< prefix=CLUTTER_FONT >*/
+  CLUTTER_FONT_MIPMAPPING = (1 << 0),
+  CLUTTER_FONT_HINTING    = (1 << 1)
+} ClutterFontFlags;
+
 /**
 * ClutterTextDirection:
 * @CLUTTER_TEXT_DIRECTION_DEFAULT: Use the default setting, as returned
@@ -288,8 +300,7 @@ typedef enum
 *
 * Since: 1.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TEXT_DIRECTION_DEFAULT,
  CLUTTER_TEXT_DIRECTION_LTR,
  CLUTTER_TEXT_DIRECTION_RTL
@@ -304,8 +315,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_VERTEX_SHADER,
  CLUTTER_FRAGMENT_SHADER
 } ClutterShaderType;
@@ -340,8 +350,7 @@ typedef enum
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SHIFT_MASK    = 1 << 0,
  CLUTTER_LOCK_MASK     = 1 << 1,
  CLUTTER_CONTROL_MASK  = 1 << 2,
@@ -407,8 +416,7 @@ typedef enum
 * Keyboard accessibility features applied to a ClutterInputDevice keyboard.
 *
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_A11Y_KEYBOARD_ENABLED          = 1 << 0,
  CLUTTER_A11Y_TIMEOUT_ENABLED           = 1 << 1,
  CLUTTER_A11Y_MOUSE_KEYS_ENABLED        = 1 << 2,
@@ -425,88 +433,6 @@ typedef enum
  CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP = 1 << 13,
 } ClutterKeyboardA11yFlags;

-/**
- * ClutterPointerA11yFlags:
- * @CLUTTER_A11Y_POINTER_ENABLED:
- * @CLUTTER_A11Y_SECONDARY_CLICK_ENABLED:
- * @CLUTTER_A11Y_DWELL_ENABLED:
- *
- * Pointer accessibility features applied to a ClutterInputDevice pointer.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_SECONDARY_CLICK_ENABLED   = 1 << 0,
-  CLUTTER_A11Y_DWELL_ENABLED             = 1 << 1,
-} ClutterPointerA11yFlags;
-
-/**
- * ClutterPointerA11yDwellClickType:
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_NONE: Internal use only
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY:
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_SECONDARY:
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_MIDDLE:
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_DOUBLE:
- * @CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG:
- *
- * Dwell click types.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_NONE,
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY,
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_SECONDARY,
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_MIDDLE,
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_DOUBLE,
-  CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG,
-} ClutterPointerA11yDwellClickType;
-
-/**
- * ClutterPointerA11yDwellDirection:
- * @CLUTTER_A11Y_DWELL_DIRECTION_NONE:
- * @CLUTTER_A11Y_DWELL_DIRECTION_LEFT:
- * @CLUTTER_A11Y_DWELL_DIRECTION_RIGHT:
- * @CLUTTER_A11Y_DWELL_DIRECTION_UP:
- * @CLUTTER_A11Y_DWELL_DIRECTION_DOWN:
- *
- * Dwell gesture directions.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_DWELL_DIRECTION_NONE,
-  CLUTTER_A11Y_DWELL_DIRECTION_LEFT,
-  CLUTTER_A11Y_DWELL_DIRECTION_RIGHT,
-  CLUTTER_A11Y_DWELL_DIRECTION_UP,
-  CLUTTER_A11Y_DWELL_DIRECTION_DOWN,
-} ClutterPointerA11yDwellDirection;
-
-/**
- * ClutterPointerA11yDwellMode:
- * @CLUTTER_A11Y_DWELL_MODE_WINDOW:
- * @CLUTTER_A11Y_DWELL_MODE_GESTURE:
- *
- * Dwell mode.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_DWELL_MODE_WINDOW,
-  CLUTTER_A11Y_DWELL_MODE_GESTURE,
-} ClutterPointerA11yDwellMode;
-
-/**
- * ClutterPointerA11yTimeoutType:
- * @CLUTTER_A11Y_TIMEOUT_TYPE_SECONDARY_CLICK:
- * @CLUTTER_A11Y_TIMEOUT_TYPE_DWELL:
- * @CLUTTER_A11Y_TIMEOUT_TYPE_GESTURE:
- *
- * Pointer accessibility timeout type.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_TIMEOUT_TYPE_SECONDARY_CLICK,
-  CLUTTER_A11Y_TIMEOUT_TYPE_DWELL,
-  CLUTTER_A11Y_TIMEOUT_TYPE_GESTURE,
-} ClutterPointerA11yTimeoutType;
-
 /**
 * ClutterActorFlags:
 * @CLUTTER_ACTOR_MAPPED: the actor will be painted (is visible, and inside
@@ -522,8 +448,7 @@ typedef enum {
 *
 * Flags used to signal the state of an actor.
 */
-typedef enum /*< prefix=CLUTTER_ACTOR >*/
-{
+typedef enum { /*< prefix=CLUTTER_ACTOR >*/
  CLUTTER_ACTOR_MAPPED    = 1 << 1,
  CLUTTER_ACTOR_REALIZED  = 1 << 2,
  CLUTTER_ACTOR_REACTIVE  = 1 << 3,
@@ -543,8 +468,7 @@ typedef enum /*< prefix=CLUTTER_ACTOR >*/
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
-{
+typedef enum { /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
  CLUTTER_OFFSCREEN_REDIRECT_AUTOMATIC_FOR_OPACITY = 1<<0,
  CLUTTER_OFFSCREEN_REDIRECT_ALWAYS = 1<<1
 } ClutterOffscreenRedirect;
@@ -568,8 +492,7 @@ typedef enum /*< prefix=CLUTTER_OFFSCREEN_REDIRECT >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ALLOCATION_NONE         = 0,
  CLUTTER_ABSOLUTE_ORIGIN_CHANGED = 1 << 1,
  CLUTTER_DELEGATE_LAYOUT         = 1 << 2
@@ -586,8 +509,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_ALIGN >*/
-{
+typedef enum { /*< prefix=CLUTTER_ALIGN >*/
  CLUTTER_ALIGN_X_AXIS,
  CLUTTER_ALIGN_Y_AXIS,
  CLUTTER_ALIGN_BOTH
@@ -604,8 +526,7 @@ typedef enum /*< prefix=CLUTTER_ALIGN >*/
 *
 * Deprecated: 1.22
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INTERPOLATION_LINEAR,
  CLUTTER_INTERPOLATION_CUBIC
 } ClutterInterpolation;
@@ -630,8 +551,7 @@ typedef enum
 * Deprecated: 1.12: Use #ClutterActorAlign and the #ClutterActor
 *   API instead
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_BIN_ALIGNMENT_FIXED,
  CLUTTER_BIN_ALIGNMENT_FILL,
  CLUTTER_BIN_ALIGNMENT_START,
@@ -656,8 +576,7 @@ typedef enum
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_BIND >*/
-{
+typedef enum { /*< prefix=CLUTTER_BIND >*/
  CLUTTER_BIND_X,
  CLUTTER_BIND_Y,
  CLUTTER_BIND_WIDTH,
@@ -676,8 +595,7 @@ typedef enum /*< prefix=CLUTTER_BIND >*/
 *
 * Flags passed to the ‘paint’ or ‘pick’ method of #ClutterEffect.
 */
-typedef enum /*< prefix=CLUTTER_EFFECT_PAINT >*/
-{
+typedef enum { /*< prefix=CLUTTER_EFFECT_PAINT >*/
  CLUTTER_EFFECT_PAINT_ACTOR_DIRTY = (1 << 0)
 } ClutterEffectPaintFlags;

@@ -693,8 +611,7 @@ typedef enum /*< prefix=CLUTTER_EFFECT_PAINT >*/
 *
 * Since: 1.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_BOX_ALIGNMENT_START,
  CLUTTER_BOX_ALIGNMENT_END,
  CLUTTER_BOX_ALIGNMENT_CENTER
@@ -711,8 +628,7 @@ typedef enum
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_LONG_PRESS >*/
-{
+typedef enum { /*< prefix=CLUTTER_LONG_PRESS >*/
  CLUTTER_LONG_PRESS_QUERY,
  CLUTTER_LONG_PRESS_ACTIVATE,
  CLUTTER_LONG_PRESS_CANCEL
@@ -770,8 +686,7 @@ typedef enum /*< prefix=CLUTTER_LONG_PRESS >*/
 *
 * Since: 1.6
 */
-typedef enum /*< prefix=CLUTTER_COLOR >*/
-{
+typedef enum { /*< prefix=CLUTTER_COLOR >*/
  /* CGA/EGA-like palette */
  CLUTTER_COLOR_WHITE           = 0,
  CLUTTER_COLOR_BLACK,
@@ -835,8 +750,7 @@ typedef enum /*< prefix=CLUTTER_COLOR >*/
 *
 * Since: 1.4
 */
-typedef enum /*< prefix=CLUTTER_DRAG >*/
-{
+typedef enum { /*< prefix=CLUTTER_DRAG >*/
  CLUTTER_DRAG_AXIS_NONE = 0,

  CLUTTER_DRAG_X_AXIS,
@@ -853,8 +767,7 @@ typedef enum /*< prefix=CLUTTER_DRAG >*/
 *
 * Since: 0.6
 */
-typedef enum /*< flags prefix=CLUTTER_EVENT >*/
-{
+typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
  CLUTTER_EVENT_NONE              = 0,
  CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1,
@@ -899,8 +812,7 @@ typedef enum /*< flags prefix=CLUTTER_EVENT >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER >*/
-{
+typedef enum { /*< prefix=CLUTTER >*/
  CLUTTER_NOTHING = 0,
  CLUTTER_KEY_PRESS,
  CLUTTER_KEY_RELEASE,
@@ -945,8 +857,7 @@ typedef enum /*< prefix=CLUTTER >*/
 *
 * Since: 0.4
 */
-typedef enum /*< prefix=CLUTTER_SCROLL >*/
-{
+typedef enum { /*< prefix=CLUTTER_SCROLL >*/
  CLUTTER_SCROLL_UP,
  CLUTTER_SCROLL_DOWN,
  CLUTTER_SCROLL_LEFT,
@@ -956,23 +867,28 @@ typedef enum /*< prefix=CLUTTER_SCROLL >*/

 /**
 * ClutterStageState:
+ * @CLUTTER_STAGE_STATE_FULLSCREEN: Fullscreen mask
+ * @CLUTTER_STAGE_STATE_OFFSCREEN: Offscreen mask (deprecated)
 * @CLUTTER_STAGE_STATE_ACTIVATED: Activated mask
 *
 * Stage state masks, used by the #ClutterEvent of type %CLUTTER_STAGE_STATE.
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
+  CLUTTER_STAGE_STATE_FULLSCREEN       = (1 << 1),
+  CLUTTER_STAGE_STATE_OFFSCREEN        = (1 << 2),
  CLUTTER_STAGE_STATE_ACTIVATED        = (1 << 3)
 } ClutterStageState;

 /**
 * ClutterFeatureFlags:
+ * @CLUTTER_FEATURE_TEXTURE_NPOT: Set if NPOTS textures supported.
 * @CLUTTER_FEATURE_SWAP_THROTTLE: Set if backend throttles buffer swaps.
 * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported.
 * @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read.
 * @CLUTTER_FEATURE_STAGE_STATIC: Set if stage size if fixed (i.e framebuffer)
+ * @CLUTTER_FEATURE_STAGE_USER_RESIZE: Set if stage is able to be user resized.
 * @CLUTTER_FEATURE_STAGE_CURSOR: Set if stage has a graphical cursor.
 * @CLUTTER_FEATURE_SHADERS_GLSL: Set if the backend supports GLSL shaders.
 * @CLUTTER_FEATURE_OFFSCREEN: Set if the backend supports offscreen rendering.
@@ -986,10 +902,12 @@ typedef enum
 */
 typedef enum
 {
+  CLUTTER_FEATURE_TEXTURE_NPOT           = (1 << 2),
  CLUTTER_FEATURE_SWAP_THROTTLE          = (1 << 3),
  CLUTTER_FEATURE_TEXTURE_YUV            = (1 << 4),
  CLUTTER_FEATURE_TEXTURE_READ_PIXELS    = (1 << 5),
  CLUTTER_FEATURE_STAGE_STATIC           = (1 << 6),
+  CLUTTER_FEATURE_STAGE_USER_RESIZE      = (1 << 7),
  CLUTTER_FEATURE_STAGE_CURSOR           = (1 << 8),
  CLUTTER_FEATURE_SHADERS_GLSL           = (1 << 9),
  CLUTTER_FEATURE_OFFSCREEN              = (1 << 10),
@@ -1009,8 +927,7 @@ typedef enum
 *
 * Since: 1.2
 */
-typedef enum /*< prefix=CLUTTER_FLOW >*/
-{
+typedef enum { /*< prefix=CLUTTER_FLOW >*/
  CLUTTER_FLOW_HORIZONTAL,
  CLUTTER_FLOW_VERTICAL
 } ClutterFlowOrientation;
@@ -1037,8 +954,7 @@ typedef enum /*< prefix=CLUTTER_FLOW >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_POINTER_DEVICE,
  CLUTTER_KEYBOARD_DEVICE,
  CLUTTER_EXTENSION_DEVICE,
@@ -1066,8 +982,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_MODE_MASTER,
  CLUTTER_INPUT_MODE_SLAVE,
  CLUTTER_INPUT_MODE_FLOATING
@@ -1092,8 +1007,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_AXIS_IGNORE,

  CLUTTER_INPUT_AXIS_X,
@@ -1120,8 +1034,7 @@ typedef enum
 *
 * Since: 1.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SNAP_EDGE_TOP,
  CLUTTER_SNAP_EDGE_RIGHT,
  CLUTTER_SNAP_EDGE_BOTTOM,
@@ -1138,8 +1051,7 @@ typedef enum
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_PICK_NONE = 0,
  CLUTTER_PICK_REACTIVE,
  CLUTTER_PICK_ALL
@@ -1156,8 +1068,7 @@ typedef enum
 *
 * Since: 1.8
 */
-typedef enum /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
-{
+typedef enum { /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
  CLUTTER_SWIPE_DIRECTION_UP    = 1 << 0,
  CLUTTER_SWIPE_DIRECTION_DOWN  = 1 << 1,
  CLUTTER_SWIPE_DIRECTION_LEFT  = 1 << 2,
@@ -1177,8 +1088,7 @@ typedef enum /*< prefix=CLUTTER_SWIPE_DIRECTION >*/
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_PAN >*/
-{
+typedef enum { /*< prefix=CLUTTER_PAN >*/
  CLUTTER_PAN_AXIS_NONE = 0,

  CLUTTER_PAN_X_AXIS,
@@ -1203,8 +1113,7 @@ typedef enum /*< prefix=CLUTTER_PAN >*/
 *
 * Deprecated: 1.22: Use the alignment properties of #ClutterActor
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TABLE_ALIGNMENT_START,
  CLUTTER_TABLE_ALIGNMENT_CENTER,
  CLUTTER_TABLE_ALIGNMENT_END
@@ -1225,8 +1134,7 @@ typedef enum
 * Deprecated: 1.22: The #ClutterTexture class was the only user of
 *   this API
 */
-typedef enum /*< prefix=CLUTTER_TEXTURE >*/
-{
+typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
  CLUTTER_TEXTURE_NONE             = 0,
  CLUTTER_TEXTURE_RGB_FLAG_BGR     = 1 << 1,
  CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */
@@ -1250,8 +1158,7 @@ typedef enum /*< prefix=CLUTTER_TEXTURE >*/
 *   this API; use #ClutterImage and clutter_actor_set_content_scaling_filters()
 *   instead.
 */
-typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
-{
+typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
  CLUTTER_TEXTURE_QUALITY_LOW,
  CLUTTER_TEXTURE_QUALITY_MEDIUM,
  CLUTTER_TEXTURE_QUALITY_HIGH
@@ -1266,8 +1173,7 @@ typedef enum /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
 *
 * Since: 0.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TIMELINE_FORWARD,
  CLUTTER_TIMELINE_BACKWARD
 } ClutterTimelineDirection;
@@ -1286,8 +1192,7 @@ typedef enum
 *
 * Since: 1.0
 */
-typedef enum /*< prefix=CLUTTER_UNIT >*/
-{
+typedef enum { /*< prefix=CLUTTER_UNIT >*/
  CLUTTER_UNIT_PIXEL,
  CLUTTER_UNIT_EM,
  CLUTTER_UNIT_MM,
@@ -1317,8 +1222,7 @@ typedef enum /*< prefix=CLUTTER_UNIT >*/
 *
 * Since: 1.0
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_PATH_MOVE_TO      = 0,
  CLUTTER_PATH_LINE_TO      = 1,
  CLUTTER_PATH_CURVE_TO     = 2,
@@ -1349,8 +1253,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_ALIGN_FILL,
  CLUTTER_ACTOR_ALIGN_START,
  CLUTTER_ACTOR_ALIGN_CENTER,
@@ -1370,8 +1273,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_REPAINT_FLAGS_PRE_PAINT = 1 << 0,
  CLUTTER_REPAINT_FLAGS_POST_PAINT = 1 << 1,
  CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD = 1 << 2
@@ -1396,8 +1298,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_CONTENT_GRAVITY_TOP_LEFT,
  CLUTTER_CONTENT_GRAVITY_TOP,
  CLUTTER_CONTENT_GRAVITY_TOP_RIGHT,
@@ -1427,8 +1328,7 @@ typedef enum
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCALING_FILTER_LINEAR,
  CLUTTER_SCALING_FILTER_NEAREST,
  CLUTTER_SCALING_FILTER_TRILINEAR
@@ -1443,8 +1343,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_ORIENTATION_HORIZONTAL,
  CLUTTER_ORIENTATION_VERTICAL
 } ClutterOrientation;
@@ -1460,8 +1359,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_SCROLL >*/
-{
+typedef enum { /*< prefix=CLUTTER_SCROLL >*/
  CLUTTER_SCROLL_NONE         = 0,

  CLUTTER_SCROLL_HORIZONTALLY = 1 << 0,
@@ -1481,8 +1379,7 @@ typedef enum /*< prefix=CLUTTER_SCROLL >*/
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_GRID_POSITION_LEFT,
  CLUTTER_GRID_POSITION_RIGHT,
  CLUTTER_GRID_POSITION_TOP,
@@ -1500,8 +1397,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_REPEAT_NONE   = 0,
  CLUTTER_REPEAT_X_AXIS = 1 << 0,
  CLUTTER_REPEAT_Y_AXIS = 1 << 1,
@@ -1523,8 +1419,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_STEP_MODE_START,
  CLUTTER_STEP_MODE_END
 } ClutterStepMode;
@@ -1540,8 +1435,7 @@ typedef enum
 *
 * Since: 1.12
 */
-typedef enum /*< prefix=CLUTTER_ZOOM >*/
-{
+typedef enum { /*< prefix=CLUTTER_ZOOM >*/
  CLUTTER_ZOOM_X_AXIS,
  CLUTTER_ZOOM_Y_AXIS,
  CLUTTER_ZOOM_BOTH
@@ -1564,8 +1458,7 @@ typedef enum /*< prefix=CLUTTER_ZOOM >*/
 *
 * Since: 1.18
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_GESTURE_TRIGGER_EDGE_NONE  = 0,
  CLUTTER_GESTURE_TRIGGER_EDGE_AFTER,
  CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE
@@ -1601,8 +1494,7 @@ typedef enum
 *
 * Since: 1.24
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TOUCHPAD_GESTURE_PHASE_BEGIN,
  CLUTTER_TOUCHPAD_GESTURE_PHASE_UPDATE,
  CLUTTER_TOUCHPAD_GESTURE_PHASE_END,
@@ -1624,8 +1516,7 @@ typedef enum
 *
 * Since: 1.26
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCROLL_SOURCE_UNKNOWN,
  CLUTTER_SCROLL_SOURCE_WHEEL,
  CLUTTER_SCROLL_SOURCE_FINGER,
@@ -1643,8 +1534,7 @@ typedef enum
 *
 * Since: 1.26
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCROLL_FINISHED_NONE       = 0,
  CLUTTER_SCROLL_FINISHED_HORIZONTAL = 1 << 0,
  CLUTTER_SCROLL_FINISHED_VERTICAL   = 1 << 1
@@ -1665,8 +1555,7 @@ typedef enum
 *
 * Since: 1.28
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_TOOL_NONE,
  CLUTTER_INPUT_DEVICE_TOOL_PEN,
  CLUTTER_INPUT_DEVICE_TOOL_ERASER,
@@ -1677,20 +1566,17 @@ typedef enum
  CLUTTER_INPUT_DEVICE_TOOL_LENS
 } ClutterInputDeviceToolType;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_PAD_SOURCE_UNKNOWN,
  CLUTTER_INPUT_DEVICE_PAD_SOURCE_FINGER,
 } ClutterInputDevicePadSource;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE,
  CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE,
 } ClutterInputDeviceMapping;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_CONTENT_HINT_COMPLETION          = 1 << 0,
  CLUTTER_INPUT_CONTENT_HINT_SPELLCHECK          = 1 << 1,
  CLUTTER_INPUT_CONTENT_HINT_AUTO_CAPITALIZATION = 1 << 2,
@@ -1703,8 +1589,7 @@ typedef enum
  CLUTTER_INPUT_CONTENT_HINT_MULTILINE           = 1 << 9,
 } ClutterInputContentHintFlags;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
  CLUTTER_INPUT_CONTENT_PURPOSE_ALPHA,
  CLUTTER_INPUT_CONTENT_PURPOSE_DIGITS,
@@ -1720,8 +1605,7 @@ typedef enum
  CLUTTER_INPUT_CONTENT_PURPOSE_TERMINAL,
 } ClutterInputContentPurpose;

-typedef enum
-{
+typedef enum {
  CLUTTER_INPUT_PANEL_STATE_OFF,
  CLUTTER_INPUT_PANEL_STATE_ON,
  CLUTTER_INPUT_PANEL_STATE_TOGGLE,
--- a/clutter/clutter/clutter-event-private.h
+++ b/clutter/clutter/clutter-event-private.h
@@ -5,28 +5,22 @@

 G_BEGIN_DECLS

-CLUTTER_EXPORT
 void            _clutter_event_set_pointer_emulated     (ClutterEvent       *event,
                                                         gboolean            is_emulated);

 /* Reinjecting queued events for processing */
-CLUTTER_EXPORT
 void            _clutter_process_event                  (ClutterEvent       *event);

-CLUTTER_EXPORT
 gboolean        _clutter_event_process_filters          (ClutterEvent       *event);

 /* clears the event queue inside the main context */
 void            _clutter_clear_events_queue             (void);
 void            _clutter_clear_events_queue_for_stage   (ClutterStage       *stage);

-CLUTTER_EXPORT
 void            _clutter_event_set_platform_data        (ClutterEvent       *event,
                                                         gpointer            data);
-CLUTTER_EXPORT
 gpointer        _clutter_event_get_platform_data        (const ClutterEvent *event);

-CLUTTER_EXPORT
 void            _clutter_event_set_state_full           (ClutterEvent        *event,
 							 ClutterModifierType  button_state,
 							 ClutterModifierType  base_state,
@@ -34,7 +28,6 @@ void            _clutter_event_set_state_full           (ClutterEvent        *ev
 							 ClutterModifierType  locked_state,
 							 ClutterModifierType  effective_state);

-CLUTTER_EXPORT
 void            _clutter_event_push                     (const ClutterEvent *event,
                                                         gboolean            do_copy);

--- a/clutter/clutter/clutter-event-translator.c
+++ b/clutter/clutter/clutter-event-translator.c
@@ -0,0 +1,38 @@
+#include "clutter-build-config.h"
+
+#include "clutter-event-translator.h"
+
+#include "clutter-backend.h"
+#include "clutter-private.h"
+
+#define clutter_event_translator_get_type       _clutter_event_translator_get_type
+
+typedef ClutterEventTranslatorIface     ClutterEventTranslatorInterface;
+
+G_DEFINE_INTERFACE (ClutterEventTranslator, clutter_event_translator, G_TYPE_OBJECT);
+
+static ClutterTranslateReturn
+default_translate_event (ClutterEventTranslator *translator,
+                         gpointer                native,
+                         ClutterEvent           *event)
+{
+  return CLUTTER_TRANSLATE_CONTINUE;
+}
+
+static void
+clutter_event_translator_default_init (ClutterEventTranslatorIface *iface)
+{
+  iface->translate_event = default_translate_event;
+}
+
+ClutterTranslateReturn
+_clutter_event_translator_translate_event (ClutterEventTranslator *translator,
+                                           gpointer                native,
+                                           ClutterEvent           *translated)
+{
+  ClutterEventTranslatorIface *iface;
+
+  iface = CLUTTER_EVENT_TRANSLATOR_GET_IFACE (translator);
+
+  return iface->translate_event (translator, native, translated);
+}
--- a/clutter/clutter/clutter-event-translator.h
+++ b/clutter/clutter/clutter-event-translator.h
@@ -0,0 +1,41 @@
+#ifndef __CLUTTER_EVENT_TRANSLATOR_H__
+#define __CLUTTER_EVENT_TRANSLATOR_H__
+
+#include <glib-object.h>
+#include <clutter/clutter-event.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_EVENT_TRANSLATOR           (_clutter_event_translator_get_type ())
+#define CLUTTER_EVENT_TRANSLATOR(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_EVENT_TRANSLATOR, ClutterEventTranslator))
+#define CLUTTER_IS_EVENT_TRANSLATOR(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_EVENT_TRANSLATOR))
+#define CLUTTER_EVENT_TRANSLATOR_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_EVENT_TRANSLATOR, ClutterEventTranslatorIface))
+
+typedef struct _ClutterEventTranslator          ClutterEventTranslator;
+typedef struct _ClutterEventTranslatorIface     ClutterEventTranslatorIface;
+
+typedef enum {
+  CLUTTER_TRANSLATE_CONTINUE,
+  CLUTTER_TRANSLATE_REMOVE,
+  CLUTTER_TRANSLATE_QUEUE
+} ClutterTranslateReturn;
+
+struct _ClutterEventTranslatorIface
+{
+  GTypeInterface g_iface;
+
+  ClutterTranslateReturn (* translate_event) (ClutterEventTranslator *translator,
+                                              gpointer                native,
+                                              ClutterEvent           *translated);
+};
+
+CLUTTER_EXPORT
+GType _clutter_event_translator_get_type (void) G_GNUC_CONST;
+
+ClutterTranslateReturn _clutter_event_translator_translate_event (ClutterEventTranslator *translator,
+                                                                  gpointer                native,
+                                                                  ClutterEvent           *translated);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_EVENT_TRANSLATOR_H__ */
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -1021,9 +1021,6 @@ clutter_event_get_event_sequence (const ClutterEvent *event)
      event->type == CLUTTER_TOUCH_END ||
      event->type == CLUTTER_TOUCH_CANCEL)
    return event->touch.sequence;
-  else if (event->type == CLUTTER_ENTER ||
-           event->type == CLUTTER_LEAVE)
-    return event->crossing.sequence;

  return NULL;
 }
--- a/clutter/clutter/clutter-event.h
+++ b/clutter/clutter/clutter-event.h
@@ -269,7 +269,6 @@ struct _ClutterCrossingEvent
  gfloat x;
  gfloat y;
  ClutterInputDevice *device;
-  ClutterEventSequence *sequence;
  ClutterActor *related;
 };

--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -64,13 +64,17 @@ clutter_features_from_cogl (guint cogl_flags)
 {
  ClutterFeatureFlags clutter_flags = 0;
  
+  if (cogl_flags & COGL_FEATURE_TEXTURE_NPOT)
+    clutter_flags |= CLUTTER_FEATURE_TEXTURE_NPOT;
+
  if (cogl_flags & COGL_FEATURE_TEXTURE_YUV)
    clutter_flags |= CLUTTER_FEATURE_TEXTURE_YUV;
  
  if (cogl_flags & COGL_FEATURE_TEXTURE_READ_PIXELS)
    clutter_flags |= CLUTTER_FEATURE_TEXTURE_READ_PIXELS;
  
-  clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
+  if (cogl_flags & COGL_FEATURE_SHADERS_GLSL)
+    clutter_flags |= CLUTTER_FEATURE_SHADERS_GLSL;
  
  if (cogl_flags & COGL_FEATURE_OFFSCREEN)
    clutter_flags |= CLUTTER_FEATURE_OFFSCREEN;
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -804,7 +804,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterGestureActionClass, gesture_end),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);

@@ -826,7 +827,8 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterGestureActionClass, gesture_cancel),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
 }
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -57,7 +57,7 @@ struct _ClutterImagePrivate
  gint height;
 };

-static void clutter_content_iface_init (ClutterContentInterface *iface);
+static void clutter_content_iface_init (ClutterContentIface *iface);

 G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT,
                         G_ADD_PRIVATE (ClutterImage)
@@ -154,7 +154,7 @@ clutter_image_get_preferred_size (ClutterContent *content,
 }

 static void
-clutter_content_iface_init (ClutterContentInterface *iface)
+clutter_content_iface_init (ClutterContentIface *iface)
 {
  iface->get_preferred_size = clutter_image_get_preferred_size;
  iface->paint_content = clutter_image_paint_content;
@@ -256,7 +256,7 @@ clutter_image_set_data (ClutterImage     *image,
    {
      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
+                           _("Unable to load image data"));
      return FALSE;
    }

@@ -325,7 +325,7 @@ clutter_image_set_bytes (ClutterImage     *image,
    {
      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
+                           _("Unable to load image data"));
      return FALSE;
    }

@@ -419,7 +419,7 @@ clutter_image_set_area (ClutterImage                 *image,
    {
      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
+                           _("Unable to load image data"));
      return FALSE;
    }

--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -63,8 +63,7 @@ typedef struct _ClutterImageClass      ClutterImageClass;
 *
 * Since: 1.10
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_IMAGE_ERROR_INVALID_DATA
 } ClutterImageError;

--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@@ -35,8 +35,7 @@ struct _ClutterInputDeviceToolPrivate
  guint64 id;
 };

-enum
-{
+enum {
  PROP_0,
  PROP_TYPE,
  PROP_SERIAL,
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -107,9 +107,6 @@ clutter_input_device_dispose (GObject *gobject)
      device->associated = NULL;
    }

-  if (device->accessibility_virtual_device)
-    g_clear_object (&device->accessibility_virtual_device);
-
  g_clear_pointer (&device->axes, g_array_unref);
  g_clear_pointer (&device->keys, g_array_unref);
  g_clear_pointer (&device->scroll_info, g_array_unref);
@@ -837,7 +834,6 @@ _clutter_input_device_set_actor (ClutterInputDevice   *device,
          event->crossing.x = device->current_x;
          event->crossing.y = device->current_y;
          event->crossing.related = actor;
-          event->crossing.sequence = sequence;
          clutter_event_set_device (event, device);

          /* we need to make sure that this event is processed
@@ -874,7 +870,6 @@ _clutter_input_device_set_actor (ClutterInputDevice   *device,
          event->crossing.y = device->current_y;
          event->crossing.source = actor;
          event->crossing.related = old_actor;
-          event->crossing.sequence = sequence;
          clutter_event_set_device (event, device);

          /* see above */
@@ -1039,10 +1034,9 @@ _clutter_input_device_update (ClutterInputDevice   *device,
  ClutterActor *new_cursor_actor;
  ClutterActor *old_cursor_actor;
  ClutterPoint point = { -1, -1 };
-  ClutterInputDeviceType device_type = device->device_type;

-  g_assert (device_type != CLUTTER_KEYBOARD_DEVICE &&
-            device_type != CLUTTER_PAD_DEVICE);
+  if (device->device_type == CLUTTER_KEYBOARD_DEVICE)
+    return NULL;

  stage = device->stage;
  if (G_UNLIKELY (stage == NULL))
@@ -1925,157 +1919,6 @@ _clutter_input_device_reset_scroll_info (ClutterInputDevice *device)
    }
 }

-static void
-on_grab_actor_destroy (ClutterActor       *actor,
-                       ClutterInputDevice *device)
-{
-  switch (device->device_type)
-    {
-    case CLUTTER_POINTER_DEVICE:
-    case CLUTTER_TABLET_DEVICE:
-      device->pointer_grab_actor = NULL;
-      break;
-
-    case CLUTTER_KEYBOARD_DEVICE:
-      device->keyboard_grab_actor = NULL;
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-/**
- * clutter_input_device_grab:
- * @device: a #ClutterInputDevice
- * @actor: a #ClutterActor
- *
- * Acquires a grab on @actor for the given @device.
- *
- * Any event coming from @device will be delivered to @actor, bypassing
- * the usual event delivery mechanism, until the grab is released by
- * calling clutter_input_device_ungrab().
- *
- * The grab is client-side: even if the windowing system used by the Clutter
- * backend has the concept of "device grabs", Clutter will not use them.
- *
- * Only #ClutterInputDevice of types %CLUTTER_POINTER_DEVICE,
- * %CLUTTER_TABLET_DEVICE and %CLUTTER_KEYBOARD_DEVICE can hold a grab.
- *
- * Since: 1.10
- */
-void
-clutter_input_device_grab (ClutterInputDevice *device,
-                           ClutterActor       *actor)
-{
-  ClutterActor **grab_actor;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
-  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-
-  switch (device->device_type)
-    {
-    case CLUTTER_POINTER_DEVICE:
-    case CLUTTER_TABLET_DEVICE:
-      grab_actor = &device->pointer_grab_actor;
-      break;
-
-    case CLUTTER_KEYBOARD_DEVICE:
-      grab_actor = &device->keyboard_grab_actor;
-      break;
-
-    default:
-      g_critical ("Only pointer and keyboard devices can grab an actor");
-      return;
-    }
-
-  if (*grab_actor != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (*grab_actor,
-                                            G_CALLBACK (on_grab_actor_destroy),
-                                            device);
-    }
-
-  *grab_actor = actor;
-
-  g_signal_connect (*grab_actor,
-                    "destroy",
-                    G_CALLBACK (on_grab_actor_destroy),
-                    device);
-}
-
-/**
- * clutter_input_device_ungrab:
- * @device: a #ClutterInputDevice
- *
- * Releases the grab on the @device, if one is in place.
- *
- * Since: 1.10
- */
-void
-clutter_input_device_ungrab (ClutterInputDevice *device)
-{
-  ClutterActor **grab_actor;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
-
-  switch (device->device_type)
-    {
-    case CLUTTER_POINTER_DEVICE:
-    case CLUTTER_TABLET_DEVICE:
-      grab_actor = &device->pointer_grab_actor;
-      break;
-
-    case CLUTTER_KEYBOARD_DEVICE:
-      grab_actor = &device->keyboard_grab_actor;
-      break;
-
-    default:
-      return;
-    }
-
-  if (*grab_actor == NULL)
-    return;
-
-  g_signal_handlers_disconnect_by_func (*grab_actor,
-                                        G_CALLBACK (on_grab_actor_destroy),
-                                        device);
-
-  *grab_actor = NULL;
-}
-
-/**
- * clutter_input_device_get_grabbed_actor:
- * @device: a #ClutterInputDevice
- *
- * Retrieves a pointer to the #ClutterActor currently grabbing all
- * the events coming from @device.
- *
- * Return value: (transfer none): a #ClutterActor, or %NULL
- *
- * Since: 1.10
- */
-ClutterActor *
-clutter_input_device_get_grabbed_actor (ClutterInputDevice *device)
-{
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL);
-
-  switch (device->device_type)
-    {
-    case CLUTTER_POINTER_DEVICE:
-    case CLUTTER_TABLET_DEVICE:
-      return device->pointer_grab_actor;
-
-    case CLUTTER_KEYBOARD_DEVICE:
-      return device->keyboard_grab_actor;
-
-    default:
-      g_critical ("Only pointer and keyboard devices can grab an actor");
-    }
-
-  return NULL;
-}
-
 static void
 on_grab_sequence_actor_destroy (ClutterActor       *actor,
                                ClutterInputDevice *device)
@@ -2441,3 +2284,15 @@ clutter_input_device_is_grouped (ClutterInputDevice *device,

  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->is_grouped (device, other_device);
 }
+
+gboolean
+clutter_input_device_get_physical_size (ClutterInputDevice *device,
+                                        gdouble            *width,
+                                        gdouble            *height)
+{
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
+
+  return CLUTTER_INPUT_DEVICE_GET_CLASS (device)->get_physical_size (device,
+                                                                     width,
+                                                                     height);
+}
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -171,6 +171,10 @@ void                      clutter_input_device_set_mapping_mode (ClutterInputDev
 CLUTTER_EXPORT
 gboolean                  clutter_input_device_is_grouped       (ClutterInputDevice *device,
                                                                 ClutterInputDevice *other_device);
+CLUTTER_EXPORT
+gboolean                  clutter_input_device_get_physical_size (ClutterInputDevice *device,
+								  gdouble            *width,
+								  gdouble            *height);

 G_END_DECLS

--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@@ -175,8 +175,7 @@ clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
 }

 void
-clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,
-                                           ClutterInputPanelState  state)
+clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus)
 {
  ClutterInputFocusPrivate *priv;

@@ -185,7 +184,7 @@ clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,

  priv = clutter_input_focus_get_instance_private (focus);

-  clutter_input_method_set_input_panel_state (priv->im, state);
+  clutter_input_method_toggle_input_panel (priv->im);
 }

 void
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@@ -78,7 +78,6 @@ CLUTTER_EXPORT
 void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
                                               gboolean           can_show_preedit);
 CLUTTER_EXPORT
-void clutter_input_focus_set_input_panel_state (ClutterInputFocus      *focus,
-                                                ClutterInputPanelState  state);
+void clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus);

 #endif /* __CLUTTER_INPUT_FOCUS_H__ */
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -37,8 +37,7 @@ struct _ClutterInputMethodPrivate
  gboolean can_show_preedit;
 };

-enum
-{
+enum {
  COMMIT,
  DELETE_SURROUNDING,
  REQUEST_SURROUNDING,
@@ -47,8 +46,7 @@ enum
  N_SIGNALS,
 };

-enum
-{
+enum {
  PROP_0,
  PROP_CONTENT_HINTS,
  PROP_CONTENT_PURPOSE,
@@ -266,6 +264,9 @@ clutter_input_method_focus_out (ClutterInputMethod *im)

  klass = CLUTTER_INPUT_METHOD_GET_CLASS (im);
  klass->focus_out (im);
+
+  g_signal_emit (im, signals[INPUT_PANEL_STATE],
+                 0, CLUTTER_INPUT_PANEL_STATE_OFF);
 }

 ClutterInputFocus *
@@ -360,12 +361,12 @@ clutter_input_method_notify_key_event (ClutterInputMethod *im,
 }

 void
-clutter_input_method_set_input_panel_state (ClutterInputMethod     *im,
-                                            ClutterInputPanelState  state)
+clutter_input_method_toggle_input_panel (ClutterInputMethod *im)
 {
  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));

-  g_signal_emit (im, signals[INPUT_PANEL_STATE], 0, state);
+  g_signal_emit (im, signals[INPUT_PANEL_STATE], 0,
+                 CLUTTER_INPUT_PANEL_STATE_TOGGLE);
 }

 void
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@@ -83,8 +83,7 @@ void clutter_input_method_notify_key_event (ClutterInputMethod *im,
                                            const ClutterEvent *event,
                                            gboolean            filtered);
 CLUTTER_EXPORT
-void clutter_input_method_set_input_panel_state (ClutterInputMethod     *im,
-                                                 ClutterInputPanelState  state);
+void clutter_input_method_request_toggle_input_panel (ClutterInputMethod *im);

 CLUTTER_EXPORT
 void clutter_input_method_forward_key (ClutterInputMethod *im,
--- a/clutter/clutter/clutter-input-pointer-a11y-private.h
+++ b/clutter/clutter/clutter-input-pointer-a11y-private.h
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2019 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Olivier Fourdan <ofourdan@redhat.com>
- */
-
-#ifndef __CLUTTER_INPUT_POINTER_A11Y_H__
-#define __CLUTTER_INPUT_POINTER_A11Y_H__
-
-#include <clutter/clutter-types.h>
-#include "clutter-enum-types.h"
-
-G_BEGIN_DECLS
-
-CLUTTER_EXPORT
-void _clutter_input_pointer_a11y_add_device      (ClutterInputDevice   *device);
-CLUTTER_EXPORT
-void _clutter_input_pointer_a11y_remove_device   (ClutterInputDevice   *device);
-CLUTTER_EXPORT
-void _clutter_input_pointer_a11y_on_motion_event (ClutterInputDevice   *device,
-                                                  float                 x,
-                                                  float                 y);
-CLUTTER_EXPORT
-void _clutter_input_pointer_a11y_on_button_event (ClutterInputDevice   *device,
-                                                  int                   button,
-                                                  gboolean              pressed);
-CLUTTER_EXPORT
-gboolean _clutter_is_input_pointer_a11y_enabled  (ClutterInputDevice     *device);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_INPUT_POINTER_A11Y_H__ */
--- a/clutter/clutter/clutter-input-pointer-a11y.c
+++ b/clutter/clutter/clutter-input-pointer-a11y.c
@@ -1,710 +0,0 @@
-/*
- * Copyright (C) 2019 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Olivier Fourdan <ofourdan@redhat.com>
- *
- * This reimplements in Clutter the same behavior as mousetweaks original
- * implementation by Gerd Kohlberger <gerdko gmail com>
- * mousetweaks Copyright (C) 2007-2010 Gerd Kohlberger <gerdko gmail com>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-device-manager.h"
-#include "clutter-device-manager-private.h"
-#include "clutter-enum-types.h"
-#include "clutter-input-device.h"
-#include "clutter-input-pointer-a11y-private.h"
-#include "clutter-main.h"
-#include "clutter-virtual-input-device.h"
-
-static gboolean
-is_secondary_click_enabled (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return (settings.controls & CLUTTER_A11Y_SECONDARY_CLICK_ENABLED);
-}
-
-static gboolean
-is_dwell_click_enabled (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return (settings.controls & CLUTTER_A11Y_DWELL_ENABLED);
-}
-
-static unsigned int
-get_secondary_click_delay (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return settings.secondary_click_delay;
-}
-
-static unsigned int
-get_dwell_delay (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return settings.dwell_delay;
-}
-
-static unsigned int
-get_dwell_threshold (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return settings.dwell_threshold;
-}
-
-static ClutterPointerA11yDwellMode
-get_dwell_mode (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return settings.dwell_mode;
-}
-
-static ClutterPointerA11yDwellClickType
-get_dwell_click_type (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  return settings.dwell_click_type;
-}
-
-static ClutterPointerA11yDwellClickType
-get_dwell_click_type_for_direction (ClutterInputDevice               *device,
-                                    ClutterPointerA11yDwellDirection  direction)
-{
-  ClutterPointerA11ySettings settings;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  if (direction == settings.dwell_gesture_single)
-    return CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY;
-  else if (direction == settings.dwell_gesture_double)
-    return CLUTTER_A11Y_DWELL_CLICK_TYPE_DOUBLE;
-  else if (direction == settings.dwell_gesture_drag)
-    return CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG;
-  else if (direction == settings.dwell_gesture_secondary)
-    return CLUTTER_A11Y_DWELL_CLICK_TYPE_SECONDARY;
-
-  return CLUTTER_A11Y_DWELL_CLICK_TYPE_NONE;
-}
-
-static void
-emit_button_press (ClutterInputDevice *device,
-                   gint                button)
-{
-  clutter_virtual_input_device_notify_button (device->accessibility_virtual_device,
-                                              g_get_monotonic_time (),
-                                              button,
-                                              CLUTTER_BUTTON_STATE_PRESSED);
-}
-
-static void
-emit_button_release (ClutterInputDevice *device,
-                     gint                button)
-{
-  clutter_virtual_input_device_notify_button (device->accessibility_virtual_device,
-                                              g_get_monotonic_time (),
-                                              button,
-                                              CLUTTER_BUTTON_STATE_RELEASED);
-}
-
-static void
-emit_button_click (ClutterInputDevice *device,
-                   gint                button)
-{
-  emit_button_press (device, button);
-  emit_button_release (device, button);
-}
-
-static void
-restore_dwell_position (ClutterInputDevice *device)
-{
-  clutter_virtual_input_device_notify_absolute_motion (device->accessibility_virtual_device,
-                                                       g_get_monotonic_time (),
-                                                       device->ptr_a11y_data->dwell_x,
-                                                       device->ptr_a11y_data->dwell_y);
-}
-
-static gboolean
-trigger_secondary_click (gpointer data)
-{
-  ClutterInputDevice *device = data;
-
-  device->ptr_a11y_data->secondary_click_triggered = TRUE;
-  device->ptr_a11y_data->secondary_click_timer = 0;
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-stopped",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_SECONDARY_CLICK,
-                         TRUE);
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-start_secondary_click_timeout (ClutterInputDevice *device)
-{
-  unsigned int delay = get_secondary_click_delay (device);
-
-  device->ptr_a11y_data->secondary_click_timer =
-    clutter_threads_add_timeout (delay, trigger_secondary_click, device);
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-started",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_SECONDARY_CLICK,
-                         delay);
-}
-
-static void
-stop_secondary_click_timeout (ClutterInputDevice *device)
-{
-  if (device->ptr_a11y_data->secondary_click_timer)
-    {
-      g_source_remove (device->ptr_a11y_data->secondary_click_timer);
-      device->ptr_a11y_data->secondary_click_timer = 0;
-
-      g_signal_emit_by_name (device->device_manager,
-                             "ptr-a11y-timeout-stopped",
-                             device,
-                             CLUTTER_A11Y_TIMEOUT_TYPE_SECONDARY_CLICK,
-                             FALSE);
-    }
-  device->ptr_a11y_data->secondary_click_triggered = FALSE;
-}
-
-static gboolean
-pointer_has_moved (ClutterInputDevice *device)
-{
-  float dx, dy;
-  gint threshold;
-
-  dx = device->ptr_a11y_data->dwell_x - device->ptr_a11y_data->current_x;
-  dy = device->ptr_a11y_data->dwell_y - device->ptr_a11y_data->current_y;
-  threshold = get_dwell_threshold (device);
-
-  /* Pythagorean theorem */
-  return ((dx * dx) + (dy * dy)) > (threshold * threshold);
-}
-
-static gboolean
-is_secondary_click_pending (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->secondary_click_timer != 0;
-}
-
-static gboolean
-is_secondary_click_triggered (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->secondary_click_triggered;
-}
-
-static gboolean
-is_dwell_click_pending (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->dwell_timer != 0;
-}
-
-static gboolean
-is_dwell_dragging (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->dwell_drag_started;
-}
-
-static gboolean
-is_dwell_gesturing (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->dwell_gesture_started;
-}
-
-static gboolean
-has_button_pressed (ClutterInputDevice *device)
-{
-  return device->ptr_a11y_data->n_btn_pressed > 0;
-}
-
-static gboolean
-should_start_secondary_click_timeout (ClutterInputDevice *device)
-{
-  return !is_dwell_dragging (device);
-}
-
-static gboolean
-should_start_dwell (ClutterInputDevice *device)
-{
-  /* We should trigger a dwell if we've not already started one, and if
-   * no button is currently pressed or we are in the middle of a dwell
-   * drag action.
-   */
-  return !is_dwell_click_pending (device) &&
-         (is_dwell_dragging (device) ||
-          !has_button_pressed (device));
-}
-
-static gboolean
-should_stop_dwell (ClutterInputDevice *device)
-{
-  /* We should stop a dwell if the motion exceeds the threshold, unless
-   * we've started a gesture, because we want to keep the original dwell
-   * location to both detect a gesture and restore the original pointer
-   * location once the gesture is finished.
-   */
-  return pointer_has_moved (device) &&
-         !is_dwell_gesturing (device);
-}
-
-
-static gboolean
-should_update_dwell_position (ClutterInputDevice *device)
-{
-  return !is_dwell_gesturing (device) &&
-         !is_dwell_click_pending (device) &&
-         !is_secondary_click_pending (device);
-}
-
-static void
-update_dwell_click_type (ClutterInputDevice *device)
-{
-  ClutterPointerA11ySettings settings;
-  ClutterPointerA11yDwellClickType dwell_click_type;
-
-  clutter_device_manager_get_pointer_a11y_settings (device->device_manager, &settings);
-
-  dwell_click_type = settings.dwell_click_type;
-  switch (dwell_click_type)
-    {
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_DOUBLE:
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_SECONDARY:
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_MIDDLE:
-      dwell_click_type = CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY;
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG:
-      if (!is_dwell_dragging (device))
-        dwell_click_type = CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY;
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY:
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_NONE:
-    default:
-      break;
-    }
-
-  if (dwell_click_type != settings.dwell_click_type)
-    {
-      settings.dwell_click_type = dwell_click_type;
-      clutter_device_manager_set_pointer_a11y_settings (device->device_manager,
-                                                        &settings);
-
-      g_signal_emit_by_name (device->device_manager,
-                             "ptr-a11y-dwell-click-type-changed",
-                             dwell_click_type);
-    }
-}
-
-static void
-emit_dwell_click (ClutterInputDevice               *device,
-                  ClutterPointerA11yDwellClickType  dwell_click_type)
-{
-  switch (dwell_click_type)
-    {
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_PRIMARY:
-      emit_button_click (device, CLUTTER_BUTTON_PRIMARY);
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_DOUBLE:
-      emit_button_click (device, CLUTTER_BUTTON_PRIMARY);
-      emit_button_click (device, CLUTTER_BUTTON_PRIMARY);
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG:
-      if (is_dwell_dragging (device))
-        {
-          emit_button_release (device, CLUTTER_BUTTON_PRIMARY);
-          device->ptr_a11y_data->dwell_drag_started = FALSE;
-        }
-      else
-        {
-          emit_button_press (device, CLUTTER_BUTTON_PRIMARY);
-          device->ptr_a11y_data->dwell_drag_started = TRUE;
-        }
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_SECONDARY:
-      emit_button_click (device, CLUTTER_BUTTON_SECONDARY);
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_MIDDLE:
-      emit_button_click (device, CLUTTER_BUTTON_MIDDLE);
-      break;
-
-    case CLUTTER_A11Y_DWELL_CLICK_TYPE_NONE:
-    default:
-      break;
-    }
-}
-
-static ClutterPointerA11yDwellDirection
-get_dwell_direction (ClutterInputDevice *device)
-{
-  float dx, dy;
-
-  dx = ABS (device->ptr_a11y_data->dwell_x - device->ptr_a11y_data->current_x);
-  dy = ABS (device->ptr_a11y_data->dwell_y - device->ptr_a11y_data->current_y);
-
-  /* The pointer hasn't moved */
-  if (!pointer_has_moved (device))
-    return CLUTTER_A11Y_DWELL_DIRECTION_NONE;
-
-  if (device->ptr_a11y_data->dwell_x < device->ptr_a11y_data->current_x)
-    {
-      if (dx > dy)
-        return CLUTTER_A11Y_DWELL_DIRECTION_LEFT;
-    }
-  else
-    {
-      if (dx > dy)
-        return CLUTTER_A11Y_DWELL_DIRECTION_RIGHT;
-    }
-
-  if (device->ptr_a11y_data->dwell_y < device->ptr_a11y_data->current_y)
-    return CLUTTER_A11Y_DWELL_DIRECTION_UP;
-
-  return CLUTTER_A11Y_DWELL_DIRECTION_DOWN;
-}
-
-static gboolean
-trigger_clear_dwell_gesture (gpointer data)
-{
-  ClutterInputDevice *device = data;
-
-  device->ptr_a11y_data->dwell_timer = 0;
-  device->ptr_a11y_data->dwell_gesture_started = FALSE;
-
-  return G_SOURCE_REMOVE;
-}
-
-static gboolean
-trigger_dwell_gesture (gpointer data)
-{
-  ClutterInputDevice *device = data;
-  ClutterPointerA11yDwellDirection direction;
-  unsigned int delay = get_dwell_delay (device);
-
-  restore_dwell_position (device);
-  direction = get_dwell_direction (device);
-  emit_dwell_click (device,
-                    get_dwell_click_type_for_direction (device,
-                                                        direction));
-
-  /* Do not clear the gesture right away, otherwise we'll start another one */
-  device->ptr_a11y_data->dwell_timer =
-    clutter_threads_add_timeout (delay, trigger_clear_dwell_gesture, device);
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-stopped",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_GESTURE,
-                         TRUE);
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-start_dwell_gesture_timeout (ClutterInputDevice *device)
-{
-  unsigned int delay = get_dwell_delay (device);
-
-  device->ptr_a11y_data->dwell_timer =
-    clutter_threads_add_timeout (delay, trigger_dwell_gesture, device);
-  device->ptr_a11y_data->dwell_gesture_started = TRUE;
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-started",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_GESTURE,
-                         delay);
-}
-
-static gboolean
-trigger_dwell_click (gpointer data)
-{
-  ClutterInputDevice *device = data;
-
-  device->ptr_a11y_data->dwell_timer = 0;
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-stopped",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_DWELL,
-                         TRUE);
-
-  if (get_dwell_mode (device) == CLUTTER_A11Y_DWELL_MODE_GESTURE)
-    {
-      if (is_dwell_dragging (device))
-        emit_dwell_click (device, CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG);
-      else
-        start_dwell_gesture_timeout (device);
-    }
-  else
-    {
-      emit_dwell_click (device, get_dwell_click_type (device));
-      update_dwell_click_type (device);
-    }
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-start_dwell_timeout (ClutterInputDevice *device)
-{
-  unsigned int delay = get_dwell_delay (device);
-
-  device->ptr_a11y_data->dwell_timer =
-    clutter_threads_add_timeout (delay, trigger_dwell_click, device);
-
-  g_signal_emit_by_name (device->device_manager,
-                         "ptr-a11y-timeout-started",
-                         device,
-                         CLUTTER_A11Y_TIMEOUT_TYPE_DWELL,
-                         delay);
-}
-
-static void
-stop_dwell_timeout (ClutterInputDevice *device)
-{
-  if (device->ptr_a11y_data->dwell_timer)
-    {
-      g_source_remove (device->ptr_a11y_data->dwell_timer);
-      device->ptr_a11y_data->dwell_timer = 0;
-      device->ptr_a11y_data->dwell_gesture_started = FALSE;
-
-      g_signal_emit_by_name (device->device_manager,
-                             "ptr-a11y-timeout-stopped",
-                             device,
-                             CLUTTER_A11Y_TIMEOUT_TYPE_DWELL,
-                             FALSE);
-    }
-}
-
-static gboolean
-trigger_dwell_position_timeout (gpointer data)
-{
-  ClutterInputDevice *device = data;
-
-  device->ptr_a11y_data->dwell_position_timer = 0;
-
-  if (is_dwell_click_enabled (device))
-    {
-      if (!pointer_has_moved (device))
-        start_dwell_timeout (device);
-    }
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-start_dwell_position_timeout (ClutterInputDevice *device)
-{
-  device->ptr_a11y_data->dwell_position_timer =
-    clutter_threads_add_timeout (100, trigger_dwell_position_timeout, device);
-}
-
-static void
-stop_dwell_position_timeout (ClutterInputDevice *device)
-{
-  g_clear_handle_id (&device->ptr_a11y_data->dwell_position_timer,
-                     g_source_remove);
-}
-
-static void
-update_dwell_position (ClutterInputDevice *device)
-{
-  device->ptr_a11y_data->dwell_x = device->ptr_a11y_data->current_x;
-  device->ptr_a11y_data->dwell_y = device->ptr_a11y_data->current_y;
-}
-
-static void
-update_current_position (ClutterInputDevice *device,
-                         float               x,
-                         float               y)
-{
-  device->ptr_a11y_data->current_x = x;
-  device->ptr_a11y_data->current_y = y;
-}
-
-static gboolean
-is_device_core_pointer (ClutterInputDevice *device)
-{
-  ClutterInputDevice *core_pointer;
-
-  core_pointer = clutter_device_manager_get_core_device (device->device_manager,
-                                                         CLUTTER_POINTER_DEVICE);
-  if (core_pointer == NULL)
-    return FALSE;
-
-  return (core_pointer == device);
-}
-
-void
-_clutter_input_pointer_a11y_add_device (ClutterInputDevice *device)
-{
-  if (!is_device_core_pointer (device))
-    return;
-
-  device->accessibility_virtual_device =
-    clutter_device_manager_create_virtual_device (device->device_manager,
-                                                  CLUTTER_POINTER_DEVICE);
-
-  device->ptr_a11y_data = g_new0 (ClutterPtrA11yData, 1);
-}
-
-void
-_clutter_input_pointer_a11y_remove_device (ClutterInputDevice *device)
-{
-  if (!is_device_core_pointer (device))
-    return;
-
-  /* Terminate a drag if started */
-  if (is_dwell_dragging (device))
-    emit_dwell_click (device, CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG);
-
-  stop_dwell_position_timeout (device);
-  stop_dwell_timeout (device);
-  stop_secondary_click_timeout (device);
-
-  g_clear_pointer (&device->ptr_a11y_data, g_free);
-}
-
-void
-_clutter_input_pointer_a11y_on_motion_event (ClutterInputDevice *device,
-                                             float               x,
-                                             float               y)
-{
-  if (!is_device_core_pointer (device))
-    return;
-
-  if (!_clutter_is_input_pointer_a11y_enabled (device))
-    return;
-
-  update_current_position (device, x, y);
-
-  if (is_secondary_click_enabled (device))
-    {
-      if (pointer_has_moved (device))
-        stop_secondary_click_timeout (device);
-    }
-
-  if (is_dwell_click_enabled (device))
-    {
-      stop_dwell_position_timeout (device);
-
-      if (should_stop_dwell (device))
-        stop_dwell_timeout (device);
-
-      if (should_start_dwell (device))
-        start_dwell_position_timeout (device);
-    }
-
-  if (should_update_dwell_position (device))
-    update_dwell_position (device);
-}
-
-void
-_clutter_input_pointer_a11y_on_button_event (ClutterInputDevice *device,
-                                             int                 button,
-                                             gboolean            pressed)
-{
-  if (!is_device_core_pointer (device))
-    return;
-
-  if (!_clutter_is_input_pointer_a11y_enabled (device))
-    return;
-
-  if (pressed)
-    {
-      device->ptr_a11y_data->n_btn_pressed++;
-
-      stop_dwell_position_timeout (device);
-
-      if (is_dwell_click_enabled (device))
-        stop_dwell_timeout (device);
-
-      if (is_dwell_dragging (device))
-        stop_dwell_timeout (device);
-
-      if (is_secondary_click_enabled (device))
-        {
-          if (button == CLUTTER_BUTTON_PRIMARY)
-            {
-              if (should_start_secondary_click_timeout (device))
-                start_secondary_click_timeout (device);
-            }
-          else if (is_secondary_click_pending (device))
-            {
-              stop_secondary_click_timeout (device);
-            }
-        }
-    }
-  else
-    {
-      if (has_button_pressed (device))
-        device->ptr_a11y_data->n_btn_pressed--;
-
-      if (is_secondary_click_triggered (device))
-        {
-          emit_button_click (device, CLUTTER_BUTTON_SECONDARY);
-          stop_secondary_click_timeout (device);
-        }
-
-      if (is_secondary_click_pending (device))
-        stop_secondary_click_timeout (device);
-
-      if (is_dwell_dragging (device))
-        emit_dwell_click (device, CLUTTER_A11Y_DWELL_CLICK_TYPE_DRAG);
-    }
-}
-
-gboolean
-_clutter_is_input_pointer_a11y_enabled (ClutterInputDevice *device)
-{
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), FALSE);
-
-  return (is_secondary_click_enabled (device) || is_dwell_click_enabled (device));
-}
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -444,7 +444,8 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterLayoutManagerClass,
                                   layout_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -53,8 +53,7 @@ G_BEGIN_DECLS
 *
 * Since: 0.2
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_INIT_SUCCESS        =  1,
  CLUTTER_INIT_ERROR_UNKNOWN  =  0,
  CLUTTER_INIT_ERROR_THREADS  = -1,
@@ -117,6 +116,9 @@ void                    clutter_disable_accessibility           (void);

 /* Threading functions */
 CLUTTER_EXPORT
+void                    clutter_threads_set_lock_functions      (GCallback enter_fn,
+                                                                 GCallback leave_fn);
+CLUTTER_EXPORT
 guint                   clutter_threads_add_idle                (GSourceFunc    func,
                                                                 gpointer       data);
 CLUTTER_EXPORT
@@ -146,6 +148,19 @@ guint                   clutter_threads_add_repaint_func_full   (ClutterRepaintF
 CLUTTER_EXPORT
 void                    clutter_threads_remove_repaint_func     (guint          handle_id);

+CLUTTER_EXPORT
+void                    clutter_grab_pointer                    (ClutterActor  *actor);
+CLUTTER_EXPORT
+void                    clutter_ungrab_pointer                  (void);
+CLUTTER_EXPORT
+ClutterActor *          clutter_get_pointer_grab                (void);
+CLUTTER_EXPORT
+void                    clutter_grab_keyboard                   (ClutterActor  *actor);
+CLUTTER_EXPORT
+void                    clutter_ungrab_keyboard                 (void);
+CLUTTER_EXPORT
+ClutterActor *          clutter_get_keyboard_grab               (void);
+
 CLUTTER_EXPORT
 PangoFontMap *          clutter_get_font_map                    (void);

--- a/clutter/clutter/clutter-marshal.list
+++ b/clutter/clutter/clutter-marshal.list
@@ -1,7 +1,6 @@
 BOOLEAN:BOXED
 BOOLEAN:BOXED,INT,INT
 BOOLEAN:OBJECT,BOOLEAN
-BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,DOUBLE
 BOOLEAN:OBJECT,DOUBLE
 BOOLEAN:OBJECT,ENUM
@@ -12,24 +11,29 @@ BOOLEAN:OBJECT,FLOAT,FLOAT
 BOXED:UINT,UINT
 DOUBLE:VOID
 UINT:VOID
+VOID:BOOLEAN
+VOID:BOXED
 VOID:BOXED,FLAGS
+VOID:INT
 VOID:INT64,INT64,FLOAT,BOOLEAN
 VOID:INT,INT
 VOID:INT,POINTER
 VOID:FLOAT,FLOAT
 VOID:INT,INT,INT,INT
+VOID:OBJECT
 VOID:OBJECT,FLAGS
-VOID:OBJECT,FLAGS,BOOLEAN
-VOID:OBJECT,FLAGS,UINT
 VOID:OBJECT,FLOAT,FLOAT
 VOID:OBJECT,FLOAT,FLOAT,FLAGS
 VOID:OBJECT,OBJECT
 VOID:OBJECT,PARAM
 VOID:OBJECT,POINTER
 VOID:OBJECT,UINT
+VOID:POINTER
 VOID:STRING,BOOLEAN
 VOID:STRING,BOOLEAN,BOOLEAN
 VOID:STRING,INT
+VOID:UINT
 VOID:UINT,STRING,UINT
 VOID:UINT,UINT
+VOID:VOID
 VOID:STRING,INT,POINTER
--- a/clutter/clutter/clutter-master-clock-default.c
+++ b/clutter/clutter/clutter-master-clock-default.c
@@ -64,6 +64,9 @@ struct _ClutterMasterClockDefault
  /* the current state of the clock, in usecs */
  gint64 cur_tick;

+  /* the previous state of the clock, in usecs, used to compute the delta */
+  gint64 prev_tick;
+
 #ifdef CLUTTER_ENABLE_DEBUG
  gint64 frame_budget;
  gint64 remaining_budget;
@@ -74,6 +77,12 @@ struct _ClutterMasterClockDefault
   */
  GSource *source;

+  /* If the master clock is idle that means it has
+   * fallen back to idle polling for timeline
+   * progressions and it may have been some time since
+   * the last real stage update.
+   */
+  guint idle : 1;
  guint ensure_next_iteration : 1;

  guint paused : 1;
@@ -100,8 +109,7 @@ static GSourceFuncs clock_funcs = {
  NULL
 };

-static void
-clutter_master_clock_iface_init (ClutterMasterClockInterface *iface);
+static void clutter_master_clock_iface_init (ClutterMasterClockIface *iface);

 #define clutter_master_clock_default_get_type   _clutter_master_clock_default_get_type

@@ -266,12 +274,78 @@ master_clock_reschedule_stage_updates (ClutterMasterClockDefault *master_clock,
 static gint
 master_clock_next_frame_delay (ClutterMasterClockDefault *master_clock)
 {
+  gint64 now, next;
+  gint swap_delay;
+
  if (!master_clock_is_running (master_clock))
    return -1;

  /* If all of the stages are busy waiting for a swap-buffers to complete
   * then we wait for one to be ready.. */
-  return master_clock_get_swap_wait_time (master_clock);
+  swap_delay = master_clock_get_swap_wait_time (master_clock);
+  if (swap_delay != 0)
+    return swap_delay;
+
+  /* When we have sync-to-vblank, we count on swap-buffer requests (or
+   * swap-buffer-complete events if supported in the backend) to throttle our
+   * frame rate so no additional delay is needed to start the next frame.
+   *
+   * If the master-clock has become idle due to no timeline progression causing
+   * redraws then we can no longer rely on vblank synchronization because the
+   * last real stage update/redraw may have happened a long time ago and so we
+   * fallback to polling for timeline progressions every 1/frame_rate seconds.
+   *
+   * (NB: if there aren't even any timelines running then the master clock will
+   * be completely stopped in master_clock_is_running())
+   */
+  if (clutter_feature_available (CLUTTER_FEATURE_SWAP_THROTTLE) &&
+      !master_clock->idle)
+    {
+      CLUTTER_NOTE (SCHEDULER, "swap throttling available and updated stages");
+      return 0;
+    }
+
+  if (master_clock->prev_tick == 0)
+    {
+      /* If we weren't previously running, then draw the next frame
+       * immediately
+       */
+      CLUTTER_NOTE (SCHEDULER, "draw the first frame immediately");
+      return 0;
+    }
+
+  /* Otherwise, wait at least 1/frame_rate seconds since we last
+   * started a frame
+   */
+  now = g_source_get_time (master_clock->source);
+
+  next = master_clock->prev_tick;
+
+  /* If time has gone backwards then there's no way of knowing how
+     long we should wait so let's just dispatch immediately */
+  if (now <= next)
+    {
+      CLUTTER_NOTE (SCHEDULER, "Time has gone backwards");
+
+      return 0;
+    }
+
+  next += (1000000L / clutter_get_default_frame_rate ());
+
+  if (next <= now)
+    {
+      CLUTTER_NOTE (SCHEDULER, "Less than %lu microsecs",
+                    1000000L / (gulong) clutter_get_default_frame_rate ());
+
+      return 0;
+    }
+  else
+    {
+      CLUTTER_NOTE (SCHEDULER, "Waiting %" G_GINT64_FORMAT " msecs",
+                   (next - now) / 1000);
+
+      return (next - now) / 1000;
+    }
 }

 static void
@@ -337,7 +411,8 @@ master_clock_advance_timelines (ClutterMasterClockDefault *master_clock)
  for (l = timelines; l != NULL; l = l->next)
    _clutter_timeline_do_tick (l->data, master_clock->cur_tick / 1000);

-  g_slist_free_full (timelines, g_object_unref);
+  g_slist_foreach (timelines, (GFunc) g_object_unref, NULL);
+  g_slist_free (timelines);

 #ifdef CLUTTER_ENABLE_DEBUG
  if (_clutter_diagnostic_enabled ())
@@ -455,6 +530,7 @@ clutter_clock_dispatch (GSource     *source,
 {
  ClutterClockSource *clock_source = (ClutterClockSource *) source;
  ClutterMasterClockDefault *master_clock = clock_source->master_clock;
+  gboolean stages_updated = FALSE;
  GSList *stages;

  CLUTTER_NOTE (SCHEDULER, "Master clock [tick]");
@@ -474,6 +550,8 @@ clutter_clock_dispatch (GSource     *source,
   */
  stages = master_clock_list_ready_stages (master_clock);

+  master_clock->idle = FALSE;
+
  /* Each frame is split into three separate phases: */

  /* 1. process all the events; each stage goes through its events queue
@@ -486,11 +564,19 @@ clutter_clock_dispatch (GSource     *source,
  master_clock_advance_timelines (master_clock);

  /* 3. relayout and redraw the stages */
-  master_clock_update_stages (master_clock, stages);
+  stages_updated = master_clock_update_stages (master_clock, stages);
+
+  /* The master clock goes idle if no stages were updated and falls back
+   * to polling for timeline progressions... */
+  if (!stages_updated)
+    master_clock->idle = TRUE;

  master_clock_reschedule_stage_updates (master_clock, stages);

-  g_slist_free_full (stages, g_object_unref);
+  g_slist_foreach (stages, (GFunc) g_object_unref, NULL);
+  g_slist_free (stages);
+
+  master_clock->prev_tick = master_clock->cur_tick;

  _clutter_threads_release_lock ();

@@ -523,6 +609,7 @@ clutter_master_clock_default_init (ClutterMasterClockDefault *self)
  source = clutter_clock_source_new (self);
  self->source = source;

+  self->idle = FALSE;
  self->ensure_next_iteration = FALSE;
  self->paused = FALSE;

@@ -602,7 +689,7 @@ clutter_master_clock_default_set_paused (ClutterMasterClock *clock,
 }

 static void
-clutter_master_clock_iface_init (ClutterMasterClockInterface *iface)
+clutter_master_clock_iface_init (ClutterMasterClockIface *iface)
 {
  iface->add_timeline = clutter_master_clock_default_add_timeline;
  iface->remove_timeline = clutter_master_clock_default_remove_timeline;
--- a/clutter/clutter/clutter-master-clock.c
+++ b/clutter/clutter/clutter-master-clock.c
@@ -37,6 +37,10 @@
 #include "clutter-master-clock-default.h"
 #include "clutter-private.h"

+#define clutter_master_clock_get_type   _clutter_master_clock_get_type
+
+typedef ClutterMasterClockIface ClutterMasterClockInterface;
+
 G_DEFINE_INTERFACE (ClutterMasterClock, clutter_master_clock, G_TYPE_OBJECT)

 static void
--- a/clutter/clutter/clutter-master-clock.h
+++ b/clutter/clutter/clutter-master-clock.h
@@ -28,12 +28,15 @@

 G_BEGIN_DECLS

-#define CLUTTER_TYPE_MASTER_CLOCK (clutter_master_clock_get_type ())
-G_DECLARE_INTERFACE (ClutterMasterClock, clutter_master_clock,
-                     CLUTTER, MASTER_CLOCK,
-                     GObject)
+#define CLUTTER_TYPE_MASTER_CLOCK               (_clutter_master_clock_get_type ())
+#define CLUTTER_MASTER_CLOCK(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MASTER_CLOCK, ClutterMasterClock))
+#define CLUTTER_IS_MASTER_CLOCK(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MASTER_CLOCK))
+#define CLUTTER_MASTER_CLOCK_GET_IFACE(obj)     (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_MASTER_CLOCK, ClutterMasterClockIface))

-struct _ClutterMasterClockInterface
+typedef struct _ClutterMasterClock      ClutterMasterClock; /* dummy */
+typedef struct _ClutterMasterClockIface ClutterMasterClockIface;
+
+struct _ClutterMasterClockIface
 {
  /*< private >*/
  GTypeInterface parent_iface;
@@ -48,6 +51,8 @@ struct _ClutterMasterClockInterface
                                   gboolean            paused);
 };

+GType _clutter_master_clock_get_type (void) G_GNUC_CONST;
+
 ClutterMasterClock *    _clutter_master_clock_get_default               (void);
 void                    _clutter_master_clock_add_timeline              (ClutterMasterClock *master_clock,
                                                                         ClutterTimeline    *timeline);
--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@@ -26,15 +26,10 @@
 #define __CLUTTER_H_INSIDE__

 #include "clutter-backend.h"
-#include "clutter-device-manager-private.h"
-#include "clutter-event-private.h"
-#include "clutter-input-pointer-a11y-private.h"
 #include "clutter-macros.h"
-#include "clutter-private.h"
-#include "clutter-stage-private.h"
 #include "clutter-stage-view.h"
 #include "cogl/clutter-stage-cogl.h"
-#include "clutter/x11/clutter-backend-x11.h"
+#include "x11/clutter-stage-x11.h"

 CLUTTER_EXPORT
 void clutter_set_custom_backend_func (ClutterBackend *(* func) (void));
@@ -54,12 +49,6 @@ void clutter_stage_freeze_updates (ClutterStage *stage);
 CLUTTER_EXPORT
 void clutter_stage_thaw_updates (ClutterStage *stage);

-CLUTTER_EXPORT
-void clutter_stage_update_resource_scales (ClutterStage *stage);
-
-CLUTTER_EXPORT
-gboolean clutter_actor_has_damage (ClutterActor *actor);
-
 #undef __CLUTTER_H_INSIDE__

 #endif /* __CLUTTER_MUTTER_H__ */
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -66,8 +66,6 @@

 #include "clutter-offscreen-effect.h"

-#include <math.h>
-
 #include "cogl/cogl.h"

 #include "clutter-actor-private.h"
@@ -95,8 +93,8 @@ struct _ClutterOffscreenEffectPrivate
     through create_texture(). This needs to be tracked separately so
     that we can detect when a different size is calculated and
     regenerate the fbo */
-  int target_width;
-  int target_height;
+  int fbo_width;
+  int fbo_height;

  gint old_opacity_override;
 };
@@ -137,35 +135,8 @@ clutter_offscreen_effect_real_create_texture (ClutterOffscreenEffect *effect,
                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE);
 }

-static void
-ensure_pipeline_filter_for_scale (ClutterOffscreenEffect *self,
-                                  float                   resource_scale)
-{
-  CoglPipelineFilter filter;
-
-  if (!self->priv->target)
-    return;
-
-  /* If no fractional scaling is set, we're always going to render the texture
-     at a 1:1 texel:pixel ratio so, in such case we can use 'nearest' filtering
-     to decrease the effects of rounding errors in the geometry calculation;
-     if instead we we're using a global fractional scaling we need to make sure
-     that we're using the default linear effect, not to create artifacts when
-     scaling down the texture */
-  if (fmodf (resource_scale, 1.0f) == 0)
-    filter = COGL_PIPELINE_FILTER_NEAREST;
-  else
-    filter = COGL_PIPELINE_FILTER_LINEAR;
-
-  cogl_pipeline_set_layer_filters (self->priv->target, 0 /* layer_index */,
-                                   filter, filter);
-}
-
 static gboolean
-update_fbo (ClutterEffect *effect,
-            int            target_width,
-            int            target_height,
-            float          resource_scale)
+update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
 {
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
  ClutterOffscreenEffectPrivate *priv = self->priv;
@@ -180,13 +151,10 @@ update_fbo (ClutterEffect *effect,
      return FALSE;
    }

-  if (priv->target_width == target_width &&
-      priv->target_height == target_height &&
+  if (priv->fbo_width == fbo_width &&
+      priv->fbo_height == fbo_height &&
      priv->offscreen != NULL)
-  {
-    ensure_pipeline_filter_for_scale (self, resource_scale);
    return TRUE;
-  }

  if (priv->target == NULL)
    {
@@ -194,7 +162,14 @@ update_fbo (ClutterEffect *effect,
        clutter_backend_get_cogl_context (clutter_get_default_backend ());

      priv->target = cogl_pipeline_new (ctx);
-      ensure_pipeline_filter_for_scale (self, resource_scale);
+
+      /* We're always going to render the texture at a 1:1 texel:pixel
+         ratio so we can use 'nearest' filtering to decrease the
+         effects of rounding errors in the geometry calculation */
+      cogl_pipeline_set_layer_filters (priv->target,
+                                       0, /* layer_index */
+                                       COGL_PIPELINE_FILTER_NEAREST,
+                                       COGL_PIPELINE_FILTER_NEAREST);
    }

  if (priv->texture != NULL)
@@ -210,14 +185,14 @@ update_fbo (ClutterEffect *effect,
    }

  priv->texture =
-    clutter_offscreen_effect_create_texture (self, target_width, target_height);
+    clutter_offscreen_effect_create_texture (self, fbo_width, fbo_height);
  if (priv->texture == NULL)
    return FALSE;

  cogl_pipeline_set_layer_texture (priv->target, 0, priv->texture);

-  priv->target_width = target_width;
-  priv->target_height = target_height;
+  priv->fbo_width = fbo_width;
+  priv->fbo_height = fbo_height;

  priv->offscreen = cogl_offscreen_new_to_texture (priv->texture);
  if (priv->offscreen == NULL)
@@ -227,8 +202,8 @@ update_fbo (ClutterEffect *effect,
      cogl_handle_unref (priv->target);
      priv->target = NULL;

-      priv->target_width = 0;
-      priv->target_height = 0;
+      priv->fbo_width = 0;
+      priv->fbo_height = 0;

      return FALSE;
    }
@@ -247,9 +222,7 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  const ClutterPaintVolume *volume;
  CoglColor transparent;
  gfloat stage_width, stage_height;
-  gfloat target_width = -1, target_height = -1;
-  gfloat resource_scale;
-  gfloat ceiled_resource_scale;
+  gfloat fbo_width = -1, fbo_height = -1;
  ClutterVertex local_offset = { 0.f, 0.f, 0.f };
  gfloat old_viewport[4];

@@ -262,18 +235,6 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  stage = _clutter_actor_get_stage_internal (priv->actor);
  clutter_actor_get_size (stage, &stage_width, &stage_height);

-  if (_clutter_actor_get_real_resource_scale (priv->actor, &resource_scale))
-    {
-      ceiled_resource_scale = ceilf (resource_scale);
-      stage_width *= ceiled_resource_scale;
-      stage_height *= ceiled_resource_scale;
-    }
-  else
-    {
-      /* We are sure we have a resource scale set to a good value at paint */
-      g_assert_not_reached ();
-    }
-
  /* Get the minimal bounding box for what we want to paint, relative to the
   * parent of priv->actor. Note that we may actually be painting a clone of
   * priv->actor so we need to be careful to avoid querying the transformation
@@ -300,14 +261,10 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  priv->fbo_offset_x = box.x1 - raw_box.x1;
  priv->fbo_offset_y = box.y1 - raw_box.y1;

-  clutter_actor_box_scale (&box, ceiled_resource_scale);
-  clutter_actor_box_get_size (&box, &target_width, &target_height);
-
-  target_width = ceilf (target_width);
-  target_height = ceilf (target_height);
+  clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);

  /* First assert that the framebuffer is the right size... */
-  if (!update_fbo (effect, target_width, target_height, resource_scale))
+  if (!update_fbo (effect, fbo_width, fbo_height))
    return FALSE;

  cogl_get_modelview_matrix (&old_modelview);
@@ -409,7 +366,6 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
 {
  ClutterOffscreenEffectPrivate *priv = effect->priv;
  CoglMatrix modelview;
-  float resource_scale;

  cogl_push_matrix ();

@@ -417,14 +373,6 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
   * missing a correction for the expanded FBO and offset rendering within...
   */
  cogl_get_modelview_matrix (&modelview);
-
-  if (clutter_actor_get_resource_scale (priv->actor, &resource_scale) &&
-      resource_scale != 1.0f)
-    {
-      float paint_scale = 1.0f / resource_scale;
-      cogl_matrix_scale (&modelview, paint_scale, paint_scale, 1);
-    }
-
  cogl_matrix_translate (&modelview,
                         priv->fbo_offset_x,
                         priv->fbo_offset_y,
--- a/clutter/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter/clutter-paint-node-private.h
@@ -74,8 +74,7 @@ struct _ClutterPaintNodeClass

 #define PAINT_OP_INIT   { PAINT_OP_INVALID }

-typedef enum
-{
+typedef enum {
  PAINT_OP_INVALID = 0,
  PAINT_OP_TEX_RECT,
  PAINT_OP_MULTITEX_RECT,
@@ -138,6 +137,8 @@ G_GNUC_INTERNAL
 ClutterPaintNode *      clutter_paint_node_get_last_child               (ClutterPaintNode      *node);
 G_GNUC_INTERNAL
 ClutterPaintNode *      clutter_paint_node_get_parent                   (ClutterPaintNode      *node);
+G_GNUC_INTERNAL
+CoglFramebuffer *       clutter_paint_node_get_framebuffer              (ClutterPaintNode      *node);

 #define CLUTTER_TYPE_LAYER_NODE                 (_clutter_layer_node_get_type ())
 #define CLUTTER_LAYER_NODE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_LAYER_NODE, ClutterLayerNode))
--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -1099,12 +1099,12 @@ clutter_paint_node_to_json (ClutterPaintNode *node)

            case PAINT_OP_PATH:
              json_builder_set_member_name (builder, "path");
-              json_builder_add_int_value (builder, (intptr_t) op->op.path);
+              json_builder_add_int_value (builder, (gint64) op->op.path);
              break;

            case PAINT_OP_PRIMITIVE:
              json_builder_set_member_name (builder, "primitive");
-              json_builder_add_int_value (builder, (intptr_t) op->op.primitive);
+              json_builder_add_int_value (builder, (gint64) op->op.primitive);
              break;

            case PAINT_OP_INVALID:
@@ -1194,15 +1194,6 @@ clutter_paint_node_get_root (ClutterPaintNode *node)
  return iter;
 }

-/**
- * clutter_paint_node_get_framebuffer:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the #CoglFramebuffer that @node will draw
- * into.
- *
- * Returns: (transfer none): a #CoglFramebuffer
- */
 CoglFramebuffer *
 clutter_paint_node_get_framebuffer (ClutterPaintNode *node)
 {
--- a/clutter/clutter/clutter-paint-node.h
+++ b/clutter/clutter/clutter-paint-node.h
@@ -56,9 +56,6 @@ CLUTTER_EXPORT
 void                    clutter_paint_node_set_name                     (ClutterPaintNode      *node,
                                                                         const char            *name);

-CLUTTER_EXPORT
-CoglFramebuffer *       clutter_paint_node_get_framebuffer              (ClutterPaintNode      *node);
-
 CLUTTER_EXPORT
 void                    clutter_paint_node_add_child                    (ClutterPaintNode      *node,
                                                                         ClutterPaintNode      *child);
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -75,7 +75,8 @@ _clutter_paint_node_init_types (void)
  cogl_pipeline_set_color (default_color_pipeline, &cogl_color);

  default_texture_pipeline = cogl_pipeline_new (ctx);
-  cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0);
+  cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0,
+                                        COGL_TEXTURE_TYPE_2D);
  cogl_pipeline_set_color (default_texture_pipeline, &cogl_color);
  cogl_pipeline_set_layer_wrap_mode (default_texture_pipeline, 0,
                                     COGL_PIPELINE_WRAP_MODE_AUTOMATIC);
--- a/clutter/clutter/clutter-pan-action.c
+++ b/clutter/clutter/clutter-pan-action.c
@@ -579,7 +579,8 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterPanActionClass, pan_stopped),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
 }
--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@@ -295,7 +295,8 @@ clutter_path_clear (ClutterPath *path)
 {
  ClutterPathPrivate *priv = path->priv;

-  g_slist_free_full (priv->nodes, (GDestroyNotify) clutter_path_node_full_free);
+  g_slist_foreach (priv->nodes, (GFunc) clutter_path_node_full_free, NULL);
+  g_slist_free (priv->nodes);

  priv->nodes = priv->nodes_tail = NULL;
  priv->nodes_dirty = TRUE;
@@ -658,7 +659,8 @@ clutter_path_parse_description (const gchar  *p,
  return TRUE;

 fail:
-  g_slist_free_full (nodes, (GDestroyNotify) clutter_path_node_full_free);
+  g_slist_foreach (nodes, (GFunc) clutter_path_node_full_free, NULL);
+  g_slist_free (nodes);
  return FALSE;
 }

--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -69,9 +69,6 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 #define CLUTTER_ACTOR_IN_REPARENT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_REPARENT) != FALSE)
 #define CLUTTER_ACTOR_IN_PAINT(a)               ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
 #define CLUTTER_ACTOR_IN_RELAYOUT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_WIDTH(a)          ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_WIDTH) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_HEIGHT(a)         ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_HEIGHT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_SIZE(a)           ((CLUTTER_PRIVATE_FLAGS (a) & (CLUTTER_IN_PREF_HEIGHT|CLUTTER_IN_PREF_WIDTH)) != FALSE)

 #define CLUTTER_PARAM_READABLE  (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
 #define CLUTTER_PARAM_WRITABLE  (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)
@@ -85,6 +82,7 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 /* keep this for source compatibility with clutter */
 #define P_(String) (String)
 #define N_(String) (String)
+#define _(String) (String)

 /* This is a replacement for the nearbyint function which always rounds to the
 * nearest integer. nearbyint is apparently a C99 function so it might not
@@ -93,24 +91,21 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 * because it will break for negative numbers. */
 #define CLUTTER_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f))

-typedef enum
-{
+typedef enum {
  CLUTTER_ACTOR_UNUSED_FLAG = 0,

  CLUTTER_IN_DESTRUCTION = 1 << 0,
  CLUTTER_IS_TOPLEVEL    = 1 << 1,
  CLUTTER_IN_REPARENT    = 1 << 2,
-  CLUTTER_IN_PREF_WIDTH  = 1 << 3,
-  CLUTTER_IN_PREF_HEIGHT = 1 << 4,

  /* Used to avoid recursion */
-  CLUTTER_IN_PAINT       = 1 << 5,
+  CLUTTER_IN_PAINT       = 1 << 3,

  /* Used to avoid recursion */
-  CLUTTER_IN_RELAYOUT    = 1 << 6,
+  CLUTTER_IN_RELAYOUT    = 1 << 4,

  /* a flag for internal children of Containers (DEPRECATED) */
-  CLUTTER_INTERNAL_CHILD = 1 << 7
+  CLUTTER_INTERNAL_CHILD = 1 << 5
 } ClutterPrivateFlags;

 /*
@@ -141,6 +136,13 @@ struct _ClutterMainContext
  /* default FPS; this is only used if we cannot sync to vblank */
  guint frame_rate;

+  /* actors with a grab on all devices */
+  ClutterActor *pointer_grab_actor;
+  ClutterActor *keyboard_grab_actor;
+
+  /* stack of actors with shaders during paint */
+  GSList *shaders;
+
  /* fb bit masks for col<->id mapping in picking */
  gint fb_r_mask;
  gint fb_g_mask;
@@ -165,6 +167,7 @@ struct _ClutterMainContext

  /* boolean flags */
  guint is_initialized          : 1;
+  guint motion_events_per_actor : 1;
  guint defer_display_setup     : 1;
  guint options_parsed          : 1;
  guint show_fps                : 1;
@@ -181,9 +184,7 @@ typedef struct
 gboolean _clutter_threads_dispatch      (gpointer data);
 void     _clutter_threads_dispatch_free (gpointer data);

-CLUTTER_EXPORT
 void                    _clutter_threads_acquire_lock                   (void);
-CLUTTER_EXPORT
 void                    _clutter_threads_release_lock                   (void);

 ClutterMainContext *    _clutter_context_get_default                    (void);
@@ -191,6 +192,10 @@ void                    _clutter_context_lock                           (void);
 void                    _clutter_context_unlock                         (void);
 gboolean                _clutter_context_is_initialized                 (void);
 ClutterPickMode         _clutter_context_get_pick_mode                  (void);
+void                    _clutter_context_push_shader_stack              (ClutterActor *actor);
+ClutterActor *          _clutter_context_pop_shader_stack               (ClutterActor *actor);
+ClutterActor *          _clutter_context_peek_shader_stack              (void);
+gboolean                _clutter_context_get_motion_events_enabled      (void);
 gboolean                _clutter_context_get_show_fps                   (void);

 gboolean      _clutter_feature_init (GError **error);
@@ -199,7 +204,11 @@ gboolean      _clutter_feature_init (GError **error);
 gboolean        _clutter_diagnostic_enabled     (void);
 void            _clutter_diagnostic_message     (const char *fmt, ...) G_GNUC_PRINTF (1, 2);

-CLUTTER_EXPORT
+/* Picking code */
+guint           _clutter_pixel_to_id            (guchar        pixel[4]);
+void            _clutter_id_to_color            (guint         id,
+                                                 ClutterColor *col);
+
 void            _clutter_set_sync_to_vblank     (gboolean      sync_to_vblank);

 /* use this function as the accumulator if you have a signal with
@@ -231,17 +240,6 @@ void  _clutter_util_fully_transform_vertices (const CoglMatrix    *modelview,
                                              ClutterVertex       *vertices_out,
                                              int                  n_vertices);

-void _clutter_util_rect_from_rectangle (const cairo_rectangle_int_t *src,
-                                        ClutterRect                 *dest);
-
-void _clutter_util_rectangle_int_extents (const ClutterRect     *src,
-                                          cairo_rectangle_int_t *dest);
-
-void _clutter_util_rectangle_offset (const cairo_rectangle_int_t *src,
-                                     int                          x,
-                                     int                          y,
-                                     cairo_rectangle_int_t       *dest);
-
 void _clutter_util_rectangle_union (const cairo_rectangle_int_t *src1,
                                    const cairo_rectangle_int_t *src2,
                                    cairo_rectangle_int_t       *dest);
@@ -288,12 +286,6 @@ gboolean        _clutter_util_matrix_decompose  (const ClutterMatrix *src,
                                                 ClutterVertex       *translate_p,
                                                 ClutterVertex4      *perspective_p);

-CLUTTER_EXPORT
-PangoDirection _clutter_pango_unichar_direction (gunichar ch);
-
-PangoDirection _clutter_pango_find_base_dir     (const gchar *text,
-                                                 gint         length);
-
 typedef struct _ClutterPlane
 {
  float v0[3];
@@ -315,8 +307,6 @@ gboolean        _clutter_run_progress_function  (GType gtype,
                                                 gdouble progress,
                                                 GValue *retval);

-void            clutter_timeline_cancel_delay (ClutterTimeline *timeline);
-
 G_END_DECLS

 #endif /* __CLUTTER_PRIVATE_H__ */
--- a/clutter/clutter/clutter-script-parser.c
+++ b/clutter/clutter/clutter-script-parser.c
@@ -1636,17 +1636,14 @@ clutter_script_translate_parameters (ClutterScript  *script,
                                     GObject        *object,
                                     const gchar    *name,
                                     GList          *properties,
-                                     GPtrArray     **param_names,
-                                     GArray        **param_values)
+                                     GArray        **params)
 {
  ClutterScriptable *scriptable = NULL;
  ClutterScriptableIface *iface = NULL;
  GList *l, *unparsed;
  gboolean parse_custom = FALSE;

-  *param_names = g_ptr_array_new_with_free_func (g_free);
-  *param_values = g_array_new (FALSE, FALSE, sizeof (GValue));
-  g_array_set_clear_func (*param_values, (GDestroyNotify) g_value_unset);
+  *params = g_array_new (FALSE, FALSE, sizeof (GParameter));

  if (CLUTTER_IS_SCRIPTABLE (object))
    {
@@ -1662,7 +1659,7 @@ clutter_script_translate_parameters (ClutterScript  *script,
  for (l = properties; l != NULL; l = l->next)
    {
      PropertyInfo *pinfo = l->data;
-      GValue value = G_VALUE_INIT;
+      GParameter param = { NULL };
      gboolean res = FALSE;

      if (pinfo->is_child || pinfo->is_layout)
@@ -1679,12 +1676,12 @@ clutter_script_translate_parameters (ClutterScript  *script,
                    pinfo->name);

      if (parse_custom)
-        res = iface->parse_custom_node (scriptable, script, &value,
+        res = iface->parse_custom_node (scriptable, script, &param.value,
                                        pinfo->name,
                                        pinfo->node);

      if (!res)
-        res = _clutter_script_parse_node (script, &value,
+        res = _clutter_script_parse_node (script, &param.value,
                                          pinfo->name,
                                          pinfo->node,
                                          pinfo->pspec);
@@ -1696,8 +1693,9 @@ clutter_script_translate_parameters (ClutterScript  *script,
          continue;
        }

-      g_ptr_array_add (*param_names, g_strdup (pinfo->name));
-      g_array_append_val (*param_values, value);
+      param.name = g_strdup (pinfo->name);
+
+      g_array_append_val (*params, param);

      property_info_free (pinfo);
    }
@@ -1712,8 +1710,7 @@ clutter_script_construct_parameters (ClutterScript  *script,
                                     GType           gtype,
                                     const gchar    *name,
                                     GList          *properties,
-                                     GPtrArray     **construct_param_names,
-                                     GArray        **construct_param_values)
+                                     GArray        **construct_params)
 {
  GObjectClass *klass;
  GList *l, *unparsed;
@@ -1721,17 +1718,14 @@ clutter_script_construct_parameters (ClutterScript  *script,
  klass = g_type_class_ref (gtype);
  g_assert (klass != NULL);

-  *construct_param_names = g_ptr_array_new_with_free_func (g_free);
-  *construct_param_values = g_array_new (FALSE, FALSE, sizeof (GValue));
-  g_array_set_clear_func (*construct_param_values,
-                          (GDestroyNotify) g_value_unset);
+  *construct_params = g_array_new (FALSE, FALSE, sizeof (GParameter));

  unparsed = NULL;

  for (l = properties; l != NULL; l = l->next)
    {
      PropertyInfo *pinfo = l->data;
-      GValue value = G_VALUE_INIT;
+      GParameter param = { NULL };
      GParamSpec *pspec = NULL;

      /* we allow custom property names for classes, so if we
@@ -1755,7 +1749,9 @@ clutter_script_construct_parameters (ClutterScript  *script,
          continue;
        }

-      if (!_clutter_script_parse_node (script, &value,
+      param.name = g_strdup (pinfo->name);
+
+      if (!_clutter_script_parse_node (script, &param.value,
                                       pinfo->name,
                                       pinfo->node,
                                       pinfo->pspec))
@@ -1764,8 +1760,7 @@ clutter_script_construct_parameters (ClutterScript  *script,
          continue;
        }

-      g_ptr_array_add (*construct_param_names, g_strdup (pinfo->name));
-      g_array_append_val (*construct_param_values, value);
+      g_array_append_val (*construct_params, param);

      property_info_free (pinfo);
    }
@@ -2026,7 +2021,8 @@ add_children (ClutterScript *script,
      clutter_container_add_actor (container, CLUTTER_ACTOR (object));
    }

-  g_list_free_full (oinfo->children, g_free);
+  g_list_foreach (oinfo->children, (GFunc) g_free, NULL);
+  g_list_free (oinfo->children);

  oinfo->children = unresolved;
 }
@@ -2092,8 +2088,7 @@ _clutter_script_apply_properties (ClutterScript *script,
  gboolean set_custom_property = FALSE;
  GObject *object = oinfo->object;
  GList *properties;
-  g_autoptr (GPtrArray) param_names = NULL;
-  g_autoptr (GArray) param_values = NULL;
+  GArray *params;
  guint i;

  if (!oinfo->has_unresolved)
@@ -2117,31 +2112,34 @@ _clutter_script_apply_properties (ClutterScript *script,
                                                           object,
                                                           oinfo->id,
                                                           properties,
-                                                           &param_names,
-                                                           &param_values);
+                                                           &params);

  /* consume all the properties we could translate in this pass */
-  for (i = 0; i < param_names->len; i++)
+  for (i = 0; i < params->len; i++)
    {
-      char *name = g_ptr_array_index (param_names, i);
-      GValue *value = &g_array_index (param_values, GValue, i);
+      GParameter *param = &g_array_index (params, GParameter, i);

      CLUTTER_NOTE (SCRIPT,
                    "Setting %s property '%s' (type:%s) to object '%s' (id:%s)",
                    set_custom_property ? "custom" : "regular",
-                    name,
-                    g_type_name (G_VALUE_TYPE (value)),
+                    param->name,
+                    g_type_name (G_VALUE_TYPE (&param->value)),
                    g_type_name (oinfo->gtype),
                    oinfo->id);

      if (set_custom_property)
        iface->set_custom_property (scriptable, script,
-                                    name,
-                                    value);
+                                    param->name,
+                                    &param->value);
      else
-        g_object_set_property (object, name, value);
+        g_object_set_property (object, param->name, &param->value);
+
+      g_free ((gchar *) param->name);
+      g_value_unset (&param->value);
    }

+  g_array_free (params, TRUE);
+
  _clutter_script_check_unresolved (script, oinfo);
 }

@@ -2149,8 +2147,8 @@ void
 _clutter_script_construct_object (ClutterScript *script,
                                  ObjectInfo    *oinfo)
 {
-  g_autoptr (GPtrArray) param_names = NULL;
-  g_autoptr (GArray) param_values = NULL;
+  GArray *params = NULL;
+  guint i;

  /* we have completely updated the object */
  if (oinfo->object != NULL)
@@ -2193,14 +2191,25 @@ _clutter_script_construct_object (ClutterScript *script,
                                             oinfo->gtype,
                                             oinfo->id,
                                             properties,
-                                             &param_names,
-                                             &param_values);
+                                             &params);

      default_stage = clutter_stage_manager_get_default_stage (manager);
      oinfo->object = G_OBJECT (default_stage);
+
+      for (i = 0; i < params->len; i++)
+        {
+          GParameter *param = &g_array_index (params, GParameter, i);
+
+          g_free ((gchar *) param->name);
+          g_value_unset (&param->value);
+        }
+
+      g_array_free (params, TRUE);
    }
  else
    {
+      g_autoptr (GPtrArray) param_names = NULL;
+      GArray *param_values;
      GList *properties = oinfo->properties;

      /* every other object: first, we get the construction parameters */
@@ -2209,11 +2218,22 @@ _clutter_script_construct_object (ClutterScript *script,
                                             oinfo->gtype,
                                             oinfo->id,
                                             properties,
-                                             &param_names,
-                                             &param_values);
+                                             &params);
+
+      /* Convert GParameter → (GStrv, GValue[]) */
+      param_names = g_ptr_array_sized_new (params->len);
+      param_values = g_array_sized_new (TRUE, FALSE, sizeof (GValue), params->len);
+      for (i = 0; i < params->len; i++)
+        {
+          GParameter *param = &g_array_index (params, GParameter, i);
+
+          g_ptr_array_add (param_names, (gchar *) param->name);
+          g_array_append_val (param_values, param->value);
+        }
+      g_ptr_array_add (param_names, NULL);

      oinfo->object = g_object_new_with_properties (oinfo->gtype,
-                                                    param_names->len,
+                                                    params->len,
                                                    (const gchar **) param_names->pdata,
                                                    (const GValue *) param_values->data);

@@ -2222,6 +2242,17 @@ _clutter_script_construct_object (ClutterScript *script,
       * else too or only by this ClutterScript object.
       */
      g_object_ref_sink (oinfo->object);
+
+      for (i = 0; i < params->len; i++)
+        {
+          GParameter *param = &g_array_index (params, GParameter, i);
+
+          g_free ((gchar *) param->name);
+          g_value_unset (&param->value);
+        }
+
+      g_array_free (param_values, FALSE);
+      g_array_free (params, TRUE);
   }

  g_assert (oinfo->object != NULL);
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -263,6 +263,8 @@ enum

 static GParamSpec *obj_props[PROP_LAST];

+#define CLUTTER_SCRIPT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SCRIPT, ClutterScriptPrivate))
+
 struct _ClutterScriptPrivate
 {
  GHashTable *objects;
@@ -344,12 +346,15 @@ object_info_free (gpointer data)
      g_free (oinfo->class_name);
      g_free (oinfo->type_func);

-      g_list_free_full (oinfo->properties, property_info_free);
+      g_list_foreach (oinfo->properties, (GFunc) property_info_free, NULL);
+      g_list_free (oinfo->properties);

-      g_list_free_full (oinfo->signals, signal_info_free);
+      g_list_foreach (oinfo->signals, (GFunc) signal_info_free, NULL);
+      g_list_free (oinfo->signals);

      /* these are ids */
-      g_list_free_full (oinfo->children, g_free);
+      g_list_foreach (oinfo->children, (GFunc) g_free, NULL);
+      g_list_free (oinfo->children);

      /* we unref top-level objects and leave the actors alone,
       * unless we are unmerging in which case we have to destroy
@@ -375,7 +380,7 @@ object_info_free (gpointer data)
 static void
 clutter_script_finalize (GObject *gobject)
 {
-  ClutterScriptPrivate *priv = CLUTTER_SCRIPT (gobject)->priv;
+  ClutterScriptPrivate *priv = CLUTTER_SCRIPT_GET_PRIVATE (gobject);

  g_object_unref (priv->parser);
  g_hash_table_destroy (priv->objects);
@@ -841,7 +846,8 @@ clutter_script_unmerge_objects (ClutterScript *script,
  for (l = data.ids; l != NULL; l = l->next)
    g_hash_table_remove (priv->objects, l->data);

-  g_slist_free_full (data.ids, g_free);
+  g_slist_foreach (data.ids, (GFunc) g_free, NULL);
+  g_slist_free (data.ids);

  clutter_script_ensure_objects (script);
 }
--- a/clutter/clutter/clutter-script.h
+++ b/clutter/clutter/clutter-script.h
@@ -79,8 +79,7 @@ typedef void (* ClutterScriptConnectFunc) (ClutterScript *script,
 *
 * Since: 0.6
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_SCRIPT_ERROR_INVALID_TYPE_FUNCTION,
  CLUTTER_SCRIPT_ERROR_INVALID_PROPERTY,
  CLUTTER_SCRIPT_ERROR_INVALID_VALUE
--- a/clutter/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter/clutter-scroll-actor.c
@@ -84,9 +84,9 @@ enum
 static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 static GParamSpec *animatable_props[ANIM_PROP_LAST] = { NULL, };

-static ClutterAnimatableInterface *parent_animatable_iface = NULL;
+static ClutterAnimatableIface *parent_animatable_iface = NULL;

-static void clutter_animatable_iface_init (ClutterAnimatableInterface *iface);
+static void     clutter_animatable_iface_init   (ClutterAnimatableIface *iface);

 G_DEFINE_TYPE_WITH_CODE (ClutterScrollActor, clutter_scroll_actor, CLUTTER_TYPE_ACTOR,
                         G_ADD_PRIVATE (ClutterScrollActor)
@@ -240,7 +240,7 @@ clutter_scroll_actor_get_initial_state (ClutterAnimatable *animatable,
 }

 static void
-clutter_animatable_iface_init (ClutterAnimatableInterface *iface)
+clutter_animatable_iface_init (ClutterAnimatableIface *iface)
 {
  parent_animatable_iface = g_type_interface_peek_parent (iface);

--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -500,7 +500,6 @@ static void
 clutter_shader_effect_init (ClutterShaderEffect *effect)
 {
  effect->priv = clutter_shader_effect_get_instance_private (effect);
-  effect->priv->shader_type = CLUTTER_FRAGMENT_SHADER;
 }

 /**
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -89,8 +89,8 @@ clutter_stage_manager_dispose (GObject *gobject)

  stage_manager = CLUTTER_STAGE_MANAGER (gobject);

-  g_slist_free_full (stage_manager->stages,
-                     (GDestroyNotify) clutter_actor_destroy);
+  g_slist_foreach (stage_manager->stages, (GFunc) clutter_actor_destroy, NULL);
+  g_slist_free (stage_manager->stages);
  stage_manager->stages = NULL;

  G_OBJECT_CLASS (clutter_stage_manager_parent_class)->dispose (gobject);
@@ -134,7 +134,8 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass)
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterStageManagerClass, stage_added),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_STAGE);
  /**
@@ -152,7 +153,8 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass)
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterStageManagerClass, stage_removed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_STAGE);
 }
--- a/clutter/clutter/clutter-stage-private.h
+++ b/clutter/clutter/clutter-stage-private.h
@@ -40,12 +40,8 @@ void                _clutter_stage_paint_view            (ClutterStage
                                                          ClutterStageView            *view,
                                                          const cairo_rectangle_int_t *clip);

-void                _clutter_stage_emit_after_paint      (ClutterStage          *stage);
-
-CLUTTER_EXPORT
 void                _clutter_stage_set_window            (ClutterStage          *stage,
                                                          ClutterStageWindow    *stage_window);
-CLUTTER_EXPORT
 ClutterStageWindow *_clutter_stage_get_window            (ClutterStage          *stage);
 void                _clutter_stage_get_projection_matrix (ClutterStage          *stage,
                                                          CoglMatrix            *projection);
@@ -67,7 +63,6 @@ void                _clutter_stage_maybe_relayout        (ClutterActor
 gboolean            _clutter_stage_needs_update          (ClutterStage          *stage);
 gboolean            _clutter_stage_do_update             (ClutterStage          *stage);

-CLUTTER_EXPORT
 void     _clutter_stage_queue_event                       (ClutterStage *stage,
                                                           ClutterEvent *event,
                                                           gboolean      copy_event);
@@ -79,15 +74,6 @@ gint64    _clutter_stage_get_update_time                  (ClutterStage *stage);
 void     _clutter_stage_clear_update_time                 (ClutterStage *stage);
 gboolean _clutter_stage_has_full_redraw_queued            (ClutterStage *stage);

-void clutter_stage_log_pick (ClutterStage       *stage,
-                             const ClutterPoint *vertices,
-                             ClutterActor       *actor);
-
-void clutter_stage_push_pick_clip (ClutterStage       *stage,
-                                   const ClutterPoint *vertices);
-
-void clutter_stage_pop_pick_clip (ClutterStage *stage);
-
 ClutterActor *_clutter_stage_do_pick (ClutterStage    *stage,
                                      gint             x,
                                      gint             y,
@@ -106,6 +92,13 @@ void                          _clutter_stage_queue_redraw_entry_invalidate (Clut

 CoglFramebuffer *_clutter_stage_get_active_framebuffer (ClutterStage *stage);

+gint32          _clutter_stage_acquire_pick_id          (ClutterStage *stage,
+                                                         ClutterActor *actor);
+void            _clutter_stage_release_pick_id          (ClutterStage *stage,
+                                                         gint32        pick_id);
+ClutterActor *  _clutter_stage_get_actor_by_pick_id     (ClutterStage *stage,
+                                                         gint32        pick_id);
+
 void            _clutter_stage_add_pointer_drag_actor    (ClutterStage       *stage,
                                                          ClutterInputDevice *device,
                                                          ClutterActor       *actor);
@@ -122,27 +115,20 @@ ClutterActor *  _clutter_stage_get_touch_drag_actor    (ClutterStage         *st
 void            _clutter_stage_remove_touch_drag_actor (ClutterStage         *stage,
                                                        ClutterEventSequence *sequence);

-CLUTTER_EXPORT
 ClutterStageState       _clutter_stage_get_state        (ClutterStage      *stage);
-CLUTTER_EXPORT
 gboolean                _clutter_stage_is_activated     (ClutterStage      *stage);
-CLUTTER_EXPORT
+gboolean                _clutter_stage_is_fullscreen    (ClutterStage      *stage);
 gboolean                _clutter_stage_update_state     (ClutterStage      *stage,
                                                         ClutterStageState  unset_state,
                                                         ClutterStageState  set_state);

 void                    _clutter_stage_set_scale_factor (ClutterStage      *stage,
                                                         int                factor);
-gboolean                _clutter_stage_get_max_view_scale_factor_for_rect (ClutterStage *stage,
-                                                                           ClutterRect  *rect,
-                                                                           float        *view_scale);

 void            _clutter_stage_presented                (ClutterStage      *stage,
                                                         CoglFrameEvent     frame_event,
                                                         ClutterFrameInfo  *frame_info);

-GList *         _clutter_stage_peek_stage_views         (ClutterStage *stage);
-
 G_END_DECLS

 #endif /* __CLUTTER_STAGE_PRIVATE_H__ */
--- a/clutter/clutter/clutter-stage-view-private.h
+++ b/clutter/clutter/clutter-stage-view-private.h
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2019 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_STAGE_VIEW_PRIVATE_H__
-#define __CLUTTER_STAGE_VIEW_PRIVATE_H__
-
-#include "clutter/clutter-stage-view.h"
-
-void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
-                                        const cairo_rectangle_int_t *clip);
-
-gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
-
-void clutter_stage_view_set_dirty_viewport (ClutterStageView *view,
-                                            gboolean          dirty);
-
-gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view);
-
-void clutter_stage_view_set_dirty_projection (ClutterStageView *view,
-                                              gboolean          dirty);
-
-
-#endif /* __CLUTTER_STAGE_VIEW_PRIVATE_H__ */
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -18,7 +18,6 @@
 #include "clutter-build-config.h"

 #include "clutter/clutter-stage-view.h"
-#include "clutter/clutter-stage-view-private.h"

 #include <cairo-gobject.h>
 #include <math.h>
@@ -62,14 +61,6 @@ clutter_stage_view_get_layout (ClutterStageView      *view,
  *rect = priv->layout;
 }

-/**
- * clutter_stage_view_get_framebuffer:
- * @view: a #ClutterStageView
- *
- * Retrieves the framebuffer of @view to draw to.
- *
- * Returns: (transfer none): a #CoglFramebuffer
- */
 CoglFramebuffer *
 clutter_stage_view_get_framebuffer (ClutterStageView *view)
 {
@@ -82,14 +73,6 @@ clutter_stage_view_get_framebuffer (ClutterStageView *view)
    return priv->framebuffer;
 }

-/**
- * clutter_stage_view_get_onscreen:
- * @view: a #ClutterStageView
- *
- * Retrieves the onscreen framebuffer of @view if available.
- *
- * Returns: (transfer none): a #CoglFramebuffer
- */
 CoglFramebuffer *
 clutter_stage_view_get_onscreen (ClutterStageView *view)
 {
@@ -143,21 +126,6 @@ clutter_stage_view_blit_offscreen (ClutterStageView            *view,
    clutter_stage_view_get_instance_private (view);
  CoglMatrix matrix;

-  clutter_stage_view_get_offscreen_transformation_matrix (view, &matrix);
-  if (cogl_matrix_is_identity (&matrix))
-    {
-      int fb_width = cogl_framebuffer_get_width (priv->framebuffer);
-      int fb_height = cogl_framebuffer_get_height (priv->framebuffer);
-
-      if (cogl_blit_framebuffer (priv->offscreen,
-                                 priv->framebuffer,
-                                 0, 0,
-                                 0, 0,
-                                 fb_width, fb_height,
-                                 NULL))
-        return;
-    }
-
  clutter_stage_view_ensure_offscreen_blit_pipeline (view);
  cogl_framebuffer_push_matrix (priv->framebuffer);

--- a/clutter/clutter/clutter-stage-view.h
+++ b/clutter/clutter/clutter-stage-view.h
@@ -18,10 +18,6 @@
 #ifndef __CLUTTER_STAGE_VIEW_H__
 #define __CLUTTER_STAGE_VIEW_H__

-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
 #include <cairo.h>
 #include <glib-object.h>
 #include <cogl/cogl.h>
@@ -61,9 +57,22 @@ void             clutter_stage_view_transform_to_onscreen (ClutterStageView *vie
                                                           gfloat           *x,
                                                           gfloat           *y);

+void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
+					const cairo_rectangle_int_t *clip);
+
 CLUTTER_EXPORT
 float clutter_stage_view_get_scale (ClutterStageView *view);

+gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
+
+void clutter_stage_view_set_dirty_viewport (ClutterStageView *view,
+                                            gboolean          dirty);
+
+gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view);
+
+void clutter_stage_view_set_dirty_projection (ClutterStageView *view,
+                                              gboolean          dirty);
+
 CLUTTER_EXPORT
 void clutter_stage_view_get_offscreen_transformation_matrix (ClutterStageView *view,
                                                             CoglMatrix       *matrix);
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -14,6 +14,10 @@
 * #ClutterStage actor, abstracting away the specifics of the windowing system.
 */

+#define clutter_stage_window_get_type   _clutter_stage_window_get_type
+
+typedef ClutterStageWindowIface ClutterStageWindowInterface;
+
 G_DEFINE_INTERFACE (ClutterStageWindow, clutter_stage_window, G_TYPE_OBJECT);

 static void
@@ -56,22 +60,40 @@ void
 _clutter_stage_window_set_title (ClutterStageWindow *window,
                                 const gchar        *title)
 {
-  ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);

  if (iface->set_title)
    iface->set_title (window, title);
 }

+void
+_clutter_stage_window_set_fullscreen (ClutterStageWindow *window,
+                                      gboolean            is_fullscreen)
+{
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+
+  if (iface->set_fullscreen)
+    iface->set_fullscreen (window, is_fullscreen);
+}
+
 void
 _clutter_stage_window_set_cursor_visible (ClutterStageWindow *window,
                                          gboolean            is_visible)
 {
-  ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);

  if (iface->set_cursor_visible)
    iface->set_cursor_visible (window, is_visible);
 }

+void
+_clutter_stage_window_set_user_resizable (ClutterStageWindow *window,
+                                          gboolean            is_resizable)
+{
+  CLUTTER_STAGE_WINDOW_GET_IFACE (window)->set_user_resizable (window,
+                                                               is_resizable);
+}
+
 gboolean
 _clutter_stage_window_realize (ClutterStageWindow *window)
 {
@@ -116,7 +138,7 @@ void
 _clutter_stage_window_schedule_update  (ClutterStageWindow *window,
                                        int                 sync_delay)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));

@@ -141,7 +163,7 @@ _clutter_stage_window_schedule_update  (ClutterStageWindow *window,
 gint64
 _clutter_stage_window_get_update_time (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), 0);

@@ -164,7 +186,7 @@ _clutter_stage_window_get_update_time (ClutterStageWindow *window)
 void
 _clutter_stage_window_clear_update_time (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));

@@ -182,7 +204,7 @@ void
 _clutter_stage_window_add_redraw_clip (ClutterStageWindow    *window,
                                       cairo_rectangle_int_t *stage_clip)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));

@@ -202,7 +224,7 @@ _clutter_stage_window_add_redraw_clip (ClutterStageWindow    *window,
 gboolean
 _clutter_stage_window_has_redraw_clips (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);

@@ -224,7 +246,7 @@ _clutter_stage_window_has_redraw_clips (ClutterStageWindow *window)
 gboolean
 _clutter_stage_window_ignoring_redraw_clips (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);

@@ -239,7 +261,7 @@ gboolean
 _clutter_stage_window_get_redraw_clip_bounds (ClutterStageWindow    *window,
                                              cairo_rectangle_int_t *stage_clip)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);

@@ -254,7 +276,7 @@ void
 _clutter_stage_window_set_accept_focus (ClutterStageWindow *window,
                                        gboolean            accept_focus)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));

@@ -266,7 +288,7 @@ _clutter_stage_window_set_accept_focus (ClutterStageWindow *window,
 void
 _clutter_stage_window_redraw (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));

@@ -275,10 +297,28 @@ _clutter_stage_window_redraw (ClutterStageWindow *window)
    iface->redraw (window);
 }

+
+void
+_clutter_stage_window_get_dirty_pixel (ClutterStageWindow *window,
+                                       ClutterStageView   *view,
+                                       int *x, int *y)
+{
+  ClutterStageWindowIface *iface;
+
+  *x = 0;
+  *y = 0;
+
+  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));
+
+  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  if (iface->get_dirty_pixel)
+    iface->get_dirty_pixel (window, view, x, y);
+}
+
 gboolean
 _clutter_stage_window_can_clip_redraws (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface;
+  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);

@@ -292,7 +332,7 @@ _clutter_stage_window_can_clip_redraws (ClutterStageWindow *window)
 GList *
 _clutter_stage_window_get_views (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);

  return iface->get_views (window);
 }
@@ -300,7 +340,7 @@ _clutter_stage_window_get_views (ClutterStageWindow *window)
 void
 _clutter_stage_window_finish_frame (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);

  if (iface->finish_frame)
    iface->finish_frame (window);
@@ -309,7 +349,7 @@ _clutter_stage_window_finish_frame (ClutterStageWindow *window)
 int64_t
 _clutter_stage_window_get_frame_counter (ClutterStageWindow *window)
 {
-  ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  ClutterStageWindowIface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);

  if (iface->get_frame_counter)
    return iface->get_frame_counter (window);
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@@ -7,21 +7,30 @@

 G_BEGIN_DECLS

-#define CLUTTER_TYPE_STAGE_WINDOW (clutter_stage_window_get_type ())
-
-CLUTTER_EXPORT
-G_DECLARE_INTERFACE (ClutterStageWindow, clutter_stage_window,
-                     CLUTTER, STAGE_WINDOW,
-                     GObject)
+#define CLUTTER_TYPE_STAGE_WINDOW               (_clutter_stage_window_get_type ())
+#define CLUTTER_STAGE_WINDOW(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_WINDOW, ClutterStageWindow))
+#define CLUTTER_IS_STAGE_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_WINDOW))
+#define CLUTTER_STAGE_WINDOW_GET_IFACE(obj)     (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_STAGE_WINDOW, ClutterStageWindowIface))

 /*
- * ClutterStageWindowInterface: (skip)
+ * ClutterStageWindow: (skip)
+ *
+ * #ClutterStageWindow is an opaque structure
+ * whose members should not be accessed directly
+ *
+ * Since: 0.8
+ */
+typedef struct _ClutterStageWindow      ClutterStageWindow; /* dummy */
+typedef struct _ClutterStageWindowIface ClutterStageWindowIface;
+
+/*
+ * ClutterStageWindowIface: (skip)
 *
 * The interface implemented by backends for stage windows
 *
 * Since: 0.8
 */
-struct _ClutterStageWindowInterface
+struct _ClutterStageWindowIface
 {
  /*< private >*/
  GTypeInterface parent_iface;
@@ -30,8 +39,12 @@ struct _ClutterStageWindowInterface

  void              (* set_title)               (ClutterStageWindow *stage_window,
                                                 const gchar        *title);
+  void              (* set_fullscreen)          (ClutterStageWindow *stage_window,
+                                                 gboolean            is_fullscreen);
  void              (* set_cursor_visible)      (ClutterStageWindow *stage_window,
                                                 gboolean            cursor_visible);
+  void              (* set_user_resizable)      (ClutterStageWindow *stage_window,
+                                                 gboolean            is_resizable);

  gboolean          (* realize)                 (ClutterStageWindow *stage_window);
  void              (* unrealize)               (ClutterStageWindow *stage_window);
@@ -64,6 +77,10 @@ struct _ClutterStageWindowInterface

  void              (* redraw)                  (ClutterStageWindow *stage_window);

+  void              (* get_dirty_pixel)         (ClutterStageWindow *stage_window,
+                                                 ClutterStageView   *view,
+                                                 int *x, int *y);
+
  gboolean          (* can_clip_redraws)        (ClutterStageWindow *stage_window);

  GList            *(* get_views)               (ClutterStageWindow *stage_window);
@@ -71,12 +88,19 @@ struct _ClutterStageWindowInterface
  void              (* finish_frame)            (ClutterStageWindow *stage_window);
 };

+CLUTTER_EXPORT
+GType _clutter_stage_window_get_type (void) G_GNUC_CONST;
+
 ClutterActor *    _clutter_stage_window_get_wrapper        (ClutterStageWindow *window);

 void              _clutter_stage_window_set_title          (ClutterStageWindow *window,
                                                            const gchar        *title);
+void              _clutter_stage_window_set_fullscreen     (ClutterStageWindow *window,
+                                                            gboolean            is_fullscreen);
 void              _clutter_stage_window_set_cursor_visible (ClutterStageWindow *window,
                                                            gboolean            is_visible);
+void              _clutter_stage_window_set_user_resizable (ClutterStageWindow *window,
+                                                            gboolean            is_resizable);

 gboolean          _clutter_stage_window_realize                 (ClutterStageWindow *window);
 void              _clutter_stage_window_unrealize               (ClutterStageWindow *window);
@@ -88,7 +112,6 @@ void              _clutter_stage_window_hide                    (ClutterStageWin
 void              _clutter_stage_window_resize                  (ClutterStageWindow *window,
                                                                 gint                width,
                                                                 gint                height);
-CLUTTER_EXPORT
 void              _clutter_stage_window_get_geometry            (ClutterStageWindow *window,
                                                                 cairo_rectangle_int_t *geometry);
 void              _clutter_stage_window_schedule_update         (ClutterStageWindow *window,
@@ -108,6 +131,10 @@ void              _clutter_stage_window_set_accept_focus        (ClutterStageWin

 void              _clutter_stage_window_redraw                  (ClutterStageWindow *window);

+void              _clutter_stage_window_get_dirty_pixel         (ClutterStageWindow *window,
+                                                                 ClutterStageView   *view,
+                                                                 int *x, int *y);
+
 gboolean          _clutter_stage_window_can_clip_redraws        (ClutterStageWindow *window);

 GList *           _clutter_stage_window_get_views               (ClutterStageWindow *window);
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -30,7 +30,6 @@

 #include <clutter/clutter-types.h>
 #include <clutter/clutter-group.h>
-#include <clutter/clutter-stage-view.h>

 G_BEGIN_DECLS

@@ -62,6 +61,8 @@ struct _ClutterStage
 };
 /**
 * ClutterStageClass:
+ * @fullscreen: handler for the #ClutterStage::fullscreen signal
+ * @unfullscreen: handler for the #ClutterStage::unfullscreen signal
 * @activate: handler for the #ClutterStage::activate signal
 * @deactivate: handler for the #ClutterStage::deactivate signal
 * @delete_event: handler for the #ClutterStage::delete-event signal
@@ -78,18 +79,17 @@ struct _ClutterStageClass

  /*< public >*/
  /* signals */
+  void (* fullscreen)   (ClutterStage *stage);
+  void (* unfullscreen) (ClutterStage *stage);
  void (* activate)     (ClutterStage *stage);
  void (* deactivate)   (ClutterStage *stage);

  gboolean (* delete_event) (ClutterStage *stage,
                             ClutterEvent *event);

-  void (* paint_view) (ClutterStage     *stage,
-                       ClutterStageView *view);
-
  /*< private >*/
  /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[31];
 };

 /**
@@ -168,6 +168,11 @@ CLUTTER_EXPORT
 void            clutter_stage_get_perspective                   (ClutterStage          *stage,
 			                                         ClutterPerspective    *perspective);
 CLUTTER_EXPORT
+void            clutter_stage_set_fullscreen                    (ClutterStage          *stage,
+                                                                 gboolean               fullscreen);
+CLUTTER_EXPORT
+gboolean        clutter_stage_get_fullscreen                    (ClutterStage          *stage);
+CLUTTER_EXPORT
 void            clutter_stage_show_cursor                       (ClutterStage          *stage);
 CLUTTER_EXPORT
 void            clutter_stage_hide_cursor                       (ClutterStage          *stage);
@@ -176,6 +181,11 @@ void            clutter_stage_set_title                         (ClutterStage
                                                                 const gchar           *title);
 CLUTTER_EXPORT
 const gchar *   clutter_stage_get_title                         (ClutterStage          *stage);
+CLUTTER_EXPORT
+void            clutter_stage_set_user_resizable                (ClutterStage          *stage,
+						                 gboolean               resizable);
+CLUTTER_EXPORT
+gboolean        clutter_stage_get_user_resizable                (ClutterStage          *stage);

 CLUTTER_EXPORT
 void            clutter_stage_set_minimum_size                  (ClutterStage          *stage,
@@ -251,23 +261,12 @@ CLUTTER_EXPORT
 void            clutter_stage_skip_sync_delay                   (ClutterStage          *stage);
 #endif

-CLUTTER_EXPORT
-gboolean clutter_stage_get_capture_final_size (ClutterStage          *stage,
-                                               cairo_rectangle_int_t *rect,
-                                               int                   *width,
-                                               int                   *height,
-                                               float                 *scale);
-
 CLUTTER_EXPORT
 gboolean clutter_stage_capture (ClutterStage          *stage,
                                gboolean               paint,
                                cairo_rectangle_int_t *rect,
                                ClutterCapture       **captures,
                                int                   *n_captures);
-CLUTTER_EXPORT
-ClutterStageView * clutter_stage_get_view_at (ClutterStage *stage,
-                                              float         x,
-                                              float         y);

 G_END_DECLS

--- a/clutter/clutter/clutter-tap-action.c
+++ b/clutter/clutter/clutter-tap-action.c
@@ -122,7 +122,8 @@ clutter_tap_action_class_init (ClutterTapActionClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterTapActionClass, tap),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  CLUTTER_TYPE_ACTOR);
 }
--- a/clutter/clutter/clutter-test-utils.c
+++ b/clutter/clutter/clutter-test-utils.c
@@ -1,8 +1,17 @@
+#include "clutter-build-config.h"
+
 #include "clutter-test-utils.h"

 #include <stdlib.h>
 #include <glib-object.h>
-#include <clutter/clutter.h>
+
+#include "clutter-actor.h"
+#include "clutter-color.h"
+#include "clutter-event.h"
+#include "clutter-keysyms.h"
+#include "clutter-main.h"
+#include "clutter-private.h"
+#include "clutter-stage.h"

 typedef struct {
  ClutterActor *stage;
--- a/clutter/clutter/clutter-test-utils.h
+++ b/clutter/clutter/clutter-test-utils.h
@@ -19,23 +19,16 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "config.h"
-
 #ifndef __CLUTTER_TEST_UTILS_H__
 #define __CLUTTER_TEST_UTILS_H__

-#define __CLUTTER_H_INSIDE__
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif

-#include "clutter/clutter-types.h"
-#include "clutter/clutter-actor.h"
-#include "clutter/clutter-color.h"
-#include "clutter/clutter-private.h"
-#include "core/main-private.h"
-#include "meta/common.h"
-#include "meta/main.h"
-#include "backends/x11/nested/meta-backend-x11-nested.h"
-#include "wayland/meta-wayland.h"
-#include "wayland/meta-xwayland.h"
+#include <clutter/clutter-types.h>
+#include <clutter/clutter-actor.h>
+#include <clutter/clutter-color.h>

 G_BEGIN_DECLS

@@ -86,8 +79,6 @@ G_BEGIN_DECLS
 int \
 main (int argc, char *argv[]) \
 { \
-  meta_test_init ();\
-\
  clutter_test_init (&argc, &argv); \
 \
  { \
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@@ -50,8 +50,7 @@
 /* Initial size of buffer, in bytes */
 #define MIN_SIZE 16

-enum
-{
+enum {
  PROP_0,
  PROP_TEXT,
  PROP_LENGTH,
@@ -61,8 +60,7 @@ enum

 static GParamSpec *obj_props[PROP_LAST] = { NULL, };

-enum
-{
+enum {
  INSERTED_TEXT,
  DELETED_TEXT,
  LAST_SIGNAL
@@ -171,7 +169,7 @@ clutter_text_buffer_normal_insert_text (ClutterTextBuffer *buffer,

  /* Actual text insertion */
  at = g_utf8_offset_to_pointer (pv->normal_text, position) - pv->normal_text;
-  memmove (pv->normal_text + at + n_bytes, pv->normal_text + at, pv->normal_text_bytes - at);
+  g_memmove (pv->normal_text + at + n_bytes, pv->normal_text + at, pv->normal_text_bytes - at);
  memcpy (pv->normal_text + at, chars, n_bytes);

  /* Book keeping */
@@ -201,7 +199,7 @@ clutter_text_buffer_normal_delete_text (ClutterTextBuffer *buffer,
      start = g_utf8_offset_to_pointer (pv->normal_text, position) - pv->normal_text;
      end = g_utf8_offset_to_pointer (pv->normal_text, position + n_chars) - pv->normal_text;

-      memmove (pv->normal_text + start, pv->normal_text + end, pv->normal_text_bytes + 1 - end);
+      g_memmove (pv->normal_text + start, pv->normal_text + end, pv->normal_text_bytes + 1 - end);
      pv->normal_text_chars -= n_chars;
      pv->normal_text_bytes -= (end - start);

@@ -228,8 +226,8 @@ clutter_text_buffer_real_inserted_text (ClutterTextBuffer *buffer,
                                     const gchar    *chars,
                                     guint           n_chars)
 {
-  g_object_notify_by_pspec (G_OBJECT (buffer), obj_props[PROP_TEXT]);
-  g_object_notify_by_pspec (G_OBJECT (buffer), obj_props[PROP_LENGTH]);
+  g_object_notify (G_OBJECT (buffer), "text");
+  g_object_notify (G_OBJECT (buffer), "length");
 }

 static void
@@ -237,8 +235,8 @@ clutter_text_buffer_real_deleted_text (ClutterTextBuffer *buffer,
                                    guint           position,
                                    guint           n_chars)
 {
-  g_object_notify_by_pspec (G_OBJECT (buffer), obj_props[PROP_TEXT]);
-  g_object_notify_by_pspec (G_OBJECT (buffer), obj_props[PROP_LENGTH]);
+  g_object_notify (G_OBJECT (buffer), "text");
+  g_object_notify (G_OBJECT (buffer), "length");
 }

 /* --------------------------------------------------------------------------------
@@ -598,7 +596,7 @@ clutter_text_buffer_set_max_length (ClutterTextBuffer *buffer,
    clutter_text_buffer_delete_text (buffer, max_length, -1);

  buffer->priv->max_length = max_length;
-  g_object_notify_by_pspec (G_OBJECT (buffer), obj_props[PROP_MAX_LENGTH]);
+  g_object_notify (G_OBJECT (buffer), "max-length");
 }

 /**
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -144,17 +144,15 @@ struct _ClutterTextPrivate
   */
  gint x_pos;

-  /* the x position of the PangoLayout (in both physical and logical pixels)
-   * when in single line mode, to scroll the contents of the
+  /* the x position of the PangoLayout when in
+   * single line mode, to scroll the contents of the
   * text actor
   */
  gint text_x;
-  gint text_logical_x;

-  /* the y position of the PangoLayout (in both physical and logical pixels),
-   * fixed to 0 by default for now */
+  /* the y position of the PangoLayout, fixed to 0 by
+   * default for now */
  gint text_y;
-  gint text_logical_y;

  /* Where to draw the cursor */
  ClutterRect cursor_rect;
@@ -187,9 +185,6 @@ struct _ClutterTextPrivate
  ClutterInputContentHintFlags input_hints;
  ClutterInputContentPurpose input_purpose;

-  /* Signal handler for when the :resource-scale changes */
-  guint resource_scale_changed_id;
-
  /* bitfields */
  guint alignment               : 2;
  guint wrap                    : 1;
@@ -284,7 +279,7 @@ static const ClutterColor default_selected_text_color = {   0,   0,   0, 255 };

 static CoglPipeline *default_color_pipeline = NULL;

-static ClutterAnimatableInterface *parent_animatable_iface = NULL;
+static ClutterAnimatableIface *parent_animatable_iface = NULL;
 static ClutterScriptableIface *parent_scriptable_iface = NULL;

 /* ClutterTextInputFocus */
@@ -295,33 +290,6 @@ G_DECLARE_FINAL_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
 G_DEFINE_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
               CLUTTER_TYPE_INPUT_FOCUS)

-/* Utilities pango to (logical) pixels functions */
-static float
-pixels_to_pango (float px)
-{
-  return ceilf (px * (float) PANGO_SCALE);
-}
-
-static float
-logical_pixels_to_pango (float px,
-                         float scale)
-{
-  return pixels_to_pango (px * scale);
-}
-
-static float
-pango_to_pixels (float size)
-{
-  return ceilf (size / (float) PANGO_SCALE);
-}
-
-static float
-pango_to_logical_pixels (float size,
-                         float scale)
-{
-  return pango_to_pixels (size / scale);
-}
-
 static void
 clutter_text_input_focus_request_surrounding (ClutterInputFocus *focus)
 {
@@ -421,7 +389,7 @@ clutter_text_input_focus_new (ClutterText *text)

 /* ClutterText */
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-static void clutter_animatable_iface_init (ClutterAnimatableInterface *iface);
+static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);

 G_DEFINE_TYPE_WITH_CODE (ClutterText,
                         clutter_text,
@@ -582,63 +550,6 @@ clutter_text_get_display_text (ClutterText *self)
    }
 }

-static void
-ensure_effective_pango_scale_attribute (ClutterText *self)
-{
-  float resource_scale;
-  ClutterTextPrivate *priv = self->priv;
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale) ||
-      resource_scale == 1.0)
-    return;
-
-  if (priv->effective_attrs != NULL)
-    {
-      PangoAttrIterator *iter;
-      PangoAttribute *scale_attrib;
-      PangoAttrList *old_attributes;
-
-      old_attributes = priv->effective_attrs;
-      priv->effective_attrs = pango_attr_list_copy (priv->effective_attrs);
-      pango_attr_list_unref (old_attributes);
-
-      iter = pango_attr_list_get_iterator (priv->effective_attrs);
-      scale_attrib = pango_attr_iterator_get (iter, PANGO_ATTR_SCALE);
-
-      if (scale_attrib != NULL)
-        resource_scale *= ((PangoAttrFloat *) scale_attrib)->value;
-
-      pango_attr_iterator_destroy (iter);
-    }
-  else
-    priv->effective_attrs = pango_attr_list_new ();
-
-  pango_attr_list_change (priv->effective_attrs,
-                          pango_attr_scale_new (resource_scale));
-}
-
-static void
-set_effective_pango_attributes (ClutterText   *self,
-                                PangoAttrList *attributes)
-{
-  ClutterTextPrivate *priv = self->priv;
-
-  if (attributes != NULL)
-    {
-      PangoAttrList *old_attributes = priv->effective_attrs;
-      priv->effective_attrs = pango_attr_list_ref (attributes);
-
-      if (old_attributes != NULL)
-        pango_attr_list_unref (old_attributes);
-    }
-  else
-    {
-      g_clear_pointer (&priv->effective_attrs, pango_attr_list_unref);
-    }
-
-  ensure_effective_pango_scale_attribute (self);
-}
-
 static inline void
 clutter_text_ensure_effective_attributes (ClutterText *self)
 {
@@ -652,25 +563,21 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
  /* Same as if we don't have any attribute at all.
   * We also ignore markup attributes for editable. */
  if (priv->attrs == NULL && (priv->editable || priv->markup_attrs == NULL))
-    {
-      set_effective_pango_attributes (self, NULL);
-      return;
-    }
+    return;

  if (priv->attrs != NULL)
    {
      /* If there are no markup attributes, or if this is editable (in which
       * case we ignore markup), then we can just use these attrs directly */
      if (priv->editable || priv->markup_attrs == NULL)
-        set_effective_pango_attributes (self, priv->attrs);
+        priv->effective_attrs = pango_attr_list_ref (priv->attrs);
      else
        {
          /* Otherwise we need to merge the two lists */
-          PangoAttrList *effective_attrs;
          PangoAttrIterator *iter;
          GSList *attributes, *l;

-          effective_attrs = pango_attr_list_copy (priv->markup_attrs);
+          priv->effective_attrs = pango_attr_list_copy (priv->markup_attrs);

          iter = pango_attr_list_get_iterator (priv->attrs);
          do
@@ -681,7 +588,7 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
                {
                  PangoAttribute *attr = l->data;

-                  pango_attr_list_insert (effective_attrs, attr);
+                  pango_attr_list_insert (priv->effective_attrs, attr);
                }

              g_slist_free (attributes);
@@ -689,14 +596,12 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
          while (pango_attr_iterator_next (iter));

          pango_attr_iterator_destroy (iter);
-
-          set_effective_pango_attributes (self, effective_attrs);
-          pango_attr_list_unref (effective_attrs);
        }
    }
  else if (priv->markup_attrs != NULL)
    {
-      set_effective_pango_attributes (self, priv->markup_attrs);
+      /* We can just use the markup attributes directly */
+      priv->effective_attrs = pango_attr_list_ref (priv->markup_attrs);
    }
 }

@@ -751,7 +656,7 @@ clutter_text_create_layout_no_cache (ClutterText       *text,
      if (priv->password_char != 0)
        pango_dir = PANGO_DIRECTION_NEUTRAL;
      else
-        pango_dir = _clutter_pango_find_base_dir (contents, contents_len);
+        pango_dir = pango_find_base_dir (contents, contents_len);

      if (pango_dir == PANGO_DIRECTION_NEUTRAL)
        {
@@ -905,18 +810,6 @@ clutter_text_direction_changed_cb (GObject    *gobject,
  /* no need to queue a relayout: set_text_direction() will do that for us */
 }

-static void
-clutter_text_resource_scale_changed_cb (GObject    *gobject,
-                                        GParamSpec *pspec)
-{
-  ClutterText *self = CLUTTER_TEXT (gobject);
-  ClutterTextPrivate *priv = self->priv;
-
-  g_clear_pointer (&priv->effective_attrs, pango_attr_list_unref);
-  clutter_text_dirty_cache (self);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (gobject));
-}
-
 /*
 * clutter_text_create_layout:
 * @text: a #ClutterText
@@ -984,7 +877,7 @@ clutter_text_create_layout (ClutterText *text,
       !((priv->editable && priv->single_line_mode) ||
         (priv->ellipsize == PANGO_ELLIPSIZE_NONE && !priv->wrap))))
    {
-      width = pixels_to_pango (allocation_width);
+      width = allocation_width * 1024 + 0.5f;
    }

  /* Pango only uses height if ellipsization is enabled, so don't set
@@ -1001,7 +894,7 @@ clutter_text_create_layout (ClutterText *text,
      priv->ellipsize != PANGO_ELLIPSIZE_NONE &&
      !priv->single_line_mode)
    {
-      height = pixels_to_pango (allocation_height);
+      height = allocation_height * 1024 + 0.5f;
    }

  /* Search for a cached layout with the same width and keep
@@ -1098,37 +991,6 @@ clutter_text_create_layout (ClutterText *text,
  return oldest_cache->layout;
 }

-static PangoLayout *
-create_text_layout_with_scale (ClutterText *text,
-                               gfloat       allocation_width,
-                               gfloat       allocation_height,
-                               gfloat       scale)
-{
-  if (allocation_width > 0)
-    allocation_width = roundf (allocation_width * scale);
-
-  if (allocation_height > 0)
-    allocation_height = roundf (allocation_height * scale);
-
-  return clutter_text_create_layout (text, allocation_width, allocation_height);
-}
-
-static PangoLayout *
-maybe_create_text_layout_with_resource_scale (ClutterText *text,
-                                              gfloat       allocation_width,
-                                              gfloat       allocation_height)
-{
-  float resource_scale;
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (text), &resource_scale))
-    return NULL;
-
-  return create_text_layout_with_scale (text,
-                                        allocation_width,
-                                        allocation_height,
-                                        resource_scale);
-}
-
 /**
 * clutter_text_coords_to_position:
 * @self: a #ClutterText
@@ -1149,18 +1011,14 @@ clutter_text_coords_to_position (ClutterText *self,
  gint index_;
  gint px, py;
  gint trailing;
-  gfloat resource_scale;

  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);

-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return 0;
-
  /* Take any offset due to scrolling into account, and normalize
   * the coordinates to PangoScale units
   */
-  px = logical_pixels_to_pango (x - self->priv->text_logical_x, resource_scale);
-  py = logical_pixels_to_pango (y - self->priv->text_logical_y, resource_scale);
+  px = (x - self->priv->text_x) * PANGO_SCALE;
+  py = (y - self->priv->text_y) * PANGO_SCALE;

  pango_layout_xy_to_index (clutter_text_get_layout (self),
                            px, py,
@@ -1169,12 +1027,26 @@ clutter_text_coords_to_position (ClutterText *self,
  return index_ + trailing;
 }

-static gboolean
-clutter_text_position_to_coords_internal (ClutterText *self,
-                                          gint         position,
-                                          gfloat      *x,
-                                          gfloat      *y,
-                                          gfloat      *line_height)
+/**
+ * clutter_text_position_to_coords:
+ * @self: a #ClutterText
+ * @position: position in characters
+ * @x: (out): return location for the X coordinate, or %NULL
+ * @y: (out): return location for the Y coordinate, or %NULL
+ * @line_height: (out): return location for the line height, or %NULL
+ *
+ * Retrieves the coordinates of the given @position.
+ *
+ * Return value: %TRUE if the conversion was successful
+ *
+ * Since: 1.0
+ */
+gboolean
+clutter_text_position_to_coords (ClutterText *self,
+                                 gint         position,
+                                 gfloat      *x,
+                                 gfloat      *y,
+                                 gfloat      *line_height)
 {
  ClutterTextPrivate *priv;
  PangoRectangle rect;
@@ -1240,7 +1112,7 @@ clutter_text_position_to_coords_internal (ClutterText *self,

  if (x)
    {
-      *x = pango_to_pixels (rect.x);
+      *x = (gfloat) rect.x / 1024.0f;

      /* Take any offset due to scrolling into account */
      if (priv->single_line_mode)
@@ -1248,58 +1120,14 @@ clutter_text_position_to_coords_internal (ClutterText *self,
    }

  if (y)
-    *y = pango_to_pixels (rect.y);
+    *y = (gfloat) rect.y / 1024.0f;

  if (line_height)
-    *line_height = pango_to_pixels (rect.height);
+    *line_height = (gfloat) rect.height / 1024.0f;

  return TRUE;
 }

-/**
- * clutter_text_position_to_coords:
- * @self: a #ClutterText
- * @position: position in characters
- * @x: (out): return location for the X coordinate, or %NULL
- * @y: (out): return location for the Y coordinate, or %NULL
- * @line_height: (out): return location for the line height, or %NULL
- *
- * Retrieves the coordinates of the given @position.
- *
- * Return value: %TRUE if the conversion was successful
- *
- * Since: 1.0
- */
-gboolean
-clutter_text_position_to_coords (ClutterText *self,
-                                 gint         position,
-                                 gfloat      *x,
-                                 gfloat      *y,
-                                 gfloat      *line_height)
-{
-  gfloat resource_scale;
-  gboolean ret;
-
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
-
-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return FALSE;
-
-  ret = clutter_text_position_to_coords_internal (self, position,
-                                                  x, y, line_height);
-
-  if (x)
-    *x /= resource_scale;
-
-  if (y)
-    *y /= resource_scale;
-
-  if (line_height)
-    *line_height /= resource_scale;
-
-  return ret;
-}
-
 static inline void
 update_cursor_location (ClutterText *self)
 {
@@ -1317,8 +1145,7 @@ update_cursor_location (ClutterText *self)
 }

 static inline void
-clutter_text_ensure_cursor_position (ClutterText *self,
-                                     float        scale)
+clutter_text_ensure_cursor_position (ClutterText *self)
 {
  ClutterTextPrivate *priv = self->priv;
  gfloat x, y, cursor_height;
@@ -1341,15 +1168,15 @@ clutter_text_ensure_cursor_position (ClutterText *self,
                priv->preedit_set ? priv->preedit_cursor_pos : 0);

  x = y = cursor_height = 0;
-  clutter_text_position_to_coords_internal (self, position,
-                                            &x, &y,
-                                            &cursor_height);
+  clutter_text_position_to_coords (self, position,
+                                   &x, &y,
+                                   &cursor_height);

  clutter_rect_init (&cursor_rect,
                     x,
-                     y + CURSOR_Y_PADDING * scale,
-                     priv->cursor_size * scale,
-                     cursor_height - 2 * CURSOR_Y_PADDING * scale);
+                     y + CURSOR_Y_PADDING,
+                     priv->cursor_size,
+                     cursor_height - 2 * CURSOR_Y_PADDING);

  if (!clutter_rect_equals (&priv->cursor_rect, &cursor_rect))
    {
@@ -1772,12 +1599,6 @@ clutter_text_dispose (GObject *gobject)
      priv->direction_changed_id = 0;
    }

-  if (priv->resource_scale_changed_id)
-    {
-      g_signal_handler_disconnect (self, priv->resource_scale_changed_id);
-      priv->resource_scale_changed_id = 0;
-    }
-
  if (priv->settings_changed_id)
    {
      g_signal_handler_disconnect (clutter_get_default_backend (),
@@ -1830,7 +1651,6 @@ typedef void (* ClutterTextSelectionFunc) (ClutterText           *text,

 static void
 clutter_text_foreach_selection_rectangle (ClutterText              *self,
-                                          float                     scale,
                                          ClutterTextSelectionFunc  func,
                                          gpointer                  user_data)
 {
@@ -1882,9 +1702,9 @@ clutter_text_foreach_selection_rectangle (ClutterText              *self,
                                      &n_ranges);
      pango_layout_line_x_to_index (line, 0, &index_, NULL);

-      clutter_text_position_to_coords_internal (self,
-                                                bytes_to_offset (utf8, index_),
-                                                NULL, &y, &height);
+      clutter_text_position_to_coords (self,
+                                       bytes_to_offset (utf8, index_),
+                                       NULL, &y, &height);

      box.y1 = y;
      box.y2 = y + height;
@@ -1894,18 +1714,18 @@ clutter_text_foreach_selection_rectangle (ClutterText              *self,
          gfloat range_x;
          gfloat range_width;

-          range_x = pango_to_pixels (ranges[i * 2]);
+          range_x = ranges[i * 2] / PANGO_SCALE;

          /* Account for any scrolling in single line mode */
          if (priv->single_line_mode)
            range_x += priv->text_x;


-          range_width = pango_to_pixels (ranges[i * 2 + 1] - ranges[i * 2]);
-          box.x1 = range_x;
-          box.x2 = ceilf (range_x + range_width);
+          range_width = ((gfloat) ranges[i * 2 + 1] - (gfloat) ranges[i * 2])
+                      / PANGO_SCALE;

-          clutter_actor_box_scale (&box, scale);
+          box.x1 = range_x;
+          box.x2 = ceilf (range_x + range_width + .5f);

          func (self, &box, user_data);
        }
@@ -1924,14 +1744,6 @@ add_selection_rectangle_to_path (ClutterText           *text,
  cogl_path_rectangle (user_data, box->x1, box->y1, box->x2, box->y2);
 }

-static void
-clutter_text_foreach_selection_rectangle_prescaled (ClutterText              *self,
-                                                    ClutterTextSelectionFunc  func,
-                                                    gpointer                  user_data)
-{
-  clutter_text_foreach_selection_rectangle (self, 1.0f, func, user_data);
-}
-
 /* Draws the selected text, its background, and the cursor */
 static void
 selection_paint (ClutterText     *self,
@@ -1975,7 +1787,6 @@ selection_paint (ClutterText     *self,
  else
    {
      /* Paint selection background first */
-      CoglPipeline *color_pipeline = cogl_pipeline_copy (default_color_pipeline);
      PangoLayout *layout = clutter_text_get_layout (self);
      CoglPath *selection_path = cogl_path_new ();
      CoglColor cogl_color = { 0, };
@@ -1988,19 +1799,11 @@ selection_paint (ClutterText     *self,
      else
        color = &priv->text_color;

-      cogl_color_init_from_4ub (&cogl_color,
-                                color->red,
-                                color->green,
-                                color->blue,
-                                paint_opacity * color->alpha / 255);
-      cogl_color_premultiply (&cogl_color);
-      cogl_pipeline_set_color (color_pipeline, &cogl_color);
+      clutter_text_foreach_selection_rectangle (self,
+                                                add_selection_rectangle_to_path,
+                                                selection_path);

-      clutter_text_foreach_selection_rectangle_prescaled (self,
-                                                          add_selection_rectangle_to_path,
-                                                          selection_path);
-
-      cogl_framebuffer_fill_path (fb, color_pipeline, selection_path);
+      cogl_path_fill (selection_path);

      /* Paint selected text */
      cogl_framebuffer_push_path_clip (fb, selection_path);
@@ -2195,8 +1998,7 @@ clutter_text_press (ClutterActor *actor,
    return CLUTTER_EVENT_PROPAGATE;

  clutter_actor_grab_key_focus (actor);
-  clutter_input_focus_set_input_panel_state (priv->input_focus,
-                                             CLUTTER_INPUT_PANEL_STATE_TOGGLE);
+  clutter_input_focus_request_toggle_input_panel (priv->input_focus);

  /* if the actor is empty we just reset everything and not
   * set up the dragging of the selection since there's nothing
@@ -2260,10 +2062,7 @@ clutter_text_press (ClutterActor *actor,
  priv->in_select_drag = TRUE;

  if (type == CLUTTER_BUTTON_PRESS)
-    {
-      clutter_input_device_grab (clutter_event_get_device (event),
-                                 actor);
-    }
+    clutter_grab_pointer (actor);
  else
    {
      clutter_input_device_sequence_grab (clutter_event_get_device (event),
@@ -2321,7 +2120,7 @@ clutter_text_release (ClutterActor *actor,
        {
          if (!priv->in_select_touch)
            {
-              clutter_input_device_ungrab (clutter_event_get_device (event));
+              clutter_ungrab_pointer ();
              priv->in_select_drag = FALSE;

              return CLUTTER_EVENT_STOP;
@@ -2591,7 +2390,6 @@ clutter_text_paint (ClutterActor *self)
  guint n_chars;
  float alloc_width;
  float alloc_height;
-  float resource_scale;

  fb = cogl_get_draw_framebuffer ();

@@ -2601,6 +2399,8 @@ clutter_text_paint (ClutterActor *self)
  n_chars = clutter_text_buffer_get_length (get_buffer (text));

  clutter_actor_get_allocation_box (self, &alloc);
+  alloc_width = alloc.x2 - alloc.x1;
+  alloc_height = alloc.y2 - alloc.y1;

  if (G_UNLIKELY (default_color_pipeline == NULL))
    {
@@ -2633,8 +2433,7 @@ clutter_text_paint (ClutterActor *self)
      cogl_framebuffer_draw_rectangle (fb,
                                       color_pipeline,
                                       0, 0,
-                                       clutter_actor_box_get_width (&alloc),
-                                       clutter_actor_box_get_height (&alloc));
+                                       alloc_width, alloc_height);

      cogl_object_unref (color_pipeline);
    }
@@ -2647,12 +2446,6 @@ clutter_text_paint (ClutterActor *self)
      !clutter_text_should_draw_cursor (text))
    return;

-  if (!clutter_actor_get_resource_scale (CLUTTER_ACTOR (self), &resource_scale))
-    return;
-
-  clutter_actor_box_scale (&alloc, resource_scale);
-  clutter_actor_box_get_size (&alloc, &alloc_width, &alloc_height);
-
  if (priv->editable && priv->single_line_mode)
    layout = clutter_text_create_layout (text, -1, -1);
  else
@@ -2684,15 +2477,8 @@ clutter_text_paint (ClutterActor *self)
        }
    }

-  if (resource_scale != 1.0f)
-    {
-      float paint_scale = 1.0f / resource_scale;
-      cogl_framebuffer_push_matrix (fb);
-      cogl_framebuffer_scale (fb, paint_scale, paint_scale, 1.0f);
-    }
-
  if (clutter_text_should_draw_cursor (text))
-    clutter_text_ensure_cursor_position (text, resource_scale);
+    clutter_text_ensure_cursor_position (text);

  if (priv->editable && priv->single_line_mode)
    {
@@ -2706,7 +2492,7 @@ clutter_text_paint (ClutterActor *self)
      clip_set = TRUE;

      actor_width = alloc_width - 2 * TEXT_PADDING;
-      text_width  = pango_to_pixels (logical_rect.width);
+      text_width  = logical_rect.width / PANGO_SCALE;

      rtl = priv->resolved_direction == PANGO_DIRECTION_RTL;

@@ -2763,10 +2549,8 @@ clutter_text_paint (ClutterActor *self)
    {
      priv->text_x = text_x;
      priv->text_y = text_y;
-      priv->text_logical_x = roundf ((float) text_x / resource_scale);
-      priv->text_logical_y = roundf ((float) text_y / resource_scale);

-      clutter_text_ensure_cursor_position (text, resource_scale);
+      clutter_text_ensure_cursor_position (text);
    }

  real_opacity = clutter_actor_get_paint_opacity (self)
@@ -2785,9 +2569,6 @@ clutter_text_paint (ClutterActor *self)

  selection_paint (text, fb);

-  if (resource_scale != 1.0f)
-    cogl_framebuffer_pop_matrix (fb);
-
  if (clip_set)
    cogl_framebuffer_pop_clip (fb);
 }
@@ -2817,32 +2598,26 @@ add_selection_to_paint_volume (ClutterText           *text,

 static void
 clutter_text_get_paint_volume_for_cursor (ClutterText        *text,
-                                          float               resource_scale,
                                          ClutterPaintVolume *volume)
 {
  ClutterTextPrivate *priv = text->priv;
  ClutterVertex origin;

-  clutter_text_ensure_cursor_position (text, resource_scale);
+  clutter_text_ensure_cursor_position (text);

  if (priv->position == priv->selection_bound)
    {
-      float width, height;
-
-      width = priv->cursor_rect.size.width / resource_scale;
-      height = priv->cursor_rect.size.height / resource_scale;
-      origin.x = priv->cursor_rect.origin.x / resource_scale;
-      origin.y = priv->cursor_rect.origin.y / resource_scale;
+      origin.x = priv->cursor_rect.origin.x;
+      origin.y = priv->cursor_rect.origin.y;
      origin.z = 0;

      clutter_paint_volume_set_origin (volume, &origin);
-      clutter_paint_volume_set_width (volume, width);
-      clutter_paint_volume_set_height (volume, height);
+      clutter_paint_volume_set_width (volume, priv->cursor_rect.size.width);
+      clutter_paint_volume_set_height (volume, priv->cursor_rect.size.height);
    }
  else
    {
      clutter_text_foreach_selection_rectangle (text,
-                                                1.0f / resource_scale,
                                                add_selection_to_paint_volume,
                                                volume);
    }
@@ -2865,7 +2640,6 @@ clutter_text_get_paint_volume (ClutterActor       *self,
      PangoLayout *layout;
      PangoRectangle ink_rect;
      ClutterVertex origin;
-      float resource_scale;

      /* If the text is single line editable then it gets clipped to
         the allocation anyway so we can just use that */
@@ -2880,24 +2654,19 @@ clutter_text_get_paint_volume (ClutterActor       *self,
      if (!clutter_actor_has_allocation (self))
        return FALSE;

-      if (!clutter_actor_get_resource_scale (self, &resource_scale))
-        return FALSE;
-
      _clutter_paint_volume_init_static (&priv->paint_volume, self);

      layout = clutter_text_get_layout (text);
      pango_layout_get_extents (layout, &ink_rect, NULL);

-      origin.x = pango_to_logical_pixels (ink_rect.x, resource_scale);
-      origin.y = pango_to_logical_pixels (ink_rect.y, resource_scale);
+      origin.x = ink_rect.x / (float) PANGO_SCALE;
+      origin.y = ink_rect.y / (float) PANGO_SCALE;
      origin.z = 0;
      clutter_paint_volume_set_origin (&priv->paint_volume, &origin);
      clutter_paint_volume_set_width (&priv->paint_volume,
-                                      pango_to_logical_pixels (ink_rect.width,
-                                                               resource_scale));
+                                      ink_rect.width / (float) PANGO_SCALE);
      clutter_paint_volume_set_height (&priv->paint_volume,
-                                       pango_to_logical_pixels (ink_rect.height,
-                                                                resource_scale));
+                                       ink_rect.height / (float) PANGO_SCALE);

      /* If the cursor is visible then that will likely be drawn
         outside of the ink rectangle so we should merge that in */
@@ -2907,8 +2676,7 @@ clutter_text_get_paint_volume (ClutterActor       *self,

          _clutter_paint_volume_init_static (&cursor_paint_volume, self);

-          clutter_text_get_paint_volume_for_cursor (text, resource_scale,
-                                                    &cursor_paint_volume);
+          clutter_text_get_paint_volume_for_cursor (text, &cursor_paint_volume);

          clutter_paint_volume_union (&priv->paint_volume,
                                      &cursor_paint_volume);
@@ -2936,12 +2704,9 @@ clutter_text_get_preferred_width (ClutterActor *self,
  PangoLayout *layout;
  gint logical_width;
  gfloat layout_width;
-  gfloat resource_scale;
-
-  if (!clutter_actor_get_resource_scale (self, &resource_scale))
-    resource_scale = 1;

  layout = clutter_text_create_layout (text, -1, -1);
+
  pango_layout_get_extents (layout, NULL, &logical_rect);

  /* the X coordinate of the logical rectangle might be non-zero
@@ -2951,7 +2716,7 @@ clutter_text_get_preferred_width (ClutterActor *self,
  logical_width = logical_rect.x + logical_rect.width;

  layout_width = logical_width > 0
-    ? pango_to_logical_pixels (logical_width, resource_scale)
+    ? ceilf (logical_width / 1024.0f)
    : 1;

  if (min_width_p)
@@ -2993,16 +2758,12 @@ clutter_text_get_preferred_height (ClutterActor *self,
      PangoRectangle logical_rect = { 0, };
      gint logical_height;
      gfloat layout_height;
-      gfloat resource_scale;
-
-      if (!clutter_actor_get_resource_scale (self, &resource_scale))
-        resource_scale = 1;

      if (priv->single_line_mode)
        for_width = -1;

-      layout = create_text_layout_with_scale (CLUTTER_TEXT (self),
-                                              for_width, -1, resource_scale);
+      layout = clutter_text_create_layout (CLUTTER_TEXT (self),
+                                           for_width, -1);

      pango_layout_get_extents (layout, NULL, &logical_rect);

@@ -3011,7 +2772,7 @@ clutter_text_get_preferred_height (ClutterActor *self,
       * the height accordingly
       */
      logical_height = logical_rect.y + logical_rect.height;
-      layout_height = pango_to_logical_pixels (logical_height, resource_scale);
+      layout_height = ceilf (logical_height / 1024.0f);

      if (min_height_p)
        {
@@ -3027,8 +2788,7 @@ clutter_text_get_preferred_height (ClutterActor *self,
              pango_layout_line_get_extents (line, NULL, &logical_rect);

              logical_height = logical_rect.y + logical_rect.height;
-              line_height = pango_to_logical_pixels (logical_height,
-                                                     resource_scale);
+              line_height = ceilf (logical_height / 1024.0f);

              *min_height_p = line_height;
            }
@@ -3059,9 +2819,9 @@ clutter_text_allocate (ClutterActor           *self,
  if (text->priv->editable && text->priv->single_line_mode)
    clutter_text_create_layout (text, -1, -1);
  else
-    maybe_create_text_layout_with_resource_scale (text,
-                                                  box->x2 - box->x1,
-                                                  box->y2 - box->y1);
+    clutter_text_create_layout (text,
+                                box->x2 - box->x1,
+                                box->y2 - box->y1);

  parent_class = CLUTTER_ACTOR_CLASS (clutter_text_parent_class);
  parent_class->allocate (self, box, flags);
@@ -3787,7 +3547,7 @@ clutter_text_set_final_state (ClutterAnimatable *animatable,
 }

 static void
-clutter_animatable_iface_init (ClutterAnimatableInterface *iface)
+clutter_animatable_iface_init (ClutterAnimatableIface *iface)
 {
  parent_animatable_iface = g_type_interface_peek_parent (iface);

@@ -4343,7 +4103,8 @@ clutter_text_class_init (ClutterTextClass *klass)
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterTextClass, text_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  /**
@@ -4415,7 +4176,8 @@ clutter_text_class_init (ClutterTextClass *klass)
 		  G_TYPE_FROM_CLASS (gobject_class),
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
 		  G_STRUCT_OFFSET (ClutterTextClass, cursor_event),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__BOXED,
 		  G_TYPE_NONE, 1,
 		  CLUTTER_TYPE_GEOMETRY | G_SIGNAL_TYPE_STATIC_SCOPE);

@@ -4433,7 +4195,8 @@ clutter_text_class_init (ClutterTextClass *klass)
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterTextClass, cursor_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  /**
@@ -4451,7 +4214,8 @@ clutter_text_class_init (ClutterTextClass *klass)
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (ClutterTextClass, activate),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _clutter_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  binding_pool = clutter_binding_pool_get_for_class (klass);
@@ -4628,11 +4392,6 @@ clutter_text_init (ClutterText *self)
                      NULL);

  priv->input_focus = clutter_text_input_focus_new (self);
-
-  priv->resource_scale_changed_id =
-    g_signal_connect (self, "notify::resource-scale",
-                      G_CALLBACK (clutter_text_resource_scale_changed_cb),
-                      NULL);
 }

 /**
@@ -4820,7 +4579,7 @@ buffer_notify_max_length (ClutterTextBuffer *buffer,
                          GParamSpec        *spec,
                          ClutterText       *self)
 {
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAX_LENGTH]);
+  g_object_notify (G_OBJECT (self), "max-length");
 }

 static void
@@ -4919,9 +4678,9 @@ clutter_text_set_buffer (ClutterText       *self,

  obj = G_OBJECT (self);
  g_object_freeze_notify (obj);
-  g_object_notify_by_pspec (obj, obj_props[PROP_BUFFER]);
-  g_object_notify_by_pspec (obj, obj_props[PROP_TEXT]);
-  g_object_notify_by_pspec (obj, obj_props[PROP_MAX_LENGTH]);
+  g_object_notify (obj, "buffer");
+  g_object_notify (obj, "text");
+  g_object_notify (obj, "max-length");
  g_object_thaw_notify (obj);
 }

@@ -5743,7 +5502,6 @@ clutter_text_set_markup (ClutterText *self,
 PangoLayout *
 clutter_text_get_layout (ClutterText *self)
 {
-  PangoLayout *layout;
  gfloat width, height;

  g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
@@ -5752,12 +5510,8 @@ clutter_text_get_layout (ClutterText *self)
    return clutter_text_create_layout (self, -1, -1);

  clutter_actor_get_size (CLUTTER_ACTOR (self), &width, &height);
-  layout = maybe_create_text_layout_with_resource_scale (self, width, height);

-  if (!layout)
-    layout = clutter_text_create_layout (self, width, height);
-
-  return layout;
+  return clutter_text_create_layout (self, width, height);
 }

 /**
@@ -6761,10 +6515,10 @@ clutter_text_get_layout_offsets (ClutterText *self,
  priv = self->priv;

  if (x != NULL)
-    *x = priv->text_logical_x;
+    *x = priv->text_x;

  if (y != NULL)
-    *y = priv->text_logical_y;
+    *y = priv->text_y;
 }

 /**
--- a/clutter/clutter/clutter-texture.h
+++ b/clutter/clutter/clutter-texture.h
@@ -53,8 +53,7 @@ G_BEGIN_DECLS
 *
 * Since: 0.4
 */
-typedef enum
-{
+typedef enum {
  CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY,
  CLUTTER_TEXTURE_ERROR_NO_YUV,
  CLUTTER_TEXTURE_ERROR_BAD_FORMAT
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -424,11 +424,6 @@ clutter_timeline_set_custom_property (ClutterScriptable *scriptable,
    g_object_set_property (G_OBJECT (scriptable), name, value);
 }

-void
-clutter_timeline_cancel_delay (ClutterTimeline *timeline)
-{
-  g_clear_handle_id (&timeline->priv->delay_id, g_source_remove);
-}

 static void
 clutter_scriptable_iface_init (ClutterScriptableIface *iface)
@@ -555,7 +550,11 @@ clutter_timeline_dispose (GObject *object)

  priv = self->priv;

-  clutter_timeline_cancel_delay (self);
+  if (priv->delay_id)
+    {
+      g_source_remove (priv->delay_id);
+      priv->delay_id = 0;
+    }

  if (priv->progress_notify != NULL)
    {
@@ -710,7 +709,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (ClutterTimelineClass, new_frame),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__INT,
 		  G_TYPE_NONE,
 		  1, G_TYPE_INT);
  /**
@@ -733,7 +733,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (ClutterTimelineClass, completed),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
  /**
   * ClutterTimeline::started:
@@ -749,7 +750,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (ClutterTimelineClass, started),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
  /**
   * ClutterTimeline::paused:
@@ -762,7 +764,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (ClutterTimelineClass, paused),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
  /**
   * ClutterTimeline::marker-reached:
@@ -829,7 +832,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (ClutterTimelineClass, stopped),
-		  NULL, NULL, NULL,
+		  NULL, NULL,
+		  _clutter_marshal_VOID__BOOLEAN,
 		  G_TYPE_NONE, 1,
                  G_TYPE_BOOLEAN);
 }
@@ -1214,11 +1218,15 @@ clutter_timeline_pause (ClutterTimeline *timeline)

  priv = timeline->priv;

-  clutter_timeline_cancel_delay (timeline);
-
-  if (!priv->is_playing)
+  if (priv->delay_id == 0 && !priv->is_playing)
    return;

+  if (priv->delay_id)
+    {
+      g_source_remove (priv->delay_id);
+      priv->delay_id = 0;
+    }
+
  priv->msecs_delta = 0;
  set_is_playing (timeline, FALSE);

--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@@ -134,6 +134,7 @@ clutter_transition_stopped (ClutterTimeline *timeline,
      clutter_transition_detach (CLUTTER_TRANSITION (timeline),
                                 priv->animatable);
      g_clear_object (&priv->animatable);
+      g_object_unref (timeline);
    }
 }

--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -90,6 +90,7 @@ typedef struct _ClutterVertex                   ClutterVertex;

 typedef struct _ClutterAlpha            	ClutterAlpha;
 typedef struct _ClutterAnimation                ClutterAnimation;
+typedef struct _ClutterAnimator         	ClutterAnimator;
 typedef struct _ClutterState            	ClutterState;

 typedef struct _ClutterInputDeviceTool          ClutterInputDeviceTool;
@@ -200,9 +201,6 @@ float                   clutter_point_distance  (const ClutterPoint *a,
                                                 const ClutterPoint *b,
                                                 float              *x_distance,
                                                 float              *y_distance);
-CLUTTER_EXPORT
-gboolean clutter_point_inside_quadrilateral     (const ClutterPoint *point,
-                                                 const ClutterPoint *vertices);

 /**
 * ClutterSize:
@@ -364,10 +362,6 @@ void                    clutter_rect_inset              (ClutterRect       *rect
                                                         float              d_x,
                                                         float              d_y);
 CLUTTER_EXPORT
-void                    clutter_rect_scale              (ClutterRect       *rect,
-                                                         float              s_x,
-                                                         float              s_y);
-CLUTTER_EXPORT
 void                    clutter_rect_clamp_to_pixel     (ClutterRect       *rect);
 CLUTTER_EXPORT
 float                   clutter_rect_get_x              (ClutterRect       *rect);
@@ -567,10 +561,6 @@ void             clutter_actor_box_set_size       (ClutterActorBox       *box,
                                                   gfloat                 width,
                                                   gfloat                 height);

-CLUTTER_EXPORT
-void             clutter_actor_box_scale          (ClutterActorBox       *box,
-                                                   gfloat                 scale);
-
 /**
 * ClutterGeometry:
 * @x: X coordinate of the top left corner of an actor
--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@@ -32,7 +32,6 @@

 #include "clutter-build-config.h"

-#include <fribidi.h>
 #include <math.h>

 #include "clutter-debug.h"
@@ -106,50 +105,6 @@ _clutter_util_fully_transform_vertices (const CoglMatrix *modelview,
    }
 }

-void
-_clutter_util_rect_from_rectangle (const cairo_rectangle_int_t *src,
-                                   ClutterRect                 *dest)
-{
-  *dest = (ClutterRect) {
-    .origin = {
-      .x = src->x,
-      .y = src->y
-    },
-    .size = {
-      .width = src->width,
-      .height = src->height
-    }
-  };
-}
-
-void
-_clutter_util_rectangle_int_extents (const  ClutterRect    *src,
-                                     cairo_rectangle_int_t *dest)
-{
-  ClutterRect tmp = *src;
-
-  clutter_rect_clamp_to_pixel (&tmp);
-
-  *dest = (cairo_rectangle_int_t) {
-    .x = tmp.origin.x,
-    .y = tmp.origin.y,
-    .width = tmp.size.width,
-    .height = tmp.size.height,
-  };
-}
-
-void
-_clutter_util_rectangle_offset (const cairo_rectangle_int_t *src,
-                                int                          x,
-                                int                          y,
-                                cairo_rectangle_int_t       *dest)
-{
-  *dest = *src;
-
-  dest->x += x;
-  dest->y += y;
-}
-
 /*< private >
 * _clutter_util_rectangle_union:
 * @src1: first rectangle to union
@@ -700,45 +655,3 @@ clutter_interval_register_progress_func (GType               value_type,

  G_UNLOCK (progress_funcs);
 }
-
-PangoDirection
-_clutter_pango_unichar_direction (gunichar ch)
-{
-  FriBidiCharType fribidi_ch_type;
-
-  G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
-
-  fribidi_ch_type = fribidi_get_bidi_type (ch);
-
-  if (!FRIBIDI_IS_STRONG (fribidi_ch_type))
-    return PANGO_DIRECTION_NEUTRAL;
-  else if (FRIBIDI_IS_RTL (fribidi_ch_type))
-    return PANGO_DIRECTION_RTL;
-  else
-    return PANGO_DIRECTION_LTR;
-}
-
-PangoDirection
-_clutter_pango_find_base_dir (const gchar *text,
-                              gint         length)
-{
-  PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
-  const gchar *p;
-
-  g_return_val_if_fail (text != NULL || length == 0, PANGO_DIRECTION_NEUTRAL);
-
-  p = text;
-  while ((length < 0 || p < text + length) && *p)
-    {
-      gunichar wc = g_utf8_get_char (p);
-
-      dir = _clutter_pango_unichar_direction (wc);
-
-      if (dir != PANGO_DIRECTION_NEUTRAL)
-        break;
-
-      p = g_utf8_next_char (p);
-    }
-
-  return dir;
-}
--- a/Show More
+++ b/Show More