wayland: Use weak ref to keep track of buffers

Instead of using a one-shot signal meant to happen then the buffer is being destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=782344
compositor: Use redraw clip region to cull out children
2017-05-22 17:43:10 +02:00 · 2017-05-22 17:43:10 +02:00 · 2017-05-22 17:43:10 +02:00 · 2017-05-22 17:43:10 +02:00 · 2017-05-22 17:43:10 +02:00 · 2017-05-22 17:43:10 +02:00
475 changed files with 35555 additions and 66679 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,7 +55,6 @@ mutter-restart-helper
 mutter-test-client
 mutter-test-runner
 mutter-test-unit-tests
-mutter-test-headless-start-test
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
@ -72,8 +71,6 @@ src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
-src/meta-dbus-remote-desktop.[ch]
-src/meta-dbus-screen-cast.[ch]
 src/gtk-primary-selection-protocol.c
 src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
@ -88,19 +85,6 @@ src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
 src/xdg-foreign-unstable-v*-protocol.c
 src/xdg-foreign-unstable-v*-server-protocol.h
-src/xdg-output-unstable-v1-protocol.c
-src/xdg-output-unstable-v1-server-protocol.h
-src/xwayland-keyboard-grab-unstable-v1-protocol.c
-src/xwayland-keyboard-grab-unstable-v1-server-protocol.h
-src/tablet-unstable-v*-protocol.c
-src/tablet-unstable-v*-server-protocol.h
-src/keyboard-shortcuts-inhibit-unstable-v*-protocol.c
-src/keyboard-shortcuts-inhibit-unstable-v*-server-protocol.h
-src/linux-dmabuf-unstable-v*-protocol.c
-src/linux-dmabuf-unstable-v*-server-protocol.h
-src/xdg-shell-protocol.c
-src/xdg-shell-server-protocol.h
-src/wayland-eglstream-controller-server-protocol.h
 src/meta/meta-version.h
 src/libmutter-*.pc
 doc/reference/*.args
@ -128,4 +112,3 @@ ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
 .dirstamp
-**/tags.*
--- a/322
+++ b/322
@ -1,325 +1,3 @@
-3.29.4
-======
-* Fix crash with parent-less modal dialogs [Olivier; #174]
-* Preserve paint volumes where possible to optimize CPU usage [Carlos; #782344]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Iain Lane, Bastien Nocera
-
-Translators:
-  Daniel Șerbănescu [ro]
-
-3.29.3
-======
-* Fix Korean Hangul support on wayland [Changwoo; #152]
-* Improve support for proprietary Nvidia driver [Jonas; #790316]
-* Only upload HW cursor sprite to the GPU that will display them [Jonas; #77]
-* Improve EGLstream support [Miguel; #2, #782575]
-* Remove MetaScreen to prepare for non-mandatary X11 dependency
-  [Armin, Jonas; #759538]
-* Misc. bug fixes [Olivier, Jonas, Sam; #160, !130, #786929, #788834]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Armin Krezović, Corentin Noël,
-  Changwoo Ryu, Sam Spilsbury, Daniel Stone, Marco Trevisan (Treviño),
-  Miguel A. Vico, Daniel van Vugt
-
-Translators:
-  Yi-Jyun Pan [zh_TW], Jordi Mas [ca], Daniel Șerbănescu [ro], Fabio Tomat [fur]
-
-3.29.2
-======
-* Fix size change animations on wayland [Georges; #780292]
-* Handle touch events on server-side titlebars [Carlos; #770185]
-* Misc. bug fixes [Florian, Olivier, Jonas, Georges; #134, #124, !96, #138,
-  !102, #781471, #150]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Florian Müllner,
-  Georges Basile Stavracas Neto, Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Daniel Șerbănescu [ro], Marcos Lans [gl], Dz Chen [zh_CN]
-
-3.29.1
-======
-* Fix various input-method regressions [Carlos, Olivier; #65, #74, #66, #112]
-* Fix wayland build on FreeBSD [Ting-Wei; #792280, #792717]
-* Fix swapped colors in screenshots (again) [Carlos; #72]
-* Allow building with elogind [Rasmus; !46]
-* Consider display rotation for cursor [Olivier; #85]
-* Fall back to non-modifier GBM surfaces [Daniel; #84]
-* Take inhibitors into account for monitoring idle [Bastien; #705942]
-* Misc. bug fixes [handsome-feng, Olivier, Mario, Jonas; !45, #83, #104,
-  gnome-shell#157, #130, #21]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, handsome-feng, Yussuf Khalil,
-  Ting-Wei Lan, Aleksandr Mezin, Alberts Muktupāvels,
-  Georges Basile Stavracas Neto, Bastien Nocera, Benjamin Otte,
-  Mario Sanchez Prada, Daniel Stone, Ray Strode, Rasmus Thomsen,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Emin Tufan Çetin [tr], Dušan Kazik [sk], Matej Urbančič [sl]
-
-3.28.0
-======
-* Fix xdg-foreign regression [Carlos; #63]
-
-Contributors:
-  Carlos Garnacho, Georges Basile Stavracas Neto
-
-Translators:
-  Marek Cernocky [cs], Ask Hjorth Larsen [da], Chao-Hsiung Liao [zh_TW],
-  Anders Jonsson [sv], Mart Raudsepp [et]
-
-3.27.92
-=======
-* Fix use of modifiers with multi-GPU systems [Louis-Francis; #18]
-* Add xdg-shell stable support [Jonas; #791938]
-* Fix scaling of icons in titlebar buttons [Egmont; #23]
-* Implement missing wacom functionality on X11 [Carlos; #48]
-* Force 8-bit RGB config [Jonas; #2]
-* Misc. bug fixes [Jonas, Olivier, Robert; #6, #27, #792203]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Egmont Koblinger, Robert Mader,
-  Bastien Nocera, Louis-Francis Ratté-Boulianne
-
-Translators:
-  Daniel Mustieles [es], Марко Костић [sr], Милош Поповић [sr@latin],
-  Fran Dieguez [gl], Balázs Úr [hu], Gwan-gyeong Mun [ko], Rūdolfs Mazurs [lv],
-  Milo Casagrande [it], Mario Blättermann [de], GNOME Translation Robot [gd,
-  nl], Claude Paroz [fr], Aurimas Černius [lt]
-
-3.27.91
-=======
-* Fix handling of trackball settings on wayland [Carlos; #787804]
-* Apply font settings on wayland [Daniel; #645433]
-* Fix keybindings getting mixed up with some layouts [Jonas; #789300]
-* Fix bluetooth mouse cursor disappearing after idle [Benoit; #761067]
-* Support platforms that export EGL_KHR_platform_gbm [memeka; #780668]
-* Add keyboard accessibility support on wayland [Olivier; #788564]
-* Fix missing cursor when using screen magnifier [Carlos; #754806]
-* Fix external monitor shutting off on wayland when lid closes [Jonas; #788915]
-* Add xdg-output support [Olivier; #787363]
-* Add Xwayland grab keyboard support [Olivier; #783342]
-* Allow shortcut inhibition of the super key [Olivier; #790627]
-* Take "panel orientation" drm_connector property into account [Hans; #782294]
-* Fix focus window ending up below other windows on wayland [Olivier; #780820]
-* Fix maximized windows restoring to a tiny size on wayland [Olivier; #783901]
-* Fix tap-and-drag setting on X11 [Jonas; #775755]
-* Fix handling of single-touch devices on wayland [Carlos; #792005]
-* Support tiled/compressed buffers [Daniel; #785779]
-* Port screencast support to pipewire 0.1.8 [Jonas; #792854]
-* Add support for third stylus button on newer tablets [Jason; #790033]
-* Fix background corruption regression on nvidia [Jonas; #739178]
-* Misc. bug fixes [Jonas, Rui, Michael, Marco, Carlos, Olivier, Philip, Piotr,
-  Ting-Wei, Daniel, Jeremy, Hans, Florian, Ray, Jeff, George, Gwan-gyeong;
-  #789153, #788493, #784314, #789227, #789223, #789277, #782344, #789552,
-  #789553, #788695, #789984, #788764, #789386, #784545, #790336, #790358,
-  #791022, #791006, #789070, #772218, #791383, #791809, #776220, #791916,
-  #792281, #790309, #791371, #792527, #792599, #788834, #792765, #792062,
-  #645460, #792853, !2, #792818, #8, #12, #789501, #10, #789961, #13, !15, #1,
-  #26, #28, #35, #36, #38]
-
-Contributors:
-  Jonas Ådahl, Jeremy Bicha, Michael Catanzaro, Piotr Drąg, Olivier Fourdan,
-  Carlos Garnacho, Jason Gerecke, Hans de Goede, Benoit Gschwind,
-  Peter Hutterer, George Kiagiadakis, Ting-Wei Lan, Rui Matos, memeka,
-  Florian Müllner, Gwan-gyeong Mun, Jeremy Nickurak, Marc-Antoine Perennou,
-  Jeff Smith, Daniel Stone, Ray Strode, Marco Trevisan (Treviño),
-  Daniel van Vugt, Philip Withnall
-
-Translators:
-  Khaled Hosny [ar], Kjartan Maraas [nb], Piotr Drąg [pl],
-  Rafael Fontenelle [pt_BR], Christian Kirbach [de], Anders Jonsson [sv],
-  Charles Monzat [fr], Marek Cernocky [cs], Muhammet Kara [tr],
-  Milo Casagrande [it], Pawan Chitrakar [ne], Yosef Or Boczko [he],
-  Kukuh Syafaat [id], Daniel Mustieles [es], Fabio Tomat [fur],
-  Kristjan SCHMIDT [eo], Balázs Úr [hu], Andika Triwidada [id],
-  Fran Dieguez [gl], gogo [hr]
-
-3.27.1
-======
-* Work with clients that require older linux_dmabuf protocol [Daniel; #788558]
-* Support hybrid GPU systems [Jonas; #785381]
-* Prevent crash when closing maximized windows [Jonni; #788666]
-* Use the correct monitor for HiDPI scaling of shell chrome [Jonas; #788820]
-* Fix unredirection of fullscreen windows [Rui, Jonas; #788493]
-* Fix list of supported monitor scales on X11 [Jonas; #788901]
-* Misc. bug fixes [Florian, Jonas, Marco; #788572, #788569, #788607, #788860,
-  #788921]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Daniel Stone,
-  Marco Trevisan, Jonni Westphalen
-
-Translations:
-  Xavi Ivars [ca@valencia]
-
-3.26.1
-======
-* Fix crash when respawning shortcut inhibitor dialog [Olivier; #787568]
-* Fix crash during monitor configuration migration [Carlos, Jonas; #787668]
-* Fix multihead regressions in X11 session [Jonas; #787477]
-* Fix screen rotation regressions [Hans; #787836]
-* Fix keybindings not being resolved with non-latin layouts [Jonas; #787016]
-* Support snap packages for sandboxed app IDs [Marco; #788217]
-* Fix crash when reconnecting tablet device [Jason; #787649]
-* Support running headless [Jonas; #730551, #787637]
-* Support _NET_RESTACK_WINDOW and ConfigureRequest siblings [Vasilis; #786365]
-* Fix monitor layout not being remembered across sessions [Jonas; #787629]
-* Make sure to export _NET_NUMBER_OF_DESKTOPS [Florian; #760651]
-* Allow resizing of tiled windows [Georges, Florian; #645153]
-* Export tiling information to clients [Georges; #751857]
-* Misc. bug fixes [Jonas, Florian, Jeremy, Rico; #787570, #787715, #787953,
-  #788049, #788199, #788292, #788197]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Georges Basile Stavracas Neto, Hans de Goede,
-  Olivier Fourdan, Carlos Garnacho, Jason Gerecke, Vasilis Liaskovitis,
-  Rui Matos, Florian Müllner, Jeremy Soller, Marco Trevisan, Rico Tzschichholz
-
-Translations:
-  Matej Urbančič [sl], gogo [hr], Cheng-Chia Tseng [zh_TW]
-
-3.26.0
-======
-Contributors:
-  Florian Müllner
-
-Translations:
-  Trần Ngọc Quân [vi], Inaki Larranaga Murgoitio [eu], Jordi Mas [ca],
-  Anders Jonsson [sv], Alexander Shopov [bg], Ask Hjorth Larsen [da],
-  Jean-Baptiste Holcroft [fr], A S Alam [pa]
-
-3.25.92
-=======
-* Add screencast and remote desktop support [Jonas; #784199]
-* Support running with no attached monitors [Jonas; #730551]
-* Add a vertical gradient effect to background actor [Alessandro; #786618]
-* Misc. bug fixes [Mario, Daniel, Piotr, Jonas, Bastien; #786619, #786677,
-  #772218, #786918, #760670]
-
-Contributors:
-  Jonas Ådahl, Alessandro Bono, Piotr Drąg, Bastien Nocera,
-  Mario Sanchez Prada, Daniel Stone
-
-Translations:
-  Marek Cernocky [cs], Aurimas Černius [lt], Piotr Drąg [pl],
-  Fran Dieguez [gl], gogo [hr], Dušan Kazik [sk], Milo Casagrande [it],
-  Jordi Mas [ca], Cheng-Chia Tseng [zh_TW], Марко Костић [sr],
-  Милош Поповић [sr@latin], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
-  Ask Hjorth Larsen [da], Piotr Drąg [it, lt], Jiri Grönroos [fi],
-  Emin Tufan Çetin [tr], Wolfgang Stöggl [de], Kukuh Syafaat [id],
-  Yuras Shumovich [be], Changwoo Ryu [ko], Alexander Shopov [bg],
-  Rafael Fontenelle [pt_BR], Balázs Úr [hu]
-
-3.25.91
-=======
-* Reduce memory use of suspended instances [Jonas; #786299]
-* Make supported scales determination saner [Rui; #786474]
-* Fix crash on inhibit-shortcuts dialog reponse [Jonas; #786385]
-* Support libinput's tag-and-drag setting [freeroot; #775755]
-* Avoid overlapping keybindings with multiple layouts [Jonas; #786408]
-* Fix non-transformed cursor on rotated monitors [Jonas; #786023]
-* Avoid unnecessary work during background painting [Alessandro; #783512]
-* Misc. bug fixes [Alberts, Jonas, Mario; #691611, #786300, #777732, #786568]
-
-Contributors:
-  freeroot, Jonas Ådahl, Alessandro Bono, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Mario Sanchez Prada
-
-Translations:
-  Muhammet Kara [tr], Claude Paroz [fr], Мирослав Николић [sr, sr@latin],
-  Pawan Chitrakar [ne], Kukuh Syafaat [id]
-
-3.25.90
-=======
-* Add zwp_linux_dmabuf_v1 support [Daniel; #785262]
-* Add (x)wayland shortcut inhibitor support [Olivier; #783342]
-* Misc. bug fixes [Daniel, Carlos, Cosimo; #785263, #785347, #767805]
-
-Contributors:
-  Jonas Ådahl, Cosimo Cecchi, Olivier Fourdan, Carlos Garnacho, Daniel Stone
-
-Translations:
-  Fabio Tomat [fur], Kukuh Syafaat [id], Aurimas Černius [lt],
-  Daniel Mustieles [es], Baurzhan Muftakhidinov [kk], Jordi Mas [ca],
-  Matej Urbančič [sl], Marek Cernocky [cs], gogo [hr], Fran Dieguez [gl],
-  Balázs Meskó [hu]
-
-3.25.4
-======
-* Do not throttle motion events on tablet tools [Carlos; #783535]
-* Handle left-handed mode on pen/eraser devices [Carlos; #782027]
-* Add wl_surface.damage_buffer() support [Jonas; #784080]
-* Fix crash when moving across on-adjacent monitors [Jonas; #783630]
-* Fix window moving/resizing via tablet tools [Jason; #777333]
-* Support fractional monitor scaling [Jonas, Marco; #765011]
-* Keep override-redirect windows stacked on top [Rui; #780485]
-* Implement tablet rings/strips configuration [Carlos; #782033]
-* Support tablet wheel events on wayland [Jason; #783716]
-* Move g-s-d xrandr functionality into mutter [Rui; #781906]
-* Misc. bug fixes [Florian, Jason, Miguel, Carlos, Jonas; #783502, #784009,
-  #784223, #784272, #784402, #784881, #762083, #784867, #781723]
-
-Contributors:
-  Jonas Ådahl, Miguel A. Vico, Emmanuele Bassi, Carlos Garnacho, Jason Gerecke,
-  Rui Matos, Florian Müllner, Marco Trevisan (Treviño)
-
-3.25.3
-======
-* Ignore hotplug-mode-update value on startup [Marco; #783073]
-* Implement configurable monitor scales on X11 [Jonas; #777732]
-* Fix handling of tiled monitors [Jonas; #781723]
-* Handle multiple keycodes for keysym [Christian; #781223]
-* Consider subsurfaces when grabbing [mindtree; #781811]
-* Fix logic for HiPDPI scaling of TV outputs [Christian; #777347]
-* Fix handling of left-handed mode on pen/eraser devices [Carlos; #782027]
-* Fix output cycling in non-display-attached tablets [Carlos; #782032]
-* Fix wacom cursor offset on wayland [Jason; #784009]
-* Handle EXIF orientation of backgrounds [Silvère; #783125]
-* Misc. bug fixes [Piotr, Tim, Bastien, Jonas, Florian, Benoit, Carlos; #772218,
-  #783161, #780407, #783113, #783293, #783505, #781703]
-
-Contributors:
-  mitchmindtree, Jonas Ådahl, Ikey Doherty, Piotr Drąg, Carlos Garnacho,
-  Jason Gerecke, Benoit Gschwind, Christian Kellner, Silvère Latchurié,
-  Tim Lunn, Florian Müllner, Bastien Nocera, Marco Trevisan (Treviño)
-
-Translations:
-  Fabio Tomat [fur], Kukuh Syafaat [id], Khaled Hosny [ar],
-  Daniel Mustieles [es]
-
-3.25.2
-======
-* Fix frame updates on hide-titlebar-when-maximized changes [Florian; #781862]
-* Fix accessible screen coordinates on X11 [Florian; #781902]
-* Use less CPU when rendering fast-updating windows [Carlos, Emmanuele; #782344]
-* Compute geometry of clients that don't set one explicitly [Olivier; #782213]
-* Fix copy+paste of UTF8 strings between X11 and wayland [Carlos; #782472]
-* Fix non-wayland builds [Chris; #780533]
-* Add plugin vfunc to implement a custom force-quit dialog [Carlos; #711619]
-* Fix swapped red and blue channels in CoglTexture data [Carlos; #779234
-* Fix build where libtool's link_all_deplibs defaults to 'no' [Marco; #782821]
-* Fix glitches when opening a window maximized [Olivier; #781353, #782183]
-* Fix wrong cursor after window underneath the pointer changed [Carlos; #755164]
-* Implement support for disable-while-typing option [Evan; #764852]
-* Emit size-change signal when tiling [Alessandro; #782968]
-* Misc. bug fixes [Nigel, Matthias, Jonas; #759085, #780215, #782156, #782152]
-
-Contributors:
-  Jonas Ådahl, Emmanuele Bassi, Alessandro Bono, Olivier Fourdan,
-  Carlos Garnacho, Matthias Liertzer, Florian Müllner, Nigel Taylor,
-  Marco Trevisan (Treviño), Chris Vine, Evan Welsh
-
-Translations:
-  Fabio Tomat [fur], Jordi Mas [ca], Mario Blättermann [de],
-  Emin Tufan Çetin [tr], Balázs Úr [hu]
-
 3.25.1
 ======
 * Always sync window geometry on state changes [Jonas; #780292]
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@ -87,8 +87,6 @@ source_h =					\
 	clutter-image.h		\
 	clutter-input-device.h	\
 	clutter-input-device-tool.h	\
-	clutter-input-focus.h	\
-	clutter-input-method.h	\
        clutter-interval.h            \
 	clutter-keyframe-transition.h	\
 	clutter-keysyms.h 		\
@ -171,8 +169,6 @@ source_c = \
 	clutter-image.c		\
 	clutter-input-device.c	\
 	clutter-input-device-tool.c	\
-	clutter-input-focus.c	\
-	clutter-input-method.c	\
 	clutter-virtual-input-device.c	\
 	clutter-interval.c            \
 	clutter-keyframe-transition.c	\
@ -233,8 +229,6 @@ source_h_priv = \
 	clutter-flatten-effect.h		\
 	clutter-gesture-action-private.h	\
 	clutter-id-pool.h 			\
-	clutter-input-focus-private.h		\
-	clutter-input-method-private.h		\
 	clutter-master-clock.h			\
 	clutter-master-clock-default.h		\
 	clutter-offscreen-effect-private.h	\
@ -394,7 +388,6 @@ x11_source_c = \
 	x11/clutter-keymap-x11.c		\
 	x11/clutter-stage-x11.c		\
 	x11/clutter-x11-texture-pixmap.c	\
-	x11/clutter-xkb-a11y-x11.c		\
 	$(NULL)

 x11_source_h = \
@ -409,7 +402,6 @@ x11_source_h_priv = \
 	x11/clutter-keymap-x11.h		\
 	x11/clutter-settings-x11.h		\
 	x11/clutter-stage-x11.h		\
-	x11/clutter-xkb-a11y-x11.h		\
 	$(NULL)

 x11_source_c_priv = \
@ -692,7 +684,7 @@ Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
-	--pkg-export=mutter-clutter-@LIBMUTTER_API_VERSION@ \
+	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
 	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir

 INTROSPECTION_GIRS += Cally-@LIBMUTTER_API_VERSION@.gir
--- a/clutter/clutter/Makefile.am.marshal
+++ b/clutter/clutter/Makefile.am.marshal
@ -34,7 +34,6 @@ stamp-marshal: $(marshal_list)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--header \
-		--valist-marshallers \
 	$(marshal_list) > xgen-mh \
 	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
 	&& rm -f xgen-mh \
@ -47,8 +46,6 @@ $(marshal_c): $(marshal_h)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--body \
-		--valist-marshallers \
-		--prototypes \
 	$(marshal_list) > xgen-mc \
 	&& (cmp -s xgen-mc $(marshal_c) || cp -f xgen-mc $(marshal_c)) \
 	&& rm -f xgen-mc
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@ -214,8 +214,6 @@ cally_util_simulate_snooper_install (void)
                    G_CALLBACK (cally_util_stage_added_cb), cally_key_snooper);
  g_signal_connect (G_OBJECT (stage_manager), "stage-removed",
                    G_CALLBACK (cally_util_stage_removed_cb), cally_key_snooper);
-
-  g_slist_free (stage_list);
 }

 static void
--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@ -283,9 +283,6 @@ void                            _clutter_actor_queue_redraw_full
                                                                                         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);

--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@ -1505,8 +1505,6 @@ clutter_actor_real_map (ClutterActor *self)

  CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);

-  self->priv->needs_paint_volume_update = TRUE;
-
  stage = _clutter_actor_get_stage_internal (self);
  priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);

@ -2622,6 +2620,7 @@ clutter_actor_real_allocate (ClutterActor           *self,
  g_object_freeze_notify (G_OBJECT (self));

  changed = clutter_actor_set_allocation_internal (self, box, flags);
+  priv->needs_paint_volume_update = changed;

  /* we allocate our children before we notify changes in our geometry,
   * so that people connecting to properties will be able to get valid
@ -2644,9 +2643,12 @@ clutter_actor_real_allocate (ClutterActor           *self,
 }

 static void
-_clutter_actor_signal_queue_redraw (ClutterActor *self,
-                                    ClutterActor *origin)
+_clutter_actor_propagate_queue_redraw (ClutterActor       *self,
+                                       ClutterActor       *origin,
+                                       ClutterPaintVolume *pv)
 {
+  gboolean stop = FALSE;
+
  /* no point in queuing a redraw on a destroyed actor */
  if (CLUTTER_ACTOR_IN_DESTRUCTION (self))
    return;
@ -2655,27 +2657,33 @@ _clutter_actor_signal_queue_redraw (ClutterActor *self,
   * the actor bas been cloned. In this case the clone will need to
   * receive the signal so it can queue its own redraw.
   */
+  while (self)
+    {
+      _clutter_actor_queue_redraw_on_clones (self);

-  _clutter_actor_queue_redraw_on_clones (self);
-
-  /* calls klass->queue_redraw in default handler */
-  if (g_signal_has_handler_pending (self, actor_signals[QUEUE_REDRAW],
+      /* calls klass->queue_redraw in default handler */
+      if (g_signal_has_handler_pending (self, actor_signals[QUEUE_REDRAW],
                                    0, TRUE))
-    {
-      g_signal_emit (self, actor_signals[QUEUE_REDRAW], 0, origin);
-    }
-  else
-    {
-      CLUTTER_ACTOR_GET_CLASS (self)->queue_redraw (self, origin);
+        {
+          g_signal_emit (self, actor_signals[QUEUE_REDRAW], 0, origin, pv, &stop);
+        }
+      else
+        {
+          stop = CLUTTER_ACTOR_GET_CLASS (self)->queue_redraw (self, origin, pv);
+        }
+
+      if (stop)
+        break;
+
+      self = clutter_actor_get_parent (self);
    }
 }

-static void
-clutter_actor_real_queue_redraw (ClutterActor *self,
-                                 ClutterActor *origin)
+static gboolean
+clutter_actor_real_queue_redraw (ClutterActor       *self,
+                                 ClutterActor       *origin,
+                                 ClutterPaintVolume *paint_volume)
 {
-  ClutterActor *parent;
-
  CLUTTER_NOTE (PAINT, "Redraw queued on '%s' (from: '%s')",
                _clutter_actor_get_debug_name (self),
                origin != NULL ? _clutter_actor_get_debug_name (origin)
@ -2683,13 +2691,14 @@ clutter_actor_real_queue_redraw (ClutterActor *self,

  /* no point in queuing a redraw on a destroyed actor */
  if (CLUTTER_ACTOR_IN_DESTRUCTION (self))
-    return;
+    return TRUE;

  /* If the queue redraw is coming from a child then the actor has
     become dirty and any queued effect is no longer valid */
  if (self != origin)
    {
      self->priv->is_dirty = TRUE;
+      self->priv->needs_paint_volume_update = TRUE;
      self->priv->effect_to_redraw = NULL;
    }

@ -2698,7 +2707,7 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
   * won't change so we don't have to propagate up the hierarchy.
   */
  if (!CLUTTER_ACTOR_IS_VISIBLE (self))
-    return;
+    return TRUE;

  /* Although we could determine here that a full stage redraw
   * has already been queued and immediately bail out, we actually
@ -2712,7 +2721,7 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
      ClutterActor *stage = _clutter_actor_get_stage_internal (self);
      if (stage != NULL &&
          _clutter_stage_has_full_redraw_queued (CLUTTER_STAGE (stage)))
-        return;
+        return TRUE;
    }

  self->priv->propagated_one_redraw = TRUE;
@ -2720,12 +2729,7 @@ clutter_actor_real_queue_redraw (ClutterActor *self,
  /* notify parents, if they are all visible eventually we'll
   * queue redraw on the stage, which queues the redraw idle.
   */
-  parent = clutter_actor_get_parent (self);
-  if (parent != NULL)
-    {
-      /* this will go up recursively */
-      _clutter_actor_signal_queue_redraw (parent, origin);
-    }
+  return FALSE;
 }

 static void
@ -2740,7 +2744,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self)
  priv->needs_width_request  = TRUE;
  priv->needs_height_request = TRUE;
  priv->needs_allocation     = TRUE;
-  priv->needs_paint_volume_update = TRUE;

  /* reset the cached size requests */
  memset (priv->width_requests, 0,
@ -2825,7 +2828,7 @@ _clutter_actor_fully_transform_vertices (ClutterActor *self,
  /* Note: we pass NULL as the ancestor because we don't just want the modelview
   * that gets us to stage coordinates, we want to go all the way to eye
   * coordinates */
-  _clutter_actor_get_relative_transformation_matrix (self, NULL, &modelview);
+  _clutter_actor_apply_relative_transformation_matrix (self, NULL, &modelview);

  /* Fetch the projection and viewport */
  _clutter_stage_get_projection_matrix (CLUTTER_STAGE (stage), &projection);
@ -4832,7 +4835,8 @@ clutter_actor_set_scale_factor (ClutterActor      *self,
  g_assert (pspec != NULL);
  g_assert (scale_p != NULL);

-  _clutter_actor_create_transition (self, pspec, *scale_p, factor);
+  if (*scale_p != factor)
+    _clutter_actor_create_transition (self, pspec, *scale_p, factor);
 }

 static inline void
@ -8014,10 +8018,12 @@ clutter_actor_class_init (ClutterActorClass *klass)
 		  G_SIGNAL_RUN_LAST |
                  G_SIGNAL_NO_HOOKS,
 		  G_STRUCT_OFFSET (ClutterActorClass, queue_redraw),
-		  NULL, NULL,
-		  _clutter_marshal_VOID__OBJECT,
-		  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_ACTOR);
+                  g_signal_accumulator_true_handled,
+		  NULL,
+		  _clutter_marshal_BOOLEAN__OBJECT_BOXED,
+		  G_TYPE_BOOLEAN, 2,
+                  CLUTTER_TYPE_ACTOR,
+                  CLUTTER_TYPE_PAINT_VOLUME);

  /**
   * ClutterActor::queue-relayout:
@ -8616,8 +8622,7 @@ _clutter_actor_finish_queue_redraw (ClutterActor *self,
                                    ClutterPaintVolume *clip)
 {
  ClutterActorPrivate *priv = self->priv;
-  ClutterPaintVolume *pv;
-  gboolean clipped;
+  ClutterPaintVolume *pv = NULL;

  /* Remove queue entry early in the process, otherwise a new
     queue_redraw() during signal handling could put back this
@ -8644,8 +8649,7 @@ _clutter_actor_finish_queue_redraw (ClutterActor *self,
   */
  if (clip)
    {
-      _clutter_actor_set_queue_redraw_clip (self, clip);
-      clipped = TRUE;
+      pv = clip;
    }
  else if (G_LIKELY (priv->last_paint_volume_valid))
    {
@ -8655,36 +8659,12 @@ _clutter_actor_finish_queue_redraw (ClutterActor *self,
          ClutterActor *stage = _clutter_actor_get_stage_internal (self);

          /* make sure we redraw the actors old position... */
-          _clutter_actor_set_queue_redraw_clip (stage,
-                                                &priv->last_paint_volume);
-          _clutter_actor_signal_queue_redraw (stage, stage);
-          _clutter_actor_set_queue_redraw_clip (stage, NULL);
-
-          /* XXX: Ideally the redraw signal would take a clip volume
-           * argument, but that would be an ABI break. Until we can
-           * break the ABI we pass the argument out-of-band
-           */
-
-          /* setup the clip for the actors new position... */
-          _clutter_actor_set_queue_redraw_clip (self, pv);
-          clipped = TRUE;
+          _clutter_actor_propagate_queue_redraw (stage, stage,
+                                                 &priv->last_paint_volume);
        }
-      else
-        clipped = FALSE;
    }
-  else
-    clipped = FALSE;

-  _clutter_actor_signal_queue_redraw (self, self);
-
-  /* Just in case anyone is manually firing redraw signals without
-   * using the public queue_redraw() API we are careful to ensure that
-   * our out-of-band clip member is cleared before returning...
-   *
-   * Note: A NULL clip denotes a full-stage, un-clipped redraw
-   */
-  if (G_LIKELY (clipped))
-    _clutter_actor_set_queue_redraw_clip (self, NULL);
+  _clutter_actor_propagate_queue_redraw (self, self, pv);
 }

 static void
@ -8845,8 +8825,7 @@ _clutter_actor_queue_redraw_full (ClutterActor       *self,
        {
          /* NB: NULL denotes an undefined clip which will result in a
           * full redraw... */
-          _clutter_actor_set_queue_redraw_clip (self, NULL);
-          _clutter_actor_signal_queue_redraw (self, self);
+          _clutter_actor_propagate_queue_redraw (self, self, NULL);
          return;
        }

@ -8920,6 +8899,7 @@ _clutter_actor_queue_redraw_full (ClutterActor       *self,
    }

  priv->is_dirty = TRUE;
+  priv->needs_paint_volume_update = TRUE;
 }

 /**
@ -10089,9 +10069,6 @@ clutter_actor_allocate (ClutterActor           *self,
      return;
    }

-  if (CLUTTER_ACTOR_IS_MAPPED (self))
-    self->priv->needs_paint_volume_update = TRUE;
-
  if (!stage_allocation_changed)
    {
      /* If the actor didn't move but needs_allocation is set, we just
@ -10271,9 +10248,10 @@ clutter_actor_set_position (ClutterActor *self,
  cur_position.x = clutter_actor_get_x (self);
  cur_position.y = clutter_actor_get_y (self);

-  _clutter_actor_create_transition (self, obj_props[PROP_POSITION],
-                                    &cur_position,
-                                    &new_position);
+  if (!clutter_point_equals (&cur_position, &new_position))
+    _clutter_actor_create_transition (self, obj_props[PROP_POSITION],
+                                      &cur_position,
+                                      &new_position);
 }

 /**
@ -12979,9 +12957,7 @@ clutter_actor_add_child_internal (ClutterActor              *self,
      child->priv->needs_width_request = TRUE;
      child->priv->needs_height_request = TRUE;
      child->priv->needs_allocation = TRUE;
-
-      if (CLUTTER_ACTOR_IS_MAPPED (child))
-        child->priv->needs_paint_volume_update = TRUE;
+      child->priv->needs_paint_volume_update = TRUE;

      /* we only queue a relayout here, because any possible
       * redraw has already been queued either by show() or
@ -16659,26 +16635,6 @@ clutter_actor_has_pointer (ClutterActor *self)
  return self->priv->has_pointer;
 }

-/* XXX: This is a workaround for not being able to break the ABI of
- * the QUEUE_REDRAW signal. It is an out-of-band argument.  See
- * clutter_actor_queue_clipped_redraw() for details.
- */
-ClutterPaintVolume *
-_clutter_actor_get_queue_redraw_clip (ClutterActor *self)
-{
-  return g_object_get_data (G_OBJECT (self),
-                            "-clutter-actor-queue-redraw-clip");
-}
-
-void
-_clutter_actor_set_queue_redraw_clip (ClutterActor       *self,
-                                      ClutterPaintVolume *clip)
-{
-  g_object_set_data (G_OBJECT (self),
-                     "-clutter-actor-queue-redraw-clip",
-                     clip);
-}
-
 /**
 * clutter_actor_has_allocation:
 * @self: a #ClutterActor
@ -17540,6 +17496,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
  else
    {
      priv->paint_volume_valid = FALSE;
+      priv->needs_paint_volume_update = FALSE;
      return NULL;
    }
 }
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@ -236,8 +236,9 @@ struct _ClutterActorClass
  void (* pick)                 (ClutterActor          *actor,
                                 const ClutterColor    *color);

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

  /* size negotiation */
  void (* get_preferred_width)  (ClutterActor           *self,
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@ -58,8 +58,6 @@ struct _ClutterBackend
  gint32 units_serial;

  GList *event_translators;
-
-  ClutterInputMethod *input_method;
 };

 struct _ClutterBackendClass
@ -102,8 +100,6 @@ struct _ClutterBackendClass

  PangoDirection        (* get_keymap_direction) (ClutterBackend   *backend);

-  void                  (* bell_notify)          (ClutterBackend   *backend);
-
  /* signals */
  void (* resolution_changed) (ClutterBackend *backend);
  void (* font_changed)       (ClutterBackend *backend);
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@ -127,7 +127,6 @@ clutter_backend_finalize (GObject *gobject)

  g_free (backend->font_name);
  clutter_backend_set_font_options (backend, NULL);
-  g_clear_object (&backend->input_method);

  G_OBJECT_CLASS (clutter_backend_parent_class)->finalize (gobject);
 }
@ -1364,41 +1363,3 @@ clutter_set_allowed_drivers (const char *drivers)

  allowed_drivers = g_strdup (drivers);
 }
-
-void
-clutter_backend_bell_notify (ClutterBackend *backend)
-{
-  ClutterBackendClass *klass;
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->bell_notify)
-    klass->bell_notify (backend);
-}
-
-/**
- * clutter_backend_get_input_method:
- * @backend: the #CLutterBackend
- *
- * Returns the input method used by Clutter
- *
- * Returns: (transfer none): the input method
- **/
-ClutterInputMethod *
-clutter_backend_get_input_method (ClutterBackend *backend)
-{
-  return backend->input_method;
-}
-
-/**
- * clutter_backend_set_input_method:
- * @backend: the #ClutterBackend
- * @method: the input method
- *
- * Sets the input method to be used by Clutter
- **/
-void
-clutter_backend_set_input_method (ClutterBackend     *backend,
-                                  ClutterInputMethod *method)
-{
-  g_set_object (&backend->input_method, method);
-}
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@ -74,15 +74,6 @@ const cairo_font_options_t *    clutter_backend_get_font_options        (Clutter
 CLUTTER_AVAILABLE_IN_1_8
 CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);

-CLUTTER_AVAILABLE_IN_ALL
-void                            clutter_backend_bell_notify             (ClutterBackend             *backend);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputMethod *            clutter_backend_get_input_method        (ClutterBackend             *backend);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void                            clutter_backend_set_input_method        (ClutterBackend             *backend,
-                                                                         ClutterInputMethod         *method);
 G_END_DECLS

 #endif /* __CLUTTER_BACKEND_H__ */
--- a/clutter/clutter/clutter-bezier.c
+++ b/clutter/clutter/clutter-bezier.c
@ -324,7 +324,7 @@ _clutter_bezier_init (ClutterBezier *b,
   * triggers, we need to change those two functions a bit.
   */
  if (b->ax > 0x1fff || b->bx > 0x1fff || b->cx > 0x1fff)
-    g_warning ("Calculated coefficients will result in multiplication "
+    g_warning ("Calculated coefficents will result in multiplication "
               "overflow in clutter_bezier_t2x and clutter_bezier_t2y.");

  /*
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@ -145,9 +145,6 @@ struct _ClutterInputDevice
  guint is_enabled : 1;
 };

-typedef void (*ClutterEmitInputDeviceEvent) (ClutterEvent       *event,
-                                             ClutterInputDevice *device);
-
 struct _ClutterInputDeviceClass
 {
  GObjectClass parent_class;
@ -166,11 +163,6 @@ struct _ClutterInputDeviceClass

  gboolean (* is_grouped) (ClutterInputDevice *device,
                           ClutterInputDevice *other_device);
-
-  /* Keyboard accessbility */
-  void (* process_kbd_a11y_event) (ClutterEvent               *event,
-                                   ClutterInputDevice         *device,
-                                   ClutterEmitInputDeviceEvent emit_event_func);
 };

 /* Platform-dependent interface */
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@ -54,9 +54,6 @@ struct _ClutterDeviceManagerPrivate
 {
  /* back-pointer to the backend */
  ClutterBackend *backend;
-
-  /* Keyboard a11y */
-  ClutterKbdA11ySettings kbd_a11y_settings;
 };

 enum
@ -75,8 +72,6 @@ enum
  DEVICE_ADDED,
  DEVICE_REMOVED,
  TOOL_CHANGED,
-  KBD_A11Y_MASK_CHANGED,
-  KBD_A11Y_FLAGS_CHANGED,

  LAST_SIGNAL
 };
@ -201,46 +196,6 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                  G_TYPE_NONE, 2,
                  CLUTTER_TYPE_INPUT_DEVICE,
                  CLUTTER_TYPE_INPUT_DEVICE_TOOL);
-
-  /**
-   * ClutterDeviceManager::kbd-a11y-mods-state-changed:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @latched_mask: the latched modifier mask from stickykeys
-   * @locked_mask:  the locked modifier mask from stickykeys
-   *
-   * The ::kbd-a11y-mods-state-changed signal is emitted each time either the
-   * latched modifiers mask or locked modifiers mask are changed as the
-   * result of keyboard accessibilty's sticky keys operations.
-   */
-  manager_signals[KBD_A11Y_MASK_CHANGED] =
-    g_signal_new (I_("kbd-a11y-mods-state-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__UINT_UINT,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_UINT,
-                  G_TYPE_UINT);
-
-  /**
-   * ClutterDeviceManager::kbd-a11y-flags-changed:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @settings_flags: the new ClutterKeyboardA11yFlags configuration
-   * @changed_mask: the ClutterKeyboardA11yFlags changed
-   *
-   * The ::kbd-a11y-flags-changed signal is emitted each time the
-   * ClutterKeyboardA11yFlags configuration is changed as the result of
-   * keyboard accessibilty operations.
-   */
-  manager_signals[KBD_A11Y_FLAGS_CHANGED] =
-    g_signal_new (I_("kbd-a11y-flags-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__UINT_UINT,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_UINT,
-                  G_TYPE_UINT);
 }

 static void
@ -516,21 +471,6 @@ clutter_device_manager_create_virtual_device (ClutterDeviceManager   *device_man
                                               device_type);
 }

-/**
- * clutter_device_manager_supported_virtua_device_types: (skip)
- */
-ClutterVirtualDeviceType
-clutter_device_manager_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_val_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager),
-                        CLUTTER_VIRTUAL_DEVICE_TYPE_NONE);
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  return manager_class->get_supported_virtual_device_types (device_manager);
-}
-
 void
 _clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,
                                         ClutterEvent         *event,
@ -547,43 +487,3 @@ _clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,

  manager_class->compress_motion (device_manager, event, to_discard);
 }
-
-static gboolean
-are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
-                             ClutterKbdA11ySettings *b)
-{
-  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
-clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                              ClutterKbdA11ySettings *settings)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  if (are_kbd_a11y_settings_equal (&device_manager->priv->kbd_a11y_settings, settings))
-    return;
-
-  device_manager->priv->kbd_a11y_settings = *settings;
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  if (manager_class->apply_kbd_a11y_settings)
-    manager_class->apply_kbd_a11y_settings (device_manager, settings);
-}
-
-void
-clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                              ClutterKbdA11ySettings *settings)
-{
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  *settings = device_manager->priv->kbd_a11y_settings;
-}
--- a/clutter/clutter/clutter-device-manager.h
+++ b/clutter/clutter/clutter-device-manager.h
@ -44,35 +44,6 @@ typedef struct _ClutterDeviceManager            ClutterDeviceManager;
 typedef struct _ClutterDeviceManagerPrivate     ClutterDeviceManagerPrivate;
 typedef struct _ClutterDeviceManagerClass       ClutterDeviceManagerClass;

-/**
- * ClutterVirtualDeviceType:
- */
-typedef enum _ClutterVirtualDeviceType
-{
-  CLUTTER_VIRTUAL_DEVICE_TYPE_NONE = 0,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD = 1 << 0,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER = 1 << 1,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_TOUCHSCREEN = 1 << 2,
-} ClutterVirtualDeviceType;
-
-/**
- * ClutterKbdA11ySettings:
- *
- * The #ClutterKbdA11ySettings structure contains keyboard accessibility
- * settings
- *
- */
-typedef struct _ClutterKbdA11ySettings
-{
-  ClutterKeyboardA11yFlags controls;
-  gint slowkeys_delay;
-  gint debounce_delay;
-  gint timeout_delay;
-  gint mousekeys_init_delay;
-  gint mousekeys_max_speed;
-  gint mousekeys_accel_time;
-} ClutterKbdA11ySettings;
-
 /**
 * ClutterDeviceManager:
 *
@ -114,13 +85,10 @@ struct _ClutterDeviceManagerClass
                                               ClutterStage       *stage);
  ClutterVirtualInputDevice *(* create_virtual_device) (ClutterDeviceManager  *device_manager,
                                                        ClutterInputDeviceType device_type);
-  ClutterVirtualDeviceType (* get_supported_virtual_device_types) (ClutterDeviceManager *device_manager);
  void                (* compress_motion) (ClutterDeviceManager *device_manger,
                                           ClutterEvent         *event,
                                           const ClutterEvent   *to_discard);
-  /* Keyboard accessbility */
-  void                (* apply_kbd_a11y_settings) (ClutterDeviceManager   *device_manger,
-                                                   ClutterKbdA11ySettings *settings);
+
  /* padding */
  gpointer _padding[6];
 };
@ -146,16 +114,6 @@ CLUTTER_AVAILABLE_IN_ALL
 ClutterVirtualInputDevice *clutter_device_manager_create_virtual_device (ClutterDeviceManager  *device_manager,
                                                                         ClutterInputDeviceType device_type);

-CLUTTER_AVAILABLE_IN_ALL
-ClutterVirtualDeviceType clutter_device_manager_get_supported_virtual_device_types (ClutterDeviceManager *device_manager);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                   ClutterKbdA11ySettings *settings);
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                   ClutterKbdA11ySettings *settings);
-
 G_END_DECLS

 #endif /* __CLUTTER_DEVICE_MANAGER_H__ */
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@ -396,43 +396,6 @@ typedef enum {
  CLUTTER_MODIFIER_MASK = 0x5c001fff
 } ClutterModifierType;

-/**
- * ClutterKeyboardA11yFlags:
- * @CLUTTER_A11Y_KEYBOARD_ENABLED:
- * @CLUTTER_A11Y_TIMEOUT_ENABLED:
- * @CLUTTER_A11Y_MOUSE_KEYS_ENABLED:
- * @CLUTTER_A11Y_SLOW_KEYS_ENABLED:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT:
- * @CLUTTER_A11Y_BOUNCE_KEYS_ENABLED:
- * @CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT:
- * @CLUTTER_A11Y_TOGGLE_KEYS_ENABLED:
- * @CLUTTER_A11Y_STICKY_KEYS_ENABLED:
- * @CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF:
- * @CLUTTER_A11Y_STICKY_KEYS_BEEP:
- * @CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP:
- *
- * Keyboard accessibility features applied to a ClutterInputDevice keyboard.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_KEYBOARD_ENABLED          = 1 << 0,
-  CLUTTER_A11Y_TIMEOUT_ENABLED           = 1 << 1,
-  CLUTTER_A11Y_MOUSE_KEYS_ENABLED        = 1 << 2,
-  CLUTTER_A11Y_SLOW_KEYS_ENABLED         = 1 << 3,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS      = 1 << 4,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT     = 1 << 5,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT     = 1 << 6,
-  CLUTTER_A11Y_BOUNCE_KEYS_ENABLED       = 1 << 7,
-  CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT   = 1 << 8,
-  CLUTTER_A11Y_TOGGLE_KEYS_ENABLED       = 1 << 9,
-  CLUTTER_A11Y_STICKY_KEYS_ENABLED       = 1 << 10,
-  CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF   = 1 << 11,
-  CLUTTER_A11Y_STICKY_KEYS_BEEP          = 1 << 12,
-  CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP = 1 << 13,
-} ClutterKeyboardA11yFlags;
-
 /**
 * ClutterActorFlags:
 * @CLUTTER_ACTOR_MAPPED: the actor will be painted (is visible, and inside
@ -767,9 +730,8 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
 * Since: 0.6
 */
 typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
-  CLUTTER_EVENT_NONE              = 0,
-  CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
-  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1
+  CLUTTER_EVENT_NONE           = 0,
+  CLUTTER_EVENT_FLAG_SYNTHETIC = 1 << 0
 } ClutterEventFlags;

 /**
@ -1574,41 +1536,6 @@ typedef enum {
  CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE,
 } ClutterInputDeviceMapping;

-typedef enum {
-  CLUTTER_INPUT_CONTENT_HINT_COMPLETION          = 1 << 0,
-  CLUTTER_INPUT_CONTENT_HINT_SPELLCHECK          = 1 << 1,
-  CLUTTER_INPUT_CONTENT_HINT_AUTO_CAPITALIZATION = 1 << 2,
-  CLUTTER_INPUT_CONTENT_HINT_LOWERCASE           = 1 << 3,
-  CLUTTER_INPUT_CONTENT_HINT_UPPERCASE           = 1 << 4,
-  CLUTTER_INPUT_CONTENT_HINT_TITLECASE           = 1 << 5,
-  CLUTTER_INPUT_CONTENT_HINT_HIDDEN_TEXT         = 1 << 6,
-  CLUTTER_INPUT_CONTENT_HINT_SENSITIVE_DATA      = 1 << 7,
-  CLUTTER_INPUT_CONTENT_HINT_LATIN               = 1 << 8,
-  CLUTTER_INPUT_CONTENT_HINT_MULTILINE           = 1 << 9,
-} ClutterInputContentHintFlags;
-
-typedef enum {
-  CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_ALPHA,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DIGITS,
-  CLUTTER_INPUT_CONTENT_PURPOSE_NUMBER,
-  CLUTTER_INPUT_CONTENT_PURPOSE_PHONE,
-  CLUTTER_INPUT_CONTENT_PURPOSE_URL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_EMAIL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_NAME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_PASSWORD,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DATE,
-  CLUTTER_INPUT_CONTENT_PURPOSE_TIME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DATETIME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_TERMINAL,
-} ClutterInputContentPurpose;
-
-typedef enum {
-  CLUTTER_INPUT_PANEL_STATE_OFF,
-  CLUTTER_INPUT_PANEL_STATE_ON,
-  CLUTTER_INPUT_PANEL_STATE_TOGGLE,
-} ClutterInputPanelState;
-
 G_END_DECLS

 #endif /* __CLUTTER_ENUMS_H__ */
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@ -2179,61 +2179,3 @@ clutter_event_get_mode_group (const ClutterEvent *event)
      return 0;
    }
 }
-
-/**
- * clutter_event_get_pad_event_details:
- * @event: a pad event
- * @number: (out) (optional): ring/strip/button number
- * @mode: (out) (optional): pad mode as per the event
- * @value: (out) (optional): event axis value
- *
- * Returns the details of a pad event.
- *
- * Returns: #TRUE if event details could be obtained
- **/
-gboolean
-clutter_event_get_pad_event_details (const ClutterEvent *event,
-                                     guint              *number,
-                                     guint              *mode,
-                                     gdouble            *value)
-{
-  guint n, m;
-  gdouble v;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-  g_return_val_if_fail (event->type == CLUTTER_PAD_BUTTON_PRESS ||
-                        event->type == CLUTTER_PAD_BUTTON_RELEASE ||
-                        event->type == CLUTTER_PAD_RING ||
-                        event->type == CLUTTER_PAD_STRIP, FALSE);
-
-  switch (event->type)
-    {
-    case CLUTTER_PAD_BUTTON_PRESS:
-    case CLUTTER_PAD_BUTTON_RELEASE:
-      n = event->pad_button.button;
-      m = event->pad_button.mode;
-      v = 0.0;
-      break;
-    case CLUTTER_PAD_RING:
-      n = event->pad_ring.ring_number;
-      m = event->pad_ring.mode;
-      v = event->pad_ring.angle;
-      break;
-    case CLUTTER_PAD_STRIP:
-      n = event->pad_strip.strip_number;
-      m = event->pad_strip.mode;
-      v = event->pad_strip.value;
-      break;
-    default:
-      return FALSE;
-    }
-
-  if (number)
-    *number = n;
-  if (mode)
-    *mode = m;
-  if (value)
-    *value = v;
-
-  return TRUE;
-}
--- a/clutter/clutter/clutter-event.h
+++ b/clutter/clutter/clutter-event.h
@ -778,12 +778,6 @@ ClutterScrollFinishFlags clutter_event_get_scroll_finish_flags       (const Clut
 CLUTTER_AVAILABLE_IN_ALL
 guint                    clutter_event_get_mode_group                (const ClutterEvent     *event);

-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean                 clutter_event_get_pad_event_details         (const ClutterEvent     *event,
-                                                                      guint                  *number,
-                                                                      guint                  *mode,
-                                                                      gdouble                *value);
-

 G_END_DECLS

--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@ -2243,15 +2243,10 @@ clutter_input_device_get_device_node (ClutterInputDevice *device)
 ClutterInputDeviceMapping
 clutter_input_device_get_mapping_mode (ClutterInputDevice *device)
 {
-  ClutterInputDeviceType device_type;
-
  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device),
                        CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);
-
-  device_type = clutter_input_device_get_device_type (device);
-  g_return_val_if_fail (device_type == CLUTTER_TABLET_DEVICE ||
-                        device_type == CLUTTER_PEN_DEVICE ||
-                        device_type == CLUTTER_ERASER_DEVICE,
+  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
+                        CLUTTER_TABLET_DEVICE,
                        CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);

  return device->mapping_mode;
@ -2261,14 +2256,9 @@ void
 clutter_input_device_set_mapping_mode (ClutterInputDevice        *device,
                                       ClutterInputDeviceMapping  mapping)
 {
-  ClutterInputDeviceType device_type;
-
  g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
-
-  device_type = clutter_input_device_get_device_type (device);
-  g_return_if_fail (device_type == CLUTTER_TABLET_DEVICE ||
-                    device_type == CLUTTER_PEN_DEVICE ||
-                    device_type == CLUTTER_ERASER_DEVICE);
+  g_return_if_fail (clutter_input_device_get_device_type (device) ==
+                    CLUTTER_TABLET_DEVICE);

  if (device->mapping_mode == mapping)
    return;
--- a/clutter/clutter/clutter-input-focus-private.h
+++ b/clutter/clutter/clutter-input-focus-private.h
@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_FOCUS_PRIVATE_H__
-#define __CLUTTER_INPUT_FOCUS_PRIVATE_H__
-
-void clutter_input_focus_focus_in  (ClutterInputFocus  *focus,
-                                    ClutterInputMethod *method);
-void clutter_input_focus_focus_out (ClutterInputFocus  *focus);
-
-void clutter_input_focus_commit (ClutterInputFocus *focus,
-                                 const gchar       *text);
-void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                             guint              offset,
-                                             guint              len);
-void clutter_input_focus_request_surrounding (ClutterInputFocus *focus);
-
-void clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                           const gchar       *preedit,
-                                           guint              cursor);
-
-#endif /* __CLUTTER_INPUT_FOCUS_PRIVATE_H__ */
--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter/clutter-input-focus.h"
-#include "clutter/clutter-input-focus-private.h"
-#include "clutter/clutter-input-method-private.h"
-
-typedef struct _ClutterInputFocusPrivate ClutterInputFocusPrivate;
-
-struct _ClutterInputFocusPrivate
-{
-  ClutterInputMethod *im;
-};
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterInputFocus, clutter_input_focus, G_TYPE_OBJECT)
-
-static void
-clutter_input_focus_real_focus_in (ClutterInputFocus  *focus,
-                                   ClutterInputMethod *im)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-  priv->im = im;
-}
-
-static void
-clutter_input_focus_real_focus_out (ClutterInputFocus  *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-  priv->im = NULL;
-}
-
-static void
-clutter_input_focus_class_init (ClutterInputFocusClass *klass)
-{
-  klass->focus_in = clutter_input_focus_real_focus_in;
-  klass->focus_out = clutter_input_focus_real_focus_out;
-}
-
-static void
-clutter_input_focus_init (ClutterInputFocus *focus)
-{
-}
-
-gboolean
-clutter_input_focus_is_focused (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  return !!priv->im;
-}
-
-void
-clutter_input_focus_reset (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_reset (priv->im);
-}
-
-void
-clutter_input_focus_set_cursor_location (ClutterInputFocus *focus,
-                                         const ClutterRect *rect)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_cursor_location (priv->im, rect);
-}
-
-void
-clutter_input_focus_set_surrounding (ClutterInputFocus *focus,
-                                     const gchar       *text,
-                                     guint              cursor,
-                                     guint              anchor)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_surrounding (priv->im, text, cursor, anchor);
-}
-
-void
-clutter_input_focus_set_content_hints (ClutterInputFocus            *focus,
-                                       ClutterInputContentHintFlags  hints)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_content_hints (priv->im, hints);
-}
-
-void
-clutter_input_focus_set_content_purpose (ClutterInputFocus          *focus,
-                                         ClutterInputContentPurpose  purpose)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_content_purpose (priv->im, purpose);
-}
-
-gboolean
-clutter_input_focus_filter_key_event (ClutterInputFocus     *focus,
-                                      const ClutterKeyEvent *key)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_FOCUS (focus), FALSE);
-  g_return_val_if_fail (clutter_input_focus_is_focused (focus), FALSE);
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  return clutter_input_method_filter_key_event (priv->im, key);
-}
-
-void
-clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
-                                          gboolean           can_show_preedit)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_can_show_preedit (priv->im, can_show_preedit);
-}
-
-void
-clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_toggle_input_panel (priv->im);
-}
-
-void
-clutter_input_focus_focus_in (ClutterInputFocus  *focus,
-                              ClutterInputMethod *im)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->focus_in (focus, im);
-}
-
-void
-clutter_input_focus_focus_out (ClutterInputFocus  *focus)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->focus_out (focus);
-}
-
-void
-clutter_input_focus_commit (ClutterInputFocus *focus,
-                            const gchar       *text)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->commit_text (focus, text);
-}
-
-void
-clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                        guint              offset,
-                                        guint              len)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->delete_surrounding (focus, offset, len);
-}
-
-void
-clutter_input_focus_request_surrounding (ClutterInputFocus *focus)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->request_surrounding (focus);
-}
-
-void
-clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                      const gchar       *preedit,
-                                      guint              cursor)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->set_preedit_text (focus, preedit, cursor);
-}
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_FOCUS_H__
-#define __CLUTTER_INPUT_FOCUS_H__
-
-#include <clutter/clutter.h>
-
-#define CLUTTER_TYPE_INPUT_FOCUS (clutter_input_focus_get_type ())
-
-CLUTTER_AVAILABLE_IN_MUTTER
-G_DECLARE_DERIVABLE_TYPE (ClutterInputFocus, clutter_input_focus,
-                          CLUTTER, INPUT_FOCUS, GObject)
-
-struct _ClutterInputFocusClass
-{
-  GObjectClass parent_class;
-  GTypeInterface iface;
-
-  void (* focus_in)  (ClutterInputFocus  *focus,
-                      ClutterInputMethod *input_method);
-  void (* focus_out) (ClutterInputFocus  *focus);
-
-  void (* request_surrounding) (ClutterInputFocus *focus);
-  void (* delete_surrounding)  (ClutterInputFocus *focus,
-                                guint              offset,
-                                guint              len);
-  void (* commit_text) (ClutterInputFocus *focus,
-                        const gchar       *text);
-
-  void (* set_preedit_text) (ClutterInputFocus *focus,
-                             const gchar       *preedit,
-                             guint              cursor);
-};
-
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean clutter_input_focus_is_focused (ClutterInputFocus *focus);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_reset (ClutterInputFocus *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_cursor_location (ClutterInputFocus *focus,
-                                              const ClutterRect *rect);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_surrounding (ClutterInputFocus *focus,
-                                          const gchar       *text,
-                                          guint              cursor,
-                                          guint              anchor);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_content_hints (ClutterInputFocus            *focus,
-                                            ClutterInputContentHintFlags  hint);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_content_purpose (ClutterInputFocus          *focus,
-                                              ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean clutter_input_focus_filter_key_event (ClutterInputFocus     *focus,
-                                               const ClutterKeyEvent *key);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
-                                               gboolean           can_show_preedit);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus);
-
-#endif /* __CLUTTER_INPUT_FOCUS_H__ */
--- a/clutter/clutter/clutter-input-method-private.h
+++ b/clutter/clutter/clutter-input-method-private.h
@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_METHOD_PRIVATE_H__
-#define __CLUTTER_INPUT_METHOD_PRIVATE_H__
-
-ClutterInputFocus * clutter_input_method_get_focus (ClutterInputMethod *method);
-
-void clutter_input_method_reset               (ClutterInputMethod *method);
-
-void clutter_input_method_set_cursor_location (ClutterInputMethod *method,
-                                               const ClutterRect  *rect);
-void clutter_input_method_set_surrounding     (ClutterInputMethod *method,
-                                               const gchar        *text,
-                                               guint               cursor,
-                                               guint               anchor);
-void clutter_input_method_set_content_hints   (ClutterInputMethod           *method,
-                                               ClutterInputContentHintFlags  hints);
-void clutter_input_method_set_content_purpose (ClutterInputMethod         *method,
-                                               ClutterInputContentPurpose  purpose);
-void clutter_input_method_set_can_show_preedit (ClutterInputMethod *method,
-                                                gboolean            can_show_preedit);
-gboolean clutter_input_method_filter_key_event (ClutterInputMethod    *method,
-                                                const ClutterKeyEvent *key);
-
-void clutter_input_method_toggle_input_panel (ClutterInputMethod *method);
-
-#endif /* __CLUTTER_INPUT_METHOD_PRIVATE_H__ */
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@ -1,444 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-private.h"
-#include "clutter/clutter-input-method.h"
-#include "clutter/clutter-input-method-private.h"
-#include "clutter/clutter-input-focus-private.h"
-
-typedef struct _ClutterInputMethodPrivate ClutterInputMethodPrivate;
-
-struct _ClutterInputMethodPrivate
-{
-  ClutterInputFocus *focus;
-  ClutterInputContentHintFlags content_hints;
-  ClutterInputContentPurpose content_purpose;
-  gboolean can_show_preedit;
-};
-
-enum {
-  COMMIT,
-  DELETE_SURROUNDING,
-  REQUEST_SURROUNDING,
-  INPUT_PANEL_STATE,
-  CURSOR_LOCATION_CHANGED,
-  N_SIGNALS,
-};
-
-enum {
-  PROP_0,
-  PROP_CONTENT_HINTS,
-  PROP_CONTENT_PURPOSE,
-  PROP_CAN_SHOW_PREEDIT,
-  N_PROPS
-};
-
-static guint signals[N_SIGNALS] = { 0 };
-static GParamSpec *pspecs[N_PROPS] = { 0 };
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterInputMethod, clutter_input_method, G_TYPE_OBJECT)
-
-static void
-set_content_hints (ClutterInputMethod           *im,
-                   ClutterInputContentHintFlags  content_hints)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->content_hints = content_hints;
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->update_content_hints (im, content_hints);
-}
-
-static void
-set_content_purpose (ClutterInputMethod         *im,
-                     ClutterInputContentPurpose  content_purpose)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->content_purpose = content_purpose;
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->update_content_purpose (im,
-                                                               content_purpose);
-}
-
-static void
-set_can_show_preedit (ClutterInputMethod *im,
-                      gboolean            can_show_preedit)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->can_show_preedit = can_show_preedit;
-}
-
-static void
-clutter_input_method_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-{
-  switch (prop_id)
-    {
-    case PROP_CONTENT_HINTS:
-      set_content_hints (CLUTTER_INPUT_METHOD (object),
-                         g_value_get_flags (value));
-      break;
-    case PROP_CONTENT_PURPOSE:
-      set_content_purpose (CLUTTER_INPUT_METHOD (object),
-                           g_value_get_enum (value));
-      break;
-    case PROP_CAN_SHOW_PREEDIT:
-      set_can_show_preedit (CLUTTER_INPUT_METHOD (object),
-                            g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_input_method_get_property (GObject    *object,
-                                   guint       prop_id,
-                                   GValue     *value,
-                                   GParamSpec *pspec)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethod *im;
-
-  im = CLUTTER_INPUT_METHOD (object);
-  priv = clutter_input_method_get_instance_private (im);
-
-  switch (prop_id)
-    {
-    case PROP_CONTENT_HINTS:
-      g_value_set_flags (value, priv->content_hints);
-      break;
-    case PROP_CONTENT_PURPOSE:
-      g_value_set_enum (value, priv->content_purpose);
-      break;
-    case PROP_CAN_SHOW_PREEDIT:
-      g_value_set_boolean (value, priv->can_show_preedit);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_input_method_class_init (ClutterInputMethodClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->set_property = clutter_input_method_set_property;
-  object_class->get_property = clutter_input_method_get_property;
-
-  signals[COMMIT] =
-    g_signal_new ("commit",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
-  signals[DELETE_SURROUNDING] =
-    g_signal_new ("delete-surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-  signals[REQUEST_SURROUNDING] =
-    g_signal_new ("request-surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-  signals[INPUT_PANEL_STATE] =
-    g_signal_new ("input-panel-state",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_INPUT_PANEL_STATE);
-  signals[CURSOR_LOCATION_CHANGED] =
-    g_signal_new ("cursor-location-changed",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, CLUTTER_TYPE_RECT);
-
-  pspecs[PROP_CONTENT_HINTS] =
-    g_param_spec_flags ("content-hints",
-                        P_("Content hints"),
-                        P_("Content hints"),
-                        CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS, 0,
-                        G_PARAM_READWRITE |
-                        G_PARAM_STATIC_STRINGS);
-  pspecs[PROP_CONTENT_PURPOSE] =
-    g_param_spec_enum ("content-purpose",
-                       P_("Content purpose"),
-                       P_("Content purpose"),
-                       CLUTTER_TYPE_INPUT_CONTENT_PURPOSE, 0,
-                       G_PARAM_READWRITE |
-                       G_PARAM_STATIC_STRINGS);
-  pspecs[PROP_CAN_SHOW_PREEDIT] =
-    g_param_spec_boolean ("can-show-preedit",
-                          P_("Can show preedit"),
-                          P_("Can show preedit"),
-                          FALSE,
-                          G_PARAM_READWRITE |
-                          G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, pspecs);
-}
-
-static void
-clutter_input_method_init (ClutterInputMethod *im)
-{
-}
-
-void
-clutter_input_method_focus_in (ClutterInputMethod *im,
-                               ClutterInputFocus  *focus)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethodClass *klass;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  priv = clutter_input_method_get_instance_private (im);
-
-  if (priv->focus == focus)
-    return;
-
-  if (priv->focus)
-    clutter_input_method_focus_out (im);
-
-  g_set_object (&priv->focus, focus);
-
-  if (focus)
-    {
-      klass = CLUTTER_INPUT_METHOD_GET_CLASS (im);
-      klass->focus_in (im, focus);
-
-      clutter_input_focus_focus_in (priv->focus, im);
-    }
-}
-
-void
-clutter_input_method_focus_out (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethodClass *klass;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-
-  if (!priv->focus)
-    return;
-
-  clutter_input_focus_focus_out (priv->focus);
-  g_clear_object (&priv->focus);
-
-  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 *
-clutter_input_method_get_focus (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  return priv->focus;
-}
-
-void
-clutter_input_method_commit (ClutterInputMethod *im,
-                             const gchar        *text)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_commit (priv->focus, text);
-}
-
-void
-clutter_input_method_delete_surrounding (ClutterInputMethod *im,
-                                         guint               offset,
-                                         guint               len)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_delete_surrounding (priv->focus, offset, len);
-}
-
-void
-clutter_input_method_request_surrounding (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_request_surrounding (priv->focus);
-}
-
-/**
- * clutter_input_method_set_preedit_text:
- * @im: a #ClutterInputMethod
- * @preedit: (nullable): the preedit text, or %NULL
- * @cursor: the cursor
- *
- * Sets the preedit text on the current input focus.
- **/
-void
-clutter_input_method_set_preedit_text (ClutterInputMethod *im,
-                                       const gchar        *preedit,
-                                       guint               cursor)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_set_preedit_text (priv->focus, preedit, cursor);
-}
-
-void
-clutter_input_method_notify_key_event (ClutterInputMethod *im,
-                                       const ClutterEvent *event,
-                                       gboolean            filtered)
-{
-  if (!filtered)
-    {
-      ClutterEvent *copy;
-
-      /* XXX: we rely on the IM implementation to notify back of
-       * key events in the exact same order they were given.
-       */
-      copy = clutter_event_copy (event);
-      clutter_event_set_flags (copy, clutter_event_get_flags (event) |
-                               CLUTTER_EVENT_FLAG_INPUT_METHOD);
-      clutter_event_set_source_device (copy, clutter_event_get_device (copy));
-      clutter_event_put (copy);
-      clutter_event_free (copy);
-    }
-}
-
-void
-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,
-                 CLUTTER_INPUT_PANEL_STATE_TOGGLE);
-}
-
-void
-clutter_input_method_reset (ClutterInputMethod *im)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->reset (im);
-}
-
-void
-clutter_input_method_set_cursor_location (ClutterInputMethod *im,
-                                          const ClutterRect  *rect)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->set_cursor_location (im, rect);
-
-  g_signal_emit (im, signals[CURSOR_LOCATION_CHANGED], 0, rect);
-}
-
-void
-clutter_input_method_set_surrounding (ClutterInputMethod *im,
-                                      const gchar        *text,
-                                      guint               cursor,
-                                      guint               anchor)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->set_surrounding (im, text,
-                                                        cursor, anchor);
-}
-
-void
-clutter_input_method_set_content_hints (ClutterInputMethod           *im,
-                                        ClutterInputContentHintFlags  hints)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "content-hints", hints, NULL);
-}
-
-void
-clutter_input_method_set_content_purpose (ClutterInputMethod         *im,
-                                          ClutterInputContentPurpose  purpose)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "content-purpose", purpose, NULL);
-}
-
-void
-clutter_input_method_set_can_show_preedit (ClutterInputMethod *im,
-                                           gboolean            can_show_preedit)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "can-show-preedit", can_show_preedit, NULL);
-}
-
-gboolean
-clutter_input_method_filter_key_event (ClutterInputMethod    *im,
-                                       const ClutterKeyEvent *key)
-{
-  ClutterInputMethodClass *im_class = CLUTTER_INPUT_METHOD_GET_CLASS (im);
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_METHOD (im), FALSE);
-  g_return_val_if_fail (key != NULL, FALSE);
-
-  if (clutter_event_get_flags ((ClutterEvent *) key) & CLUTTER_EVENT_FLAG_INPUT_METHOD)
-    return FALSE;
-  if (!im_class->filter_key_event)
-    return FALSE;
-
-  return im_class->filter_key_event (im, (const ClutterEvent *) key);
-}
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_METHOD_H__
-#define __CLUTTER_INPUT_METHOD_H__
-
-#include <clutter/clutter.h>
-
-#define CLUTTER_TYPE_INPUT_METHOD (clutter_input_method_get_type ())
-
-CLUTTER_AVAILABLE_IN_MUTTER
-G_DECLARE_DERIVABLE_TYPE (ClutterInputMethod, clutter_input_method,
-                          CLUTTER, INPUT_METHOD, GObject)
-
-typedef struct _ClutterInputMethodClass ClutterInputMethodClass;
-
-struct _ClutterInputMethodClass
-{
-  GObjectClass parent_class;
-
-  void (* focus_in) (ClutterInputMethod *im,
-                     ClutterInputFocus  *actor);
-  void (* focus_out) (ClutterInputMethod *im);
-
-  void (* reset) (ClutterInputMethod *im);
-
-  void (* set_cursor_location) (ClutterInputMethod          *im,
-                                const ClutterRect           *rect);
-  void (* set_surrounding) (ClutterInputMethod *im,
-                            const gchar        *text,
-                            guint               cursor,
-                            guint               anchor);
-  void (* update_content_hints) (ClutterInputMethod           *im,
-                                 ClutterInputContentHintFlags  hint);
-  void (* update_content_purpose) (ClutterInputMethod         *im,
-                                   ClutterInputContentPurpose  purpose);
-
-  gboolean (* filter_key_event) (ClutterInputMethod *im,
-                                 const ClutterEvent *key);
-};
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_focus_in  (ClutterInputMethod *im,
-                                     ClutterInputFocus  *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_focus_out (ClutterInputMethod *im);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_commit (ClutterInputMethod *im,
-                                  const gchar        *text);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_delete_surrounding (ClutterInputMethod *im,
-                                              guint               offset,
-                                              guint               len);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_request_surrounding (ClutterInputMethod *im);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_set_preedit_text (ClutterInputMethod *im,
-                                            const gchar        *preedit,
-                                            guint               cursor);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_notify_key_event (ClutterInputMethod *im,
-                                            const ClutterEvent *event,
-                                            gboolean            filtered);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_request_toggle_input_panel (ClutterInputMethod *im);
-
-#endif /* __CLUTTER_INPUT_METHOD_H__ */
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@ -2089,21 +2089,6 @@ emit_keyboard_event (ClutterEvent       *event,
    }
 }

-static inline void
-process_key_event (ClutterEvent       *event,
-                   ClutterInputDevice *device)
-{
-  ClutterInputDeviceClass *device_class = CLUTTER_INPUT_DEVICE_GET_CLASS (device);
-
-  if (device_class->process_kbd_a11y_event)
-    {
-      device_class->process_kbd_a11y_event (event, device, emit_keyboard_event);
-      return;
-    }
-
-  emit_keyboard_event (event, device);
-}
-
 static gboolean
 is_off_stage (ClutterActor *stage,
              gfloat        x,
@ -2191,7 +2176,7 @@ _clutter_process_event_details (ClutterActor        *stage,
                }
            }

-          process_key_event (event, device);
+          emit_keyboard_event (event, device);
        }
        break;

--- a/clutter/clutter/clutter-marshal.list
+++ b/clutter/clutter/clutter-marshal.list
@ -1,6 +1,7 @@
 BOOLEAN:BOXED
 BOOLEAN:BOXED,INT,INT
 BOOLEAN:OBJECT,BOOLEAN
+BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,DOUBLE
 BOOLEAN:OBJECT,DOUBLE
 BOOLEAN:OBJECT,ENUM
--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@ -40,12 +40,6 @@ gboolean        _clutter_get_sync_to_vblank     (void);
 CLUTTER_AVAILABLE_IN_MUTTER
 int64_t clutter_stage_get_frame_counter (ClutterStage *stage);

-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_stage_capture_into (ClutterStage          *stage,
-                                 gboolean               paint,
-                                 cairo_rectangle_int_t *rect,
-                                 uint8_t               *data);
-
 #undef __CLUTTER_H_INSIDE__

 #endif /* __CLUTTER_MUTTER_H__ */
--- a/clutter/clutter/clutter-paint-volume.c
+++ b/clutter/clutter/clutter-paint-volume.c
@ -1166,6 +1166,21 @@ _clutter_paint_volume_get_stage_paint_box (ClutterPaintVolume *pv,

  _clutter_paint_volume_get_bounding_box (&projected_pv, box);

+  if (pv->is_2d && pv->actor &&
+      clutter_actor_get_z_position (pv->actor) == 0)
+    {
+      /* If the volume/actor are perfectly 2D, take the bounding box as
+       * good. We won't need to add any extra room for sub-pixel positioning
+       * in this case.
+       */
+      clutter_paint_volume_free (&projected_pv);
+      box->x1 = CLUTTER_NEARBYINT (box->x1);
+      box->y1 = CLUTTER_NEARBYINT (box->y1);
+      box->x2 = CLUTTER_NEARBYINT (box->x2);
+      box->y2 = CLUTTER_NEARBYINT (box->y2);
+      return;
+    }
+
  /* The aim here is that for a given rectangle defined with floating point
   * coordinates we want to determine a stable quantized size in pixels
   * that doesn't vary due to the original box's sub-pixel position.
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@ -20,7 +20,6 @@
 #include "clutter/clutter-stage-view.h"

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

 enum
 {
@ -39,7 +38,7 @@ static GParamSpec *obj_props[PROP_LAST];
 typedef struct _ClutterStageViewPrivate
 {
  cairo_rectangle_int_t layout;
-  float scale;
+  int scale;
  CoglFramebuffer *framebuffer;

  CoglOffscreen *offscreen;
@ -144,7 +143,7 @@ clutter_stage_view_blit_offscreen (ClutterStageView            *view,
  cogl_framebuffer_pop_matrix (priv->framebuffer);
 }

-float
+int
 clutter_stage_view_get_scale (ClutterStageView *view)
 {
  ClutterStageViewPrivate *priv =
@ -242,7 +241,7 @@ clutter_stage_view_get_property (GObject    *object,
      g_value_set_boxed (value, priv->offscreen);
      break;
    case PROP_SCALE:
-      g_value_set_float (value, priv->scale);
+      g_value_set_int (value, priv->scale);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -268,26 +267,12 @@ clutter_stage_view_set_property (GObject      *object,
      break;
    case PROP_FRAMEBUFFER:
      priv->framebuffer = g_value_dup_boxed (value);
-#ifndef G_DISABLE_CHECKS
-      if (priv->framebuffer)
-        {
-          int fb_width, fb_height;
-
-          fb_width = cogl_framebuffer_get_width (priv->framebuffer);
-          fb_height = cogl_framebuffer_get_height (priv->framebuffer);
-
-          g_warn_if_fail (fabsf (roundf (fb_width / priv->scale) -
-                                 fb_width / priv->scale) < FLT_EPSILON);
-          g_warn_if_fail (fabsf (roundf (fb_height / priv->scale) -
-                                 fb_height / priv->scale) < FLT_EPSILON);
-        }
-#endif
      break;
    case PROP_OFFSCREEN:
      priv->offscreen = g_value_dup_boxed (value);
      break;
    case PROP_SCALE:
-      priv->scale = g_value_get_float (value);
+      priv->scale = g_value_get_int (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -316,7 +301,7 @@ clutter_stage_view_init (ClutterStageView *view)

  priv->dirty_viewport = TRUE;
  priv->dirty_projection = TRUE;
-  priv->scale = 1.0;
+  priv->scale = 1;
 }

 static void
@ -337,7 +322,6 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                        "The view layout on the screen",
                        CAIRO_GOBJECT_TYPE_RECTANGLE_INT,
                        G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT |
                        G_PARAM_STATIC_STRINGS);

  obj_props[PROP_FRAMEBUFFER] =
@ -346,7 +330,6 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                        "The front buffer of the view",
                        COGL_TYPE_HANDLE,
                        G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT |
                        G_PARAM_STATIC_STRINGS);

  obj_props[PROP_OFFSCREEN] =
@ -355,17 +338,16 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                        "Framebuffer used as intermediate buffer",
                        COGL_TYPE_HANDLE,
                        G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT_ONLY |
+			G_PARAM_CONSTRUCT_ONLY |
                        G_PARAM_STATIC_STRINGS);

  obj_props[PROP_SCALE] =
-    g_param_spec_float ("scale",
-                        "View scale",
-                        "The view scale",
-                        0.5, G_MAXFLOAT, 1.0,
-                        G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT |
-                        G_PARAM_STATIC_STRINGS);
+    g_param_spec_int ("scale",
+                      "View scale",
+                      "The view scale",
+                      1, G_MAXINT, 1,
+                      G_PARAM_READWRITE |
+                      G_PARAM_STATIC_STRINGS);

  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }
--- a/clutter/clutter/clutter-stage-view.h
+++ b/clutter/clutter/clutter-stage-view.h
@ -61,7 +61,7 @@ void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
 					const cairo_rectangle_int_t *clip);

 CLUTTER_AVAILABLE_IN_MUTTER
-float clutter_stage_view_get_scale (ClutterStageView *view);
+int clutter_stage_view_get_scale (ClutterStageView *view);

 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);

--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@ -231,19 +231,35 @@ _clutter_stage_window_ignoring_redraw_clips (ClutterStageWindow *window)
  return TRUE;
 }

-gboolean
-_clutter_stage_window_get_redraw_clip_bounds (ClutterStageWindow    *window,
-                                              cairo_rectangle_int_t *stage_clip)
+cairo_region_t *
+_clutter_stage_window_get_redraw_clip (ClutterStageWindow *window)
 {
  ClutterStageWindowIface *iface;

  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);

  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
-  if (iface->get_redraw_clip_bounds != NULL)
-    return iface->get_redraw_clip_bounds (window, stage_clip);
+  if (iface->get_redraw_clip != NULL)
+    return iface->get_redraw_clip (window);

-  return FALSE;
+  return NULL;
+}
+
+gboolean
+_clutter_stage_window_get_redraw_clip_bounds (ClutterStageWindow    *window,
+                                              cairo_rectangle_int_t *stage_clip)
+{
+  cairo_region_t *redraw_clip;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);
+
+  redraw_clip = _clutter_stage_window_get_redraw_clip (window);
+  if (!redraw_clip)
+    return FALSE;
+
+  cairo_region_get_extents (redraw_clip, stage_clip);
+  cairo_region_destroy (redraw_clip);
+  return TRUE;
 }

 void
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@ -68,9 +68,7 @@ struct _ClutterStageWindowIface
                                                 cairo_rectangle_int_t *stage_rectangle);
  gboolean          (* has_redraw_clips)        (ClutterStageWindow    *stage_window);
  gboolean          (* ignoring_redraw_clips)   (ClutterStageWindow    *stage_window);
-  gboolean          (* get_redraw_clip_bounds)  (ClutterStageWindow    *stage_window,
-                                                 cairo_rectangle_int_t *clip);
-
+  cairo_region_t *  (* get_redraw_clip)         (ClutterStageWindow    *stage_window);

  void              (* set_accept_focus)        (ClutterStageWindow *stage_window,
                                                 gboolean            accept_focus);
@ -125,6 +123,7 @@ gboolean          _clutter_stage_window_has_redraw_clips        (ClutterStageWin
 gboolean          _clutter_stage_window_ignoring_redraw_clips   (ClutterStageWindow    *window);
 gboolean          _clutter_stage_window_get_redraw_clip_bounds  (ClutterStageWindow    *window,
                                                                 cairo_rectangle_int_t *clip);
+cairo_region_t *  _clutter_stage_window_get_redraw_clip         (ClutterStageWindow    *window);

 void              _clutter_stage_window_set_accept_focus        (ClutterStageWindow *window,
                                                                 gboolean            accept_focus);
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@ -161,7 +161,6 @@ struct _ClutterStagePrivate
  guint accept_focus           : 1;
  guint motion_events_enabled  : 1;
  guint has_custom_perspective : 1;
-  guint stage_was_relayout     : 1;
 };

 enum
@ -962,7 +961,6 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
      ClutterEvent *next_event;
      ClutterInputDevice *device;
      ClutterInputDevice *next_device;
-      ClutterInputDeviceType device_type;
      gboolean check_device = FALSE;

      event = l->data;
@ -978,16 +976,8 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
      if (device != NULL && next_device != NULL)
        check_device = TRUE;

-      device_type = clutter_input_device_get_device_type (device);
-
-      /* Skip consecutive motion events coming from the same device,
-       * except those of tablet tools, since users of these events
-       * want no precision loss.
-       */
-      if (priv->throttle_motion_events && next_event != NULL &&
-          device_type != CLUTTER_TABLET_DEVICE &&
-          device_type != CLUTTER_PEN_DEVICE &&
-          device_type != CLUTTER_ERASER_DEVICE)
+      /* Skip consecutive motion events coming from the same device */
+      if (priv->throttle_motion_events && next_event != NULL)
        {
          if (event->type == CLUTTER_MOTION &&
              (next_event->type == CLUTTER_MOTION ||
@ -1069,7 +1059,6 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
  if (!CLUTTER_ACTOR_IN_RELAYOUT (stage))
    {
      priv->relayout_pending = FALSE;
-      priv->stage_was_relayout = TRUE;

      CLUTTER_NOTE (ACTOR, "Recomputing layout");

@ -1140,58 +1129,6 @@ clutter_stage_do_redraw (ClutterStage *stage)
                stage);
 }

-static GSList *
-_clutter_stage_check_updated_pointers (ClutterStage *stage)
-{
-  ClutterStagePrivate *priv = stage->priv;
-  ClutterDeviceManager *device_manager;
-  GSList *updating = NULL;
-  const GSList *devices;
-  cairo_rectangle_int_t clip;
-  ClutterPoint point;
-  gboolean has_clip;
-
-  has_clip = _clutter_stage_window_get_redraw_clip_bounds (priv->impl, &clip);
-
-  device_manager = clutter_device_manager_get_default ();
-  devices = clutter_device_manager_peek_devices (device_manager);
-
-  for (; devices != NULL; devices = devices->next)
-    {
-      ClutterInputDevice *dev = devices->data;
-
-      if (clutter_input_device_get_device_mode (dev) !=
-          CLUTTER_INPUT_MODE_MASTER)
-        continue;
-
-      switch (clutter_input_device_get_device_type (dev))
-        {
-        case CLUTTER_POINTER_DEVICE:
-        case CLUTTER_TABLET_DEVICE:
-        case CLUTTER_PEN_DEVICE:
-        case CLUTTER_ERASER_DEVICE:
-        case CLUTTER_CURSOR_DEVICE:
-          if (!clutter_input_device_get_coords (dev, NULL, &point))
-            continue;
-
-          if (!has_clip ||
-              (point.x >= clip.x && point.x < clip.x + clip.width &&
-               point.y >= clip.y && point.y < clip.y + clip.height))
-            updating = g_slist_prepend (updating, dev);
-          break;
-        default:
-          /* Any other devices don't need checking, either because they
-           * don't have x/y coordinates, or because they're implicitly
-           * grabbed on an actor by default as it's the case of
-           * touch(screens).
-           */
-          break;
-        }
-    }
-
-  return updating;
-}
-
 /**
 * _clutter_stage_do_update:
 * @stage: A #ClutterStage
@ -1204,10 +1141,6 @@ gboolean
 _clutter_stage_do_update (ClutterStage *stage)
 {
  ClutterStagePrivate *priv = stage->priv;
-  gboolean stage_was_relayout = priv->stage_was_relayout;
-  GSList *pointers = NULL;
-
-  priv->stage_was_relayout = FALSE;

  /* if the stage is being destroyed, or if the destruction already
   * happened and we don't have an StageWindow any more, then we
@ -1228,9 +1161,6 @@ _clutter_stage_do_update (ClutterStage *stage)
  if (!priv->redraw_pending)
    return FALSE;

-  if (stage_was_relayout)
-    pointers = _clutter_stage_check_updated_pointers (stage);
-
  clutter_stage_maybe_finish_queue_redraws (stage);

  clutter_stage_do_redraw (stage);
@ -1248,12 +1178,6 @@ _clutter_stage_do_update (ClutterStage *stage)
    }
 #endif /* CLUTTER_ENABLE_DEBUG */

-  while (pointers)
-    {
-      _clutter_input_device_update (pointers->data, NULL, TRUE);
-      pointers = g_slist_delete_link (pointers, pointers);
-    }
-
  return TRUE;
 }

@ -1275,45 +1199,44 @@ clutter_stage_real_queue_relayout (ClutterActor *self)
  parent_class->queue_relayout (self);
 }

-static void
-clutter_stage_real_queue_redraw (ClutterActor *actor,
-                                 ClutterActor *leaf)
+static gboolean
+clutter_stage_real_queue_redraw (ClutterActor       *actor,
+                                 ClutterActor       *leaf,
+                                 ClutterPaintVolume *redraw_clip)
 {
  ClutterStage *stage = CLUTTER_STAGE (actor);
  ClutterStageWindow *stage_window;
-  ClutterPaintVolume *redraw_clip;
  ClutterActorBox bounding_box;
  ClutterActorBox intersection_box;
  cairo_rectangle_int_t geom, stage_clip;

  if (CLUTTER_ACTOR_IN_DESTRUCTION (actor))
-    return;
+    return TRUE;

  /* If the backend can't do anything with redraw clips (e.g. it already knows
   * it needs to redraw everything anyway) then don't spend time transforming
   * any clip volume into stage coordinates... */
  stage_window = _clutter_stage_get_window (stage);
  if (stage_window == NULL)
-    return;
+    return TRUE;

  if (_clutter_stage_window_ignoring_redraw_clips (stage_window))
    {
      _clutter_stage_window_add_redraw_clip (stage_window, NULL);
-      return;
+      return FALSE;
    }

  /* Convert the clip volume into stage coordinates and then into an
   * axis aligned stage coordinates bounding box...
   */
-  redraw_clip = _clutter_actor_get_queue_redraw_clip (leaf);
  if (redraw_clip == NULL)
    {
      _clutter_stage_window_add_redraw_clip (stage_window, NULL);
-      return;
+      return FALSE;
    }

  if (redraw_clip->is_empty)
-    return;
+    return TRUE;

  _clutter_paint_volume_get_stage_paint_box (redraw_clip,
                                             stage,
@ -1329,7 +1252,7 @@ clutter_stage_real_queue_redraw (ClutterActor *actor,
  /* There is no need to track degenerate/empty redraw clips */
  if (intersection_box.x2 <= intersection_box.x1 ||
      intersection_box.y2 <= intersection_box.y1)
-    return;
+    return TRUE;

  /* when converting to integer coordinates make sure we round the edges of the
   * clip rectangle outwards... */
@ -1339,6 +1262,7 @@ clutter_stage_real_queue_redraw (ClutterActor *actor,
  stage_clip.height = intersection_box.y2 - stage_clip.y;

  _clutter_stage_window_add_redraw_clip (stage_window, &stage_clip);
+  return FALSE;
 }

 gboolean
@ -1391,6 +1315,31 @@ clutter_stage_get_redraw_clip_bounds (ClutterStage          *stage,
    }
 }

+cairo_region_t *
+clutter_stage_get_redraw_clip (ClutterStage *stage)
+{
+  ClutterStagePrivate *priv;
+  cairo_rectangle_int_t clip;
+  cairo_region_t *region;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
+
+  priv = stage->priv;
+
+  region = _clutter_stage_window_get_redraw_clip (priv->impl);
+  if (region)
+    return region;
+
+  if (!region)
+    {
+      /* Set clip to the full extents of the stage */
+      _clutter_stage_window_get_geometry (priv->impl, &clip);
+      region = cairo_region_create_rectangle (&clip);
+    }
+
+  return region;
+}
+
 static void
 read_pixels_to_file (char *filename_stem,
                     int   x,
@ -1445,9 +1394,9 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
  gint read_x;
  gint read_y;
  float fb_width, fb_height;
-  float fb_scale;
-  float viewport_offset_x;
-  float viewport_offset_y;
+  int fb_scale;
+  int viewport_offset_x;
+  int viewport_offset_y;

  priv = stage->priv;

@ -1474,8 +1423,8 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
  if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
    {
      CLUTTER_NOTE (PICK, "Pushing pick scissor clip x: %d, y: %d, 1x1",
-                    (int) dirty_x * fb_scale,
-                    (int) dirty_y * fb_scale);
+                    dirty_x * fb_scale,
+                    dirty_y * fb_scale);
      cogl_framebuffer_push_scissor_clip (fb, dirty_x * fb_scale, dirty_y * fb_scale, 1, 1);
    }

@ -1486,11 +1435,10 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
                priv->viewport[1] * fb_scale - viewport_offset_y,
                priv->viewport[2] * fb_scale,
                priv->viewport[3] * fb_scale);
-  cogl_framebuffer_set_viewport (fb,
-                                 priv->viewport[0] * fb_scale - viewport_offset_x,
-                                 priv->viewport[1] * fb_scale - viewport_offset_y,
-                                 priv->viewport[2] * fb_scale,
-                                 priv->viewport[3] * fb_scale);
+  cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
+                     priv->viewport[1] * fb_scale - viewport_offset_y,
+                     priv->viewport[2] * fb_scale,
+                     priv->viewport[3] * fb_scale);

  read_x = dirty_x * fb_scale;
  read_y = dirty_y * fb_scale;
@ -3618,15 +3566,14 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
                                     ClutterStageView *view)
 {
  ClutterStagePrivate *priv = stage->priv;
-  CoglFramebuffer *fb = clutter_stage_view_get_framebuffer (view);

  if (clutter_stage_view_is_dirty_viewport (view))
    {
      cairo_rectangle_int_t view_layout;
      ClutterPerspective perspective;
-      float fb_scale;
-      float viewport_offset_x;
-      float viewport_offset_y;
+      int fb_scale;
+      int viewport_offset_x;
+      int viewport_offset_y;
      float z_2d;

      CLUTTER_NOTE (PAINT,
@ -3639,11 +3586,10 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,

      viewport_offset_x = view_layout.x * fb_scale;
      viewport_offset_y = view_layout.y * fb_scale;
-      cogl_framebuffer_set_viewport (fb,
-                                     priv->viewport[0] * fb_scale - viewport_offset_x,
-                                     priv->viewport[1] * fb_scale - viewport_offset_y,
-                                     priv->viewport[2] * fb_scale,
-                                     priv->viewport[3] * fb_scale);
+      cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
+                         priv->viewport[1] * fb_scale - viewport_offset_y,
+                         priv->viewport[2] * fb_scale,
+                         priv->viewport[3] * fb_scale);

      perspective = priv->perspective;

@ -3682,7 +3628,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,

  if (clutter_stage_view_is_dirty_projection (view))
    {
-      cogl_framebuffer_set_projection_matrix (fb, &priv->projection);
+      cogl_set_projection_matrix (&priv->projection);

      clutter_stage_view_set_dirty_projection (view, FALSE);
    }
@ -4723,22 +4669,18 @@ capture_view (ClutterStage          *stage,
  int stride;
  CoglBitmap *bitmap;
  cairo_rectangle_int_t view_layout;
-  float view_scale;

  framebuffer = clutter_stage_view_get_framebuffer (view);

  if (paint)
    {
-      cogl_push_framebuffer (framebuffer);
      _clutter_stage_maybe_setup_viewport (stage, view);
+      cogl_push_framebuffer (framebuffer);
      clutter_stage_do_paint_view (stage, view, rect);
    }

-  view_scale = clutter_stage_view_get_scale (view);
  image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                      rect->width * view_scale,
-                                      rect->height * view_scale);
-  cairo_surface_set_device_scale (image, view_scale, view_scale);
+                                      rect->width, rect->height);

  data = cairo_image_surface_get_data (image);
  stride = cairo_image_surface_get_stride (image);
@ -4746,8 +4688,7 @@ capture_view (ClutterStage          *stage,
  backend = clutter_get_default_backend ();
  context = clutter_backend_get_cogl_context (backend);
  bitmap = cogl_bitmap_new_for_data (context,
-                                     rect->width * view_scale,
-                                     rect->height * view_scale,
+                                     rect->width, rect->height,
                                     CLUTTER_CAIRO_FORMAT_ARGB32,
                                     stride,
                                     data);
@ -4755,8 +4696,8 @@ capture_view (ClutterStage          *stage,
  clutter_stage_view_get_layout (view, &view_layout);

  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
-                                            (rect->x - view_layout.x) * view_scale,
-                                            (rect->y - view_layout.y) * view_scale,
+                                            rect->x - view_layout.x,
+                                            rect->y - view_layout.y,
                                            COGL_READ_PIXELS_COLOR_BUFFER,
                                            bitmap);

@ -4813,93 +4754,3 @@ clutter_stage_capture (ClutterStage          *stage,

  return TRUE;
 }
-
-static void
-capture_view_into (ClutterStage          *stage,
-                   gboolean               paint,
-                   ClutterStageView      *view,
-                   cairo_rectangle_int_t *rect,
-                   uint8_t               *data,
-                   int                    stride)
-{
-  CoglFramebuffer *framebuffer;
-  ClutterBackend *backend;
-  CoglContext *context;
-  CoglBitmap *bitmap;
-  cairo_rectangle_int_t view_layout;
-
-  framebuffer = clutter_stage_view_get_framebuffer (view);
-
-  if (paint)
-    {
-      cogl_push_framebuffer (framebuffer);
-      _clutter_stage_maybe_setup_viewport (stage, view);
-      clutter_stage_do_paint_view (stage, view, rect);
-    }
-
-  backend = clutter_get_default_backend ();
-  context = clutter_backend_get_cogl_context (backend);
-  bitmap = cogl_bitmap_new_for_data (context,
-                                     rect->width, rect->height,
-                                     CLUTTER_CAIRO_FORMAT_ARGB32,
-                                     stride,
-                                     data);
-
-  clutter_stage_view_get_layout (view, &view_layout);
-
-  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
-                                            rect->x - view_layout.x,
-                                            rect->y - view_layout.y,
-                                            COGL_READ_PIXELS_COLOR_BUFFER,
-                                            bitmap);
-
-  if (paint)
-    cogl_pop_framebuffer ();
-
-  cogl_object_unref (bitmap);
-}
-
-static ClutterStageView *
-get_view_at_rect (ClutterStage          *stage,
-                  cairo_rectangle_int_t *rect)
-{
-  ClutterStagePrivate *priv = stage->priv;
-  GList *views = _clutter_stage_window_get_views (priv->impl);
-  GList *l;
-
-  for (l = views; l; l = l->next)
-    {
-      ClutterStageView *view = l->data;
-      cairo_rectangle_int_t view_layout;
-      cairo_region_t *region;
-      cairo_rectangle_int_t view_capture_rect;
-
-      clutter_stage_view_get_layout (view, &view_layout);
-      region = cairo_region_create_rectangle (&view_layout);
-      cairo_region_intersect_rectangle (region, rect);
-      cairo_region_get_extents (region, &view_capture_rect);
-      cairo_region_destroy (region);
-
-      if (view_capture_rect.width == 0 || view_capture_rect.height == 0)
-        continue;
-
-      g_assert (view_capture_rect.width == rect->width &&
-                view_capture_rect.height == rect->height);
-      return view;
-    }
-
-  return NULL;
-}
-
-void
-clutter_stage_capture_into (ClutterStage          *stage,
-                            gboolean               paint,
-                            cairo_rectangle_int_t *rect,
-                            uint8_t               *data)
-{
-  ClutterStageView *view;
-  int bpp = 4;
-
-  view = get_view_at_rect (stage, rect);
-  capture_view_into (stage, paint, view, rect, data, rect->width * bpp);
-}
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@ -245,6 +245,9 @@ guchar *        clutter_stage_read_pixels                       (ClutterStage
 CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_get_redraw_clip_bounds            (ClutterStage          *stage,
                                                                 cairo_rectangle_int_t *clip);
+CLUTTER_AVAILABLE_IN_MUTTER
+cairo_region_t * clutter_stage_get_redraw_clip                  (ClutterStage          *stage);
+
 CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_ensure_viewport                   (ClutterStage          *stage);
 CLUTTER_AVAILABLE_IN_ALL
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@ -63,7 +63,6 @@
 #include "clutter-units.h"
 #include "clutter-paint-volume-private.h"
 #include "clutter-scriptable.h"
-#include "clutter-input-focus.h"

 /* cursor width in pixels */
 #define DEFAULT_CURSOR_SIZE     2
@ -99,12 +98,6 @@ struct _LayoutCache
  guint age;
 };

-struct _ClutterTextInputFocus
-{
-  ClutterInputFocus parent_instance;
-  ClutterText *text;
-};
-
 struct _ClutterTextPrivate
 {
  PangoFontDescription *font_desc;
@ -183,10 +176,6 @@ struct _ClutterTextPrivate
  /* Signal handler for when the :text-direction changes */
  guint direction_changed_id;

-  ClutterInputFocus *input_focus;
-  ClutterInputContentHintFlags input_hints;
-  ClutterInputContentPurpose input_purpose;
-
  /* bitfields */
  guint alignment               : 2;
  guint wrap                    : 1;
@ -247,8 +236,6 @@ enum
  PROP_SINGLE_LINE_MODE,
  PROP_SELECTED_TEXT_COLOR,
  PROP_SELECTED_TEXT_COLOR_SET,
-  PROP_INPUT_HINTS,
-  PROP_INPUT_PURPOSE,

  PROP_LAST
 };
@ -282,112 +269,6 @@ static const ClutterColor default_selected_text_color = {   0,   0,   0, 255 };
 static ClutterAnimatableIface *parent_animatable_iface = NULL;
 static ClutterScriptableIface *parent_scriptable_iface = NULL;

-/* ClutterTextInputFocus */
-#define CLUTTER_TYPE_TEXT_INPUT_FOCUS (clutter_text_input_focus_get_type ())
-
-G_DECLARE_FINAL_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
-                      CLUTTER, TEXT_INPUT_FOCUS, ClutterInputFocus)
-G_DEFINE_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
-               CLUTTER_TYPE_INPUT_FOCUS)
-
-static void
-clutter_text_input_focus_request_surrounding (ClutterInputFocus *focus)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-  ClutterTextBuffer *buffer;
-  const gchar *text;
-  gint anchor_pos, cursor_pos;
-
-  buffer = clutter_text_get_buffer (clutter_text);
-  text = clutter_text_buffer_get_text (buffer);
-
-  cursor_pos = clutter_text_get_cursor_position (clutter_text);
-  if (cursor_pos < 0)
-    cursor_pos = clutter_text_buffer_get_length (buffer);
-
-  anchor_pos = clutter_text_get_selection_bound (clutter_text);
-  if (anchor_pos < 0)
-    anchor_pos = cursor_pos;
-
-  clutter_input_focus_set_surrounding (focus, text,
-                                       g_utf8_offset_to_pointer (text, cursor_pos) - text,
-                                       g_utf8_offset_to_pointer (text, anchor_pos) - text);
-}
-
-static void
-clutter_text_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                             guint              offset,
-                                             guint              len)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    clutter_text_delete_text (clutter_text, offset, len);
-}
-
-static void
-clutter_text_input_focus_commit_text (ClutterInputFocus *focus,
-                                      const gchar       *text)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    {
-      clutter_text_delete_selection (clutter_text);
-      clutter_text_insert_text (clutter_text, text,
-                                clutter_text_get_cursor_position (clutter_text));
-      clutter_text_set_preedit_string (clutter_text, NULL, NULL, 0);
-    }
-}
-
-static void
-clutter_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                           const gchar       *preedit_text,
-                                           guint              cursor_pos)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    {
-      PangoAttrList *list;
-
-      list = pango_attr_list_new ();
-      pango_attr_list_insert (list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
-      clutter_text_set_preedit_string (clutter_text,
-                                       preedit_text, list,
-                                       cursor_pos);
-      pango_attr_list_unref (list);
-    }
-}
-
-static void
-clutter_text_input_focus_class_init (ClutterTextInputFocusClass *klass)
-{
-  ClutterInputFocusClass *focus_class = CLUTTER_INPUT_FOCUS_CLASS (klass);
-
-  focus_class->request_surrounding = clutter_text_input_focus_request_surrounding;
-  focus_class->delete_surrounding = clutter_text_input_focus_delete_surrounding;
-  focus_class->commit_text = clutter_text_input_focus_commit_text;
-  focus_class->set_preedit_text = clutter_text_input_focus_set_preedit_text;
-}
-
-static void
-clutter_text_input_focus_init (ClutterTextInputFocus *focus)
-{
-}
-
-static ClutterInputFocus *
-clutter_text_input_focus_new (ClutterText *text)
-{
-  ClutterTextInputFocus *focus;
-
-  focus = g_object_new (CLUTTER_TYPE_TEXT_INPUT_FOCUS, NULL);
-  focus->text = text;
-
-  return CLUTTER_INPUT_FOCUS (focus);
-}
-
-/* ClutterText */
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);

@ -1128,22 +1009,6 @@ clutter_text_position_to_coords (ClutterText *self,
  return TRUE;
 }

-static inline void
-update_cursor_location (ClutterText *self)
-{
-  ClutterTextPrivate *priv = self->priv;
-  ClutterRect rect;
-  float x, y;
-
-  if (!priv->editable)
-    return;
-
-  rect = priv->cursor_rect;
-  clutter_actor_get_transformed_position (CLUTTER_ACTOR (self), &x, &y);
-  clutter_rect_offset (&rect, x, y);
-  clutter_input_focus_set_cursor_location (priv->input_focus, &rect);
-}
-
 static inline void
 clutter_text_ensure_cursor_position (ClutterText *self)
 {
@ -1192,8 +1057,6 @@ clutter_text_ensure_cursor_position (ClutterText *self)
      g_signal_emit (self, text_signals[CURSOR_EVENT], 0, &cursor_pos);

      g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
-
-      update_cursor_location (self);
    }
 }

@ -1640,8 +1503,6 @@ clutter_text_finalize (GObject *gobject)
  clutter_text_set_buffer (self, NULL);
  g_free (priv->font_name);

-  g_clear_object (&priv->input_focus);
-
  G_OBJECT_CLASS (clutter_text_parent_class)->finalize (gobject);
 }

@ -1998,7 +1859,6 @@ clutter_text_press (ClutterActor *actor,
    return CLUTTER_EVENT_PROPAGATE;

  clutter_actor_grab_key_focus (actor);
-  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
@ -2224,17 +2084,10 @@ clutter_text_key_press (ClutterActor    *actor,
  pool = clutter_binding_pool_find (g_type_name (CLUTTER_TYPE_TEXT));
  g_assert (pool != NULL);

-  if (!(event->flags & CLUTTER_EVENT_FLAG_INPUT_METHOD) &&
-      clutter_input_focus_is_focused (priv->input_focus) &&
-      clutter_input_focus_filter_key_event (priv->input_focus, event))
-    return CLUTTER_EVENT_STOP;
-
  /* we allow passing synthetic events that only contain
-   * the Unicode value and not the key symbol, unless they
-   * contain the input method flag.
+   * the Unicode value and not the key symbol
   */
-  if (event->keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC) &&
-      !(event->flags & CLUTTER_EVENT_FLAG_INPUT_METHOD))
+  if (event->keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
    res = FALSE;
  else
    res = clutter_binding_pool_activate (pool, event->keyval,
@ -2288,20 +2141,6 @@ clutter_text_key_press (ClutterActor    *actor,
  return CLUTTER_EVENT_PROPAGATE;
 }

-static gboolean
-clutter_text_key_release (ClutterActor    *actor,
-                          ClutterKeyEvent *event)
-{
-  ClutterText *self = CLUTTER_TEXT (actor);
-  ClutterTextPrivate *priv = self->priv;
-
-  if (clutter_input_focus_is_focused (priv->input_focus) &&
-      clutter_input_focus_filter_key_event (priv->input_focus, event))
-    return CLUTTER_EVENT_STOP;
-
-  return CLUTTER_EVENT_PROPAGATE;
-}
-
 static void
 clutter_text_compute_layout_offsets (ClutterText           *self,
                                     PangoLayout           *layout,
@ -2824,18 +2663,6 @@ static void
 clutter_text_key_focus_in (ClutterActor *actor)
 {
  ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);
-
-  if (method && priv->editable)
-    {
-      clutter_input_method_focus_in (method, priv->input_focus);
-      clutter_input_focus_set_content_purpose (priv->input_focus,
-					       priv->input_purpose);
-      clutter_input_focus_set_content_hints (priv->input_focus,
-					     priv->input_hints);
-      update_cursor_location (CLUTTER_TEXT (actor));
-    }

  priv->has_focus = TRUE;

@ -2846,17 +2673,9 @@ static void
 clutter_text_key_focus_out (ClutterActor *actor)
 {
  ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);

  priv->has_focus = FALSE;

-  if (priv->editable && clutter_input_focus_is_focused (priv->input_focus))
-    {
-      clutter_text_set_preedit_string (CLUTTER_TEXT (actor), NULL, NULL, 0);
-      clutter_input_method_focus_out (method);
-    }
-
  clutter_text_queue_redraw (actor);
 }

@ -3550,7 +3369,6 @@ clutter_text_class_init (ClutterTextClass *klass)
  actor_class->get_preferred_height = clutter_text_get_preferred_height;
  actor_class->allocate = clutter_text_allocate;
  actor_class->key_press_event = clutter_text_key_press;
-  actor_class->key_release_event = clutter_text_key_release;
  actor_class->button_press_event = clutter_text_button_press;
  actor_class->button_release_event = clutter_text_button_release;
  actor_class->motion_event = clutter_text_motion;
@ -4051,22 +3869,6 @@ clutter_text_class_init (ClutterTextClass *klass)
  obj_props[PROP_SELECTED_TEXT_COLOR_SET] = pspec;
  g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR_SET, pspec);

-  pspec = g_param_spec_flags ("input-hints",
-                              P_("Input hints"),
-                              P_("Input hints"),
-                              CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS,
-                              0, CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_INPUT_HINTS] = pspec;
-  g_object_class_install_property (gobject_class, PROP_INPUT_HINTS, pspec);
-
-  pspec = g_param_spec_enum ("input-purpose",
-                             P_("Input purpose"),
-                             P_("Input purpose"),
-                             CLUTTER_TYPE_INPUT_CONTENT_PURPOSE,
-                             0, CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_INPUT_PURPOSE] = pspec;
-  g_object_class_install_property (gobject_class, PROP_INPUT_PURPOSE, pspec);
-
  /**
   * ClutterText::text-changed:
   * @self: the #ClutterText that emitted the signal
@ -4367,8 +4169,6 @@ clutter_text_init (ClutterText *self)
    g_signal_connect (self, "notify::text-direction",
                      G_CALLBACK (clutter_text_direction_changed_cb),
                      NULL);
-
-  priv->input_focus = clutter_text_input_focus_new (self);
 }

 /**
@ -4515,27 +4315,6 @@ buffer_deleted_text (ClutterTextBuffer *buffer,
    }
 }

-static void
-clutter_text_queue_redraw_or_relayout (ClutterText *self)
-{
-  ClutterActor *actor = CLUTTER_ACTOR (self);
-  gfloat preferred_width;
-  gfloat preferred_height;
-
-  clutter_text_dirty_cache (self);
-
-  /* we're using our private implementations here to avoid the caching done by ClutterActor */
-  clutter_text_get_preferred_width (actor, -1, NULL, &preferred_width);
-  clutter_text_get_preferred_height (actor, preferred_width, NULL, &preferred_height);
-
-  if (clutter_actor_has_allocation (actor) &&
-      (fabsf (preferred_width - clutter_actor_get_width (actor)) > 0.001 ||
-       fabsf (preferred_height - clutter_actor_get_height (actor)) > 0.001))
-    clutter_actor_queue_relayout (actor);
-  else
-    clutter_text_queue_redraw (actor);
-}
-
 static void
 buffer_notify_text (ClutterTextBuffer *buffer,
                    GParamSpec        *spec,
@ -4543,7 +4322,9 @@ buffer_notify_text (ClutterTextBuffer *buffer,
 {
  g_object_freeze_notify (G_OBJECT (self));

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

  g_signal_emit (self, text_signals[TEXT_CHANGED], 0);
  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]);
@ -4678,8 +4459,6 @@ void
 clutter_text_set_editable (ClutterText *self,
                           gboolean     editable)
 {
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);
  ClutterTextPrivate *priv;

  g_return_if_fail (CLUTTER_IS_TEXT (self));
@ -4690,14 +4469,6 @@ clutter_text_set_editable (ClutterText *self,
    {
      priv->editable = editable;

-      if (method)
-        {
-          if (!priv->editable && clutter_input_focus_is_focused (priv->input_focus))
-            clutter_input_method_focus_out (method);
-          else if (priv->has_focus)
-            clutter_input_method_focus_in (method, priv->input_focus);
-        }
-
      clutter_text_queue_redraw (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EDITABLE]);
@ -4895,7 +4666,8 @@ clutter_text_set_cursor_visible (ClutterText *self,
    {
      priv->cursor_visible = cursor_visible;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]);
    }
@ -5796,7 +5568,9 @@ clutter_text_set_line_alignment (ClutterText    *self,
    {
      priv->alignment = alignment;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]);
    }
@ -5851,7 +5625,9 @@ clutter_text_set_use_markup (ClutterText *self,
  if (setting)
    clutter_text_set_markup_internal (self, text);

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }

 /**
@ -5898,7 +5674,9 @@ clutter_text_set_justify (ClutterText *self,
    {
      priv->justify = justify;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]);
    }
@ -6465,7 +6243,8 @@ clutter_text_set_preedit_string (ClutterText   *self,
      priv->preedit_set = TRUE;
    }

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }


@ -6519,53 +6298,3 @@ clutter_text_get_cursor_rect (ClutterText *self,

  *rect = self->priv->cursor_rect;
 }
-
-void
-clutter_text_set_input_hints (ClutterText                  *self,
-                              ClutterInputContentHintFlags  hints)
-{
-  g_return_if_fail (CLUTTER_IS_TEXT (self));
-
-  self->priv->input_hints = hints;
-
-  if (clutter_input_focus_is_focused (self->priv->input_focus))
-    clutter_input_focus_set_content_hints (self->priv->input_focus, hints);
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_INPUT_HINTS]);
-}
-
-ClutterInputContentHintFlags
-clutter_text_get_input_hints (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
-
-  return self->priv->input_hints;
-}
-
-void
-clutter_text_set_input_purpose (ClutterText                *self,
-                                ClutterInputContentPurpose  purpose)
-{
-  g_return_if_fail (CLUTTER_IS_TEXT (self));
-
-  self->priv->input_purpose = purpose;
-
-  if (clutter_input_focus_is_focused (self->priv->input_focus))
-    clutter_input_focus_set_content_purpose (self->priv->input_focus, purpose);
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_INPUT_PURPOSE]);
-}
-
-ClutterInputContentPurpose
-clutter_text_get_input_purpose (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
-
-  return self->priv->input_purpose;
-}
-
-gboolean
-clutter_text_has_preedit (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
-
-  return self->priv->preedit_set;
-}
--- a/clutter/clutter/clutter-text.h
+++ b/clutter/clutter/clutter-text.h
@ -302,20 +302,6 @@ void                  clutter_text_get_layout_offsets   (ClutterText           *
                                                         gint                  *x,
                                                         gint                  *y);

-CLUTTER_AVAILABLE_IN_MUTTER
-void                  clutter_text_set_input_hints (ClutterText                  *self,
-                                                    ClutterInputContentHintFlags  hints);
-CLUTTER_AVAILABLE_IN_MUTTER
-void                  clutter_text_set_input_purpose (ClutterText                *self,
-                                                      ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputContentHintFlags clutter_text_get_input_hints (ClutterText *self);
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputContentPurpose clutter_text_get_input_purpose (ClutterText *self);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean              clutter_text_has_preedit (ClutterText *self);
-
 G_END_DECLS

 #endif /* __CLUTTER_TEXT_H__ */
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@ -97,9 +97,6 @@ typedef struct _ClutterInputDeviceTool          ClutterInputDeviceTool;
 typedef struct _ClutterInputDevice              ClutterInputDevice;
 typedef struct _ClutterVirtualInputDevice       ClutterVirtualInputDevice;

-typedef struct _ClutterInputMethod              ClutterInputMethod;
-typedef struct _ClutterInputFocus               ClutterInputFocus;
-
 typedef CoglMatrix                              ClutterMatrix;

 typedef union _ClutterEvent                     ClutterEvent;
--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@ -115,74 +115,6 @@ clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_d
  klass->notify_keyval (virtual_device, time_us, keyval, key_state);
 }

-void
-clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
-                                                     uint64_t                   time_us,
-                                                     ClutterScrollDirection     direction,
-                                                     ClutterScrollSource        scroll_source)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_discrete_scroll (virtual_device, time_us,
-                                 direction, scroll_source);
-}
-
-void
-clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                       uint64_t                   time_us,
-                                                       double                     dx,
-                                                       double                     dy,
-                                                       ClutterScrollSource        scroll_source,
-                                                       ClutterScrollFinishFlags   finish_flags)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_scroll_continuous (virtual_device, time_us,
-                                   dx, dy, scroll_source, finish_flags);
-}
-
-void
-clutter_virtual_input_device_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                uint64_t                   time_us,
-                                                int                        slot,
-                                                double                     x,
-                                                double                     y)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_down (virtual_device, time_us,
-                            slot, x, y);
-}
-
-void
-clutter_virtual_input_device_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  int                        slot,
-                                                  double                     x,
-                                                  double                     y)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_motion (virtual_device, time_us,
-                              slot, x, y);
-}
-
-void
-clutter_virtual_input_device_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                              uint64_t                   time_us,
-                                              int                        slot)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_up (virtual_device, time_us,
-                          slot);
-}
-
 /**
 * clutter_virtual_input_device_get_manager:
 * @virtual_device: a virtual device
--- a/clutter/clutter/clutter-virtual-input-device.h
+++ b/clutter/clutter/clutter-virtual-input-device.h
@ -76,34 +76,6 @@ struct _ClutterVirtualInputDeviceClass
                         uint64_t                   time_us,
                         uint32_t                   keyval,
                         ClutterKeyState            key_state);
-
-  void (*notify_discrete_scroll) (ClutterVirtualInputDevice *virtual_device,
-                                  uint64_t                   time_us,
-                                  ClutterScrollDirection     direction,
-                                  ClutterScrollSource        scroll_source);
-
-  void (*notify_scroll_continuous) (ClutterVirtualInputDevice *virtual_device,
-                                    uint64_t                   time_us,
-                                    double                     dx,
-                                    double                     dy,
-                                    ClutterScrollSource        scroll_source,
-                                    ClutterScrollFinishFlags   finish_flags);
-
-  void (*notify_touch_down) (ClutterVirtualInputDevice *virtual_device,
-                             uint64_t                   time_us,
-                             int                        slot,
-                             double                     x,
-                             double                     y);
-
-  void (*notify_touch_motion) (ClutterVirtualInputDevice *virtual_device,
-                               uint64_t                   time_us,
-                               int                        slot,
-                               double                     x,
-                               double                     y);
-
-  void (*notify_touch_up) (ClutterVirtualInputDevice *virtual_device,
-                           uint64_t                   time_us,
-                           int                        slot);
 };

 CLUTTER_AVAILABLE_IN_ALL
@ -136,39 +108,6 @@ void clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virt
                                                 uint32_t                   keyval,
                                                 ClutterKeyState            key_state);

-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
-                                                          uint64_t                   time_us,
-                                                          ClutterScrollDirection     direction,
-                                                          ClutterScrollSource        scroll_source);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                            uint64_t                   time_us,
-                                                            double                     dx,
-                                                            double                     dy,
-                                                            ClutterScrollSource        scroll_source,
-                                                            ClutterScrollFinishFlags   finish_flags);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                     uint64_t                   time_us,
-                                                     int                        slot,
-                                                     double                     x,
-                                                     double                     y);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                       uint64_t                   time_us,
-                                                       int                        slot,
-                                                       double                     x,
-                                                       double                     y);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                   uint64_t                   time_us,
-                                                   int                        slot);
-
 CLUTTER_AVAILABLE_IN_ALL
 ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);

--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@ -72,8 +72,6 @@
 #include "clutter-image.h"
 #include "clutter-input-device.h"
 #include "clutter-input-device-tool.h"
-#include "clutter-input-method.h"
-#include "clutter-input-focus.h"
 #include "clutter-interval.h"
 #include "clutter-keyframe-transition.h"
 #include "clutter-keysyms.h"
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@ -51,12 +51,10 @@

 typedef struct _ClutterStageViewCoglPrivate
 {
-  /*
-   * List of previous damaged areas in stage view framebuffer coordinate space.
-   */
+  /* Stores a list of previous damaged areas in the stage coordinate space */
 #define DAMAGE_HISTORY_MAX 16
 #define DAMAGE_HISTORY(x) ((x) & (DAMAGE_HISTORY_MAX - 1))
-  cairo_rectangle_int_t damage_history[DAMAGE_HISTORY_MAX];
+  cairo_region_t * damage_history[DAMAGE_HISTORY_MAX];
  unsigned int damage_index;
 } ClutterStageViewCoglPrivate;

@ -248,13 +246,10 @@ clutter_stage_cogl_has_redraw_clips (ClutterStageWindow *stage_window)
  /* NB: at the start of each new frame there is an implied clip that
   * clips everything (i.e. nothing would be drawn) so we need to make
   * sure we return True in the un-initialized case here.
-   *
-   * NB: a clip width of 0 means a full stage redraw has been queued
-   * so we effectively don't have any redraw clips in that case.
   */
  if (!stage_cogl->initialized_redraw_clip ||
      (stage_cogl->initialized_redraw_clip &&
-       stage_cogl->bounding_redraw_clip.width != 0))
+       stage_cogl->redraw_clip))
    return TRUE;
  else
    return FALSE;
@ -265,9 +260,9 @@ clutter_stage_cogl_ignoring_redraw_clips (ClutterStageWindow *stage_window)
 {
  ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);

-  /* NB: a clip width of 0 means a full stage redraw is required */
+  /* NB: a NULL clip means a full stage redraw is required */
  if (stage_cogl->initialized_redraw_clip &&
-      stage_cogl->bounding_redraw_clip.width == 0)
+      !stage_cogl->redraw_clip)
    return TRUE;
  else
    return FALSE;
@ -298,11 +293,11 @@ clutter_stage_cogl_add_redraw_clip (ClutterStageWindow    *stage_window,
    return;

  /* A NULL stage clip means a full stage redraw has been queued and
-   * we keep track of this by setting a zero width
-   * stage_cogl->bounding_redraw_clip */
+   * we keep track of this by setting a NULL redraw_clip.
+   */
  if (stage_clip == NULL)
    {
-      stage_cogl->bounding_redraw_clip.width = 0;
+      g_clear_pointer (&stage_cogl->redraw_clip, cairo_region_destroy);
      stage_cogl->initialized_redraw_clip = TRUE;
      return;
    }
@ -311,34 +306,27 @@ clutter_stage_cogl_add_redraw_clip (ClutterStageWindow    *stage_window,
  if (stage_clip->width == 0 || stage_clip->height == 0)
    return;

-  if (!stage_cogl->initialized_redraw_clip)
+  if (!stage_cogl->redraw_clip)
    {
-      stage_cogl->bounding_redraw_clip = *stage_clip;
+      stage_cogl->redraw_clip = cairo_region_create_rectangle (stage_clip);
    }
-  else if (stage_cogl->bounding_redraw_clip.width > 0)
+  else
    {
-      _clutter_util_rectangle_union (&stage_cogl->bounding_redraw_clip,
-                                     stage_clip,
-                                     &stage_cogl->bounding_redraw_clip);
+      cairo_region_union_rectangle (stage_cogl->redraw_clip, stage_clip);
    }

  stage_cogl->initialized_redraw_clip = TRUE;
 }

-static gboolean
-clutter_stage_cogl_get_redraw_clip_bounds (ClutterStageWindow    *stage_window,
-                                           cairo_rectangle_int_t *stage_clip)
+static cairo_region_t *
+clutter_stage_cogl_get_redraw_clip (ClutterStageWindow *stage_window)
 {
  ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);

-  if (stage_cogl->using_clipped_redraw)
-    {
-      *stage_clip = stage_cogl->bounding_redraw_clip;
+  if (stage_cogl->using_clipped_redraw && stage_cogl->redraw_clip)
+    return cairo_region_copy (stage_cogl->redraw_clip);

-      return TRUE;
-    }
-
-  return FALSE;
+  return NULL;
 }

 static inline gboolean
@ -416,44 +404,51 @@ swap_framebuffer (ClutterStageWindow    *stage_window,
 static void
 paint_stage (ClutterStageCogl            *stage_cogl,
             ClutterStageView            *view,
-             const cairo_rectangle_int_t *clip)
+             cairo_region_t              *clip)
 {
  ClutterStage *stage = stage_cogl->wrapper;
+  cairo_rectangle_int_t clip_rect;
+
+  cairo_region_get_extents (clip, &clip_rect);

  _clutter_stage_maybe_setup_viewport (stage, view);
-  _clutter_stage_paint_view (stage, view, clip);
+  _clutter_stage_paint_view (stage, view, &clip_rect);

  if (clutter_stage_view_get_onscreen (view) !=
      clutter_stage_view_get_framebuffer (view))
    {
-      clutter_stage_view_blit_offscreen (view, clip);
+      clutter_stage_view_blit_offscreen (view, &clip_rect);
    }
 }

 static void
-fill_current_damage_history_and_step (ClutterStageView *view)
+fill_current_damage_history (ClutterStageView *view,
+                             cairo_region_t   *damage)
 {
  ClutterStageViewCogl *view_cogl = CLUTTER_STAGE_VIEW_COGL (view);
  ClutterStageViewCoglPrivate *view_priv =
    clutter_stage_view_cogl_get_instance_private (view_cogl);
-  cairo_rectangle_int_t view_rect;
-  float fb_scale;
-  cairo_rectangle_int_t *current_fb_damage;
+  cairo_region_t **current_damage;

-  current_fb_damage =
+  current_damage =
    &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index)];
-  clutter_stage_view_get_layout (view, &view_rect);
-  fb_scale = clutter_stage_view_get_scale (view);

-  *current_fb_damage = (cairo_rectangle_int_t) {
-    .x = 0,
-    .y = 0,
-    .width = view_rect.width * fb_scale,
-    .height = view_rect.height * fb_scale
-  };
+  g_clear_pointer (current_damage, cairo_region_destroy);
+  *current_damage = cairo_region_copy (damage);
  view_priv->damage_index++;
 }

+static void
+fill_current_damage_history_rectangle (ClutterStageView            *view,
+                                       const cairo_rectangle_int_t *rect)
+{
+  cairo_region_t *damage;
+
+  damage = cairo_region_create_rectangle (rect);
+  fill_current_damage_history (view, damage);
+  cairo_region_destroy (damage);
+}
+
 static void
 transform_swap_region_to_onscreen (ClutterStageView      *view,
                                   cairo_rectangle_int_t *swap_region)
@ -490,40 +485,6 @@ transform_swap_region_to_onscreen (ClutterStageView      *view,
  };
 }

-static void
-calculate_scissor_region (cairo_rectangle_int_t *fb_clip_region,
-                          int                    subpixel_compensation,
-                          int                    fb_width,
-                          int                    fb_height,
-                          cairo_rectangle_int_t *out_scissor_rect)
-{
-  int scissor_x;
-  int scissor_y;
-  int scissor_width;
-  int scissor_height;
-
-  scissor_x = fb_clip_region->x;
-  scissor_y = fb_clip_region->y;
-  scissor_width = fb_clip_region->width;
-  scissor_height = fb_clip_region->height;
-
-  if (fb_clip_region->x > 0)
-    scissor_x += subpixel_compensation;
-  if (fb_clip_region->y > 0)
-    scissor_y += subpixel_compensation;
-  if (fb_clip_region->x + fb_clip_region->width < fb_width)
-    scissor_width -= 2 * subpixel_compensation;
-  if (fb_clip_region->y + fb_clip_region->height < fb_height)
-    scissor_height -= 2 * subpixel_compensation;
-
-  *out_scissor_rect = (cairo_rectangle_int_t) {
-    .x = scissor_x,
-    .y = scissor_y,
-    .width = scissor_width,
-    .height = scissor_height
-  };
-}
-
 static gboolean
 clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                ClutterStageView   *view)
@ -542,20 +503,17 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
  gboolean do_swap_buffer;
  gboolean swap_with_damage;
  ClutterActor *wrapper;
-  cairo_rectangle_int_t redraw_clip;
+  cairo_region_t *redraw_clip;
+  cairo_region_t *clip_region;
  cairo_rectangle_int_t swap_region;
-  cairo_rectangle_int_t fb_clip_region;
+  cairo_rectangle_int_t clip_rect;
+  cairo_rectangle_int_t redraw_rect;
  gboolean clip_region_empty;
-  float fb_scale;
-  int subpixel_compensation = 0;
-  int fb_width, fb_height;
+  int fb_scale;

  wrapper = CLUTTER_ACTOR (stage_cogl->wrapper);

  clutter_stage_view_get_layout (view, &view_rect);
-  fb_scale = clutter_stage_view_get_scale (view);
-  fb_width = cogl_framebuffer_get_width (fb);
-  fb_height = cogl_framebuffer_get_height (fb);

  can_blit_sub_buffer =
    cogl_is_onscreen (fb) &&
@ -565,20 +523,19 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
    cogl_is_onscreen (fb) &&
    cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);

-  /* NB: a zero width redraw clip == full stage redraw */
-  if (stage_cogl->bounding_redraw_clip.width == 0)
+  /* NB: a NULL redraw clip == full stage redraw */
+  if (!stage_cogl->redraw_clip)
    have_clip = FALSE;
  else
    {
-      redraw_clip = stage_cogl->bounding_redraw_clip;
-      _clutter_util_rectangle_intersection (&redraw_clip,
-                                            &view_rect,
-                                            &redraw_clip);
+      cairo_region_t *view_region;
+      redraw_clip = cairo_region_copy (stage_cogl->redraw_clip);

-      have_clip = !(redraw_clip.x == view_rect.x &&
-                    redraw_clip.y == view_rect.y &&
-                    redraw_clip.width == view_rect.width &&
-                    redraw_clip.height == view_rect.height);
+      view_region = cairo_region_create_rectangle (&view_rect);
+      cairo_region_intersect (redraw_clip, view_region);
+
+      have_clip = !cairo_region_equal (redraw_clip, view_region);
+      cairo_region_destroy (view_region);
    }

  may_use_clipped_redraw = FALSE;
@ -590,24 +547,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
      cogl_onscreen_get_frame_counter (COGL_ONSCREEN (fb)) > 3)
    {
      may_use_clipped_redraw = TRUE;
-
-      if (fb_scale != floorf (fb_scale))
-        subpixel_compensation = ceilf (fb_scale);
-
-      fb_clip_region = (cairo_rectangle_int_t) {
-        .x = (floorf ((redraw_clip.x - view_rect.x) * fb_scale) -
-              subpixel_compensation),
-        .y = (floorf ((redraw_clip.y - view_rect.y) * fb_scale) -
-              subpixel_compensation),
-        .width = (ceilf (redraw_clip.width * fb_scale) +
-                  (2 * subpixel_compensation)),
-        .height = (ceilf (redraw_clip.height * fb_scale) +
-                   (2 * subpixel_compensation))
-      };
+      clip_region = cairo_region_reference (redraw_clip);
    }
  else
    {
-      fb_clip_region = (cairo_rectangle_int_t) { 0 };
+      clip_region = cairo_region_create ();
+      redraw_clip = cairo_region_reference (clip_region);
    }

  if (may_use_clipped_redraw &&
@ -616,7 +561,9 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
  else
    use_clipped_redraw = FALSE;

-  clip_region_empty = may_use_clipped_redraw && fb_clip_region.width == 0;
+  clip_region_empty = may_use_clipped_redraw && cairo_region_is_empty (clip_region);
+
+  fb_scale = clutter_stage_view_get_scale (view);

  swap_with_damage = FALSE;
  if (has_buffer_age)
@ -624,44 +571,26 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
      if (use_clipped_redraw && !clip_region_empty)
        {
          int age, i;
-          cairo_rectangle_int_t *current_fb_damage =
-            &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index++)];

          age = cogl_onscreen_get_buffer_age (COGL_ONSCREEN (fb));

          if (valid_buffer_age (view_cogl, age))
            {
-              cairo_rectangle_int_t damage_region;
-
-              *current_fb_damage = fb_clip_region;
+              fill_current_damage_history (view, clip_region);

              for (i = 1; i <= age; i++)
                {
-                  cairo_rectangle_int_t *fb_damage =
-                    &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - i - 1)];
-
-                  _clutter_util_rectangle_union (&fb_clip_region,
-                                                 fb_damage,
-                                                 &fb_clip_region);
+                  cairo_region_t *damage =
+                    view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - i - 1)];
+                  cairo_region_union (clip_region, damage);
                }

-              /* Update the bounding redraw clip state with the extra damage. */
-              damage_region = (cairo_rectangle_int_t) {
-                .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
-                .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
-                .width = ceilf (fb_clip_region.width / fb_scale),
-                .height = ceilf (fb_clip_region.height / fb_scale)
-              };
-              _clutter_util_rectangle_union (&stage_cogl->bounding_redraw_clip,
-                                             &damage_region,
-                                             &stage_cogl->bounding_redraw_clip);
+              /* Update the redraw clip state with the extra damage. */
+              cairo_region_union (stage_cogl->redraw_clip, clip_region);

-              CLUTTER_NOTE (CLIPPING, "Reusing back buffer(age=%d) - repairing region: x=%d, y=%d, width=%d, height=%d\n",
+              CLUTTER_NOTE (CLIPPING, "Reusing back buffer(age=%d) - repairing region: num rects: %d\n",
                            age,
-                            fb_clip_region.x,
-                            fb_clip_region.y,
-                            fb_clip_region.width,
-                            fb_clip_region.height);
+                            cairo_region_num_rectangles (clip_region));

              swap_with_damage = TRUE;
            }
@ -669,20 +598,17 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
            {
              CLUTTER_NOTE (CLIPPING, "Invalid back buffer(age=%d): forcing full redraw\n", age);
              use_clipped_redraw = FALSE;
-              *current_fb_damage = (cairo_rectangle_int_t) {
-                .x = 0,
-                .y = 0,
-                .width = view_rect.width * fb_scale,
-                .height = view_rect.height * fb_scale
-              };
+              fill_current_damage_history_rectangle (view, &view_rect);
            }
        }
      else if (!use_clipped_redraw)
        {
-          fill_current_damage_history_and_step (view);
+          fill_current_damage_history_rectangle (view, &view_rect);
        }
    }

+  cairo_region_get_extents (clip_region, &clip_rect);
+
  cogl_push_framebuffer (fb);
  if (use_clipped_redraw && clip_region_empty)
    {
@ -690,34 +616,26 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
    }
  else if (use_clipped_redraw)
    {
-      cairo_rectangle_int_t scissor_rect;
-
-      calculate_scissor_region (&fb_clip_region,
-                                subpixel_compensation,
-                                fb_width, fb_height,
-                                &scissor_rect);
+      int scissor_x;
+      int scissor_y;

      CLUTTER_NOTE (CLIPPING,
                    "Stage clip pushed: x=%d, y=%d, width=%d, height=%d\n",
-                    scissor_rect.x,
-                    scissor_rect.y,
-                    scissor_rect.width,
-                    scissor_rect.height);
+                    clip_rect.x,
+                    clip_rect.y,
+                    clip_rect.width,
+                    clip_rect.height);

      stage_cogl->using_clipped_redraw = TRUE;

+      scissor_x = (clip_rect.x - view_rect.x) * fb_scale;
+      scissor_y = (clip_rect.y - view_rect.y) * fb_scale;
      cogl_framebuffer_push_scissor_clip (fb,
-                                          scissor_rect.x,
-                                          scissor_rect.y,
-                                          scissor_rect.width,
-                                          scissor_rect.height);
-      paint_stage (stage_cogl, view,
-                   &(cairo_rectangle_int_t) {
-                     .x = view_rect.x + floorf ((fb_clip_region.x - 0) / fb_scale),
-                     .y = view_rect.y + floorf ((fb_clip_region.y - 0) / fb_scale),
-                     .width = ceilf ((fb_clip_region.width + 0) / fb_scale),
-                     .height = ceilf ((fb_clip_region.height + 0) / fb_scale)
-                   });
+                                          scissor_x,
+                                          scissor_y,
+                                          clip_rect.width * fb_scale,
+                                          clip_rect.height * fb_scale);
+      paint_stage (stage_cogl, view, clip_region);
      cogl_framebuffer_pop_clip (fb);

      stage_cogl->using_clipped_redraw = FALSE;
@ -727,47 +645,47 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
      CLUTTER_NOTE (CLIPPING, "Unclipped stage paint\n");

      /* If we are trying to debug redraw issues then we want to pass
-       * the bounding_redraw_clip so it can be visualized */
+       * the redraw_clip so it can be visualized */
      if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS) &&
          may_use_clipped_redraw &&
          !clip_region_empty)
        {
-          cairo_rectangle_int_t scissor_rect;
-
-          calculate_scissor_region (&fb_clip_region,
-                                    subpixel_compensation,
-                                    fb_width, fb_height,
-                                    &scissor_rect);
+          int scissor_x;
+          int scissor_y;

+          scissor_x = (clip_rect.x - view_rect.x) * fb_scale;;
+          scissor_y = (clip_rect.y - view_rect.y) * fb_scale;
          cogl_framebuffer_push_scissor_clip (fb,
-                                              scissor_rect.x,
-                                              scissor_rect.y,
-                                              scissor_rect.width,
-                                              scissor_rect.height);
-          paint_stage (stage_cogl, view,
-                       &(cairo_rectangle_int_t) {
-                         .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
-                         .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
-                         .width = ceilf (fb_clip_region.width / fb_scale),
-                         .height = ceilf (fb_clip_region.height / fb_scale)
-                       });
+                                              scissor_x,
+                                              scissor_y,
+                                              clip_rect.width * fb_scale,
+                                              clip_rect.height * fb_scale);
+          paint_stage (stage_cogl, view, clip_region);
          cogl_framebuffer_pop_clip (fb);
        }
      else
-        paint_stage (stage_cogl, view, &view_rect);
+        {
+          cairo_region_t *view_region;
+
+          view_region = cairo_region_create_rectangle (&view_rect);
+          paint_stage (stage_cogl, view, view_region);
+          cairo_region_destroy (view_region);
+        }
    }
  cogl_pop_framebuffer ();

+  cairo_region_get_extents (redraw_clip, &redraw_rect);
+
  if (may_use_clipped_redraw &&
      G_UNLIKELY ((clutter_paint_debug_flags & CLUTTER_DEBUG_REDRAWS)))
    {
      CoglContext *ctx = cogl_framebuffer_get_context (fb);
      static CoglPipeline *outline = NULL;
      ClutterActor *actor = CLUTTER_ACTOR (wrapper);
-      float x_1 = redraw_clip.x;
-      float x_2 = redraw_clip.x + redraw_clip.width;
-      float y_1 = redraw_clip.y;
-      float y_2 = redraw_clip.y + redraw_clip.height;
+      float x_1 = redraw_rect.x;
+      float x_2 = redraw_rect.x + redraw_rect.width;
+      float y_1 = redraw_rect.y;
+      float y_2 = redraw_rect.y + redraw_rect.height;
      CoglVertexP2 quad[4] = {
        { x_1, y_1 },
        { x_2, y_1 },
@ -813,7 +731,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
        }
      else if (use_clipped_redraw)
        {
-          swap_region = fb_clip_region;
+          swap_region = (cairo_rectangle_int_t) {
+            .x = (clip_rect.x - view_rect.x) * fb_scale,
+            .y = (clip_rect.y - view_rect.y) * fb_scale,
+            .width = clip_rect.width * fb_scale,
+            .height = clip_rect.height * fb_scale,
+          };
          g_assert (swap_region.width > 0);
          do_swap_buffer = TRUE;
        }
@ -834,6 +757,11 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
      do_swap_buffer = TRUE;
    }

+  if (redraw_clip)
+    cairo_region_destroy (redraw_clip);
+  if (clip_region)
+    cairo_region_destroy (clip_region);
+
  if (do_swap_buffer)
    {
      if (clutter_stage_view_get_onscreen (view) !=
@ -881,6 +809,7 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)

  /* reset the redraw clipping for the next paint... */
  stage_cogl->initialized_redraw_clip = FALSE;
+  g_clear_pointer (&stage_cogl->redraw_clip, cairo_region_destroy);

  stage_cogl->frame_count++;
 }
@ -895,25 +824,9 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
  gboolean has_buffer_age =
    cogl_is_onscreen (framebuffer) &&
    cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
-  float fb_scale;
-  gboolean scale_is_fractional;
+  cairo_rectangle_int_t rect;

-  fb_scale = clutter_stage_view_get_scale (view);
-  if (fb_scale != floorf (fb_scale))
-    scale_is_fractional = TRUE;
-  else
-    scale_is_fractional = FALSE;
-
-  /*
-   * Buffer damage is tracked in the framebuffer coordinate space
-   * using the damage history. When fractional scaling is used, a
-   * coordinate on the stage might not correspond to the exact position of any
-   * physical pixel, which causes issues when painting using the pick mode.
-   *
-   * For now, always use the (0, 0) pixel for picking when using fractional
-   * framebuffer scaling.
-   */
-  if (!has_buffer_age || scale_is_fractional)
+  if (!has_buffer_age)
    {
      *x = 0;
      *y = 0;
@ -924,13 +837,18 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
      ClutterStageViewCoglPrivate *view_priv =
        clutter_stage_view_cogl_get_instance_private (view_cogl);
      cairo_rectangle_int_t view_layout;
-      cairo_rectangle_int_t *fb_damage;
+      cairo_region_t *damage;

      clutter_stage_view_get_layout (view, &view_layout);

-      fb_damage = &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - 1)];
-      *x = fb_damage->x / fb_scale;
-      *y = fb_damage->y / fb_scale;
+      damage = view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - 1)];
+      if (damage)
+        cairo_region_get_rectangle (damage, 0, &rect);
+      else
+        rect.x = rect.y = 0;
+
+      *x = rect.x - view_layout.x;
+      *y = rect.y - view_layout.y;
    }
 }

@ -949,7 +867,7 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
  iface->add_redraw_clip = clutter_stage_cogl_add_redraw_clip;
  iface->has_redraw_clips = clutter_stage_cogl_has_redraw_clips;
  iface->ignoring_redraw_clips = clutter_stage_cogl_ignoring_redraw_clips;
-  iface->get_redraw_clip_bounds = clutter_stage_cogl_get_redraw_clip_bounds;
+  iface->get_redraw_clip = clutter_stage_cogl_get_redraw_clip;
  iface->redraw = clutter_stage_cogl_redraw;
  iface->get_dirty_pixel = clutter_stage_cogl_get_dirty_pixel;
 }
--- a/clutter/clutter/cogl/clutter-stage-cogl.h
+++ b/clutter/clutter/cogl/clutter-stage-cogl.h
@ -59,7 +59,7 @@ struct _ClutterStageCogl
   * junk frames to start with. */
  unsigned int frame_count;

-  cairo_rectangle_int_t bounding_redraw_clip;
+  cairo_region_t *redraw_clip;

  guint initialized_redraw_clip : 1;

--- a/clutter/clutter/egl/clutter-backend-eglnative.c
+++ b/clutter/clutter/egl/clutter-backend-eglnative.c
@ -48,7 +48,6 @@
 #include "clutter-private.h"
 #include "clutter-main.h"
 #include "clutter-stage-private.h"
-#include "clutter-settings-private.h"

 #ifdef COGL_HAS_EGL_SUPPORT
 #include "clutter-egl.h"
@ -61,8 +60,6 @@ clutter_backend_egl_native_dispose (GObject *gobject)
 {
  ClutterBackendEglNative *backend_egl_native = CLUTTER_BACKEND_EGL_NATIVE (gobject);

-  g_clear_object (&backend_egl_native->xsettings);
-
  if (backend_egl_native->event_timer != NULL)
    {
      g_timer_destroy (backend_egl_native->event_timer);
@ -80,181 +77,9 @@ clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass)
  gobject_class->dispose = clutter_backend_egl_native_dispose;
 }

-typedef struct
-{
-  cairo_antialias_t cairo_antialias;
-  gint clutter_font_antialias;
-
-  cairo_hint_style_t cairo_hint_style;
-  const char *clutter_font_hint_style;
-
-  cairo_subpixel_order_t cairo_subpixel_order;
-  const char *clutter_font_subpixel_order;
-} FontSettings;
-
-static void
-get_font_gsettings (GSettings    *xsettings,
-                    FontSettings *output)
-{
-  /* org.gnome.settings-daemon.GsdFontAntialiasingMode */
-  static const struct
-  {
-    cairo_antialias_t cairo_antialias;
-    gint clutter_font_antialias;
-  }
-  antialiasings[] =
-  {
-    /* none=0      */ {CAIRO_ANTIALIAS_NONE,     0},
-    /* grayscale=1 */ {CAIRO_ANTIALIAS_GRAY,     1},
-    /* rgba=2      */ {CAIRO_ANTIALIAS_SUBPIXEL, 1},
-  };
-
-  /* org.gnome.settings-daemon.GsdFontHinting */
-  static const struct
-  {
-    cairo_hint_style_t cairo_hint_style;
-    const char *clutter_font_hint_style;
-  }
-  hintings[] =
-  {
-    /* none=0   */ {CAIRO_HINT_STYLE_NONE,   "hintnone"},
-    /* slight=1 */ {CAIRO_HINT_STYLE_SLIGHT, "hintslight"},
-    /* medium=2 */ {CAIRO_HINT_STYLE_MEDIUM, "hintmedium"},
-    /* full=3   */ {CAIRO_HINT_STYLE_FULL,   "hintfull"},
-  };
-
-  /* org.gnome.settings-daemon.GsdFontRgbaOrder */
-  static const struct
-  {
-    cairo_subpixel_order_t cairo_subpixel_order;
-    const char *clutter_font_subpixel_order;
-  }
-  rgba_orders[] =
-  {
-    /* rgba=0 */ {CAIRO_SUBPIXEL_ORDER_RGB,  "rgb"}, /* XXX what is 'rgba'? */
-    /* rgb=1  */ {CAIRO_SUBPIXEL_ORDER_RGB,  "rgb"},
-    /* bgr=2  */ {CAIRO_SUBPIXEL_ORDER_BGR,  "bgr"},
-    /* vrgb=3 */ {CAIRO_SUBPIXEL_ORDER_VRGB, "vrgb"},
-    /* vbgr=4 */ {CAIRO_SUBPIXEL_ORDER_VBGR, "vbgr"},
-  };
-  guint i;
-
-  i = g_settings_get_enum (xsettings, "hinting");
-  if (i < G_N_ELEMENTS (hintings))
-    {
-      output->cairo_hint_style = hintings[i].cairo_hint_style;
-      output->clutter_font_hint_style = hintings[i].clutter_font_hint_style;
-    }
-  else
-    {
-      output->cairo_hint_style = CAIRO_HINT_STYLE_DEFAULT;
-      output->clutter_font_hint_style = NULL;
-    }
-
-  i = g_settings_get_enum (xsettings, "antialiasing");
-  if (i < G_N_ELEMENTS (antialiasings))
-    {
-      output->cairo_antialias = antialiasings[i].cairo_antialias;
-      output->clutter_font_antialias = antialiasings[i].clutter_font_antialias;
-    }
-  else
-    {
-      output->cairo_antialias = CAIRO_ANTIALIAS_DEFAULT;
-      output->clutter_font_antialias = -1;
-    }
-
-  i = g_settings_get_enum (xsettings, "rgba-order");
-  if (i < G_N_ELEMENTS (rgba_orders))
-    {
-      output->cairo_subpixel_order = rgba_orders[i].cairo_subpixel_order;
-      output->clutter_font_subpixel_order = rgba_orders[i].clutter_font_subpixel_order;
-    }
-  else
-    {
-      output->cairo_subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-      output->clutter_font_subpixel_order = NULL;
-    }
-
-  if (output->cairo_antialias == CAIRO_ANTIALIAS_GRAY)
-    output->clutter_font_subpixel_order = "none";
-}
-
-static void
-init_font_options (ClutterBackendEglNative *backend_egl_native)
-{
-  GSettings *xsettings = backend_egl_native->xsettings;
-  cairo_font_options_t *options = cairo_font_options_create ();
-  FontSettings fs;
-
-  get_font_gsettings (xsettings, &fs);
-
-  cairo_font_options_set_hint_style (options, fs.cairo_hint_style);
-  cairo_font_options_set_antialias (options, fs.cairo_antialias);
-  cairo_font_options_set_subpixel_order (options, fs.cairo_subpixel_order);
-
-  clutter_backend_set_font_options (CLUTTER_BACKEND (backend_egl_native),
-                                    options);
-
-  cairo_font_options_destroy (options);
-}
-
-static gboolean
-on_xsettings_change_event (GSettings *xsettings,
-                           gpointer   keys,
-                           gint       n_keys,
-                           gpointer   user_data)
-{
-  /*
-   * A simpler alternative to this function that does not update the screen
-   * immediately (like macOS :P):
-   *
-   *   init_font_options (CLUTTER_BACKEND_EGL_NATIVE (user_data));
-   *
-   * which has the added benefit of eliminating the need for all the
-   * FontSettings.clutter_ fields. However the below approach is better for
-   * testing settings and more consistent with the existing x11 backend...
-   */
-  ClutterSettings *csettings = clutter_settings_get_default ();
-  FontSettings fs;
-  gint hinting;
-
-  get_font_gsettings (xsettings, &fs);
-  hinting = fs.cairo_hint_style == CAIRO_HINT_STYLE_NONE ? 0 : 1;
-  g_object_set (csettings,
-                "font-hinting",        hinting,
-                "font-hint-style",     fs.clutter_font_hint_style,
-                "font-antialias",      fs.clutter_font_antialias,
-                "font-subpixel-order", fs.clutter_font_subpixel_order,
-                NULL);
-
-  return FALSE;
-}
-
 static void
 clutter_backend_egl_native_init (ClutterBackendEglNative *backend_egl_native)
 {
-  static const gchar xsettings_path[] = "org.gnome.settings-daemon.plugins.xsettings";
-  GSettingsSchemaSource *source = g_settings_schema_source_get_default ();
-  GSettingsSchema *schema = g_settings_schema_source_lookup (source,
-                                                             xsettings_path,
-                                                             FALSE);
-
-  if (!schema)
-    {
-      g_warning ("Failed to find schema: %s", xsettings_path);
-    }
-  else
-    {
-      backend_egl_native->xsettings = g_settings_new_full (schema, NULL, NULL);
-      if (backend_egl_native->xsettings)
-        {
-          init_font_options (backend_egl_native);
-          g_signal_connect (backend_egl_native->xsettings, "change-event",
-                            G_CALLBACK (on_xsettings_change_event),
-                            backend_egl_native);
-        }
-    }
-
  backend_egl_native->event_timer = g_timer_new ();
 }

--- a/clutter/clutter/egl/clutter-backend-eglnative.h
+++ b/clutter/clutter/egl/clutter-backend-eglnative.h
@ -61,9 +61,6 @@ struct _ClutterBackendEglNative

  /* event timer */
  GTimer *event_timer;
-
-  /* "xsettings" is still the defacto place for Xft settings, even in Wayland */
-  GSettings *xsettings;
 };

 struct _ClutterBackendEglNativeClass
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@ -59,6 +59,9 @@

 #include "clutter-device-manager-evdev.h"

+#define DISCRETE_SCROLL_STEP 10.0
+
+
 /*
 * Clutter makes the assumption that two core devices have ID's 2 and 3 (core
 * pointer and core keyboard).
@ -397,6 +400,168 @@ notify_relative_tool_motion (ClutterInputDevice *input_device,
  queue_event (event);
 }

+static ClutterScrollDirection
+discrete_to_direction (gdouble discrete_x,
+                       gdouble discrete_y)
+{
+  if (discrete_x > 0)
+    return CLUTTER_SCROLL_RIGHT;
+  else if (discrete_x < 0)
+    return CLUTTER_SCROLL_LEFT;
+  else if (discrete_y > 0)
+    return CLUTTER_SCROLL_DOWN;
+  else if (discrete_y < 0)
+    return CLUTTER_SCROLL_UP;
+  else
+    return CLUTTER_SCROLL_SMOOTH;
+}
+
+static void
+notify_discrete_scroll (ClutterInputDevice     *input_device,
+                        guint64                 time_us,
+                        ClutterScrollDirection  direction,
+                        ClutterScrollSource     scroll_source,
+                        gboolean                emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  if (direction == CLUTTER_SCROLL_SMOOTH)
+    return;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  event->scroll.direction = direction;
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = scroll_source;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+notify_scroll (ClutterInputDevice       *input_device,
+               guint64                   time_us,
+               gdouble                   dx,
+               gdouble                   dy,
+               ClutterScrollSource       source,
+               ClutterScrollFinishFlags  flags,
+               gboolean                  emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  gdouble scroll_factor;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  /* libinput pointer axis events are in pointer motion coordinate space.
+   * To convert to Xi2 discrete step coordinate space, multiply the factor
+   * 1/10. */
+  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
+  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
+  clutter_event_set_scroll_delta (event,
+                                  scroll_factor * dx,
+                                  scroll_factor * dy);
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = source;
+  event->scroll.finish_flags = flags;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+notify_touch_event (ClutterInputDevice *input_device,
+		    ClutterEventType    evtype,
+		    guint64             time_us,
+		    gint32              slot,
+		    gdouble             x,
+		    gdouble             y)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (evtype);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->touch.time = us2ms (time_us);
+  event->touch.stage = CLUTTER_STAGE (stage);
+  event->touch.device = seat->core_pointer;
+  event->touch.x = x;
+  event->touch.y = y;
+  clutter_input_device_evdev_translate_coordinates (input_device, stage,
+                                                    &event->touch.x,
+                                                    &event->touch.y);
+
+  /* "NULL" sequences are special cased in clutter */
+  event->touch.sequence = GINT_TO_POINTER (slot + 1);
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  if (evtype == CLUTTER_TOUCH_BEGIN ||
+      evtype == CLUTTER_TOUCH_UPDATE)
+    event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
+
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+
+  queue_event (event);
+}
+
 static void
 notify_pinch_gesture_event (ClutterInputDevice          *input_device,
                            ClutterTouchpadGesturePhase  phase,
@ -793,12 +958,10 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
      if (priv->main_seat->libinput_seat == NULL)
        seat = priv->main_seat;
      else
-        {
-          seat = clutter_seat_evdev_new (manager_evdev);
-          priv->seats = g_slist_append (priv->seats, seat);
-        }
+        seat = clutter_seat_evdev_new (manager_evdev);

      clutter_seat_evdev_set_libinput_seat (seat, libinput_seat);
+      priv->seats = g_slist_append (priv->seats, seat);
    }

  device = _clutter_input_device_evdev_new (manager, seat, libinput_device);
@ -921,6 +1084,7 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  ClutterDeviceManagerEvdev *manager_evdev;
  ClutterDeviceManagerEvdevPrivate *priv;
  GSList *l;
+  GSList *device_it;

  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
  priv = manager_evdev->priv;
@ -928,10 +1092,14 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  for (l = priv->seats; l; l = l->next)
    {
      ClutterSeatEvdev *seat = l->data;
-      ClutterInputDevice *device = clutter_seat_evdev_get_device (seat, id);

-      if (device)
-        return device;
+      for (device_it = seat->devices; device_it; device_it = device_it->next)
+        {
+          ClutterInputDevice *device = device_it->data;
+
+          if (clutter_input_device_get_device_id (device) == id)
+            return device;
+        }
    }

  return NULL;
@ -985,6 +1153,40 @@ process_base_event (ClutterDeviceManagerEvdev *manager_evdev,
  return handled;
 }

+static void
+check_notify_discrete_scroll (ClutterDeviceManagerEvdev *manager_evdev,
+                              ClutterInputDevice        *device,
+                              guint64                    time_us,
+                              ClutterScrollSource        scroll_source)
+{
+  ClutterInputDeviceEvdev *device_evdev =
+    CLUTTER_INPUT_DEVICE_EVDEV (device);
+  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
+  int i, n_xscrolls, n_yscrolls;
+
+  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
+  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
+
+  for (i = 0; i < n_xscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dx > 0 ?
+                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
+                              scroll_source, TRUE);
+    }
+
+  for (i = 0; i < n_yscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dy > 0 ?
+                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
+                              scroll_source, TRUE);
+    }
+
+  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
+  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
+}
+
 static ClutterScrollSource
 translate_scroll_source (enum libinput_pointer_axis_source source)
 {
@ -1132,68 +1334,6 @@ seat_from_device (ClutterInputDevice *device)
  return _clutter_input_device_evdev_get_seat (device_evdev);
 }

-static void
-notify_continuous_axis (ClutterSeatEvdev              *seat,
-                        ClutterInputDevice            *device,
-                        uint64_t                       time_us,
-                        ClutterScrollSource            scroll_source,
-                        struct libinput_event_pointer *axis_event)
-{
-  gdouble dx = 0.0, dy = 0.0;
-  ClutterScrollFinishFlags finish_flags = CLUTTER_SCROLL_FINISHED_NONE;
-
-  if (libinput_event_pointer_has_axis (axis_event,
-                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
-    {
-      dx = libinput_event_pointer_get_axis_value (
-          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
-
-      if (fabs (dx) < DBL_EPSILON)
-        finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
-    }
-  if (libinput_event_pointer_has_axis (axis_event,
-                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
-    {
-      dy = libinput_event_pointer_get_axis_value (
-          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-
-      if (fabs (dy) < DBL_EPSILON)
-        finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
-    }
-
-  clutter_seat_evdev_notify_scroll_continuous (seat, device, time_us,
-                                               dx, dy,
-                                               scroll_source, finish_flags);
-}
-
-static void
-notify_discrete_axis (ClutterSeatEvdev              *seat,
-                      ClutterInputDevice            *device,
-                      uint64_t                       time_us,
-                      ClutterScrollSource            scroll_source,
-                      struct libinput_event_pointer *axis_event)
-{
-  gdouble discrete_dx = 0.0, discrete_dy = 0.0;
-
-  if (libinput_event_pointer_has_axis (axis_event,
-                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
-    {
-      discrete_dx = libinput_event_pointer_get_axis_value_discrete (
-          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
-    }
-  if (libinput_event_pointer_has_axis (axis_event,
-                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
-    {
-      discrete_dy = libinput_event_pointer_get_axis_value_discrete (
-          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-    }
-
-  clutter_seat_evdev_notify_discrete_scroll (seat, device,
-                                             time_us,
-                                             discrete_dx, discrete_dy,
-                                             scroll_source);
-}
-
 static gboolean
 process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
                      struct libinput_event *event)
@ -1201,7 +1341,6 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
  gboolean handled = TRUE;
  struct libinput_device *libinput_device = libinput_event_get_device(event);
  ClutterInputDevice *device;
-  ClutterInputDeviceEvdev *device_evdev;

  switch (libinput_event_get_type (event))
    {
@ -1321,12 +1460,17 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,

    case LIBINPUT_EVENT_POINTER_AXIS:
      {
+        gdouble dx = 0.0, dy = 0.0;
+        gdouble discrete_x = 0.0, discrete_y = 0.0;
        guint64 time_us;
+        gboolean wheel = FALSE;
+        enum libinput_pointer_axis axis;
        enum libinput_pointer_axis_source source;
        struct libinput_event_pointer *axis_event =
          libinput_event_get_pointer_event (event);
        ClutterSeatEvdev *seat;
        ClutterScrollSource scroll_source;
+        ClutterScrollFinishFlags finish_flags = 0;

        device = libinput_device_get_user_data (libinput_device);
        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
@ -1340,25 +1484,68 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
           backwards-compat with existing clients, we just send multiples of
           the click count. */

-        switch (scroll_source)
+        if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL)
+            wheel = TRUE;
+
+        axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
+        if (libinput_event_pointer_has_axis (axis_event, axis))
          {
-          case CLUTTER_SCROLL_SOURCE_WHEEL:
-            notify_discrete_axis (seat, device, time_us, scroll_source,
-                                  axis_event);
-            break;
-          case CLUTTER_SCROLL_SOURCE_FINGER:
-          case CLUTTER_SCROLL_SOURCE_CONTINUOUS:
-          case CLUTTER_SCROLL_SOURCE_UNKNOWN:
-            notify_continuous_axis (seat, device, time_us, scroll_source,
-                                    axis_event);
-            break;
+            discrete_y = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
+            dy = libinput_event_pointer_get_axis_value (axis_event, axis);
+
+            if (wheel)
+              seat->accum_scroll_dy = 0;
+            else if (fabs (dy) < DBL_EPSILON)
+              {
+                finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
+                seat->accum_scroll_dy = 0;
+              }
+            else
+              seat->accum_scroll_dy += dy;
          }
+
+        axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
+        if (libinput_event_pointer_has_axis (axis_event, axis))
+          {
+            discrete_x = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
+            dx = libinput_event_pointer_get_axis_value (axis_event, axis);
+
+            if (wheel)
+              seat->accum_scroll_dx = 0;
+            else if (fabs (dx) < DBL_EPSILON)
+              {
+                finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
+                seat->accum_scroll_dx = 0;
+              }
+            else
+              seat->accum_scroll_dx += dx;
+          }
+
+        if (wheel)
+          {
+            notify_scroll (device, time_us,
+                           discrete_x * DISCRETE_SCROLL_STEP,
+                           discrete_y * DISCRETE_SCROLL_STEP,
+                           scroll_source, finish_flags, TRUE);
+            notify_discrete_scroll (device, time_us,
+                                    discrete_to_direction (discrete_x, discrete_y),
+                                    scroll_source, FALSE);
+          }
+        else
+          {
+            notify_scroll (device, time_us, dx, dy,
+                           scroll_source, finish_flags, FALSE);
+            check_notify_discrete_scroll (manager_evdev, device,
+                                          time_us, scroll_source);
+          }
+
        break;
+
      }

    case LIBINPUT_EVENT_TOUCH_DOWN:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        double x, y;
        gfloat stage_width, stage_height;
@ -1369,8 +1556,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

        stage = _clutter_input_device_get_stage (device);
        if (stage == NULL)
@ -1379,31 +1565,25 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
        x = libinput_event_touch_get_x_transformed (touch_event,
                                                    stage_width);
        y = libinput_event_touch_get_y_transformed (touch_event,
                                                    stage_height);

-        touch_state =
-          clutter_input_device_evdev_acquire_touch_state (device_evdev,
-                                                          device_slot);
+        touch_state = clutter_seat_evdev_add_touch (seat, slot);
        touch_state->coords.x = x;
        touch_state->coords.y = y;

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_BEGIN,
-                                               time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
+        notify_touch_event (device, CLUTTER_TOUCH_BEGIN, time_us, slot,
+                             touch_state->coords.x, touch_state->coords.y);
        break;
      }

    case LIBINPUT_EVENT_TOUCH_UP:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        ClutterSeatEvdev *seat;
        ClutterTouchState *touch_state;
@ -1411,30 +1591,22 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
-        touch_state =
-          clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                         device_slot);
-        if (!touch_state)
-          break;
+        touch_state = clutter_seat_evdev_get_touch (seat, slot);
+
+        notify_touch_event (device, CLUTTER_TOUCH_END, time_us, slot,
+			    touch_state->coords.x, touch_state->coords.y);
+        clutter_seat_evdev_remove_touch (seat, slot);

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_END, time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
-        clutter_input_device_evdev_release_touch_state (device_evdev,
-                                                        touch_state);
        break;
      }

    case LIBINPUT_EVENT_TOUCH_MOTION:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        double x, y;
        gfloat stage_width, stage_height;
@ -1445,8 +1617,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

        stage = _clutter_input_device_get_stage (device);
        if (stage == NULL)
@ -1455,41 +1626,42 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
        x = libinput_event_touch_get_x_transformed (touch_event,
                                                    stage_width);
        y = libinput_event_touch_get_y_transformed (touch_event,
                                                    stage_height);

-        touch_state =
-          clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                         device_slot);
-        if (!touch_state)
-          break;
-
+        touch_state = clutter_seat_evdev_get_touch (seat, slot);
        touch_state->coords.x = x;
        touch_state->coords.y = y;

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_UPDATE,
-                                               time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
+        notify_touch_event (device, CLUTTER_TOUCH_UPDATE, time_us, slot,
+			    touch_state->coords.x, touch_state->coords.y);
        break;
      }
    case LIBINPUT_EVENT_TOUCH_CANCEL:
      {
+        ClutterTouchState *touch_state;
+        GHashTableIter iter;
        guint64 time_us;
        struct libinput_event_touch *touch_event =
          libinput_event_get_touch_event (event);
+        ClutterSeatEvdev *seat;

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
        time_us = libinput_event_touch_get_time_usec (touch_event);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
+        g_hash_table_iter_init (&iter, seat->touches);

-        clutter_input_device_evdev_release_touch_slots (device_evdev, time_us);
+        while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &touch_state))
+          {
+            notify_touch_event (device, CLUTTER_TOUCH_CANCEL,
+                                time_us, touch_state->id,
+                                touch_state->coords.x, touch_state->coords.y);
+            g_hash_table_iter_remove (&iter);
+          }

        break;
      }
@ -1863,14 +2035,6 @@ clutter_device_manager_evdev_create_virtual_device (ClutterDeviceManager  *manag
                       NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_evdev_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_TOUCHSCREEN);
-}
-
 static void
 clutter_device_manager_evdev_compress_motion (ClutterDeviceManager *device_manger,
                                              ClutterEvent         *event,
@ -1896,18 +2060,6 @@ clutter_device_manager_evdev_compress_motion (ClutterDeviceManager *device_mange
                                            dy_unaccel + dst_dy_unaccel);
 }

-static void
-clutter_device_manager_evdev_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                      ClutterKbdA11ySettings *settings)
-{
-  ClutterInputDevice *device;
-
-  device = clutter_device_manager_evdev_get_core_device (device_manager, CLUTTER_KEYBOARD_DEVICE);
-  if (device)
-    clutter_input_device_evdev_apply_kbd_a11y_settings (CLUTTER_INPUT_DEVICE_EVDEV (device),
-                                                        settings);
-}
-
 /*
 * GObject implementation
 */
@ -1964,7 +2116,6 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
  xkb_context_unref (ctx);

  priv->main_seat = clutter_seat_evdev_new (manager_evdev);
-  priv->seats = g_slist_append (priv->seats, priv->main_seat);

  dispatch_libinput (manager_evdev);

@ -2050,9 +2201,7 @@ clutter_device_manager_evdev_class_init (ClutterDeviceManagerEvdevClass *klass)
  manager_class->get_core_device = clutter_device_manager_evdev_get_core_device;
  manager_class->get_device = clutter_device_manager_evdev_get_device;
  manager_class->create_virtual_device = clutter_device_manager_evdev_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_evdev_get_supported_virtual_device_types;
  manager_class->compress_motion = clutter_device_manager_evdev_compress_motion;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_evdev_apply_kbd_a11y_settings;
 }

 static void
@ -2173,7 +2322,7 @@ _clutter_device_manager_evdev_acquire_device_id (ClutterDeviceManagerEvdev *mana

  first = g_list_first (priv->free_device_ids);
  next_id = GPOINTER_TO_INT (first->data);
-  priv->free_device_ids = g_list_delete_link (priv->free_device_ids, first);
+  priv->free_device_ids = g_list_remove_link (priv->free_device_ids, first);

  return next_id;
 }
@ -2292,7 +2441,7 @@ clutter_evdev_update_xkb_state (ClutterDeviceManagerEvdev *manager_evdev)
                             0, /* depressed */
                             latched_mods,
                             locked_mods,
-                             0, 0, seat->layout_idx);
+                             0, 0, 0);

      seat->caps_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_CAPS);
      seat->num_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_NUM);
@ -2440,7 +2589,6 @@ clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
  xkb_mod_mask_t latched_mods;
  xkb_mod_mask_t locked_mods;
  struct xkb_state *state;
-  GSList *l;

  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));

@ -2452,24 +2600,6 @@ clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
  locked_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED);

  xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
-  for (l = manager_evdev->priv->seats; l; l = l->next)
-    {
-      ClutterSeatEvdev *seat = l->data;
-
-      seat->layout_idx = idx;
-    }
-}
-
-/**
- * clutter_evdev_get_keyboard_layout_index: (skip)
- */
-xkb_layout_index_t
-clutter_evdev_get_keyboard_layout_index (ClutterDeviceManager *evdev)
-{
-  ClutterDeviceManagerEvdev *manager_evdev;
-
-  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
-  return manager_evdev->priv->main_seat->layout_idx;
 }

 /**
--- a/clutter/clutter/evdev/clutter-evdev.h
+++ b/clutter/clutter/evdev/clutter-evdev.h
@ -120,9 +120,6 @@ CLUTTER_AVAILABLE_IN_1_20
 void clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
                                              xkb_layout_index_t    idx);

-CLUTTER_AVAILABLE_IN_MUTTER
-xkb_layout_index_t clutter_evdev_get_keyboard_layout_index (ClutterDeviceManager *evdev);
-
 CLUTTER_AVAILABLE_IN_1_26
 void clutter_evdev_set_keyboard_numlock (ClutterDeviceManager *evdev,
                                         gboolean              numlock_state);
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
--- a/clutter/clutter/evdev/clutter-input-device-evdev.h
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.h
@ -70,31 +70,6 @@ struct _ClutterInputDeviceEvdev
  cairo_matrix_t device_matrix;
  gdouble device_aspect_ratio; /* w:h */
  gdouble output_ratio;        /* w:h */
-
-  GHashTable *touches;
-
-  /* Keyboard a11y */
-  ClutterKeyboardA11yFlags a11y_flags;
-  GList *slow_keys_list;
-  guint debounce_timer;
-  guint16 debounce_key;
-  xkb_mod_mask_t stickykeys_depressed_mask;
-  xkb_mod_mask_t stickykeys_latched_mask;
-  xkb_mod_mask_t stickykeys_locked_mask;
-  guint toggle_slowkeys_timer;
-  guint16 shift_count;
-  guint32 last_shift_time;
-  gint mousekeys_btn;
-  gboolean mousekeys_btn_states[3];
-  guint32 mousekeys_first_motion_time; /* ms */
-  guint32 mousekeys_last_motion_time; /* ms */
-  guint mousekeys_init_delay;
-  guint mousekeys_accel_time;
-  guint mousekeys_max_speed;
-  gdouble mousekeys_curve_factor;
-  guint move_mousekeys_timer;
-  guint16 last_mousekeys_key;
-  ClutterVirtualInputDevice *mousekeys_virtual_device;
 };

 GType                     _clutter_input_device_evdev_get_type        (void) G_GNUC_CONST;
@ -136,22 +111,6 @@ void                      clutter_input_device_evdev_translate_coordinates (Clut
                                                                            gfloat             *x,
                                                                            gfloat             *y);

-void                      clutter_input_device_evdev_apply_kbd_a11y_settings (ClutterInputDeviceEvdev *device,
-                                                                              ClutterKbdA11ySettings  *settings);
-
-ClutterTouchState *       clutter_input_device_evdev_acquire_touch_state (ClutterInputDeviceEvdev *device,
-                                                                          int                      device_slot);
-
-ClutterTouchState *       clutter_input_device_evdev_lookup_touch_state (ClutterInputDeviceEvdev *device,
-                                                                         int                      device_slot);
-
-void                      clutter_input_device_evdev_release_touch_state (ClutterInputDeviceEvdev *device,
-                                                                          ClutterTouchState       *touch_state);
-
-void                      clutter_input_device_evdev_release_touch_slots (ClutterInputDeviceEvdev *device_evdev,
-                                                                          uint64_t                 time_us);
-
-
 G_END_DECLS

 #endif /* __CLUTTER_INPUT_DEVICE_EVDEV_H__ */
--- a/clutter/clutter/evdev/clutter-seat-evdev.c
+++ b/clutter/clutter/evdev/clutter-seat-evdev.c
@ -29,7 +29,6 @@
 #include "clutter-seat-evdev.h"

 #include <linux/input.h>
-#include <math.h>

 #include "clutter-event-private.h"
 #include "clutter-input-device-evdev.h"
@ -43,12 +42,6 @@

 #define AUTOREPEAT_VALUE 2

-#define DISCRETE_SCROLL_STEP 10.0
-
-#ifndef BTN_STYLUS3
-#define BTN_STYLUS3 0x149 /* Linux 4.15 */
-#endif
-
 void
 clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                      struct libinput_seat *libinput_seat)
@ -92,57 +85,32 @@ clutter_touch_state_free (ClutterTouchState *touch_state)
  g_slice_free (ClutterTouchState, touch_state);
 }

-static void
-ensure_seat_slot_allocated (ClutterSeatEvdev *seat,
-                            int               seat_slot)
-{
-  if (seat_slot >= seat->n_alloc_touch_states)
-    {
-      const int size_increase = 5;
-      int i;
-
-      seat->n_alloc_touch_states += size_increase;
-      seat->touch_states = g_realloc_n (seat->touch_states,
-                                        seat->n_alloc_touch_states,
-                                        sizeof (ClutterTouchState *));
-      for (i = 0; i < size_increase; i++)
-        seat->touch_states[seat->n_alloc_touch_states - (i + 1)] = NULL;
-    }
-}
-
 ClutterTouchState *
-clutter_seat_evdev_acquire_touch_state (ClutterSeatEvdev *seat,
-                                        int               device_slot)
+clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
+                              guint32           id)
 {
-  ClutterTouchState *touch_state;
-  int seat_slot;
+  ClutterTouchState *touch;

-  for (seat_slot = 0; seat_slot < seat->n_alloc_touch_states; seat_slot++)
-    {
-      if (!seat->touch_states[seat_slot])
-        break;
-    }
+  touch = g_slice_new0 (ClutterTouchState);
+  touch->id = id;

-  ensure_seat_slot_allocated (seat, seat_slot);
+  g_hash_table_insert (seat->touches, GUINT_TO_POINTER (id), touch);

-  touch_state = g_slice_new0 (ClutterTouchState);
-  *touch_state = (ClutterTouchState) {
-    .seat = seat,
-    .seat_slot = seat_slot,
-    .device_slot = device_slot,
-  };
-
-  seat->touch_states[seat_slot] = touch_state;
-
-  return touch_state;
+  return touch;
 }

 void
-clutter_seat_evdev_release_touch_state (ClutterSeatEvdev  *seat,
-                                        ClutterTouchState *touch_state)
+clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
+                                 guint32           id)
 {
-  g_clear_pointer (&seat->touch_states[touch_state->seat_slot],
-                   (GDestroyNotify) clutter_touch_state_free);
+  g_hash_table_remove (seat->touches, GUINT_TO_POINTER (id));
+}
+
+ClutterTouchState *
+clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
+                              guint32           id)
+{
+  return g_hash_table_lookup (seat->touches, GUINT_TO_POINTER (id));
 }

 ClutterSeatEvdev *
@ -179,6 +147,9 @@ clutter_seat_evdev_new (ClutterDeviceManagerEvdev *manager_evdev)
  _clutter_device_manager_add_device (manager, device);
  seat->core_keyboard = device;

+  seat->touches = g_hash_table_new_full (NULL, NULL, NULL,
+                                         (GDestroyNotify) clutter_touch_state_free);
+
  seat->repeat = TRUE;
  seat->repeat_delay = 250;     /* ms */
  seat->repeat_interval = 33;   /* ms */
@ -518,10 +489,6 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
      button_nr = CLUTTER_BUTTON_MIDDLE;
      break;

-    case 0x149: /* BTN_STYLUS3 */
-      button_nr = 8;
-      break;
-
    default:
      /* For compatibility reasons, all additional buttons go after the old 4-7 scroll ones */
      if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
@ -602,238 +569,6 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
  queue_event (event);
 }

-static void
-notify_scroll (ClutterInputDevice       *input_device,
-               guint64                   time_us,
-               gdouble                   dx,
-               gdouble                   dy,
-               ClutterScrollSource       scroll_source,
-               ClutterScrollFinishFlags  flags,
-               gboolean                  emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-  gdouble scroll_factor;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
-  seat = _clutter_input_device_evdev_get_seat (device_evdev);
-
-  event = clutter_event_new (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  /* libinput pointer axis events are in pointer motion coordinate space.
-   * To convert to Xi2 discrete step coordinate space, multiply the factor
-   * 1/10. */
-  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
-  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
-  clutter_event_set_scroll_delta (event,
-                                  scroll_factor * dx,
-                                  scroll_factor * dy);
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = scroll_source;
-  event->scroll.finish_flags = flags;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
-static void
-notify_discrete_scroll (ClutterInputDevice     *input_device,
-                        uint64_t                time_us,
-                        ClutterScrollDirection  direction,
-                        ClutterScrollSource     scroll_source,
-                        gboolean                emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-
-  if (direction == CLUTTER_SCROLL_SMOOTH)
-    return;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
-  seat = _clutter_input_device_evdev_get_seat (device_evdev);
-
-  event = clutter_event_new (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  event->scroll.direction = direction;
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = scroll_source;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
-static void
-check_notify_discrete_scroll (ClutterSeatEvdev   *seat,
-                              ClutterInputDevice *device,
-                              uint64_t            time_us,
-                              ClutterScrollSource scroll_source)
-{
-  int i, n_xscrolls, n_yscrolls;
-
-  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
-  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
-
-  for (i = 0; i < n_xscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dx > 0 ?
-                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
-                              scroll_source, TRUE);
-    }
-
-  for (i = 0; i < n_yscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dy > 0 ?
-                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
-                              scroll_source, TRUE);
-    }
-
-  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
-  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
-}
-
-void
-clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
-                                             ClutterInputDevice       *input_device,
-                                             uint64_t                  time_us,
-                                             double                    dx,
-                                             double                    dy,
-                                             ClutterScrollSource       scroll_source,
-                                             ClutterScrollFinishFlags  finish_flags)
-{
-  if (finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL)
-    seat->accum_scroll_dx = 0;
-  else
-    seat->accum_scroll_dx += dx;
-
-  if (finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL)
-    seat->accum_scroll_dy = 0;
-  else
-    seat->accum_scroll_dy += dy;
-
-  notify_scroll (input_device, time_us, dx, dy, scroll_source,
-                 finish_flags, FALSE);
-  check_notify_discrete_scroll (seat, input_device, time_us, scroll_source);
-}
-
-static ClutterScrollDirection
-discrete_to_direction (double discrete_dx,
-                       double discrete_dy)
-{
-  if (discrete_dx > 0)
-    return CLUTTER_SCROLL_RIGHT;
-  else if (discrete_dx < 0)
-    return CLUTTER_SCROLL_LEFT;
-  else if (discrete_dy > 0)
-    return CLUTTER_SCROLL_DOWN;
-  else if (discrete_dy < 0)
-    return CLUTTER_SCROLL_UP;
-  else
-    g_assert_not_reached ();
-}
-
-void
-clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
-                                           ClutterInputDevice  *input_device,
-                                           uint64_t             time_us,
-                                           double               discrete_dx,
-                                           double               discrete_dy,
-                                           ClutterScrollSource  scroll_source)
-{
-  notify_scroll (input_device, time_us,
-                 discrete_dx * DISCRETE_SCROLL_STEP,
-                 discrete_dy * DISCRETE_SCROLL_STEP,
-                 scroll_source, CLUTTER_SCROLL_FINISHED_NONE,
-                 TRUE);
-  notify_discrete_scroll (input_device, time_us,
-                          discrete_to_direction (discrete_dx, discrete_dy),
-                          scroll_source, FALSE);
-
-}
-
-void
-clutter_seat_evdev_notify_touch_event (ClutterSeatEvdev   *seat,
-                                       ClutterInputDevice *input_device,
-                                       ClutterEventType    evtype,
-                                       uint64_t            time_us,
-                                       int                 slot,
-                                       double              x,
-                                       double              y)
-{
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  event = clutter_event_new (evtype);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->touch.time = us2ms (time_us);
-  event->touch.stage = CLUTTER_STAGE (stage);
-  event->touch.device = seat->core_pointer;
-  event->touch.x = x;
-  event->touch.y = y;
-  clutter_input_device_evdev_translate_coordinates (input_device, stage,
-                                                    &event->touch.x,
-                                                    &event->touch.y);
-
-  /* "NULL" sequences are special cased in clutter */
-  event->touch.sequence = GINT_TO_POINTER (MAX (1, slot + 1));
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  if (evtype == CLUTTER_TOUCH_BEGIN ||
-      evtype == CLUTTER_TOUCH_UPDATE)
-    event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
-
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-
-  queue_event (event);
-}
-
 void
 clutter_seat_evdev_free (ClutterSeatEvdev *seat)
 {
@ -846,7 +581,7 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
      g_object_unref (device);
    }
  g_slist_free (seat->devices);
-  g_free (seat->touch_states);
+  g_hash_table_unref (seat->touches);

  xkb_state_unref (seat->xkb);

@ -858,24 +593,6 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
  g_free (seat);
 }

-ClutterInputDevice *
-clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                               gint              id)
-{
-  ClutterInputDevice *device;
-  GSList *l;
-
-  for (l = seat->devices; l; l = l->next)
-    {
-      device = l->data;
-
-      if (clutter_input_device_get_device_id (device) == id)
-        return device;
-    }
-
-  return NULL;
-}
-
 void
 clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
                              ClutterStage     *stage)
--- a/clutter/clutter/evdev/clutter-seat-evdev.h
+++ b/clutter/clutter/evdev/clutter-seat-evdev.h
@ -38,10 +38,7 @@ typedef struct _ClutterTouchState ClutterTouchState;

 struct _ClutterTouchState
 {
-  ClutterSeatEvdev *seat;
-
-  int device_slot;
-  int seat_slot;
+  guint32 id;
  ClutterPoint coords;
 };

@ -55,14 +52,12 @@ struct _ClutterSeatEvdev
  ClutterInputDevice *core_pointer;
  ClutterInputDevice *core_keyboard;

-  ClutterTouchState **touch_states;
-  int n_alloc_touch_states;
+  GHashTable *touches;

  struct xkb_state *xkb;
  xkb_led_index_t caps_lock_led;
  xkb_led_index_t num_lock_led;
  xkb_led_index_t scroll_lock_led;
-  xkb_layout_index_t layout_idx;
  uint32_t button_state;
  int button_count[KEY_CNT];

@ -111,42 +106,16 @@ void clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
                                       uint32_t            button,
                                       uint32_t            state);

-void clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
-                                                  ClutterInputDevice       *input_device,
-                                                  uint64_t                  time_us,
-                                                  double                    dx,
-                                                  double                    dy,
-                                                  ClutterScrollSource       source,
-                                                  ClutterScrollFinishFlags  flags);
-
-void clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
-                                                ClutterInputDevice  *input_device,
-                                                uint64_t             time_us,
-                                                double               discrete_dx,
-                                                double               discrete_dy,
-                                                ClutterScrollSource  source);
-
-void clutter_seat_evdev_notify_touch_event (ClutterSeatEvdev   *seat,
-                                            ClutterInputDevice *input_device,
-                                            ClutterEventType    evtype,
-                                            uint64_t            time_us,
-                                            int                 slot,
-                                            double              x,
-                                            double              y);
-
 void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                           struct libinput_seat *libinput_seat);

 void clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat);

-ClutterInputDevice * clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                                                    gint              id);
+ClutterTouchState * clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
+                                                  guint32           id);

-ClutterTouchState * clutter_seat_evdev_acquire_touch_state (ClutterSeatEvdev *seat,
-                                                            int               device_slot);
-
-void clutter_seat_evdev_release_touch_state (ClutterSeatEvdev  *seat,
-                                             ClutterTouchState *touch_state);
+void clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
+                                      guint32           id);

 ClutterTouchState * clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
                                                  guint32           id);
--- a/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
@ -156,9 +156,6 @@ clutter_virtual_input_device_evdev_notify_relative_motion (ClutterVirtualInputDe
  ClutterVirtualInputDeviceEvdev *virtual_evdev =
    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);

-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
  clutter_seat_evdev_notify_relative_motion (virtual_evdev->seat,
                                             virtual_evdev->device,
                                             time_us,
@ -175,9 +172,6 @@ clutter_virtual_input_device_evdev_notify_absolute_motion (ClutterVirtualInputDe
  ClutterVirtualInputDeviceEvdev *virtual_evdev =
    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);

-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
  clutter_seat_evdev_notify_absolute_motion (virtual_evdev->seat,
                                             virtual_evdev->device,
                                             time_us,
@ -195,9 +189,6 @@ clutter_virtual_input_device_evdev_notify_button (ClutterVirtualInputDevice *vir
    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
  int button_count;

-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
  if (get_button_type (button) != EVDEV_BUTTON_TYPE_BUTTON)
    {
      g_warning ("Unknown/invalid virtual device button 0x%x pressed",
@ -231,9 +222,6 @@ clutter_virtual_input_device_evdev_notify_key (ClutterVirtualInputDevice *virtua
    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
  int key_count;

-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
  if (get_button_type (key) != EVDEV_BUTTON_TYPE_KEY)
    {
      g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", key);
@ -355,9 +343,6 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
  int key_count;
  guint keycode = 0, level = 0, evcode = 0;

-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
  if (!pick_keycode_for_keyval_in_current_group (virtual_device,
                                                 keyval, &keycode, &level))
    {
@ -397,175 +382,6 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
    apply_level_modifiers (virtual_device, time_us, level, key_state);
 }

-static void
-direction_to_discrete (ClutterScrollDirection direction,
-                       double                *discrete_dx,
-                       double                *discrete_dy)
-{
-  switch (direction)
-    {
-    case CLUTTER_SCROLL_UP:
-      *discrete_dx = 0.0;
-      *discrete_dy = -1.0;
-      break;
-    case CLUTTER_SCROLL_DOWN:
-      *discrete_dx = 0.0;
-      *discrete_dy = 1.0;
-      break;
-    case CLUTTER_SCROLL_LEFT:
-      *discrete_dx = -1.0;
-      *discrete_dy = 0.0;
-      break;
-    case CLUTTER_SCROLL_RIGHT:
-      *discrete_dx = 1.0;
-      *discrete_dy = 0.0;
-      break;
-    case CLUTTER_SCROLL_SMOOTH:
-      g_assert_not_reached ();
-      break;
-    }
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
-                                                           uint64_t                   time_us,
-                                                           ClutterScrollDirection     direction,
-                                                           ClutterScrollSource        scroll_source)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  double discrete_dx = 0.0, discrete_dy = 0.0;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  direction_to_discrete (direction, &discrete_dx, &discrete_dy);
-
-  clutter_seat_evdev_notify_discrete_scroll (virtual_evdev->seat,
-                                             virtual_evdev->device,
-                                             time_us,
-                                             discrete_dx, discrete_dy,
-                                             scroll_source);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                             uint64_t                   time_us,
-                                                             double                     dx,
-                                                             double                     dy,
-                                                             ClutterScrollSource        scroll_source,
-                                                             ClutterScrollFinishFlags   finish_flags)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  clutter_seat_evdev_notify_scroll_continuous (virtual_evdev->seat,
-                                               virtual_evdev->device,
-                                               time_us,
-                                               dx, dy,
-                                               scroll_source,
-                                               CLUTTER_SCROLL_FINISHED_NONE);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                      uint64_t                   time_us,
-                                                      int                        device_slot,
-                                                      double                     x,
-                                                      double                     y)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_acquire_touch_state (device_evdev,
-                                                                device_slot);
-  if (!touch_state)
-    return;
-
-  touch_state->coords.x = x;
-  touch_state->coords.y = y;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                        uint64_t                   time_us,
-                                                        int                        device_slot,
-                                                        double                     x,
-                                                        double                     y)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                               device_slot);
-  if (!touch_state)
-    return;
-
-  touch_state->coords.x = x;
-  touch_state->coords.y = y;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                    uint64_t                   time_us,
-                                                    int                        device_slot)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                               device_slot);
-  if (!touch_state)
-    return;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-
-  clutter_input_device_evdev_release_touch_state (device_evdev, touch_state);
-}
-
 static void
 clutter_virtual_input_device_evdev_get_property (GObject    *object,
                                                 guint       prop_id,
@ -669,11 +485,6 @@ clutter_virtual_input_device_evdev_class_init (ClutterVirtualInputDeviceEvdevCla
  virtual_input_device_class->notify_button = clutter_virtual_input_device_evdev_notify_button;
  virtual_input_device_class->notify_key = clutter_virtual_input_device_evdev_notify_key;
  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_evdev_notify_keyval;
-  virtual_input_device_class->notify_discrete_scroll = clutter_virtual_input_device_evdev_notify_discrete_scroll;
-  virtual_input_device_class->notify_scroll_continuous = clutter_virtual_input_device_evdev_notify_scroll_continuous;
-  virtual_input_device_class->notify_touch_down = clutter_virtual_input_device_evdev_notify_touch_down;
-  virtual_input_device_class->notify_touch_motion = clutter_virtual_input_device_evdev_notify_touch_motion;
-  virtual_input_device_class->notify_touch_up = clutter_virtual_input_device_evdev_notify_touch_up;

  obj_props[PROP_SEAT] = g_param_spec_pointer ("seat",
                                               P_("ClutterSeatEvdev"),
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@ -109,6 +109,7 @@ static const gchar *atom_names[] = {
 #define N_ATOM_NAMES G_N_ELEMENTS (atom_names)

 /* various flags corresponding to pre init setup calls */
+static gboolean _want_reset_on_video_memory_purge = FALSE;
 static gboolean _no_xevent_retrieval = FALSE;
 static gboolean clutter_enable_xinput = TRUE;
 static gboolean clutter_enable_argb = FALSE;
@ -681,7 +682,8 @@ clutter_backend_x11_get_renderer (ClutterBackend  *backend,

  /* set the display object we're using */
  cogl_xlib_renderer_set_foreign_display (renderer, xdisplay);
-
+  cogl_xlib_renderer_request_reset_on_video_memory_purge (renderer,
+                                                          _want_reset_on_video_memory_purge);
  return renderer;
 }

@ -1026,6 +1028,30 @@ clutter_x11_has_event_retrieval (void)
  return !_no_xevent_retrieval;
 }

+/**
+ * clutter_x11_request_reset_on_video_memory_purge:
+ *
+ * If the GL driver supports the NV_robustness_video_memory_purge
+ * extension, this call lets applications request that it gets
+ * initialized, thus allowing cogl_get_graphics_reset_status() to
+ * report memory purged errors if they happen. Checking for the
+ * graphics reset status is the application's responsibility.
+ *
+ * This function can only be called before calling clutter_init().
+ */
+void
+clutter_x11_request_reset_on_video_memory_purge (void)
+{
+  if (_clutter_context_is_initialized ())
+    {
+      g_warning ("%s() can only be used before calling clutter_init()",
+                 G_STRFUNC);
+      return;
+    }
+
+  _want_reset_on_video_memory_purge = TRUE;
+}
+
 /**
 * clutter_x11_get_default_screen:
 *
--- a/clutter/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/clutter/x11/clutter-device-manager-core-x11.c
@ -37,7 +37,6 @@
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
-#include "clutter-xkb-a11y-x11.h"

 enum
 {
@ -353,11 +352,9 @@ static void
 clutter_device_manager_x11_constructed (GObject *gobject)
 {
  ClutterDeviceManagerX11 *manager_x11;
-  ClutterDeviceManager *manager;
  ClutterBackendX11 *backend_x11;

  manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (gobject);
-  manager = CLUTTER_DEVICE_MANAGER (gobject);

  g_object_get (gobject, "backend", &backend_x11, NULL);
  g_assert (backend_x11 != NULL);
@ -392,8 +389,6 @@ clutter_device_manager_x11_constructed (GObject *gobject)
  _clutter_input_device_set_associated_device (manager_x11->core_keyboard,
                                               manager_x11->core_pointer);

-  clutter_device_manager_x11_a11y_init (manager);
-
  if (G_OBJECT_CLASS (clutter_device_manager_x11_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_device_manager_x11_parent_class)->constructed (gobject);
 }
@ -490,13 +485,6 @@ clutter_device_manager_x11_create_virtual_device (ClutterDeviceManager  *device_
  return g_object_new (CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_X11, NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_x11_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER);
-}
-
 static void
 clutter_device_manager_x11_set_property (GObject      *gobject,
                                         guint         prop_id,
@ -544,8 +532,6 @@ clutter_device_manager_x11_class_init (ClutterDeviceManagerX11Class *klass)
  manager_class->get_core_device = clutter_device_manager_x11_get_core_device;
  manager_class->get_device = clutter_device_manager_x11_get_device;
  manager_class->create_virtual_device = clutter_device_manager_x11_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_x11_get_supported_virtual_device_types;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_x11_apply_kbd_a11y_settings;
 }

 static void
--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@ -40,7 +40,6 @@
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
-#include "clutter-xkb-a11y-x11.h"

 #include <X11/extensions/XInput2.h>

@ -67,14 +66,6 @@ static const char *clutter_input_axis_atom_names[] = {

 #define N_AXIS_ATOMS    G_N_ELEMENTS (clutter_input_axis_atom_names)

-enum {
-  PAD_AXIS_FIRST  = 3, /* First axes are always x/y/pressure, ignored in pads */
-  PAD_AXIS_STRIP1 = PAD_AXIS_FIRST,
-  PAD_AXIS_STRIP2,
-  PAD_AXIS_RING1,
-  PAD_AXIS_RING2,
-};
-
 static Atom clutter_input_axis_atoms[N_AXIS_ATOMS] = { 0, };

 static void clutter_event_translator_iface_init (ClutterEventTranslatorIface *iface);
@ -368,36 +359,6 @@ get_device_node_path (ClutterBackendX11  *backend_x11,
  return node_path;
 }

-static void
-get_pad_features (XIDeviceInfo *info,
-                  guint        *n_rings,
-                  guint        *n_strips)
-{
-  gint i, rings = 0, strips = 0;
-
-  for (i = PAD_AXIS_FIRST; i < info->num_classes; i++)
-    {
-      XIValuatorClassInfo *valuator = (XIValuatorClassInfo*) info->classes[i];
-      int axis = valuator->number;
-
-      if (valuator->type != XIValuatorClass)
-        continue;
-      if (valuator->max <= 1)
-        continue;
-
-      /* Ring/strip axes are fixed in pad devices as handled by the
-       * wacom driver. Match those to detect pad features.
-       */
-      if (axis == PAD_AXIS_STRIP1 || axis == PAD_AXIS_STRIP2)
-        strips++;
-      else if (axis == PAD_AXIS_RING1 || axis == PAD_AXIS_RING2)
-        rings++;
-    }
-
-  *n_rings = rings;
-  *n_strips = strips;
-}
-
 static ClutterInputDevice *
 create_device (ClutterDeviceManagerXI2 *manager_xi2,
               ClutterBackendX11       *backend_x11,
@ -407,7 +368,7 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
  ClutterInputDevice *retval;
  ClutterInputMode mode;
  gboolean is_enabled;
-  guint num_touches = 0, num_rings = 0, num_strips = 0;
+  guint num_touches = 0;
  gchar *vendor_id = NULL, *product_id = NULL, *node_path = NULL;

  if (info->use == XIMasterKeyboard || info->use == XISlaveKeyboard)
@ -475,12 +436,6 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
      node_path = get_device_node_path (backend_x11, info);
    }

-  if (source == CLUTTER_PAD_DEVICE)
-    {
-      is_enabled = TRUE;
-      get_pad_features (info, &num_rings, &num_strips);
-    }
-
  retval = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_XI2,
                         "name", info->name,
                         "id", info->deviceid,
@ -493,23 +448,13 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
                         "vendor-id", vendor_id,
                         "product-id", product_id,
                         "device-node", node_path,
-                         "n-rings", num_rings,
-                         "n-strips", num_strips,
-                         "n-mode-groups", MAX (num_rings, num_strips),
                         NULL);

  translate_device_classes (backend_x11->xdpy, retval,
                            info->classes,
                            info->num_classes);
-
-#ifdef HAVE_LIBWACOM
-  if (source == CLUTTER_PAD_DEVICE)
-    clutter_input_device_xi2_ensure_wacom_info (retval, manager_xi2->wacom_db);
-#endif
-
  g_free (vendor_id);
  g_free (product_id);
-  g_free (node_path);

  CLUTTER_NOTE (BACKEND, "Created device '%s' (id: %d, has-cursor: %s)",
                info->name,
@ -902,54 +847,6 @@ translate_axes (ClutterInputDevice *device,
  return retval;
 }

-static gboolean
-translate_pad_axis (ClutterInputDevice *device,
-                    XIValuatorState    *valuators,
-                    ClutterEventType   *evtype,
-                    guint              *number,
-                    gdouble            *value)
-{
-  double *values;
-  gint i;
-
-  values = valuators->values;
-
-  for (i = PAD_AXIS_FIRST; i < valuators->mask_len * 8; i++)
-    {
-      gdouble val;
-      guint axis_number = 0;
-
-      if (!XIMaskIsSet (valuators->mask, i))
-        continue;
-
-      val = *values++;
-      if (val <= 0)
-        continue;
-
-      _clutter_input_device_translate_axis (device, i, val, value);
-
-      if (i == PAD_AXIS_RING1 || i == PAD_AXIS_RING2)
-        {
-          *evtype = CLUTTER_PAD_RING;
-          (*value) *= 360.0;
-        }
-      else if (i == PAD_AXIS_STRIP1 || i == PAD_AXIS_STRIP2)
-        {
-          *evtype = CLUTTER_PAD_STRIP;
-        }
-      else
-        continue;
-
-      if (i == PAD_AXIS_STRIP2 || i == PAD_AXIS_RING2)
-        axis_number++;
-
-      *number = axis_number;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 static void
 translate_coords (ClutterStageX11 *stage_x11,
                  gdouble          event_x,
@ -1128,60 +1025,6 @@ handle_property_event (ClutterDeviceManagerXI2 *manager_xi2,
    }
 }

-static gboolean
-translate_pad_event (ClutterEvent       *event,
-                     XIDeviceEvent      *xev,
-                     ClutterInputDevice *device)
-{
-  gdouble value;
-  guint number, mode = 0;
-
-  if (!translate_pad_axis (device, &xev->valuators,
-                           &event->any.type,
-                           &number, &value))
-    return FALSE;
-
-  /* When touching a ring/strip a first XI_Motion event
-   * is generated. Use it to reset the pad state, so
-   * later events actually have a directionality.
-   */
-  if (xev->evtype == XI_Motion)
-    value = -1;
-
-#ifdef HAVE_LIBWACOM
-  mode = clutter_input_device_xi2_get_pad_group_mode (device, number);
-#endif
-
-  if (event->any.type == CLUTTER_PAD_RING)
-    {
-      event->pad_ring.ring_number = number;
-      event->pad_ring.angle = value;
-      event->pad_ring.mode = mode;
-    }
-  else
-    {
-      event->pad_strip.strip_number = number;
-      event->pad_strip.value = value;
-      event->pad_strip.mode = mode;
-    }
-
-  event->any.time = xev->time;
-  clutter_event_set_device (event, device);
-  clutter_event_set_source_device (event, device);
-
-  CLUTTER_NOTE (EVENT,
-                "%s: win:0x%x, device:%d '%s', time:%d "
-                "(value:%f)",
-                event->any.type == CLUTTER_PAD_RING
-                ? "pad ring  "
-                : "pad strip",
-                (unsigned int) xev->event,
-                device->id,
-                device->device_name,
-                event->any.time, value);
-  return TRUE;
-}
-
 static ClutterTranslateReturn
 clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                            gpointer                native,
@ -1363,23 +1206,15 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                           XIAsyncDevice,
                           xev->time);

-            event->any.stage = stage;
-
+	    /* Ignore 4-7 buttons */
            if (xev->detail >= 4 && xev->detail <= 7)
-              {
-                retval = CLUTTER_TRANSLATE_REMOVE;
+              return CLUTTER_TRANSLATE_REMOVE;

-                if (xi_event->evtype == XI_ButtonPress &&
-                    translate_pad_event (event, xev, source_device))
-                  retval = CLUTTER_TRANSLATE_QUEUE;
-
-                break;
-              }
-
-            event->any.type =
+            event->pad_button.type =
              (xi_event->evtype == XI_ButtonPress) ? CLUTTER_PAD_BUTTON_PRESS
                                                   : CLUTTER_PAD_BUTTON_RELEASE;
-            event->any.time = xev->time;
+            event->pad_button.time = xev->time;
+            event->pad_button.stage = stage;

            /* The 4-7 button range is taken as non-existent on pad devices,
             * let the buttons above that take over this range.
@ -1389,14 +1224,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,

            /* Pad buttons are 0-indexed */
            event->pad_button.button = xev->detail - 1;
-#ifdef HAVE_LIBWACOM
-            clutter_input_device_xi2_update_pad_state (device,
-                                                       event->pad_button.button,
-                                                       (xi_event->evtype == XI_ButtonPress),
-                                                       &event->pad_button.group,
-                                                       &event->pad_button.mode);
-#endif
-            clutter_event_set_device (event, device);
            clutter_event_set_source_device (event, source_device);

            CLUTTER_NOTE (EVENT,
@ -1553,15 +1380,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
        device = g_hash_table_lookup (manager_xi2->devices_by_id,
                                      GINT_TO_POINTER (xev->deviceid));

-        if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE)
-          {
-            event->any.stage = stage;
-
-            if (translate_pad_event (event, xev, source_device))
-              retval = CLUTTER_TRANSLATE_QUEUE;
-            break;
-          }
-
        /* Set the stage for core events coming out of nowhere (see bug #684509) */
        if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER &&
            clutter_input_device_get_pointer_stage (device) == NULL &&
@ -2009,8 +1827,6 @@ clutter_device_manager_xi2_constructed (GObject *gobject)

  XSync (backend_x11->xdpy, False);

-  clutter_device_manager_x11_a11y_init (manager);
-
  if (G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed (gobject);
 }
@ -2045,13 +1861,6 @@ clutter_device_manager_xi2_create_virtual_device (ClutterDeviceManager   *manage
                       NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_xi2_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER);
-}
-
 static void
 clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
 {
@ -2080,8 +1889,6 @@ clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
  manager_class->get_device = clutter_device_manager_xi2_get_device;
  manager_class->select_stage_events = clutter_device_manager_xi2_select_stage_events;
  manager_class->create_virtual_device = clutter_device_manager_xi2_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_xi2_get_supported_virtual_device_types;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_x11_apply_kbd_a11y_settings;
 }

 static void
@ -2092,8 +1899,4 @@ clutter_device_manager_xi2_init (ClutterDeviceManagerXI2 *self)
                                               (GDestroyNotify) g_object_unref);
  self->tools_by_serial = g_hash_table_new_full (NULL, NULL, NULL,
                                                 (GDestroyNotify) g_object_unref);
-
-#ifdef HAVE_LIBWACOM
-  self->wacom_db = libwacom_database_new ();
-#endif
 }
--- a/clutter/clutter/x11/clutter-device-manager-xi2.h
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.h
@ -26,10 +26,6 @@

 #include <clutter/clutter-device-manager.h>

-#ifdef HAVE_LIBWACOM
-#include <libwacom/libwacom.h>
-#endif
-
 G_BEGIN_DECLS

 #define CLUTTER_TYPE_DEVICE_MANAGER_XI2            (_clutter_device_manager_xi2_get_type ())
@ -55,10 +51,6 @@ struct _ClutterDeviceManagerXI2
  GList *slave_devices;

  int opcode;
-
-#ifdef HAVE_LIBWACOM
-  WacomDeviceDatabase *wacom_db;
-#endif
 };

 struct _ClutterDeviceManagerXI2Class
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@ -45,11 +45,6 @@ struct _ClutterInputDeviceXI2

  gint device_id;
  ClutterInputDeviceTool *current_tool;
-
-#ifdef HAVE_LIBWACOM
-  WacomDevice *wacom_device;
-  GArray *group_modes;
-#endif
 };

 #define N_BUTTONS       5
@ -69,15 +64,6 @@ clutter_input_device_xi2_constructed (GObject *gobject)

  if (G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->constructed (gobject);
-
-#ifdef HAVE_LIBWACOM
-  if (clutter_input_device_get_device_type (CLUTTER_INPUT_DEVICE (gobject)) == CLUTTER_PAD_DEVICE)
-    {
-      device_xi2->group_modes = g_array_new (FALSE, TRUE, sizeof (guint));
-      g_array_set_size (device_xi2->group_modes,
-                        clutter_input_device_get_n_mode_groups (CLUTTER_INPUT_DEVICE (gobject)));
-    }
-#endif
 }

 static gboolean
@ -101,85 +87,6 @@ clutter_input_device_xi2_is_grouped (ClutterInputDevice *device,
  return FALSE;
 }

-static void
-clutter_input_device_xi2_finalize (GObject *object)
-{
-#ifdef HAVE_LIBWACOM
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (object);
-
-  if (device_xi2->wacom_device)
-    libwacom_destroy (device_xi2->wacom_device);
-
-  if (device_xi2->group_modes)
-    g_array_unref (device_xi2->group_modes);
-#endif
-
-  G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);
-}
-
-static gint
-clutter_input_device_xi2_get_group_n_modes (ClutterInputDevice *device,
-                                            gint                group)
-{
-#ifdef HAVE_LIBWACOM
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (device_xi2->wacom_device)
-    {
-      if (group == 0)
-        {
-          if (libwacom_has_ring (device_xi2->wacom_device))
-            return libwacom_get_ring_num_modes (device_xi2->wacom_device);
-          else if (libwacom_get_num_strips (device_xi2->wacom_device) >= 1)
-            return libwacom_get_strips_num_modes (device_xi2->wacom_device);
-        }
-      else if (group == 1)
-        {
-          if (libwacom_has_ring2 (device_xi2->wacom_device))
-            return libwacom_get_ring2_num_modes (device_xi2->wacom_device);
-          else if (libwacom_get_num_strips (device_xi2->wacom_device) >= 2)
-            return libwacom_get_strips_num_modes (device_xi2->wacom_device);
-        }
-    }
-#endif
-
-  return -1;
-}
-
-#ifdef HAVE_LIBWACOM
-static int
-clutter_input_device_xi2_get_button_group (ClutterInputDevice *device,
-                                           guint               button)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (device_xi2->wacom_device)
-    {
-      if (button >= libwacom_get_num_buttons (device_xi2->wacom_device))
-        return -1;
-
-      return libwacom_get_button_led_group (device_xi2->wacom_device,
-                                            'A' + button);
-    }
-  else
-    return -1;
-}
-#endif
-
-static gboolean
-clutter_input_device_xi2_is_mode_switch_button (ClutterInputDevice *device,
-                                                guint               group,
-                                                guint               button)
-{
-  int button_group = -1;
-
-#ifdef HAVE_LIBWACOM
-  button_group = clutter_input_device_xi2_get_button_group (device, button);
-#endif
-
-  return button_group == (int) group;
-}
-
 static void
 clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 {
@ -187,12 +94,9 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
  ClutterInputDeviceClass *device_class = CLUTTER_INPUT_DEVICE_CLASS (klass);

  gobject_class->constructed = clutter_input_device_xi2_constructed;
-  gobject_class->finalize = clutter_input_device_xi2_finalize;

  device_class->keycode_to_evdev = clutter_input_device_xi2_keycode_to_evdev;
  device_class->is_grouped = clutter_input_device_xi2_is_grouped;
-  device_class->get_group_n_modes = clutter_input_device_xi2_get_group_n_modes;
-  device_class->is_mode_switch_button = clutter_input_device_xi2_is_mode_switch_button;
 }

 static void
@ -292,66 +196,3 @@ clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device)
  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
  return device_xi2->current_tool;
 }
-
-#ifdef HAVE_LIBWACOM
-void
-clutter_input_device_xi2_ensure_wacom_info (ClutterInputDevice  *device,
-                                            WacomDeviceDatabase *wacom_db)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  const gchar *node_path;
-
-  node_path = clutter_input_device_get_device_node (device);
-  device_xi2->wacom_device = libwacom_new_from_path (wacom_db, node_path,
-                                                     WFALLBACK_NONE, NULL);
-}
-
-guint
-clutter_input_device_xi2_get_pad_group_mode (ClutterInputDevice *device,
-                                             guint               group)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (group >= device_xi2->group_modes->len)
-    return 0;
-
-  return g_array_index (device_xi2->group_modes, guint, group);
-}
-
-void
-clutter_input_device_xi2_update_pad_state (ClutterInputDevice *device,
-                                           guint               button,
-                                           guint               state,
-                                           guint              *group,
-                                           guint              *mode)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  guint button_group, *group_mode;
-  gboolean is_mode_switch = FALSE;
-
-  button_group = clutter_input_device_xi2_get_button_group (device, button);
-  is_mode_switch = button_group >= 0;
-
-  /* Assign all non-mode-switch buttons to group 0 so far */
-  button_group = MAX (0, button_group);
-
-  if (button_group >= device_xi2->group_modes->len)
-    return;
-
-  group_mode = &g_array_index (device_xi2->group_modes, guint, button_group);
-
-  if (is_mode_switch && state)
-    {
-      guint next, n_modes;
-
-      n_modes = clutter_input_device_get_group_n_modes (device, button_group);
-      next = (*group_mode + 1) % n_modes;
-      *group_mode = next;
-    }
-
-  if (group)
-    *group = button_group;
-  if (mode)
-    *mode = *group_mode;
-}
-#endif
--- a/clutter/clutter/x11/clutter-input-device-xi2.h
+++ b/clutter/clutter/x11/clutter-input-device-xi2.h
@ -27,10 +27,6 @@
 #include <clutter/clutter-input-device.h>
 #include <X11/extensions/XInput2.h>

-#ifdef HAVE_LIBWACOM
-#include <libwacom/libwacom.h>
-#endif
-
 G_BEGIN_DECLS

 #define CLUTTER_TYPE_INPUT_DEVICE_XI2           (_clutter_input_device_xi2_get_type ())
@ -49,21 +45,6 @@ void  clutter_input_device_xi2_update_tool      (ClutterInputDevice     *device,
                                                 ClutterInputDeviceTool *tool);
 ClutterInputDeviceTool * clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device);

-#ifdef HAVE_LIBWACOM
-void clutter_input_device_xi2_ensure_wacom_info (ClutterInputDevice  *device,
-                                                 WacomDeviceDatabase *wacom_db);
-
-guint clutter_input_device_xi2_get_pad_group_mode (ClutterInputDevice *device,
-                                                   guint               group);
-
-void clutter_input_device_xi2_update_pad_state (ClutterInputDevice *device,
-                                                guint               button,
-                                                guint               state,
-                                                guint              *group,
-                                                guint              *mode);
-
-#endif
-
 G_END_DECLS

 #endif /* __CLUTTER_INPUT_DEVICE_XI2_H__ */
--- a/clutter/clutter/x11/clutter-settings-x11.h
+++ b/clutter/clutter/x11/clutter-settings-x11.h
@ -10,10 +10,12 @@ static const struct {
  { "Net/DndDragThreshold",    "dnd-drag-threshold" },
  { "Gtk/FontName",            "font-name" },
  { "Xft/Antialias",           "font-antialias" },
+  { "Xft/DPI",                 "font-dpi" },
  { "Xft/Hinting",             "font-hinting" },
  { "Xft/HintStyle",           "font-hint-style" },
  { "Xft/RGBA",                "font-subpixel-order" },
  { "Fontconfig/Timestamp",    "fontconfig-timestamp" },
+  { "Gdk/UnscaledDPI",         "unscaled-font-dpi" },
 };

 static const gint _n_clutter_settings_map = G_N_ELEMENTS (_clutter_settings_map);
--- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
@ -48,10 +48,6 @@ clutter_virtual_input_device_x11_notify_relative_motion (ClutterVirtualInputDevi
                                                         double                     dx,
                                                         double                     dy)
 {
-  XTestFakeRelativeMotionEvent (clutter_x11_get_default_display (),
-                                (int) dx,
-                                (int) dy,
-                                0);
 }

 static void
@ -60,11 +56,6 @@ clutter_virtual_input_device_x11_notify_absolute_motion (ClutterVirtualInputDevi
                                                         double                     x,
                                                         double                     y)
 {
-  XTestFakeMotionEvent (clutter_x11_get_default_display (),
-                        clutter_x11_get_default_screen (),
-                        (int) x,
-                        (int) y,
-                        0);
 }

 static void
@ -77,48 +68,6 @@ clutter_virtual_input_device_x11_notify_button (ClutterVirtualInputDevice *virtu
                        button, button_state == CLUTTER_BUTTON_STATE_PRESSED, 0);
 }

-static void
-clutter_virtual_input_device_x11_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
-                                                         uint64_t                   time_us,
-                                                         ClutterScrollDirection     direction,
-                                                         ClutterScrollSource        scroll_source)
-{
-  Display *xdisplay = clutter_x11_get_default_display ();
-  int button;
-
-  switch (direction)
-    {
-    case CLUTTER_SCROLL_UP:
-      button = 4;
-      break;
-    case CLUTTER_SCROLL_DOWN:
-      button = 5;
-      break;
-    case CLUTTER_SCROLL_LEFT:
-      button = 6;
-      break;
-    case CLUTTER_SCROLL_RIGHT:
-      button = 7;
-      break;
-    default:
-      g_warn_if_reached ();
-      return;
-    }
-
-  XTestFakeButtonEvent (xdisplay, button, True, 0);
-  XTestFakeButtonEvent (xdisplay, button, False, 0);
-}
-
-static void
-clutter_virtual_input_device_x11_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                           uint64_t                   time_us,
-                                                           double                     dx,
-                                                           double                     dy,
-                                                           ClutterScrollSource        scroll_source,
-                                                           ClutterScrollFinishFlags   finish_flags)
-{
-}
-
 static void
 clutter_virtual_input_device_x11_notify_key (ClutterVirtualInputDevice *virtual_device,
                                             uint64_t                   time_us,
@ -142,34 +91,6 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
 }

-static void
-clutter_virtual_input_device_x11_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                    uint64_t                   time_us,
-                                                    int                        device_slot,
-                                                    double                     x,
-                                                    double                     y)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
-static void
-clutter_virtual_input_device_x11_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                      uint64_t                   time_us,
-                                                      int                        device_slot,
-                                                      double                     x,
-                                                      double                     y)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
-static void
-clutter_virtual_input_device_x11_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  int                        device_slot)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
 static void
 clutter_virtual_input_device_x11_init (ClutterVirtualInputDeviceX11 *virtual_device_x11)
 {
@ -184,11 +105,6 @@ clutter_virtual_input_device_x11_class_init (ClutterVirtualInputDeviceX11Class *
  virtual_input_device_class->notify_relative_motion = clutter_virtual_input_device_x11_notify_relative_motion;
  virtual_input_device_class->notify_absolute_motion = clutter_virtual_input_device_x11_notify_absolute_motion;
  virtual_input_device_class->notify_button = clutter_virtual_input_device_x11_notify_button;
-  virtual_input_device_class->notify_discrete_scroll = clutter_virtual_input_device_x11_notify_discrete_scroll;
-  virtual_input_device_class->notify_scroll_continuous = clutter_virtual_input_device_x11_notify_scroll_continuous;
  virtual_input_device_class->notify_key = clutter_virtual_input_device_x11_notify_key;
  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_x11_notify_keyval;
-  virtual_input_device_class->notify_touch_down = clutter_virtual_input_device_x11_notify_touch_down;
-  virtual_input_device_class->notify_touch_motion = clutter_virtual_input_device_x11_notify_touch_motion;
-  virtual_input_device_class->notify_touch_up = clutter_virtual_input_device_x11_notify_touch_up;
 }
--- a/clutter/clutter/x11/clutter-x11.h
+++ b/clutter/clutter/x11/clutter-x11.h
@ -161,6 +161,9 @@ gint clutter_x11_event_get_key_group (const ClutterEvent *event);
 CLUTTER_AVAILABLE_IN_ALL
 guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence);

+CLUTTER_AVAILABLE_IN_ALL
+void clutter_x11_request_reset_on_video_memory_purge (void);
+
 G_END_DECLS

 #endif /* __CLUTTER_X11_H__ */
--- a/clutter/clutter/x11/clutter-xkb-a11y-x11.c
+++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.c
@ -1,328 +0,0 @@
-/*
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2017 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.
- *
- */
-
-#include "clutter-device-manager-private.h"
-#include "clutter-xkb-a11y-x11.h"
-
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBstr.h>
-
-#define DEFAULT_XKB_SET_CONTROLS_MASK XkbSlowKeysMask         | \
-                                      XkbBounceKeysMask       | \
-                                      XkbStickyKeysMask       | \
-                                      XkbMouseKeysMask        | \
-                                      XkbMouseKeysAccelMask   | \
-                                      XkbAccessXKeysMask      | \
-                                      XkbAccessXTimeoutMask   | \
-                                      XkbAccessXFeedbackMask  | \
-                                      XkbControlsEnabledMask
-
-static int _xkb_event_base;
-
-static XkbDescRec *
-get_xkb_desc_rec (ClutterBackendX11 *backend_x11)
-{
-  XkbDescRec *desc;
-  Status      status = Success;
-
-  clutter_x11_trap_x_errors ();
-  desc = XkbGetMap (backend_x11->xdpy, XkbAllMapComponentsMask, XkbUseCoreKbd);
-  if (desc != NULL)
-    {
-      desc->ctrls = NULL;
-      status = XkbGetControls (backend_x11->xdpy, XkbAllControlsMask, desc);
-    }
-  clutter_x11_untrap_x_errors ();
-
-  g_return_val_if_fail (desc != NULL, NULL);
-  g_return_val_if_fail (desc->ctrls != NULL, NULL);
-  g_return_val_if_fail (status == Success, NULL);
-
-  return desc;
-}
-
-static void
-set_xkb_desc_rec (ClutterBackendX11 *backend_x11,
-                  XkbDescRec        *desc)
-{
-  clutter_x11_trap_x_errors ();
-  XkbSetControls (backend_x11->xdpy, DEFAULT_XKB_SET_CONTROLS_MASK, desc);
-  XSync (backend_x11->xdpy, FALSE);
-  clutter_x11_untrap_x_errors ();
-}
-
-static void
-check_settings_changed (ClutterDeviceManager *device_manager)
-{
-  ClutterBackendX11 *backend_x11;
-  ClutterKbdA11ySettings kbd_a11y_settings;
-  ClutterKeyboardA11yFlags what_changed = 0;
-  XkbDescRec *desc;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-  desc = get_xkb_desc_rec (backend_x11);
-  if (!desc)
-    return;
-
-  clutter_device_manager_get_kbd_a11y_settings (device_manager, &kbd_a11y_settings);
-
-  if (desc->ctrls->enabled_ctrls & XkbSlowKeysMask &&
-      !(kbd_a11y_settings.controls & CLUTTER_A11Y_SLOW_KEYS_ENABLED))
-    {
-      what_changed |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-      kbd_a11y_settings.controls |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-    }
-  else if (!(desc->ctrls->enabled_ctrls & XkbSlowKeysMask) &&
-           kbd_a11y_settings.controls & CLUTTER_A11Y_SLOW_KEYS_ENABLED)
-    {
-      what_changed |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-      kbd_a11y_settings.controls &= ~CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-    }
-
-  if (desc->ctrls->enabled_ctrls & XkbStickyKeysMask &&
-      !(kbd_a11y_settings.controls & CLUTTER_A11Y_STICKY_KEYS_ENABLED))
-    {
-      what_changed |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-      kbd_a11y_settings.controls |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-    }
-  else if (!(desc->ctrls->enabled_ctrls & XkbStickyKeysMask) &&
-           kbd_a11y_settings.controls & CLUTTER_A11Y_STICKY_KEYS_ENABLED)
-    {
-      what_changed |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-      kbd_a11y_settings.controls &= ~CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-    }
-
-  if (what_changed)
-    g_signal_emit_by_name (device_manager,
-                           "kbd-a11y-flags-changed",
-                           kbd_a11y_settings.controls,
-                           what_changed);
-
-  XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE);
-}
-
-static ClutterX11FilterReturn
-xkb_a11y_event_filter (XEvent       *xevent,
-                       ClutterEvent *clutter_event,
-                       gpointer      data)
-{
-  ClutterDeviceManager *device_manager = CLUTTER_DEVICE_MANAGER (data);
-  XkbEvent *xkbev = (XkbEvent *) xevent;
-
-  /* 'event_type' is set to zero on notifying us of updates in
-   * response to client requests (including our own) and non-zero
-   * to notify us of key/mouse events causing changes (like
-   * pressing shift 5 times to enable sticky keys).
-   *
-   * We only want to update out settings when it's in response to an
-   * explicit user input event, so require a non-zero event_type.
-   */
-  if (xevent->xany.type == (_xkb_event_base + XkbEventCode) &&
-      xkbev->any.xkb_type == XkbControlsNotify && xkbev->ctrls.event_type != 0)
-    check_settings_changed (device_manager);
-
-  return  CLUTTER_X11_FILTER_CONTINUE;
-}
-
-static gboolean
-is_xkb_available (ClutterBackendX11 *backend_x11)
-{
-  gint opcode, error_base, event_base, major, minor;
-
-  if (_xkb_event_base)
-    return TRUE;
-
-  if (!XkbQueryExtension (backend_x11->xdpy,
-                          &opcode,
-                          &event_base,
-                          &error_base,
-                          &major,
-                          &minor))
-    return FALSE;
-
-  if (!XkbUseExtension (backend_x11->xdpy, &major, &minor))
-    return FALSE;
-
-  _xkb_event_base = event_base;
-
-  return TRUE;
-}
-
-static unsigned long
-set_value_mask (gboolean      flag,
-                unsigned long value,
-                unsigned long mask)
-{
-  if (flag)
-    return value | mask;
-
-  return value & ~mask;
-}
-
-static gboolean
-set_xkb_ctrl (XkbDescRec               *desc,
-              ClutterKeyboardA11yFlags settings,
-              ClutterKeyboardA11yFlags flag,
-              unsigned long            mask)
-{
-  gboolean result = (settings & flag) == flag;
-  desc->ctrls->enabled_ctrls = set_value_mask (result, desc->ctrls->enabled_ctrls, mask);
-
-  return result;
-}
-
-void
-clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                    ClutterKbdA11ySettings *kbd_a11y_settings)
-{
-  ClutterBackendX11 *backend_x11;
-  XkbDescRec      *desc;
-  gboolean         enable_accessX;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-  desc = get_xkb_desc_rec (backend_x11);
-  if (!desc)
-    return;
-
-  /* general */
-  enable_accessX = kbd_a11y_settings->controls & CLUTTER_A11Y_KEYBOARD_ENABLED;
-
-  desc->ctrls->enabled_ctrls = set_value_mask (enable_accessX,
-                                               desc->ctrls->enabled_ctrls,
-                                               XkbAccessXKeysMask);
-
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls, CLUTTER_A11Y_TIMEOUT_ENABLED,
-                    XkbAccessXTimeoutMask))
-    {
-      desc->ctrls->ax_timeout = kbd_a11y_settings->timeout_delay;
-      /* disable only the master flag via the server we will disable
-       * the rest on the rebound without affecting settings state
-       * don't change the option flags at all.
-       */
-      desc->ctrls->axt_ctrls_mask = XkbAccessXKeysMask | XkbAccessXFeedbackMask;
-      desc->ctrls->axt_ctrls_values = 0;
-      desc->ctrls->axt_opts_mask = 0;
-    }
-
-  desc->ctrls->ax_options =
-    set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP,
-                    desc->ctrls->ax_options,
-                    XkbAccessXFeedbackMask | XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
-
-  /* bounce keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_BOUNCE_KEYS_ENABLED, XkbBounceKeysMask))
-    {
-      desc->ctrls->debounce_delay = kbd_a11y_settings->debounce_delay;
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT,
-                        desc->ctrls->ax_options,
-                        XkbAccessXFeedbackMask | XkbAX_BKRejectFBMask);
-    }
-
-  /* mouse keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask))
-    {
-      gint mk_max_speed;
-      gint mk_accel_time;
-
-      desc->ctrls->mk_interval     = 100;     /* msec between mousekey events */
-      desc->ctrls->mk_curve        = 50;
-
-      /* We store pixels / sec, XKB wants pixels / event */
-      mk_max_speed = kbd_a11y_settings->mousekeys_max_speed;
-      desc->ctrls->mk_max_speed = mk_max_speed / (1000 / desc->ctrls->mk_interval);
-      if (desc->ctrls->mk_max_speed <= 0)
-        desc->ctrls->mk_max_speed = 1;
-
-      mk_accel_time = kbd_a11y_settings->mousekeys_accel_time;
-      desc->ctrls->mk_time_to_max = mk_accel_time / desc->ctrls->mk_interval;
-
-      if (desc->ctrls->mk_time_to_max <= 0)
-        desc->ctrls->mk_time_to_max = 1;
-
-      desc->ctrls->mk_delay = kbd_a11y_settings->mousekeys_init_delay;
-    }
-
-  /* slow keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_SLOW_KEYS_ENABLED, XkbSlowKeysMask))
-    {
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKPressFBMask);
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKAcceptFBMask);
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKRejectFBMask);
-      desc->ctrls->slow_keys_delay = kbd_a11y_settings->slowkeys_delay;
-      /* anything larger than 500 seems to loose all keyboard input */
-      if (desc->ctrls->slow_keys_delay > 500)
-        desc->ctrls->slow_keys_delay = 500;
-    }
-
-  /* sticky keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_STICKY_KEYS_ENABLED, XkbStickyKeysMask))
-  {
-    desc->ctrls->ax_options |= XkbAX_LatchToLockMask;
-    desc->ctrls->ax_options =
-      set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF,
-                      desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_TwoKeysMask);
-    desc->ctrls->ax_options =
-      set_value_mask (kbd_a11y_settings->controls &  CLUTTER_A11Y_STICKY_KEYS_BEEP,
-                      desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_StickyKeysFBMask);
-  }
-
-  /* toggle keys */
-  desc->ctrls->ax_options =
-    set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_TOGGLE_KEYS_ENABLED,
-                    desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_IndicatorFBMask);
-
-  set_xkb_desc_rec (backend_x11, desc);
-  XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE);
-}
-
-gboolean
-clutter_device_manager_x11_a11y_init (ClutterDeviceManager *device_manager)
-{
-  ClutterBackendX11 *backend_x11;
-  guint event_mask;
-
-  backend_x11 =
-    CLUTTER_BACKEND_X11 (_clutter_device_manager_get_backend (device_manager));
-
-  if (!is_xkb_available (backend_x11))
-    return FALSE;
-
-  event_mask = XkbControlsNotifyMask | XkbAccessXNotifyMask;
-
-  XkbSelectEvents (backend_x11->xdpy, XkbUseCoreKbd, event_mask, event_mask);
-
-  clutter_x11_add_filter (xkb_a11y_event_filter, device_manager);
-
-  return TRUE;
-}
--- a/clutter/clutter/x11/clutter-xkb-a11y-x11.h
+++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.h
@ -1,39 +0,0 @@
-/*
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2017 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.
- *
- */
-
-#ifndef CLUTTER_XKB_A11Y_X11_H
-#define CLUTTER_XKB_A11Y_X11_H
-
-#include "clutter-device-manager-private.h"
-#include "clutter-backend-x11.h"
-
-#include <X11/Xlib.h>
-
-void
-clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                    ClutterKbdA11ySettings *kbd_a11y_settings);
-
-gboolean
-clutter_device_manager_x11_a11y_init               (ClutterDeviceManager *device_manager);
-
-#endif /* CLUTTER_XKB_A11Y_X11_H */
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@ -110,7 +110,7 @@ LT_LIB_M
 AC_HEADER_STDC

 # required versions for dependencies
-m4_define([glib_req_version],           [2.53.2])
+m4_define([glib_req_version],           [2.44.0])
 m4_define([cogl_req_version],           [1.21.2])
 m4_define([json_glib_req_version],      [0.12.0])
 m4_define([atk_req_version],            [2.5.3])
@ -121,7 +121,6 @@ m4_define([xcomposite_req_version],     [0.4])
 m4_define([gdk_req_version],            [3.3.18])
 m4_define([libinput_req_version],       [1.4.0])
 m4_define([libudev_req_version],        [136])
-m4_define([libwacom_req_version],       [0.13])

 AC_SUBST([GLIB_REQ_VERSION],       [glib_req_version])
 AC_SUBST([COGL_REQ_VERSION],       [cogl_req_version])
@ -134,7 +133,6 @@ AC_SUBST([XCOMPOSITE_REQ_VERSION], [xcomposite_req_version])
 AC_SUBST([GDK_REQ_VERSION],        [gdk_req_version])
 AC_SUBST([LIBINPUT_REQ_VERSION],   [libinput_req_version])
 AC_SUBST([LIBUDEV_REQ_VERSION],    [libudev_req_version])
-AC_SUBST([LIBWACOM_REQ_VERSION],   [libwacom_req_version])

 # Checks for typedefs, structures, and compiler characteristics.
 AM_PATH_GLIB_2_0([glib_req_version],
@ -151,7 +149,7 @@ AC_ARG_ENABLE([Bsymbolic],
                saved_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-                AC_TRY_LINK([], [return 0],
+                AC_TRY_LINK([], [int main (void) { return 0; }],
                            [
                              AC_MSG_RESULT([yes])
                              enable_Bsymbolic=yes
@ -172,7 +170,7 @@ dnl on other compilers, check if we can do -fvisibility=hidden
 SAVED_CFLAGS="${CFLAGS}"
 CFLAGS="-fvisibility=hidden"
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-AC_TRY_COMPILE([], [return 0],
+AC_TRY_COMPILE([], [int main (void) { return 0; }],
 	       AC_MSG_RESULT(yes)
 	       enable_fvisibility_hidden=yes,
 	       AC_MSG_RESULT(no)
@ -510,32 +508,6 @@ X11_EXTS=${X11_EXTS#* }

 AC_CACHE_SAVE

-dnl === Libwacom support for X11 ===============================================
-AC_ARG_WITH(libwacom,
-  AC_HELP_STRING([--without-libwacom],
-                 [disable the use of libwacom for advanced tablet management]),,
-  with_libwacom=auto)
-
-have_libwacom=no
-AC_MSG_CHECKING([libwacom])
-if test x$with_libwacom = xno ; then
-  AC_MSG_RESULT([disabled])
-else
-  if $PKG_CONFIG --exists libwacom '>=' $LIBWACOM_REQ_VERSION; then
-    have_libwacom=yes
-    AC_MSG_RESULT(yes)
-    PKG_CHECK_MODULES([LIBWACOM], [libwacom])
-    AC_SUBST(LIBWACOM_CFLAGS)
-    AC_SUBST(LIBWACOM_LIBS)
-    AC_DEFINE([HAVE_LIBWACOM], 1, [Building with libwacom for advanced tablet management])
-  else
-    AC_MSG_RESULT(no)
-    if test x$with_libwacom = xyes ; then
-      AC_MSG_ERROR([libwacom forced but not found])
-    fi
-  fi
-fi
-
 dnl === Enable GDK-Pixbuf in tests ============================================

 m4_define([pixbuf_default], [yes])
@ -707,8 +679,8 @@ AS_IF([test "x$CLUTTER_BASE_PC_FILES_PRIVATE" = "x" && test "x$BACKEND_PC_FILES_
 AC_SUBST(CLUTTER_REQUIRES)
 AC_SUBST(CLUTTER_REQUIRES_PRIVATE)

-CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_DEPS_PRIVATE_CFLAGS $GLIB_CFLAGS $LIBWACOM_CFLAGS"
-CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_DEPS_PRIVATE_LIBS $GLIB_LIBS $LIBWACOM_LIBS"
+CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_DEPS_PRIVATE_CFLAGS $GLIB_CFLAGS"
+CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_DEPS_PRIVATE_LIBS $GLIB_LIBS"
 AC_SUBST(CLUTTER_CFLAGS)
 AC_SUBST(CLUTTER_LIBS)

--- a/cogl/cogl/Makefile.am
+++ b/cogl/cogl/Makefile.am
@ -452,7 +452,7 @@ libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
-	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_winsys_egl_ensure_current|_cogl_pixel_format_get_bytes_per_pixel).*"
+	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_pixel_format_get_bytes_per_pixel).*"

 libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(cogl_sources_c)
 nodist_libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
--- a/cogl/cogl/cogl-framebuffer-private.h
+++ b/cogl/cogl/cogl-framebuffer-private.h
@ -193,6 +193,11 @@ struct _CoglFramebuffer
  CoglFramebufferBits bits;

  int                 samples_per_pixel;
+
+  /* Whether the depth buffer was enabled for this framebuffer,
+   * usually means it needs to be cleared before being reused next.
+   */
+  CoglBool            depth_buffer_clear_needed;
 };

 typedef enum {
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@ -117,6 +117,7 @@ _cogl_framebuffer_init (CoglFramebuffer *framebuffer,
  framebuffer->viewport_age_for_scissor_workaround = -1;
  framebuffer->dither_enabled = TRUE;
  framebuffer->depth_writing_enabled = TRUE;
+  framebuffer->depth_buffer_clear_needed = TRUE;

  framebuffer->modelview_stack = cogl_matrix_stack_new (ctx);
  framebuffer->projection_stack = cogl_matrix_stack_new (ctx);
@ -268,6 +269,13 @@ cogl_framebuffer_clear4f (CoglFramebuffer *framebuffer,
  int scissor_y1;
  CoglBool saved_viewport_scissor_workaround;

+  if (!framebuffer->depth_buffer_clear_needed &&
+      (buffers & COGL_BUFFER_BIT_DEPTH))
+    buffers &= ~(COGL_BUFFER_BIT_DEPTH);
+
+  if (buffers == 0)
+    return;
+
  _cogl_clip_stack_get_bounds (clip_stack,
                               &scissor_x0, &scissor_y0,
                               &scissor_x1, &scissor_y1);
@ -415,6 +423,9 @@ cleared:
  _cogl_framebuffer_mark_mid_scene (framebuffer);
  _cogl_framebuffer_mark_clear_clip_dirty (framebuffer);

+  if (buffers & COGL_BUFFER_BIT_DEPTH)
+    framebuffer->depth_buffer_clear_needed = FALSE;
+
  if (buffers & COGL_BUFFER_BIT_COLOR && buffers & COGL_BUFFER_BIT_DEPTH)
    {
      /* For our fast-path for reading back a single pixel of simple
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@ -43,7 +43,6 @@
 #include <cogl/winsys/cogl-winsys-private.h>

 void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                      CoglCustomWinsysVtableGetter winsys_vtable_getter,
-                                      void                        *user_data);
+                                      CoglCustomWinsysVtableGetter winsys_vtable_getter);

 #endif /* __COGL_MUTTER_H___ */
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@ -109,11 +109,7 @@ _cogl_object_default_unref (void *object)
 void
 cogl_object_unref (void *obj)
 {
-  void (* unref_func) (void *);
-
-  _COGL_RETURN_IF_FAIL (obj != NULL);
-
-  unref_func = ((CoglObject *) obj)->klass->virt_unref;
+  void (* unref_func) (void *) = ((CoglObject *) obj)->klass->virt_unref;
  unref_func (obj);
 }

--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@ -592,7 +592,7 @@ _cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,

          if (!warning_seen)
            g_warning ("Skipping layer %d of your pipeline consisting of "
-                       "a sliced texture (unsupported for multi texturing)",
+                       "a sliced texture (unsuported for multi texturing)",
                       state->i);
          warning_seen = TRUE;

--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@ -54,7 +54,6 @@ struct _CoglRenderer
  const CoglDriverVtable *driver_vtable;
  const CoglTextureDriver *texture_driver;
  const CoglWinsysVtable *winsys_vtable;
-  void *custom_winsys_user_data;
  CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
  CoglWinsysID winsys_id_override;
  GList *constraints;
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@ -566,10 +566,8 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,

 void
 cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                 CoglCustomWinsysVtableGetter winsys_vtable_getter,
-                                 void                        *user_data)
+                                 CoglCustomWinsysVtableGetter winsys_vtable_getter)
 {
-  renderer->custom_winsys_user_data = user_data;
  renderer->custom_winsys_vtable_getter = winsys_vtable_getter;
 }

--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@ -542,6 +542,285 @@ cogl_texture_set_data (CoglTexture *texture,
                                   error);
 }

+/* Reads back the contents of a texture by rendering it to the framebuffer
+ * and reading back the resulting pixels.
+ *
+ * It will perform multiple renders if the texture is larger than the
+ * current glViewport.
+ *
+ * It assumes the projection and modelview have already been setup so
+ * that rendering to 0,0 with the same width and height of the viewport
+ * will exactly cover the viewport.
+ *
+ * NB: Normally this approach isn't normally used since we can just use
+ * glGetTexImage, but may be used as a fallback in some circumstances.
+ */
+static CoglBool
+do_texture_draw_and_read (CoglFramebuffer *fb,
+                          CoglPipeline *pipeline,
+                          CoglTexture *texture,
+                          CoglBitmap *target_bmp,
+                          float *viewport,
+                          CoglError **error)
+{
+  float rx1, ry1;
+  float rx2, ry2;
+  float tx1, ty1;
+  float tx2, ty2;
+  int bw,  bh;
+  CoglBitmap *rect_bmp;
+  unsigned int tex_width, tex_height;
+  CoglContext *ctx = fb->context;
+
+  tex_width = cogl_texture_get_width (texture);
+  tex_height = cogl_texture_get_height (texture);
+
+  ry2 = 0;
+  ty2 = 0;
+
+  /* Walk Y axis until whole bitmap height consumed */
+  for (bh = tex_height; bh > 0; bh -= viewport[3])
+    {
+      /* Rectangle Y coords */
+      ry1 = ry2;
+      ry2 += (bh < viewport[3]) ? bh : viewport[3];
+
+      /* Normalized texture Y coords */
+      ty1 = ty2;
+      ty2 = (ry2 / (float) tex_height);
+
+      rx2 = 0;
+      tx2 = 0;
+
+      /* Walk X axis until whole bitmap width consumed */
+      for (bw = tex_width; bw > 0; bw-=viewport[2])
+        {
+          int width;
+          int height;
+
+          /* Rectangle X coords */
+          rx1 = rx2;
+          rx2 += (bw < viewport[2]) ? bw : viewport[2];
+
+          width = rx2 - rx1;
+          height = ry2 - ry1;
+
+          /* Normalized texture X coords */
+          tx1 = tx2;
+          tx2 = (rx2 / (float) tex_width);
+
+          /* Draw a portion of texture */
+          cogl_framebuffer_draw_textured_rectangle (fb,
+                                                    pipeline,
+                                                    0, 0,
+                                                    rx2 - rx1,
+                                                    ry2 - ry1,
+                                                    tx1, ty1,
+                                                    tx2, ty2);
+
+          /* Read into a temporary bitmap */
+          rect_bmp = _cogl_bitmap_new_with_malloc_buffer
+                                              (ctx,
+                                               width, height,
+                                               COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+                                               error);
+          if (!rect_bmp)
+            return FALSE;
+
+          if (!_cogl_framebuffer_read_pixels_into_bitmap
+                                               (fb,
+                                                viewport[0], viewport[1],
+                                                COGL_READ_PIXELS_COLOR_BUFFER,
+                                                rect_bmp,
+                                                error))
+            {
+              cogl_object_unref (rect_bmp);
+              return FALSE;
+            }
+
+          /* Copy to target bitmap */
+          if (!_cogl_bitmap_copy_subregion (rect_bmp,
+                                            target_bmp,
+                                            0, 0,
+                                            rx1, ry1,
+                                            width,
+                                            height,
+                                            error))
+            {
+              cogl_object_unref (rect_bmp);
+              return FALSE;
+            }
+
+          /* Free temp bitmap */
+          cogl_object_unref (rect_bmp);
+        }
+    }
+
+  return TRUE;
+}
+
+/* Reads back the contents of a texture by rendering it to the framebuffer
+ * and reading back the resulting pixels.
+ *
+ * NB: Normally this approach isn't normally used since we can just use
+ * glGetTexImage, but may be used as a fallback in some circumstances.
+ */
+static CoglBool
+_cogl_texture_draw_and_read (CoglTexture *texture,
+                             CoglBitmap *target_bmp,
+                             GLuint target_gl_format,
+                             GLuint target_gl_type,
+                             CoglError **error)
+{
+  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglContext *ctx = framebuffer->context;
+  float save_viewport[4];
+  float viewport[4];
+  CoglBool status = FALSE;
+
+  viewport[0] = 0;
+  viewport[1] = 0;
+  viewport[2] = cogl_framebuffer_get_width (framebuffer);
+  viewport[3] = cogl_framebuffer_get_height (framebuffer);
+
+  cogl_framebuffer_get_viewport4fv (framebuffer, save_viewport);
+  _cogl_framebuffer_push_projection (framebuffer);
+  cogl_framebuffer_orthographic (framebuffer,
+                                 0, 0,
+                                 viewport[2],
+                                 viewport[3],
+                                 0, 100);
+
+  cogl_framebuffer_push_matrix (framebuffer);
+  cogl_framebuffer_identity_matrix (framebuffer);
+
+  /* Direct copy operation */
+
+  if (ctx->texture_download_pipeline == NULL)
+    {
+      ctx->texture_download_pipeline = cogl_pipeline_new (ctx);
+      cogl_pipeline_set_blend (ctx->texture_download_pipeline,
+                               "RGBA = ADD (SRC_COLOR, 0)",
+                               NULL);
+    }
+
+  cogl_pipeline_set_layer_texture (ctx->texture_download_pipeline, 0, texture);
+
+  cogl_pipeline_set_layer_combine (ctx->texture_download_pipeline,
+                                   0, /* layer */
+                                   "RGBA = REPLACE (TEXTURE)",
+                                   NULL);
+
+  cogl_pipeline_set_layer_filters (ctx->texture_download_pipeline, 0,
+                                   COGL_PIPELINE_FILTER_NEAREST,
+                                   COGL_PIPELINE_FILTER_NEAREST);
+
+  if (!do_texture_draw_and_read (framebuffer,
+                                 ctx->texture_download_pipeline,
+                                 texture, target_bmp, viewport,
+                                 error))
+    return FALSE;
+
+  /* XXX: As an alleged PowerVR driver bug workaround where the driver
+   * is apparently not maintaining the alpha component of some
+   * framebuffers we render the alpha component of the texture
+   * separately to be sure we retrieve all components of the texture.
+   *
+   * TODO: verify if this is still an issue
+   */
+  if ((_cogl_texture_get_format (texture) & COGL_A_BIT)/* && a_bits == 0*/)
+    {
+      uint8_t *srcdata;
+      uint8_t *dstdata;
+      uint8_t *srcpixel;
+      uint8_t *dstpixel;
+      int target_width = cogl_bitmap_get_width (target_bmp);
+      int target_height = cogl_bitmap_get_height (target_bmp);
+      int target_rowstride = cogl_bitmap_get_rowstride (target_bmp);
+      int bpp = _cogl_pixel_format_get_bytes_per_pixel (COGL_PIXEL_FORMAT_RGBA_8888);
+      int alpha_rowstride = bpp * target_width;
+      CoglBitmap *alpha_bmp;
+      int x,y;
+
+      if ((dstdata = _cogl_bitmap_map (target_bmp,
+                                       COGL_BUFFER_ACCESS_WRITE,
+                                       COGL_BUFFER_MAP_HINT_DISCARD,
+                                       error)) == NULL)
+        goto EXIT;
+
+      /* Create temp bitmap for alpha values */
+      alpha_bmp =
+        _cogl_bitmap_new_with_malloc_buffer (ctx,
+                                             target_width,
+                                             target_height,
+                                             COGL_PIXEL_FORMAT_RGBA_8888,
+                                             error);
+      if (!alpha_bmp)
+        {
+          _cogl_bitmap_unmap (target_bmp);
+          goto EXIT;
+        }
+
+
+      /* Draw alpha values into RGB channels */
+      cogl_pipeline_set_layer_combine (ctx->texture_download_pipeline,
+                                       0, /* layer */
+                                       "RGBA = REPLACE (TEXTURE[A])",
+                                       NULL);
+
+      if (!do_texture_draw_and_read (framebuffer,
+                                     ctx->texture_download_pipeline,
+                                     texture, alpha_bmp, viewport,
+                                     error))
+        {
+          cogl_object_unref (alpha_bmp);
+          _cogl_bitmap_unmap (target_bmp);
+          goto EXIT;
+        }
+
+      /* Copy temp R to target A */
+
+      /* Note: we don't try to catch errors since "mapping" an
+       * malloc buffer should never fail */
+      srcdata = _cogl_bitmap_map (alpha_bmp,
+                                  COGL_BUFFER_ACCESS_READ,
+                                  0 /* hints */,
+                                  NULL);
+
+      for (y=0; y<target_height; ++y)
+        {
+          for (x=0; x<target_width; ++x)
+            {
+              srcpixel = srcdata + x*bpp;
+              dstpixel = dstdata + x*bpp;
+              dstpixel[3] = srcpixel[0];
+            }
+          srcdata += alpha_rowstride;
+          dstdata += target_rowstride;
+        }
+
+      _cogl_bitmap_unmap (alpha_bmp);
+
+      _cogl_bitmap_unmap (target_bmp);
+
+      cogl_object_unref (alpha_bmp);
+    }
+
+  status = TRUE;
+
+EXIT:
+  /* Restore old state */
+  cogl_framebuffer_pop_matrix (framebuffer);
+  _cogl_framebuffer_pop_projection (framebuffer);
+  cogl_framebuffer_set_viewport (framebuffer,
+                                 save_viewport[0],
+                                 save_viewport[1],
+                                 save_viewport[2],
+                                 save_viewport[3]);
+
+  return status;
+}
+
 static CoglBool
 get_texture_bits_via_offscreen (CoglTexture *meta_texture,
                                CoglTexture *sub_texture,
@ -877,13 +1156,25 @@ cogl_texture_get_data (CoglTexture *texture,
      tg_data.success = FALSE;
    }

-  /* XXX: In some cases this api may fail to read back the texture
-   * data; such as for GLES which doesn't support glGetTexImage
-   */
+  /* XXX: In some cases _cogl_texture_2d_download_from_gl may fail
+   * to read back the texture data; such as for GLES which doesn't
+   * support glGetTexImage, so here we fallback to drawing the
+   * texture and reading the pixels from the framebuffer. */
  if (!tg_data.success)
    {
-      cogl_object_unref (target_bmp);
-      return 0;
+      if (!_cogl_texture_draw_and_read (texture, target_bmp,
+                                        closest_gl_format,
+                                        closest_gl_type,
+                                        &ignore_error))
+        {
+          /* We have no more fallbacks so we just give up and
+           * hope for the best */
+          g_warning ("Failed to read texture since draw-and-read "
+                     "fallback failed: %s", ignore_error->message);
+          cogl_error_free (ignore_error);
+          cogl_object_unref (target_bmp);
+          return 0;
+        }
    }

  /* Was intermediate used? */
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@ -168,7 +168,7 @@ cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
                                                CoglBool enable);

 /**
- * cogl_xlib_renderer_set_threaded_swap_wait_enabled: (skip)
+ * cogl_xlib_renderer_set_threaded_swap_wait_enabled:
 * @renderer: a #CoglRenderer
 * @enable: The new value
 *
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@ -1412,12 +1412,20 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
  if (!cogl_is_offscreen (framebuffer))
    y = framebuffer_height - y - height;

-  required_format = ctx->driver_vtable->pixel_format_to_gl_with_target (ctx,
-                                                                        framebuffer->internal_format,
-                                                                        format,
-                                                                        &gl_intformat,
-                                                                        &gl_format,
-                                                                        &gl_type);
+  required_format = ctx->driver_vtable->pixel_format_to_gl (ctx,
+                                                            format,
+                                                            &gl_intformat,
+                                                            &gl_format,
+                                                            &gl_type);
+
+  /* As we are reading pixels, we want to consider the bitmap according to
+   * its real pixel format, not the swizzled channels we pretend face to the
+   * pipeline.
+   */
+  if ((format == COGL_PIXEL_FORMAT_BGRA_8888 ||
+       format == COGL_PIXEL_FORMAT_BGRA_8888_PRE) &&
+      _cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE))
+    gl_format = GL_BGRA;

  /* NB: All offscreen rendering is done upside down so there is no need
   * to flip in this case... */
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@ -418,7 +418,11 @@ flush_depth_state (CoglContext *ctx,
  if (ctx->depth_test_enabled_cache != depth_state->test_enabled)
    {
      if (depth_state->test_enabled == TRUE)
-        GE (ctx, glEnable (GL_DEPTH_TEST));
+        {
+          GE (ctx, glEnable (GL_DEPTH_TEST));
+          if (ctx->current_draw_buffer)
+            ctx->current_draw_buffer->depth_buffer_clear_needed = TRUE;
+        }
      else
        GE (ctx, glDisable (GL_DEPTH_TEST));
      ctx->depth_test_enabled_cache = depth_state->test_enabled;
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@ -90,11 +90,6 @@ typedef struct _CoglWinsysEGLVtable
  (* add_config_attributes) (CoglDisplay *display,
                             CoglFramebufferConfig *config,
                             EGLint *attributes);
-  CoglBool
-  (* choose_config) (CoglDisplay *display,
-                     EGLint *attributes,
-                     EGLConfig *out_config,
-                     CoglError **error);
 } CoglWinsysEGLVtable;

 typedef enum _CoglEGLWinsysFeature
@ -181,9 +176,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
                               EGLSurface read,
                               EGLContext context);

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display);
-
 #ifdef EGL_KHR_image_base
 EGLImageKHR
 _cogl_egl_create_image (CoglContext *ctx,
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@ -336,32 +336,6 @@ _cogl_winsys_egl_add_config_attributes (CoglDisplay *display,
  return i;
 }

-static CoglBool
-_cogl_winsys_egl_choose_config (CoglDisplay *display,
-                                EGLint *attributes,
-                                EGLConfig *out_config,
-                                CoglError **error)
-{
-  CoglRenderer *renderer = display->renderer;
-  CoglRendererEGL *egl_renderer = renderer->winsys;
-  EGLint config_count = 0;
-  EGLBoolean status;
-
-  status = eglChooseConfig (egl_renderer->edpy,
-                            attributes,
-                            out_config, 1,
-                            &config_count);
-  if (status != EGL_TRUE || config_count == 0)
-    {
-      _cogl_set_error (error, COGL_WINSYS_ERROR,
-                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                       "No compatible EGL configs found");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
 static CoglBool
 _cogl_winsys_egl_display_setup (CoglDisplay *display,
                                CoglError **error)
@ -867,7 +841,6 @@ static const CoglWinsysEGLVtable
 _cogl_winsys_egl_vtable =
  {
    .add_config_attributes = _cogl_winsys_egl_add_config_attributes,
-    .choose_config = _cogl_winsys_egl_choose_config,
    .display_setup = _cogl_winsys_egl_display_setup,
    .display_destroy = _cogl_winsys_egl_display_destroy,
    .context_created = _cogl_winsys_egl_context_created,
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@ -309,18 +309,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
  return ret;
 }

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display)
-{
-  CoglDisplayEGL *egl_display = display->winsys;
-  CoglRendererEGL *egl_renderer = display->renderer->winsys;
-
-  return eglMakeCurrent (egl_renderer->edpy,
-                         egl_display->current_draw_surface,
-                         egl_display->current_read_surface,
-                         egl_display->current_context);
-}
-
 static void
 cleanup_context (CoglDisplay *display)
 {
@ -350,9 +338,10 @@ try_create_context (CoglDisplay *display,
  CoglRendererEGL *egl_renderer = renderer->winsys;
  EGLDisplay edpy;
  EGLConfig config;
+  EGLint config_count = 0;
+  EGLBoolean status;
  EGLint attribs[9];
  EGLint cfg_attribs[MAX_EGL_CONFIG_ATTRIBS];
-  GError *config_error = NULL;
  const char *error_message;

  _COGL_RETURN_VAL_IF_FAIL (egl_display->egl_context == NULL, TRUE);
@ -367,16 +356,14 @@ try_create_context (CoglDisplay *display,

  edpy = egl_renderer->edpy;

-  if (!egl_renderer->platform_vtable->choose_config (display,
-                                                     cfg_attribs,
-                                                     &config,
-                                                     &config_error))
+  status = eglChooseConfig (edpy,
+                            cfg_attribs,
+                            &config, 1,
+                            &config_count);
+  if (status != EGL_TRUE || config_count == 0)
    {
-      _cogl_set_error (error, COGL_WINSYS_ERROR,
-                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                       "Couldn't choose config: %s", config_error->message);
-      g_error_free (config_error);
-      goto err;
+      error_message = "Unable to find a usable EGL configuration";
+      goto fail;
    }

  egl_display->egl_config = config;
@ -432,7 +419,6 @@ fail:
               COGL_WINSYS_ERROR_CREATE_CONTEXT,
               "%s", error_message);

-err:
  cleanup_context (display);

  return FALSE;
--- a/configure.ac
+++ b/configure.ac
@ -1,15 +1,15 @@
 AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [29])
-m4_define([mutter_micro_version], [4])
+m4_define([mutter_minor_version], [25])
+m4_define([mutter_micro_version], [1])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])

 m4_define([mutter_plugin_api_version], [3])

-m4_define([libmutter_api_version], [3])
+m4_define([libmutter_api_version], [0])

 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
@ -72,7 +72,7 @@ AC_HEADER_STDC
 PKG_PROG_PKG_CONFIG([0.21])

 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
-AM_PATH_GLIB_2_0([2.53.2])
+AM_PATH_GLIB_2_0([2.49.0])

 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26
@ -80,7 +80,6 @@ CANBERRA_GTK_VERSION=0.26
 LIBWACOM_VERSION=0.13

 MUTTER_PC_MODULES="
-   gl
   egl
   gtk+-3.0 >= 3.19.8
   gio-unix-2.0 >= 2.35.1
@ -88,6 +87,7 @@ MUTTER_PC_MODULES="
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.21.4
   json-glib-1.0
+   upower-glib >= 0.99.0
   gnome-desktop-3.0
   xcomposite >= 0.2
   xcursor
@ -104,7 +104,6 @@ MUTTER_PC_MODULES="
   xcb-randr
   xcb-res
 "
-XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr"

 GLIB_GSETTINGS

@ -226,10 +225,10 @@ AC_MSG_CHECKING([gudev])
 if test x$with_gudev = xno ; then
  AC_MSG_RESULT([disabled])
 else
-  if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
+  if $PKG_CONFIG --exists gudev-1.0; then
    have_gudev=yes
    AC_MSG_RESULT(yes)
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
    AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
  else
    AC_MSG_RESULT(no)
@ -239,16 +238,6 @@ else
  fi
 fi

-AC_ARG_ENABLE(remote-desktop,
-  AS_HELP_STRING([--enable-remote-desktop], [enable support for remote desktop and screen cast]),,
-  enable_remote_desktop=no
-)
-AS_IF([test "$enable_remote_desktop" = "yes"], [
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.1 >= 0.1.8"
-  AC_DEFINE([HAVE_REMOTE_DESKTOP],[1], [Defined if screen cast and remote desktop support is enabled])
-])
-AM_CONDITIONAL([HAVE_REMOTE_DESKTOP],[test "$enable_remote_desktop" = "yes"])
-
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])

@ -261,19 +250,7 @@ AC_SUBST(XWAYLAND_PATH)

 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

-PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-
-if test x$have_elogind = xyes; then
-     logind_provider="libelogind"
-fi
-
-PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], [have_systemd=no])
-
-if test x$have_systemd = xyes -o -z "$logind_provider"; then
-     logind_provider="libsystemd"
-fi
-
-MUTTER_NATIVE_BACKEND_MODULES="libdrm $logind_provider libinput >= 1.4 gudev-1.0 gbm >= 10.3"
+MUTTER_NATIVE_BACKEND_MODULES="libdrm libsystemd libinput >= 1.4 gudev-1.0 gbm >= 10.3"

 AC_ARG_ENABLE(native-backend,
  AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
@ -289,26 +266,16 @@ AS_IF([test "$have_native_backend" = "yes"], [
 ])
 AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])

-MUTTER_WAYLAND_EGLSTREAM_MODULES="wayland-eglstream-protocols"
-
 AC_ARG_ENABLE(egl-device,
-  AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),,
+  AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),
+  enable_egl_device=yes,
  enable_egl_device=no
-  have_wayland_eglstream=no
 )
 AS_IF([test "$enable_egl_device" = "yes"], [
  AC_DEFINE([HAVE_EGL_DEVICE],[1], [Defined if EGLDevice support is enabled])
-  PKG_CHECK_EXISTS([$MUTTER_WAYLAND_EGLSTREAM_MODULES], [have_wayland_eglstream=yes], [have_wayland_eglstream=no])
 ])
-AS_IF([test "$have_wayland_eglstream" = "yes"], [
-  AC_DEFINE([HAVE_WAYLAND_EGLSTREAM],[1],[Defined if Wayland EGLStream protocols are available])
-  PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [$MUTTER_WAYLAND_EGLSTREAM_MODULES],
-                    [ac_wayland_eglstream_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir $MUTTER_WAYLAND_EGLSTREAM_MODULES`])
-  AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, $ac_wayland_eglstream_pkgdatadir)
-])
-AM_CONDITIONAL([HAVE_WAYLAND_EGLSTREAM],[test "$have_wayland_eglstream" = "yes"])

-MUTTER_WAYLAND_MODULES="wayland-server >= 1.13.0"
+MUTTER_WAYLAND_MODULES="wayland-server >= 1.6.90"

 AC_ARG_ENABLE(wayland,
  AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
@ -325,27 +292,12 @@ AS_IF([test "$have_wayland" = "yes"], [
  AC_SUBST([WAYLAND_SCANNER])
  AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])

-  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.12],
+  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7],
 		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
 ])
 AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])

-AC_ARG_WITH([xwayland-grab-default-access-rules],
-    [AS_HELP_STRING([--with-xwayland-grab-default-access-rules="app-res1,app-res2,..."],
-        [comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland"])],
-    [with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$withval"],
-    [with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$XWAYLAND_GRAB_DEFAULT_ACCESS_RULES"])
-
-case "$with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES" in
-    yes) with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$XWAYLAND_GRAB_DEFAULT_ACCESS_RULES" ;;
-    no) with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES='' ;;
-esac
-AC_DEFINE_UNQUOTED([XWAYLAND_GRAB_DEFAULT_ACCESS_RULES],
-                    "$with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES",
-                    [Xwayland applications allowed to issue keyboard grabs])
-AC_SUBST(XWAYLAND_GRAB_DEFAULT_ACCESS_RULES)
-
 PKG_CHECK_EXISTS([xi >= 1.6.99.1],
                 AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))

@ -559,10 +511,8 @@ mutter-$VERSION
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
 	Wayland:                  ${have_wayland}
-	Wayland EGLStream:        ${have_wayland_eglstream}
 	Native (KMS) backend:     ${have_native_backend}
 	EGLDevice:                ${enable_egl_device}
-	Remote desktop:           ${enable_remote_desktop}
 "


--- a/data/50-mutter-navigation.xml
+++ b/data/50-mutter-navigation.xml
@ -20,6 +20,12 @@
        <KeyListEntry name="move-to-workspace-last"
                      description="Move window to last workspace" />

+	<KeyListEntry name="move-to-workspace-left"
+	              description="Move window one workspace to the left" />
+
+	<KeyListEntry name="move-to-workspace-right"
+	              description="Move window one workspace to the right" />
+
 	<KeyListEntry name="move-to-workspace-up"
 	              description="Move window one workspace up" />

@ -119,6 +125,12 @@
 	<KeyListEntry name="switch-to-workspace-last"
 	              description="Switch to last workspace" />

+	<KeyListEntry name="switch-to-workspace-left"
+	              description="Move to workspace left" />
+
+	<KeyListEntry name="switch-to-workspace-right"
+	              description="Move to workspace right" />
+
 	<KeyListEntry name="switch-to-workspace-up"
 	              description="Move to workspace above" />

--- a/data/50-mutter-wayland.xml
+++ b/data/50-mutter-wayland.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.wayland.keybindings"
-                group="system"
-                name="System"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="restore-shortcuts" description="Restore the keyboard shortcuts"/>
-
-</KeyListEntries>
--- a/data/50-mutter-windows.xml
+++ b/data/50-mutter-windows.xml
@ -15,6 +15,8 @@

 	<KeyListEntry name="unmaximize" description="Restore window"/>

+	<KeyListEntry name="toggle-shaded" description="Toggle shaded state"/>
+
 	<KeyListEntry name="close" description="Close window"/>

 	<KeyListEntry name="minimize" description="Hide window"/>
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -12,19 +12,13 @@ xml_DATA = \
        50-mutter-system.xml \
        50-mutter-windows.xml

-if HAVE_WAYLAND
-xml_DATA += \
-        50-mutter-wayland.xml
-endif
-
 gschema_in_files = \
 	org.gnome.mutter.gschema.xml.in	\
 	org.gnome.mutter.wayland.gschema.xml.in
 gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)

 %.gschema.xml: %.gschema.xml.in Makefile
-	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_PACKAGE)|g' \
-	                -e 's|@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES[@]|$(XWAYLAND_GRAB_DEFAULT_ACCESS_RULES)|g' \
+	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_DOMAIN)|g' \
 	$< > $@ || rm $@

@GSETTINGS_RULES@
--- a/data/org.gnome.mutter.gschema.xml.in
+++ b/data/org.gnome.mutter.gschema.xml.in
@ -1,6 +1,6 @@
 <schemalist>
  <schema id="org.gnome.mutter" path="/org/gnome/mutter/"
-          gettext-domain="@GETTEXT_DOMAIN@">
+          gettext-domain="@GETTEXT_DOMAIN">

    <key name="overlay-key" type="s">
      <default>'Super_L'</default>
@ -146,15 +146,5 @@
      <summary>Cancel tab popup</summary>
    </key>

-    <key name="switch-monitor" type="as">
-      <default><![CDATA[['<Super>p','XF86Display']]]></default>
-      <summary>Switch monitor configurations</summary>
-    </key>
-
-    <key name="rotate-monitor" type="as">
-      <default><![CDATA[['XF86RotateWindows']]]></default>
-      <summary>Rotates the built-in monitor configuration</summary>
-    </key>
-
  </schema>
 </schemalist>
--- a/data/org.gnome.mutter.wayland.gschema.xml.in
+++ b/data/org.gnome.mutter.wayland.gschema.xml.in
@ -49,53 +49,5 @@
      <default><![CDATA[['<Primary><Alt>F12']]]></default>
      <summary>Switch to VT 12</summary>
    </key>
-    <key name="restore-shortcuts" type="as">
-      <default><![CDATA[['<Super>Escape']]]></default>
-      <summary>Re-enable shortcuts</summary>
-    </key>
  </schema>
-
-
-  <schema id="org.gnome.mutter.wayland" path="/org/gnome/mutter/wayland/"
-          gettext-domain="@GETTEXT_DOMAIN@">
-
-    <key name="xwayland-allow-grabs" type="b">
-      <default>false</default>
-      <summary>Allow grabs with Xwayland</summary>
-      <description>
-        Allow keyboard grabs issued by X11 applications running in Xwayland
-        to be taken into account.
-
-        For a X11 grab to be taken into account under Wayland, the client must
-        also either send a specific X11 ClientMessage to the root window or be
-        among the applications white-listed in key “xwayland-grab-access-rules”.
-      </description>
-    </key>
-
-    <key name="xwayland-grab-access-rules" type="as">
-      <default>[]</default>
-      <summary>Xwayland applications allowed to issue keyboard grabs</summary>
-      <description>
-        List the resource names or resource class of X11 windows either
-        allowed or not allowed to issue X11 keyboard grabs under Xwayland.
-
-        The resource name or resource class of a given X11 window can be
-        obtained using the command “xprop WM_CLASS”.
-
-        Wildcards “*” and jokers “?” in the values are supported.
-
-        Values starting with “!” are blacklisted, which has precedence over
-        the whitelist, to revoke applications from the default system list.
-
-        The default system list includes the following applications:
-
-        “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”
-
-        Users can break an existing grab by using the specific keyboard
-        shortcut defined by the keybinding key “restore-shortcuts”.
-      </description>
-    </key>
-
-  </schema>
-
 </schemalist>
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -2,7 +2,6 @@
 # Please keep this file sorted alphabetically.
 data/50-mutter-navigation.xml
 data/50-mutter-system.xml
-data/50-mutter-wayland.xml
 data/50-mutter-windows.xml
 data/mutter.desktop.in
 data/org.gnome.mutter.gschema.xml.in
@ -14,18 +13,18 @@ src/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/display.c
+src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
 src/core/meta-close-dialog-default.c
 src/core/mutter.c
 src/core/prefs.c
+src/core/screen.c
 src/core/util.c
 src/core/window.c
 src/ui/frames.c
 src/ui/theme.c
 src/wayland/meta-wayland-tablet-pad.c
-src/x11/meta-x11-display.c
-src/x11/meta-x11-errors.c
 src/x11/session.c
 src/x11/window-props.c
 src/x11/xprops.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -28,7 +28,6 @@ clutter/clutter/clutter-grid-layout.c
 clutter/clutter/clutter-image.c
 clutter/clutter/clutter-input-device.c
 clutter/clutter/clutter-input-device-tool.c
-clutter/clutter/clutter-input-method.c
 clutter/clutter/clutter-interval.c
 clutter/clutter/clutter-layout-manager.c
 clutter/clutter/clutter-layout-meta.c
--- a/po/ar.po
+++ b/po/ar.po
@ -4,15 +4,14 @@
 # Arafat Medini <lumina@silverpen.de>, 2003.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Djihed Afifi <djihed@gmail.com>, 2006.
-# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
 # Anas Afif Emad <anas.e87@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-03 10:20+0200\n"
-"PO-Revision-Date: 2017-11-03 10:22+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-23 21:38+0200\n"
+"PO-Revision-Date: 2015-03-23 21:45+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@ -21,130 +20,524 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
-"X-Project-Style: gnome\n"
+"X-Generator: Virtaal 0.7.1\n"

-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: ../src/backends/meta-input-settings.c:2167
-#, c-format
-msgid "Mode Switch (Group %d)"
+#: ../data/50-mutter-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "الإبحار"
+
+#: ../data/50-mutter-navigation.xml.in.h:2
+msgid "Move window to workspace 1"
+msgstr "انقل النافذة إلى مساحة العمل 1"
+
+#: ../data/50-mutter-navigation.xml.in.h:3
+msgid "Move window to workspace 2"
+msgstr "انقل النافذة إلى مساحة العمل 2"
+
+#: ../data/50-mutter-navigation.xml.in.h:4
+msgid "Move window to workspace 3"
+msgstr "انقل النافذة إلى مساحة العمل 3"
+
+#: ../data/50-mutter-navigation.xml.in.h:5
+msgid "Move window to workspace 4"
+msgstr "انقل النافذة إلى مساحة العمل 4"
+
+#: ../data/50-mutter-navigation.xml.in.h:6
+msgid "Move window to last workspace"
+msgstr "انقل النافذة إلى مساحة العمل الأخيرة"
+
+#: ../data/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
+
+#: ../data/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
+
+#: ../data/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace up"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
+
+#: ../data/50-mutter-navigation.xml.in.h:10
+msgid "Move window one workspace down"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
+
+#: ../data/50-mutter-navigation.xml.in.h:11
+msgid "Move window one monitor to the left"
+msgstr "انقل النافذة شاشة واحدة إلى اليسار"
+
+#: ../data/50-mutter-navigation.xml.in.h:12
+msgid "Move window one monitor to the right"
+msgstr "انقل النافذة شاشة واحدة إلى اليمين"
+
+#: ../data/50-mutter-navigation.xml.in.h:13
+msgid "Move window one monitor up"
+msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
+
+#: ../data/50-mutter-navigation.xml.in.h:14
+msgid "Move window one monitor down"
+msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
+
+#: ../data/50-mutter-navigation.xml.in.h:15
+msgid "Switch applications"
+msgstr "تنقل بين التطبيقات"
+
+#: ../data/50-mutter-navigation.xml.in.h:16
+msgid "Switch to previous application"
+msgstr "انتقل إلى التطبيق السابق"
+
+#: ../data/50-mutter-navigation.xml.in.h:17
+msgid "Switch windows"
+msgstr "تنقل بين النوافذ"
+
+#: ../data/50-mutter-navigation.xml.in.h:18
+msgid "Switch to previous window"
+msgstr "انتقل إلى النافذة السابقة"
+
+#: ../data/50-mutter-navigation.xml.in.h:19
+msgid "Switch windows of an application"
+msgstr "تنقل بين نوافذ التطبيق"
+
+#: ../data/50-mutter-navigation.xml.in.h:20
+msgid "Switch to previous window of an application"
+msgstr "انتقل إلى نافذة التطبيق السابقة"
+
+#: ../data/50-mutter-navigation.xml.in.h:21
+msgid "Switch system controls"
+msgstr "تنقل بين تحكمات النظام"
+
+#: ../data/50-mutter-navigation.xml.in.h:22
+msgid "Switch to previous system control"
+msgstr "انتقل إلى تحكم النظام السابق"
+
+#: ../data/50-mutter-navigation.xml.in.h:23
+msgid "Switch windows directly"
+msgstr "تنقل مباشرة بين النوافذ"
+
+#: ../data/50-mutter-navigation.xml.in.h:24
+msgid "Switch directly to previous window"
+msgstr "انتقل مباشرة إلى النافذة السابقة"
+
+#: ../data/50-mutter-navigation.xml.in.h:25
+msgid "Switch windows of an app directly"
+msgstr "تنقل مباشرة بين نوافذ التطبيق"
+
+#: ../data/50-mutter-navigation.xml.in.h:26
+msgid "Switch directly to previous window of an app"
+msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
+
+#: ../data/50-mutter-navigation.xml.in.h:27
+msgid "Switch system controls directly"
+msgstr "تنقل مباشرة بين تحكمات النظام"
+
+#: ../data/50-mutter-navigation.xml.in.h:28
+msgid "Switch directly to previous system control"
+msgstr "انتقل مباشرة إلى تحكم النظام السابق"
+
+#: ../data/50-mutter-navigation.xml.in.h:29
+msgid "Hide all normal windows"
+msgstr "أخفِ كل النوافذ العادية"
+
+#: ../data/50-mutter-navigation.xml.in.h:30
+msgid "Switch to workspace 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: ../data/50-mutter-navigation.xml.in.h:31
+msgid "Switch to workspace 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: ../data/50-mutter-navigation.xml.in.h:32
+msgid "Switch to workspace 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: ../data/50-mutter-navigation.xml.in.h:33
+msgid "Switch to workspace 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: ../data/50-mutter-navigation.xml.in.h:34
+msgid "Switch to last workspace"
+msgstr "انتقل إلى مساحة العمل الأخيرة"
+
+#: ../data/50-mutter-navigation.xml.in.h:35
+msgid "Move to workspace left"
+msgstr "انقل لمساحة العمل على اليسار"
+
+#: ../data/50-mutter-navigation.xml.in.h:36
+msgid "Move to workspace right"
+msgstr "انقل لمساحة العمل على اليمين"
+
+#: ../data/50-mutter-navigation.xml.in.h:37
+msgid "Move to workspace above"
+msgstr "انقل لمساحة العمل أعلى"
+
+#: ../data/50-mutter-navigation.xml.in.h:38
+msgid "Move to workspace below"
+msgstr "انقل لمساحة العمل أسفل"
+
+#: ../data/50-mutter-system.xml.in.h:1
+msgid "System"
+msgstr "النظام"
+
+#: ../data/50-mutter-system.xml.in.h:2
+msgid "Show the run command prompt"
+msgstr "أظهر محث تشغيل أمر"
+
+#: ../data/50-mutter-system.xml.in.h:3
+msgid "Show the activities overview"
+msgstr "أظهر نظرة عامة على الأنشطة"
+
+#: ../data/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "النوافذ"
+
+#: ../data/50-mutter-windows.xml.in.h:2
+msgid "Activate the window menu"
+msgstr "فعّل قائمة النافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:3
+msgid "Toggle fullscreen mode"
+msgstr "بدّل نمط ملء الشاشة"
+
+#: ../data/50-mutter-windows.xml.in.h:4
+msgid "Toggle maximization state"
+msgstr "بدّل حالة التكبير"
+
+#: ../data/50-mutter-windows.xml.in.h:5
+msgid "Maximize window"
+msgstr "كبّر النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:6
+msgid "Restore window"
+msgstr "استعد النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "بدّل حالة الإخفاء"
+
+#: ../data/50-mutter-windows.xml.in.h:8
+msgid "Close window"
+msgstr "أغلق النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:9
+msgid "Hide window"
+msgstr "أخفِ النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:10
+msgid "Move window"
+msgstr "انقل النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "حجّم النّافذة"
+
+#: ../data/50-mutter-windows.xml.in.h:12
+msgid "Toggle window on all workspaces or one"
+msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
+
+#: ../data/50-mutter-windows.xml.in.h:13
+msgid "Raise window if covered, otherwise lower it"
+msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
+
+#: ../data/50-mutter-windows.xml.in.h:14
+msgid "Raise window above other windows"
+msgstr "ارفع النافذة فوق النوافذ الأخرى"
+
+#: ../data/50-mutter-windows.xml.in.h:15
+msgid "Lower window below other windows"
+msgstr "اخفض النافذة تحت النوافذ الأخرى"
+
+#: ../data/50-mutter-windows.xml.in.h:16
+msgid "Maximize window vertically"
+msgstr "كبّر النافذة رأسيا"
+
+#: ../data/50-mutter-windows.xml.in.h:17
+msgid "Maximize window horizontally"
+msgstr "كبّر النافذة أفقيا"
+
+#: ../data/50-mutter-windows.xml.in.h:18
+msgid "View split on left"
+msgstr "المنظور مقسوم على اليمين"
+
+#: ../data/50-mutter-windows.xml.in.h:19
+msgid "View split on right"
+msgstr "المنظور مقسوم على اليسار"
+
+#: ../data/mutter.desktop.in.h:1
+msgid "Mutter"
+msgstr "مَتَر"
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""

-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: ../src/backends/meta-input-settings.c:2190
-msgid "Switch monitor"
-msgstr "غيّر الشاشة"
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr ""

-#: ../src/backends/meta-input-settings.c:2192
-msgid "Show on-screen help"
-msgstr "اعرض المساعدة على الشاشة"
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""

-#: ../src/backends/meta-monitor-manager.c:900
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+msgid "Workspaces only on primary"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+msgid "No tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Delay focus changes until the pointer stops moving"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Auto maximize nearly monitor sized windows"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
+msgid "Place new windows in the center"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+msgid ""
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+msgid "Select window from tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+msgid "Cancel tab popup"
+msgstr ""
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#, fuzzy
+msgid "Switch to VT 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#, fuzzy
+msgid "Switch to VT 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#, fuzzy
+msgid "Switch to VT 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#, fuzzy
+msgid "Switch to VT 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#, fuzzy
+msgid "Switch to VT 5"
+msgstr "انتقل إلى مساحة العمل 5"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#, fuzzy
+msgid "Switch to VT 6"
+msgstr "انتقل إلى مساحة العمل 6"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#, fuzzy
+msgid "Switch to VT 7"
+msgstr "انتقل إلى مساحة العمل 7"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#, fuzzy
+msgid "Switch to VT 8"
+msgstr "انتقل إلى مساحة العمل 8"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#, fuzzy
+msgid "Switch to VT 9"
+msgstr "انتقل إلى مساحة العمل 9"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#, fuzzy
+msgid "Switch to VT 10"
+msgstr "انتقل إلى مساحة العمل 10"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#, fuzzy
+msgid "Switch to VT 11"
+msgstr "انتقل إلى مساحة العمل 11"
+
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#, fuzzy
+msgid "Switch to VT 12"
+msgstr "انتقل إلى مساحة العمل 12"
+
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "شاشة مدمجة"

-#: ../src/backends/meta-monitor-manager.c:923
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "غير معروفة"

-#: ../src/backends/meta-monitor-manager.c:925
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "شاشة غير معروفة"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:933
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:476
+#: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
-msgstr "يعمل مدير مزج آخر على الشاشة %i و العرض ”%s“."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr "يعمل مدير مزج آخر على الشاشة %i والعرض \"%s\"."

-#: ../src/core/bell.c:194
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "حدث جرس"

-#: ../src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "فشل فتح عرض نظام نوافذ إكس ”%s“\n"
-
-#: ../src/core/main.c:189
-msgid "Disable connection to session manager"
-msgstr "عطّل الاتصال بمدير الجلسة"
-
-#: ../src/core/main.c:195
-msgid "Replace the running window manager"
-msgstr "استبدل بمدير النوافذ الذي يعمل"
-
-#: ../src/core/main.c:201
-msgid "Specify session management ID"
-msgstr "حدّد رقم هويّة إدارة الجلسة"
-
-#: ../src/core/main.c:206
-msgid "X Display to use"
-msgstr "معراض س الذي سيستعمل"
-
-#: ../src/core/main.c:212
-msgid "Initialize session from savefile"
-msgstr "ابدأ الجلسة من ملف محفوظ"
-
-#: ../src/core/main.c:218
-msgid "Make X calls synchronous"
-msgstr "اجعل نداءات س متزامنة"
-
-#: ../src/core/main.c:225
-msgid "Run as a wayland compositor"
-msgstr ""
-
-#: ../src/core/main.c:231
-msgid "Run as a nested compositor"
-msgstr ""
-
-#: ../src/core/main.c:239
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#. Translators: %s is a window title
-#: ../src/core/meta-close-dialog-default.c:147
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "”‏%s“ لا يستجيب."

-#: ../src/core/meta-close-dialog-default.c:149
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "لا يستجيب التطبيق"

-#: ../src/core/meta-close-dialog-default.c:154
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "ربما ترغب في الانتظار قليلا ليُكمِل أو إجبار التطبيق على الإنهاء كُلّية."

-#: ../src/core/meta-close-dialog-default.c:161
+#: ../src/core/delete.c:141
+msgid "_Wait"
+msgstr "ا_نتظر"
+
+#: ../src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "أ_جبر الإنهاء"

-#: ../src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "ا_نتظر"
+#: ../src/core/display.c:562
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "فشل فتح عرض نظام نوافذ إكس '%s'\n"
+
+#: ../src/core/main.c:176
+msgid "Disable connection to session manager"
+msgstr "عطّل الاتصال بمدير الجلسة"
+
+#: ../src/core/main.c:182
+msgid "Replace the running window manager"
+msgstr "استبدل بمدير النوافذ الذي يعمل"
+
+#: ../src/core/main.c:188
+msgid "Specify session management ID"
+msgstr "حدّد رقم هويّة إدارة الجلسة"
+
+#: ../src/core/main.c:193
+msgid "X Display to use"
+msgstr "معراض س الذي سيستعمل"
+
+#: ../src/core/main.c:199
+msgid "Initialize session from savefile"
+msgstr "ابدأ الجلسة من ملف محفوظ"
+
+#: ../src/core/main.c:205
+msgid "Make X calls synchronous"
+msgstr "اجعل نداءات س متزامنة"
+
+#: ../src/core/main.c:212
+msgid "Run as a wayland compositor"
+msgstr ""
+
+#: ../src/core/main.c:220
+msgid "Run as a full display server, rather than nested"
+msgstr ""

 #: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@ -162,281 +555,42 @@ msgstr "اطبع الإصدارة"
 msgid "Mutter plugin to use"
 msgstr "ملحق مَتَر الذي سيُستخدم"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %d"

-#: ../src/core/screen.c:583
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"الشاشة ”%s“ لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace لتحُلّ"
-" محلّ مدير النوافذ الحالي."
+"الشاشة \"%s\" لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace "
+"لتحُلّ محلّ مدير النوافذ الحالي."

-#: ../src/core/screen.c:668
+#: ../src/core/screen.c:607
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "الشاشة %d على العرض ”%s“ غير صحيحة\n"
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "الشاشة %d على العرض '%s' غير صحيحة\n"

-#: ../src/core/util.c:120
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "جُمِّع مَتَر دون دعم للنمط المطنب\n"

-#: ../src/wayland/meta-wayland-tablet-pad.c:563
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr ""
-
 #: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"هذه النوافذ لا تدعم ” الضبط الحالي&quot; إعادة تشغيلها يدويا عند الولوج "
-"المرة القادمة."
+"هذه النوافذ لا تدعم &quot;احفظ الضبط الحالي&quot; يجب إعادة تشغيلها يدويا "
+"عند الولوج المرة القادمة."

-#: ../src/x11/window-props.c:559
+#: ../src/x11/window-props.c:549
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (على %s)"

-#~ msgid "Navigation"
-#~ msgstr "الإبحار"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "انقل النافذة إلى مساحة العمل 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "انقل النافذة إلى مساحة العمل 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "انقل النافذة إلى مساحة العمل 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "انقل النافذة إلى مساحة العمل 4"
-
-#~ msgid "Move window to last workspace"
-#~ msgstr "انقل النافذة إلى مساحة العمل الأخيرة"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
-
-#~ msgid "Move window one monitor to the left"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليسار"
-
-#~ msgid "Move window one monitor to the right"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليمين"
-
-#~ msgid "Move window one monitor up"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
-
-#~ msgid "Move window one monitor down"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
-
-#~ msgid "Switch applications"
-#~ msgstr "تنقل بين التطبيقات"
-
-#~ msgid "Switch to previous application"
-#~ msgstr "انتقل إلى التطبيق السابق"
-
-#~ msgid "Switch windows"
-#~ msgstr "تنقل بين النوافذ"
-
-#~ msgid "Switch to previous window"
-#~ msgstr "انتقل إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an application"
-#~ msgstr "تنقل بين نوافذ التطبيق"
-
-#~ msgid "Switch to previous window of an application"
-#~ msgstr "انتقل إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls"
-#~ msgstr "تنقل بين تحكمات النظام"
-
-#~ msgid "Switch to previous system control"
-#~ msgstr "انتقل إلى تحكم النظام السابق"
-
-#~ msgid "Switch windows directly"
-#~ msgstr "تنقل مباشرة بين النوافذ"
-
-#~ msgid "Switch directly to previous window"
-#~ msgstr "انتقل مباشرة إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an app directly"
-#~ msgstr "تنقل مباشرة بين نوافذ التطبيق"
-
-#~ msgid "Switch directly to previous window of an app"
-#~ msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls directly"
-#~ msgstr "تنقل مباشرة بين تحكمات النظام"
-
-#~ msgid "Switch directly to previous system control"
-#~ msgstr "انتقل مباشرة إلى تحكم النظام السابق"
-
-#~ msgid "Hide all normal windows"
-#~ msgstr "أخفِ كل النوافذ العادية"
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#~ msgid "Switch to last workspace"
-#~ msgstr "انتقل إلى مساحة العمل الأخيرة"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "انقل لمساحة العمل على اليسار"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "انقل لمساحة العمل على اليمين"
-
-#~ msgid "Move to workspace above"
-#~ msgstr "انقل لمساحة العمل أعلى"
-
-#~ msgid "Move to workspace below"
-#~ msgstr "انقل لمساحة العمل أسفل"
-
-#~ msgid "System"
-#~ msgstr "النظام"
-
-#~ msgid "Show the run command prompt"
-#~ msgstr "أظهر محث تشغيل أمر"
-
-#~ msgid "Show the activities overview"
-#~ msgstr "أظهر نظرة عامة على الأنشطة"
-
-#~ msgid "Windows"
-#~ msgstr "النوافذ"
-
-#~ msgid "Activate the window menu"
-#~ msgstr "فعّل قائمة النافذة"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "بدّل نمط ملء الشاشة"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "بدّل حالة التكبير"
-
-#~ msgid "Maximize window"
-#~ msgstr "كبّر النّافذة"
-
-#~ msgid "Restore window"
-#~ msgstr "استعد النّافذة"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "بدّل حالة الإخفاء"
-
-#~ msgid "Close window"
-#~ msgstr "أغلق النّافذة"
-
-#~ msgid "Hide window"
-#~ msgstr "أخفِ النّافذة"
-
-#~ msgid "Move window"
-#~ msgstr "انقل النّافذة"
-
-#~ msgid "Resize window"
-#~ msgstr "حجّم النّافذة"
-
-#~ msgid "Toggle window on all workspaces or one"
-#~ msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
-
-#~ msgid "Raise window if covered, otherwise lower it"
-#~ msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
-
-#~ msgid "Raise window above other windows"
-#~ msgstr "ارفع النافذة فوق النوافذ الأخرى"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "اخفض النافذة تحت النوافذ الأخرى"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "كبّر النافذة رأسيا"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "كبّر النافذة أفقيا"
-
-#~ msgid "View split on left"
-#~ msgstr "المنظور مقسوم على اليمين"
-
-#~ msgid "View split on right"
-#~ msgstr "المنظور مقسوم على اليسار"
-
-#~ msgid "Mutter"
-#~ msgstr "مَتَر"
-
-#~ msgid "Modifier to use for extended window management operations"
-#~ msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
-
-#, fuzzy
-#~ msgid "Switch to VT 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#, fuzzy
-#~ msgid "Switch to VT 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#, fuzzy
-#~ msgid "Switch to VT 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#, fuzzy
-#~ msgid "Switch to VT 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#, fuzzy
-#~ msgid "Switch to VT 5"
-#~ msgstr "انتقل إلى مساحة العمل 5"
-
-#, fuzzy
-#~ msgid "Switch to VT 6"
-#~ msgstr "انتقل إلى مساحة العمل 6"
-
-#, fuzzy
-#~ msgid "Switch to VT 7"
-#~ msgstr "انتقل إلى مساحة العمل 7"
-
-#, fuzzy
-#~ msgid "Switch to VT 8"
-#~ msgstr "انتقل إلى مساحة العمل 8"
-
-#, fuzzy
-#~ msgid "Switch to VT 9"
-#~ msgstr "انتقل إلى مساحة العمل 9"
-
-#, fuzzy
-#~ msgid "Switch to VT 10"
-#~ msgstr "انتقل إلى مساحة العمل 10"
-
-#, fuzzy
-#~ msgid "Switch to VT 11"
-#~ msgstr "انتقل إلى مساحة العمل 11"
-
-#, fuzzy
-#~ msgid "Switch to VT 12"
-#~ msgstr "انتقل إلى مساحة العمل 12"
-
 #~ msgid "Unknown window information request: %d"
 #~ msgstr "طلب معلومات نافذة مجهول: %d"

--- a/po/be.po
+++ b/po/be.po
@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-29 16:09+0000\n"
-"PO-Revision-Date: 2017-09-01 18:44+0300\n"
+"POT-Creation-Date: 2017-04-21 21:33+0000\n"
+"PO-Revision-Date: 2017-04-23 16:56+0300\n"
 "Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@ -409,10 +409,7 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
+"manage HiDPI monitors. Does not require a restart."
 msgstr ""
 "Каб уключыць эксперыментальныя функцыі, дадайце адпаведнае ключавое слова ў "
 "гэты ліст. Некаторыя функцыі могуць патрабаваць перазапуску кампазітара. "
@ -421,27 +418,16 @@ msgstr ""
 "\"scale-monitor-framebuffer\" - прымушае mutter прадвызначана размяшчаць "
 "лагічныя маніторы ў лагічнай прасторы каардынат пікселаў, пры гэтым "
 "маштабаваць кадравы буфер, а не змесціва акна, для падтрымкі HiDPI "
-"манітораў. Не патрабуе перазапуску. • \"remote-desktop\" - уключае падтрымку "
-"аддаленых манітораў. Для падтрымкі аддаленых манітораў з супольным доступам "
-"да экрана трэба таксама ўключыць \"screen-cast\". • \"screen-cast\" - "
-"уключае падтрымку скрынкасту."
+"манітораў. Не патрабуе перазапуску."

-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "Выбраць акно з выплыўнога акенца"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "Закрыць выплыўное акенца"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Пераключыць канфігурацыі манітора"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Паварочвае убудаваны манітор"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Перайсці ў віртуальны тэрмінал 1"
@ -490,14 +476,10 @@ msgstr "Перайсці ў віртуальны тэрмінал 11"
 msgid "Switch to VT 12"
 msgstr "Перайсці ў віртуальны тэрмінал 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Уключыць назад клавіятурныя скароты"
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2151
+#: src/backends/meta-input-settings.c:1848
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Пераключыць рэжым (група %d)"
@ -505,37 +487,37 @@ msgstr "Пераключыць рэжым (група %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2174
+#: src/backends/meta-input-settings.c:1870
 msgid "Switch monitor"
 msgstr "Пераключыць манітор"

-#: src/backends/meta-input-settings.c:2176
+#: src/backends/meta-input-settings.c:1872
 msgid "Show on-screen help"
 msgstr "Паказаць экранную даведку"

-#: src/backends/meta-monitor-manager.c:903
+#: src/backends/meta-monitor-manager.c:783
 msgid "Built-in display"
 msgstr "Убудаваны дысплей"

-#: src/backends/meta-monitor-manager.c:926
+#: src/backends/meta-monitor-manager.c:806
 msgid "Unknown"
 msgstr "Невядомы"

-#: src/backends/meta-monitor-manager.c:928
+#: src/backends/meta-monitor-manager.c:808
 msgid "Unknown Display"
 msgstr "Невядомы дысплей"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:936
+#: src/backends/meta-monitor-manager.c:816
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:476
+#: src/compositor/compositor.c:474
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@ -546,6 +528,31 @@ msgstr ""
 msgid "Bell event"
 msgstr "Падзея з сігналам"

+#. Translators: %s is a window title
+#: src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "\"%s\" не адказвае на запыты."
+
+#: src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "Праграма не адказвае на запыты."
+
+#: src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Вы можаце альбо крыху пачакаць адказу, альбо змусіць праграму да выхаду."
+
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Змусіць да выхаду"
+
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Пачакаць"
+
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@ -587,31 +594,6 @@ msgstr "Запусціць у якасці ўложанага кампазіта
 msgid "Run as a full display server, rather than nested"
 msgstr "Запусціць у якасці паўнавартаснага сервера дысплея, я не як уложаны "

-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
-#, c-format
-msgid "“%s” is not responding."
-msgstr "\"%s\" не адказвае на запыты."
-
-#: src/core/meta-close-dialog-default.c:149
-msgid "Application is not responding."
-msgstr "Праграма не адказвае на запыты."
-
-#: src/core/meta-close-dialog-default.c:154
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr ""
-"Вы можаце альбо крыху пачакаць адказу, альбо змусіць праграму да выхаду."
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_Змусіць да выхаду"
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "_Пачакаць"
-
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
@ -5,23 +5,24 @@
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
-# Jordi Serratosa <jordis@softcatala.cat>, 2012, 2017.
+# Jordi Serratosa <jordis@softcatala.cat>, 2012.
 # Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-06-07 13:00+0000\n"
-"PO-Revision-Date: 2018-06-17 10:25+0200\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-04-21 21:33+0000\n"
+"PO-Revision-Date: 2016-03-13 14:45+0100\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@ -48,118 +49,136 @@ msgid "Move window to last workspace"
 msgstr "Mou la finestra a l'últim espai de treball"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mou la finestra un espai de treball a l'esquerra"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mou la finestra un espai de treball a la dreta"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Mou la finestra un espai de treball amunt"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Mou la finestra un espai de treball avall"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mou la finestra un monitor a l'esquerra"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mou la finestra un monitor a la dreta"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Mou la finestra un monitor amunt"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Mou la finestra un monitor avall"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Canvia d'aplicacions"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Canvia a l'aplicació anterior"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Canvia de finestres"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Canvia a la finestra anterior"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Canvia entre les finestres d'una aplicació"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Canvia a la finestra anterior d'una aplicació"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
+#, fuzzy
+#| msgid "Switch system controls directly"
 msgid "Switch system controls"
-msgstr "Canvia els controls del sistema"
+msgstr "Canvia immediatament entre els controls del sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Canvia al control del sistema anterior"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Canvia immediatament entre finestres"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Canvia immediatament a la finestra anterior"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Canvia immediatament entre les finestres d'una aplicació"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Canvia immediatament a la finestra anterior d'una aplicació"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Canvia immediatament entre els controls del sistema"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Canvia immediatament al control del sistema anterior"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Oculta totes les finestres normals"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Canvia a l'espai de treball 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Canvia a l'espai de treball 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Canvia a l'espai de treball 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Canvia a l'espai de treball 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Canvia a l'últim espai de treball"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mou a l'espai de treball de l'esquerra"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mou a l'espai de treball de la dreta"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mou a l'espai de treball de sobre"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mou a l'espai de treball de sota"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@ -171,10 +190,6 @@ msgstr "Mostra l'indicador d'execució d'aplicacions"
 msgid "Show the activities overview"
 msgstr "Mostra la vista general d'activitats"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaura les dreceres de teclat"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Finestres"
@ -200,52 +215,56 @@ msgid "Restore window"
 msgstr "Restaura la finestra"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Canvia l'estat d'ombrejat"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Tanca la finestra"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Oculta la finestra"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mou la finestra"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensiona la finestra"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Canvia la funció que fa que la finestra estigui en tots els espais de "
 "treball o només en un"

-#: data/50-mutter-windows.xml:29
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Alça la finestra si està coberta per una altra; altrament, baixa-la"
-
 #: data/50-mutter-windows.xml:31
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Alça la finestra si està coberta per una altra, o sinó baixa-la"
+
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Alça la finestra per damunt de les altres"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Baixa la finestra sota les altres"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximitza la finestra verticalment"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximitza la finestra horitzontalment"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Mostra la partició a l'esquerra"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Mostra la partició a la dreta"

@ -260,6 +279,12 @@ msgstr ""
 "finestres"

 #: data/org.gnome.mutter.gschema.xml.in:8
+#, fuzzy
+#| msgid ""
+#| "This key will initiate the \"overlay\", which is a combination window "
+#| "overview and application launching system. The default is intended to be "
+#| "the \"Windows key\" on PC hardware. It's expected that this binding "
+#| "either the default or set to the empty string."
 msgid ""
 "This key will initiate the “overlay”, which is a combination window overview "
 "and application launching system. The default is intended to be the “Windows "
@ -289,7 +314,7 @@ msgstr ""
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
+"Habilita la tesselització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"

 #: data/org.gnome.mutter.gschema.xml.in:31
@ -308,6 +333,11 @@ msgid "Workspaces are managed dynamically"
 msgstr "Els espais de treball es gestionen dinàmicament"

 #: data/org.gnome.mutter.gschema.xml.in:41
+#, fuzzy
+#| msgid ""
+#| "Determines whether workspaces are managed dynamically or whether there's "
+#| "a static number of workspaces (determined by the num-workspaces key in "
+#| "org.gnome.desktop.wm.preferences)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@ -346,6 +376,11 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Retarda el canvi del focus fins que s'aturi el punter"

 #: data/org.gnome.mutter.gschema.xml.in:69
+#, fuzzy
+#| msgid ""
+#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+#| "the focus will not be changed immediately when entering a window, but "
+#| "only after the pointer stops moving."
 msgid ""
 "If set to true, and the focus mode is either “sloppy” or “mouse” then the "
 "focus will not be changed immediately when entering a window, but only after "
@ -360,6 +395,10 @@ msgid "Draggable border width"
 msgstr "Amplada del contorn arrossegable"

 #: data/org.gnome.mutter.gschema.xml.in:80
+#, fuzzy
+#| msgid ""
+#| "The amount of total draggable borders. If the theme's visible borders are "
+#| "not enough, invisible borders will be added to meet this value."
 msgid ""
 "The amount of total draggable borders. If the theme’s visible borders are "
 "not enough, invisible borders will be added to meet this value."
@ -396,7 +435,7 @@ msgstr ""

 #: data/org.gnome.mutter.gschema.xml.in:107
 msgid "Enable experimental features"
-msgstr "Habilita les funcionalitats experimentals"
+msgstr ""

 #: data/org.gnome.mutter.gschema.xml.in:108
 msgid ""
@ -418,14 +457,6 @@ msgstr "Selecció de finestra entre les emergents d'una pestanya"
 msgid "Cancel tab popup"
 msgstr "Cancel·lació de les finestres emergents a les pestanyes"

-#: data/org.gnome.mutter.gschema.xml.in:151
-msgid "Switch monitor configurations"
-msgstr "Canvia configuracions de monitor"
-
-#: data/org.gnome.mutter.gschema.xml.in:156
-msgid "Rotates the built-in monitor configuration"
-msgstr "Gira la configuració del monitor integrada"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Canvia al terminal virtual 1"
@ -474,45 +505,10 @@ msgstr "Canvia al terminal virtual 11"
 msgid "Switch to VT 12"
 msgstr "Canvia al terminal virtual 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Torna a habilitar les dreceres"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permetre la captura amb Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Les aplicacions Xwayland poden capturar el teclat"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:1848
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Mode de commutació (grup %d)"
@ -520,37 +516,37 @@ msgstr "Mode de commutació (grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:1870
 msgid "Switch monitor"
 msgstr "Commuta el monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:1872
 msgid "Show on-screen help"
 msgstr "Mostra l'ajuda en pantalla"

-#: src/backends/meta-monitor-manager.c:903
+#: src/backends/meta-monitor-manager.c:783
 msgid "Built-in display"
 msgstr "Pantalla integrada"

-#: src/backends/meta-monitor-manager.c:926
+#: src/backends/meta-monitor-manager.c:806
 msgid "Unknown"
 msgstr "Desconeguda"

-#: src/backends/meta-monitor-manager.c:928
+#: src/backends/meta-monitor-manager.c:808
 msgid "Unknown Display"
 msgstr "Pantalla desconeguda"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:936
+#: src/backends/meta-monitor-manager.c:816
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:474
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@ -562,37 +558,63 @@ msgstr ""
 msgid "Bell event"
 msgstr "Esdeveniment de campana"

+#. Translators: %s is a window title
+#: src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "«%s» no està responent."
+
+#: src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "L'aplicació no està responent."
+
+#: src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Podeu esperar un moment perquè continuï o podeu forçar-ne la sortida "
+"completa."
+
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Força'n la sortida"
+
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Espera"
+
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
 msgstr ""
 "S'ha produït un error en obrir la pantalla del sistema de finestres X «%s»\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Reemplaça el gestor de finestres en execució"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Especifica l'ID de gestió de sessió"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Visualització X per usar"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicialitza la sessió des del fitxer desat"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Fes que les crides a l'X siguin síncrones"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Funciona com a compositor de Wayland"

@ -601,44 +623,14 @@ msgstr "Funciona com a compositor de Wayland"
 #
 # Camins:
 # ../src/core/main.c:223
-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Funciona com a compositor imbricat"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Executa amb un rerefons X11"
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
-#, c-format
-msgid "“%s” is not responding."
-msgstr "«%s» no està responent."
-
-#: src/core/meta-close-dialog-default.c:149
-msgid "Application is not responding."
-msgstr "L'aplicació no està responent."
-
-#: src/core/meta-close-dialog-default.c:154
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr ""
-"Podeu esperar un moment perquè continuï o podeu forçar-ne la sortida "
-"completa."
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_Força'n la sortida"
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "_Espera"
-
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@ -668,7 +660,7 @@ msgstr "Connector del Mutter a utilitzar"
 msgid "Workspace %d"
 msgstr "Espai de treball %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@ -677,7 +669,7 @@ msgstr ""
 "La pantalla «%s» ja té un gestor de finestres; proveu l'opció --replace per "
 "reemplaçar el gestor de finestres actual."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
@ -686,12 +678,12 @@ msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Mode de commutació: mode %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@ -704,21 +696,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (a %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mou la finestra un espai de treball a l'esquerra"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mou la finestra un espai de treball a la dreta"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mou a l'espai de treball de l'esquerra"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mou a l'espai de treball de la dreta"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Canvia l'estat d'ombrejat"
-
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "No s'ha pogut analitzar el directori de temes: %s\n"

--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
@ -6,14 +6,15 @@
 # Petr Tomeš <ptomes@gmail.com>, 2006.
 # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
 # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
-# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016, 2017, 2018.
+# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-01 10:47+0000\n"
-"PO-Revision-Date: 2018-03-07 19:28+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-03-07 12:40+0000\n"
+"PO-Revision-Date: 2017-03-09 07:51+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Přesunout okno na poslední pracovní plochu"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Přesunout okno o jednu pracovní plochu doleva"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Přesunout okno o jednu pracovní plochu doprava"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Přesunout okno o jednu pracovní plochu nahoru"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Přesunout okno o jednu pracovní plochu dolů"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Přesunout okno o jeden monitor doleva"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Přesunout okno o jeden monitor doprava"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Přesunout okno o jeden monitor nahoru"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Přesunout okno o jeden monitor dolů"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Přepnout do jiné aplikace"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Přepnout do předchozí aplikaci"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Přepnout do jiného okna"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Přepnout do minulého okna"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Přepnout do jiného okna aplikace"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Přepnout do předchozího okna aplikace"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Přepnout na systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Přepnout na minulý systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Přepnout do minulého okna"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Přepnout přímo na předchozí okno"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Přepnout do jiného okna aplikace"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Přepnout do předchozího okna aplikace"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Přepnout na minulý systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Přepnout přímo na předchozí systémové ovládací prvky"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Skrýt všechna běžná okna"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Přepnout na plochu 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Přepnout na plochu 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Přepnout na plochu 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Přepnout na plochu 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Přepnout na poslední plochu"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Přesunout na plochu vlevo"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Přesunout na plochu vpravo"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Přesunout na plochu nad"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Přesunout na plochu pod"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Systém"

@ -172,10 +189,6 @@ msgstr "Zobrazit řádek ke spuštění příkazu"
 msgid "Show the activities overview"
 msgstr "Zobrazit přehled činností"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Obnovit klávesové zkratky"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Okna"
@ -201,50 +214,54 @@ msgid "Restore window"
 msgstr "Obnovit velikost okna"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Přepnout stav svinutí"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Zavřít okno"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Skrýt okno"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Přesunout okno"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Změnit velikost okna"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Přepnout okno na všechny/jednu pracovní plochu"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Když je okno zakryté vynést jej do popředí, jinak odsunout do pozadí"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Vynést okno do popředí nad ostatní okna"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Odsunout okno do pozadí za ostatní okna"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximalizovat okno svisle"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximalizovat okno vodorovně"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Rozdělit okno přes levou půlku obrazovky"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Rozdělit okno přes pravou půlku obrazovky"

@ -344,8 +361,9 @@ msgid ""
 "focus will not be changed immediately when entering a window, but only after "
 "the pointer stops moving."
 msgstr ""
-"Je-li zapnuto a režim zaměření je buď „sloppy“ nebo „mouse“, pak se zaměření "
-"nezmění hned, když vstoupíte do kona, ale až se přestane pohybovat ukazatel."
+"Je-li zapnuto a režim zaměření je buď „sloppy“ nebo „mouse“, pak se "
+"zaměření nezmění hned, když vstoupíte do kona, ale až se přestane pohybovat "
+"ukazatel."

 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@ -383,53 +401,14 @@ msgstr ""
 "Je-li zapnuto, nová okna budou vždy umístěna ve středu aktivní obrazovky "
 "monitoru."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Povolit experimentální funkce"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-"Chcete-li povolit experimentální funkce, přidejte klíčové slovo funkce do "
-"seznamu. Zda funkce vyžaduje restartování kompozitoru, závisí na dané "
-"funkci. Ne u každé experimentální funkce je vyžadováno, aby byla stále "
-"dostupná nebo konfigurovatelná. Neočekávejte, že by bylo v tomto nastavení "
-"přidáno něco, co by do budoucna přineslo vylepšení. V současné době jsou "
-"možná tato klíčová slova: • „scale-monitor-framebuffer“ – zajistí, aby byl "
-"mutter výchozí pro logické uspořádání monitorů v logickém souřadnicovém "
-"prostoru pixelů, zatímco škáluje přímo v grafické vyrovnávací paměti, "
-"namísto v obsahu oken, aby se postaral o správu montorů s HiDPI. Nevyžaduje "
-"restart. • „remote-desktop“ – zapne podporu pro vzdálenou pracovní plochu. "
-"Pro podporu vzdálené plochy se sdílením obrazovky musít být zapnuto také "
-"„screen-cast“. • „screen-cast“ – zapne podporu pro vysílání obsahu obrazovky."
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Vybrat okno z překryvné nabídky tabulátoru"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Zrušit překryvné okno tabulátoru"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Přepnout nastavení monitoru"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Postupně mění vestavěná nastavení monitoru"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Přepnout na VT 1"
@ -478,61 +457,10 @@ msgstr "Přepnout na VT 11"
 msgid "Switch to VT 12"
 msgstr "Přepnout na VT 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Znovu povolit klávesové zkratky"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Povolit zachytávání pomocí Xwaylandu"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Povolit, aby bylo bráno v úvahu zachytávání kláves, o které se stará "
-"aplikace X11 běžící v Xwaylandu. Aby bylo pod Waylandem zachytávání bráno v "
-"úvahu, musí klient navíc buď poslat specifickou zprávu X11 ClientMessage do "
-"kořenového okna, nebo být mezi aplikacemi na bílé listině v klíči „xwayland-"
-"grab-access-rules“."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-"Aplikace pod Xwaylandem mají povoleno se starat o zachytávání klávesnice"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Seznam názvů prostředků nebo tříd prostředků oken X11, které buď mají nebo "
-"nemají povolené se starat o zachytávání klávesnice X11 pod Xwaylandem. Název "
-"nebo třída prostředku daného okna X11 se dá zjistit pomocí příkazu „xprop "
-"WM_CLASS“. V názvech jsou podporované divoké znaky „*“ a „?“. Hodnoty "
-"začínající „!“ jsou na černé listině, což má přednost před bílou listinou, "
-"aby se daly aplikace odvolat z výchozího systémového seznamu. Do výchozího "
-"systémového seznamu patří následující aplikace: "
-"„@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@“. Uživatel může přerušit existující "
-"zachytávání pomocí speciální klávesové zkratky definované klíčem „restore-"
-"shortcuts“."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:1800
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Přepínač režimu (skupina %d)"
@ -540,37 +468,37 @@ msgstr "Přepínač režimu (skupina %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:1822
 msgid "Switch monitor"
 msgstr "Přepnout monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:1824
 msgid "Show on-screen help"
 msgstr "Zobrazit nápovědu na obrazovce"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:675
 msgid "Built-in display"
 msgstr "Vestavěný displej"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:698
 msgid "Unknown"
 msgstr "Neznámý"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:700
 msgid "Unknown Display"
 msgstr "Neznámý displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:708
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:474
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@ -580,62 +508,17 @@ msgstr "Jiný kompozitní správce již běží na obrazovce %i displeje „%s
 msgid "Bell event"
 msgstr "Událost zvonku"

-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Nelze otevřít displej X Window System „%s“\n"
-
-#: src/core/main.c:190
-msgid "Disable connection to session manager"
-msgstr "Zakáže připojení ke správci sezení"
-
-#: src/core/main.c:196
-msgid "Replace the running window manager"
-msgstr "Nahradí běžícího správce oken"
-
-#: src/core/main.c:202
-msgid "Specify session management ID"
-msgstr "Určení ID správy sezení"
-
-#: src/core/main.c:207
-msgid "X Display to use"
-msgstr "Displej X, který použije"
-
-#: src/core/main.c:213
-msgid "Initialize session from savefile"
-msgstr "Spustí sezení z uloženého souboru"
-
-#: src/core/main.c:219
-msgid "Make X calls synchronous"
-msgstr "Provede volání X synchronně"
-
-#: src/core/main.c:226
-msgid "Run as a wayland compositor"
-msgstr "Spustit jako kompozitor protokolu Wayland"
-
-#: src/core/main.c:232
-msgid "Run as a nested compositor"
-msgstr "Spustit jako podkladový kompozitor"
-
-#: src/core/main.c:240
-msgid "Run as a full display server, rather than nested"
-msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Spustit se serverem X11"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s“ nereaguje."

-#: src/core/meta-close-dialog-default.c:149
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikace nereaguje."

-#: src/core/meta-close-dialog-default.c:154
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -643,14 +526,55 @@ msgstr ""
 "Je možné chvíli počkat, aby aplikace mohla pokračovat, nebo si vynutit úplné "
 "ukončení aplikace."

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Vynutit ukončení"

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Počkat"

+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Nelze otevřít displej X Window System „%s“\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Zakáže připojení ke správci sezení"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Nahradí běžícího správce oken"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Určení ID správy sezení"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Displej X, který použije"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Spustí sezení z uloženého souboru"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Provede volání X synchronně"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Spustit jako kompozitor protokolu Wayland"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Spustit jako podkladový kompozitor"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@ -680,7 +604,7 @@ msgstr "Zásuvný modul Mutter, který se má použít"
 msgid "Workspace %d"
 msgstr "Plocha %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@ -689,7 +613,7 @@ msgstr ""
 "Displej „%s“ již správce oken má; zkuste prosím nahradit aktuálního správce "
 "oken pomocí přepínače --replace."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"
@ -698,35 +622,21 @@ msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Přepínač režimu: režim %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"Tato okna nepodporují „uložení aktuálního nastavení“ a po svém příštím "
-"přihlášení je budete muset spustit ručně."
+"Tato okna nepodporují „uložení aktuálního nastavení“ a po svém "
+"příštím přihlášení je budete muset spustit ručně."

 #: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Přesunout okno o jednu pracovní plochu doleva"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Přesunout okno o jednu pracovní plochu doprava"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Přesunout na plochu vlevo"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Přesunout na plochu vpravo"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Přepnout stav svinutí"
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
@ -3,26 +3,26 @@
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
 # Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2018.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2017.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
-# Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
+# Wolfgang Stöggl <c72578@yahoo.de> 2011.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
-# Tim Sabsch <timæsabsch.com>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-26 07:59+0000\n"
-"PO-Revision-Date: 2018-02-26 21:26+0100\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-05-10 19:07+0000\n"
+"PO-Revision-Date: 2017-05-12 17:35+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.1\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@ -49,118 +49,134 @@ msgid "Move window to last workspace"
 msgstr "Fenster auf letzte Arbeitsfläche verschieben"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Fenster eine Arbeitsfläche nach links verschieben"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Fenster eine Arbeitsfläche nach rechts verschieben"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Fenster eine Arbeitsfläche nach oben verschieben"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Fenster eine Arbeitsfläche nach unten verschieben"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Fenster einen Bildschirm nach links verschieben"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Fenster einen Bildschirm nach rechts verschieben"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Fenster einen Bildschirm nach oben verschieben"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Fenster einen Bildschirm nach unten verschieben"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Anwendungen wechseln"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Zur vorherigen Anwendung wechseln"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Fenster wechseln"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Zum vorherigen Fenster wechseln"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Zwischen den Fenstern einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Zum vorherigen Fenster einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Systemsteuerungen umschalten"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Zur vorherigen Systemsteuerungen wechseln"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Fenster sofort wechseln"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Direkt zum vorherigen Fenster wechseln"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Sofort zwischen den Fenstern einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Direkt zum vorherigen Fenster einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Systemsteuerungen sofort umschalten"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
-msgstr "Direkt zur vorherigen Systemsteuerungen wechseln"
+msgstr "Direkt zur vorherigen Systemsteuerungen wechselen"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Alle normalen Fenster verbergen"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Zur Arbeitsfläche 1 wechseln"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Zur Arbeitsfläche 2 wechseln"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Zur Arbeitsfläche 3 wechseln"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Zur Arbeitsfläche 4 wechseln"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Zur letzten Arbeitsfläche wechseln"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Auf Arbeitsfläche links verschieben"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Auf Arbeitsfläche rechts verschieben"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Auf Arbeitsfläche darüber verschieben"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Auf Arbeitsfläche darunter verschieben"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"

@ -172,10 +188,6 @@ msgstr "Den »Befehl ausführen«-Dialog anzeigen"
 msgid "Show the activities overview"
 msgstr "Aktivitäten-Übersicht anzeigen"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Die Tastenkombinationen wiederherstellen"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Fenster"
@ -201,51 +213,55 @@ msgid "Restore window"
 msgstr "Fenstergröße wiederherstellen"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Fenster ein-/ausrollen"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Fenster schließen"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Fenster verbergen"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Fenster verschieben"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Fenstergröße ändern"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Festlegen, ob das Fenster auf allen oder nur einer Arbeitsfläche sichtbar ist"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Fenster anheben, falls es verdeckt ist, andernfalls absenken"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Fenster vor die anderen Fenster anheben"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Fenster hinter die anderen Fenster absenken"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Fenster vertikal maximieren"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Fenster horizontal maximieren"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Ansicht links teilen"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Ansicht rechts teilen"

@ -303,7 +319,7 @@ msgstr ""

 #: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
-msgstr "Arbeitsflächen sollen dynamisch verwaltet werden"
+msgstr "Arbeitsflächen sollen dynamisch verwaltet werden "

 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
@ -389,13 +405,14 @@ msgid ""
 "screen of the monitor."
 msgstr ""
 "Falls wahr, so werden neue Fenster immer in der Mitte des aktiven "
-"Bildschirms platziert."
+"Bildschirms platziert"

 #: data/org.gnome.mutter.gschema.xml.in:107
 msgid "Enable experimental features"
 msgstr "Experimentelle Funktionsmerkmale aktivieren"

 #: data/org.gnome.mutter.gschema.xml.in:108
+#, fuzzy
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@ -404,43 +421,23 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
+"manage HiDPI monitors. Does not require a restart."
 msgstr ""
 "Um experimentelle Funktionsmerkmale zu aktivieren, fügen Sie das "
 "entsprechende Schlüsselwort zur Liste hinzu. Möglicherweise muss der "
-"Compositor neu gestartet werden, um es zu aktivieren, dies ist vom "
-"Funktionsmerkmal abhängig. Für diese experimentellen Funktionsmerkmale gilt, "
-"dass sie nicht unbedingt dauerhaft verfügbar sein werden, oder Einstellungen "
-"möglich sind. Derzeit mögliche Schlüsselwörter: • »scale-monitor-"
-"framebuffer« – weist Mutter an, in der Voreinstellung logische Bildschirme "
-"in einem logischen Pixel-Koordinatensystem anzuordnen, wobei die Bildschirm-"
-"Framebuffer anstelle der Fensterinhalte skaliert werden, um HiDPI-"
-"Bildschirme besser versorgen zu können. Dafür ist kein Neustart "
-"erforderlich. • »remote-desktop« – aktiviert Remotedesktop-Unterstützung. Um "
-"das Teilen von Bildschirmen mittels Remotedesktop zu unterstützen, muss "
-"»screen-cast« ebenfalls aktiviert sein. • »screen-cast« – aktiviert »screen "
-"cast«-Unterstützung."
+"Compositor neu gestartet werden, um es zu aktivieren. Für diese "
+"experimentellen Funktionsmerkmale gilt, dass sie nicht unbedingt dauerhaft "
+"verfügbar sein werden, oder Einstellungen möglich sind. Derzeit mögliche "
+"Schlüsselwörter: • “scale-monitor-framebuffer” — "

-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "Fenster aus Tab-Anzeige auswählen"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "Tab-Anzeige abbrechen"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Bildschirmkonfigurationen wechseln"
-
-# Ich denke nicht, dass »rotate« hier die Bildschirmdrehung meint, sondern eher eine Liste aus Konfigurationen rotiert (d.h. umgewälzt) wird.
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Zum virtuellen Terminal 1 wechseln"
@ -489,63 +486,10 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Tastenkombinationen erneut aktivieren"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Tastatur-Kontrollübernahmen in Xwayland erlauben"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Erlauben, dass in Xwayland laufende X11-Anwendungen Kontrolle über die "
-"Tastatur übernehmen dürfen. Damit eine X11-Kontrollübernahme unter Wayland "
-"durchgeführt werden kann, muss der Client auch entweder eine spezifische X11-"
-"ClientMessage an das Root-Fenster senden oder in den als »whitelisted« im "
-"Schlüssel »xwayland-grab-access-rules« aufgelisteten Anwendungen enthalten "
-"sein."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland-Anwendungen mit Erlaubnis zur Kontrollübernahme der Tastatur"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Listet die Ressourcennamen oder -klassen von X11-Fenstern auf, die unter "
-"Xwayland X11-Tastatur-Kontrollübernahmen durchführen dürfen. Ressourcenname "
-"oder -klasse eines bestimmten X11-Fensters kann mit dem Befehl »xprop "
-"WM_CLASS« ermittelt werden. Dabei werden »*« als Platzhalter und »?« als "
-"Joker in den Wertangaben unterstützt. Mit »!« beginnende Werte gelten als "
-"»blacklisted« und werden gegenüber den als »whitelisted« markierten Werten "
-"bevorzugt, um in der Standardliste des Systems aufgeführte Anwendungen außer "
-"Kraft zu setzen. Die Standardliste des Systems enthält die folgenden "
-"Anwendungen: »@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@« Benutzer können eine "
-"existierende Kontrollübernahme unterbrechen, indem sie das spezifische "
-"Tastenkürzel verwenden, wie es im Schlüssel »restore-shortcuts« angegeben "
-"ist."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:1848
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Moduswechsel (Gruppe %d)"
@ -553,37 +497,37 @@ msgstr "Moduswechsel (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:1870
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:1872
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:783
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:806
 msgid "Unknown"
 msgstr "Unbekannt"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:808
 msgid "Unknown Display"
 msgstr "Unbekannte Anzeige"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:816
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:474
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@ -595,62 +539,17 @@ msgstr ""
 msgid "Bell event"
 msgstr "Klangereignis"

-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
-
-#: src/core/main.c:190
-msgid "Disable connection to session manager"
-msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
-
-#: src/core/main.c:196
-msgid "Replace the running window manager"
-msgstr "Den aktuellen Fensterverwalter ersetzen"
-
-#: src/core/main.c:202
-msgid "Specify session management ID"
-msgstr "Kennung der Sitzungsverwaltung angeben"
-
-#: src/core/main.c:207
-msgid "X Display to use"
-msgstr "Zu verwendende X-Anzeige"
-
-#: src/core/main.c:213
-msgid "Initialize session from savefile"
-msgstr "Sitzung anhand gespeicherter Datei starten"
-
-#: src/core/main.c:219
-msgid "Make X calls synchronous"
-msgstr "X-Aufrufe abgleichen"
-
-#: src/core/main.c:226
-msgid "Run as a wayland compositor"
-msgstr "Als Wayland-Compositor ausführen"
-
-#: src/core/main.c:232
-msgid "Run as a nested compositor"
-msgstr "Als eingebetteten Compositor ausführen"
-
-#: src/core/main.c:240
-msgid "Run as a full display server, rather than nested"
-msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Mit X11-Backend ausführen"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "»%s« antwortet nicht."

-#: src/core/meta-close-dialog-default.c:149
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Die Anwendung antwortet nicht."

-#: src/core/meta-close-dialog-default.c:154
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -658,14 +557,55 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Warten"

+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Den aktuellen Fensterverwalter ersetzen"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Kennung der Sitzungsverwaltung angeben"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Zu verwendende X-Anzeige"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Sitzung anhand gespeicherter Datei starten"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "X-Aufrufe abgleichen"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Als Wayland-Compositor ausführen"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Als eingebetteten Compositor ausführen"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
+
 # CHECK
 # c-format
 #: src/core/mutter.c:39
@ -697,7 +637,7 @@ msgstr "Zu benutzendes Mutter-Plugin"
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@ -706,7 +646,7 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
@ -715,12 +655,12 @@ msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Moduswechsel: Modus %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
--- a/po/eo.po
+++ b/po/eo.po
@ -2,16 +2,16 @@
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 # Michael MORONI < >, 2011.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2012, 2015, 2018.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2012, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-12-18 16:24+0000\n"
-"PO-Revision-Date: 2018-01-22 20:12+0200\n"
+"POT-Creation-Date: 2015-02-14 11:06+0000\n"
+"PO-Revision-Date: 2015-02-14 22:34+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
+"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -20,675 +20,553 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigado"

-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Movi la fenestron al laborspaco 1"

-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Movi la fenestron al laborspaco 2"

-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Movi la fenestron al laborspaco 3"

-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Movi la fenestron al laborspaco 4"

-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Movi la fenestron al lasta laborspaco"

-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Movi la fenestron al la maldekstra laborspaco"

-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Movi la fenestron al la dekstra laborspaco"

-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Movi la fenestron al la supra laborspaco"

-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Movi la fenestron al la suba laborspaco"

-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Movi la fenestron al la maldekstra ekrano"

-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Movi la fenestron al la dekstra ekrano"

-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Movi la fenestron al la supra ekrano"

-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Movi la fenestron al la suba ekrano"

-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Ŝanĝi aplikaĵojn"

-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Ŝalti al antaŭa aplikaĵo"

-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Ŝanĝi fenestrojn"

-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Ŝalti al antaŭa fenestro"

-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Ŝanĝi fenestrojn de aplikaĵo"

-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Ŝalti al antaŭa fenestro de aplikaĵo"

-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Ŝanĝi sistem-kontrolojn"

-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Ŝalti al antaŭa sistem-kontrolo"

-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Ŝanĝi rekte fenestrojn"

-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Ŝalti rekte al antaŭa fenestro"

-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Ŝanĝi rekte fenestrojn de aplikaĵo"

-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Ŝalti rekte al antaŭa fenestro de aplikaĵo"

-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Ŝalti rekte sistem-kontrolojn"

-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Ŝalti rekte al antaŭa sistem-kontrolo"

-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Kaŝi ĉiujn normalajn fenestrojn"

-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Ŝalti al laborspaco 1"

-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Ŝalti al laborspaco 2"

-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Ŝalti al laborspaco 3"

-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Ŝalti al laborspaco 4"

-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Ŝalti al lasta laborspaco"

-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Movi al la maldekstra laborspaco"

-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Movi al la dekstra laborspaco"

-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Movi al la supra laborspaco"

-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Movi al la malsupra laborspaco"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Sistemo"

-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr ""

-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr ""

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr ""
-
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Fenestroj"

-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Aktivigi la fenestromenuon"

-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Baskuligi tutekranan reĝimon"

-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr ""

-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Restaŭri la fenestron"

-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr ""

-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Fermi la fenestron"

-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Kaŝi la fenestron"

-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Movi la fenestron"

-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Ŝanĝi la fenestrograndon"

-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr ""

-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""

-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr ""

-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr ""

-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Vertikale maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Horizontale maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr ""

-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr ""

-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutero"

-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr ""
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:155
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 #, fuzzy
-#| msgid "Switch applications"
-msgid "Switch monitor configurations"
-msgstr "Ŝanĝi aplikaĵojn"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
-msgstr "Ŝalti al virtuala terminalo 1"
+msgstr "Ŝalti al VT 1"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#, fuzzy
 msgid "Switch to VT 2"
-msgstr "Ŝalti al virtuala terminalo 2"
+msgstr "Ŝalti al VT 2"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#, fuzzy
 msgid "Switch to VT 3"
-msgstr "Ŝalti al virtuala terminalo 3"
+msgstr "Ŝalti al VT 3"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#, fuzzy
 msgid "Switch to VT 4"
-msgstr "Ŝalti al virtuala terminalo 4"
+msgstr "Ŝalti al VT 4"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#, fuzzy
 #| msgid "Switch to workspace 5"
 msgid "Switch to VT 5"
-msgstr "Ŝalti al virtuala terminalo 5"
+msgstr "Ŝalti al VT 5"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#, fuzzy
 #| msgid "Switch to workspace 6"
 msgid "Switch to VT 6"
-msgstr "Ŝalti al virtuala terminalo 6"
+msgstr "Ŝalti al VT 6"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#, fuzzy
 #| msgid "Switch to workspace 7"
 msgid "Switch to VT 7"
-msgstr "Ŝalti al virtuala terminalo 7"
+msgstr "Ŝalti al VT 7"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
-msgid "Switch to VT 8"
-msgstr "Ŝalti al virtuala terminalo 8"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
-msgid "Switch to VT 9"
-msgstr "Ŝalti al virtuala terminalo 9"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
-msgid "Switch to VT 10"
-msgstr "Ŝalti al virtuala terminalo 10"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
-msgid "Switch to VT 11"
-msgstr "Ŝalti al virtuala terminalo 11"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
-msgid "Switch to VT 12"
-msgstr "Ŝalti al virtuala terminalo 12"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Re-ŝalti klavkombinojn"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2260
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr ""
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:2283
-#, fuzzy
-#| msgid "Switch system controls"
-msgid "Switch monitor"
-msgstr "Ŝanĝi sistem-kontrolojn"
-
-#: src/backends/meta-input-settings.c:2285
-msgid "Show on-screen help"
-msgstr "Montri ekranhelpon"
-
-#: src/backends/meta-monitor-manager.c:900
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr ""

-#: src/backends/meta-monitor-manager.c:923
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Nekonate"

-#: src/backends/meta-monitor-manager.c:925
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Nekonata ekrano"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:479
-#, fuzzy, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
+#: ../src/compositor/compositor.c:456
+#, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
-msgstr "Alia kunmetanta administrilo jam rulas sur ekrano %i de montrilo “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr "Alia kunmetanta administrilo jam rulas sur ekrano %i de montrilo \"%s\"."

-#: src/core/bell.c:194
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Sonoril-evento"

-#: src/core/display.c:608
-#, fuzzy, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Malsukcesis malfermi jenan vidigon de fenestra sistemo X “%s”\n"
-
-#: src/core/main.c:189
-msgid "Disable connection to session manager"
-msgstr "Elŝalti konekton al la seancoadministrilo"
-
-#: src/core/main.c:195
-msgid "Replace the running window manager"
-msgstr "Anstataŭigi la nun ruliĝantan fenestromastrumilon"
-
-#: src/core/main.c:201
-msgid "Specify session management ID"
-msgstr "Specifi identigilon de la seancoadministrilo"
-
-#: src/core/main.c:206
-#, fuzzy
-msgid "X Display to use"
-msgstr "X-Vidigo uzenda"
-
-#: src/core/main.c:212
-msgid "Initialize session from savefile"
-msgstr "Pravalorizi la seancon el konservita dosiero"
-
-#: src/core/main.c:218
-msgid "Make X calls synchronous"
-msgstr "Fari X-vokojn sinkrone"
-
-#: src/core/main.c:225
-msgid "Run as a wayland compositor"
-msgstr ""
-
-#: src/core/main.c:231
-msgid "Run as a nested compositor"
-msgstr ""
-
-#: src/core/main.c:239
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: ../src/core/delete.c:127
 #, c-format
+#| msgid "<tt>%s</tt> is not responding."
 msgid "“%s” is not responding."
 msgstr "“%s” ne respondas."

-#: src/core/meta-close-dialog-default.c:149
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikaĵo ne respondas."

-#: src/core/meta-close-dialog-default.c:154
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Vi povas elekti ĉu atendi iomete por la aplikaĵo aŭ perforte ĉesi ĝin."

-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "Per_forta eliro"
-
-#: src/core/meta-close-dialog-default.c:161
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Atendi"

-#: src/core/mutter.c:39
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "Per_forta eliro"
+
+#: ../src/core/display.c:562
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Malsukcesis malfermi jenan vidigon de fenestra sistemo X: '%s'\n"
+
+#: ../src/core/main.c:176
+msgid "Disable connection to session manager"
+msgstr "Elŝalti konekton al la seancoadministrilo"
+
+#: ../src/core/main.c:182
+msgid "Replace the running window manager"
+msgstr "Anstataŭigi la nun ruliĝantan fenestromastrumilon"
+
+#: ../src/core/main.c:188
+msgid "Specify session management ID"
+msgstr "Specifi identigilon de la seancoadministrilo"
+
+#: ../src/core/main.c:193
+#, fuzzy
+msgid "X Display to use"
+msgstr "X-Vidigo uzenda"
+
+#: ../src/core/main.c:199
+msgid "Initialize session from savefile"
+msgstr "Pravalorizi la seancon el konservita dosiero"
+
+#: ../src/core/main.c:205
+msgid "Make X calls synchronous"
+msgstr "Fari X-vokojn sinkrone"
+
+#: ../src/core/main.c:212
+msgid "Run as a wayland compositor"
+msgstr ""
+
+#: ../src/core/main.c:220
+msgid "Run as a full display server, rather than nested"
+msgstr ""
+
+#: ../src/core/mutter.c:39
 #, c-format
-#| msgid ""
-#| "mutter %s\n"
-#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "Mutero %s\n"
-"Kopirajto © 2001-%d Havoc PENNIGTON, Red Hat, Inc., kaj aliaj\n"
-"Ĉi tio estas libera programaro; rigardu la fontkodon por kondiĉoj pri "
-"kopiado.\n"
-"Ekzistas NENIU garantio; nek por NEGOCEBLO nek por ADAPTADO AL IU APARTA "
+"Kopirajto (C) 2001-%d Havoc PENNIGTON, Red Hat, Inc., kaj aliaj\n"
+"Ĉi tio estas libera programaro; rigardu la fontkodon por pli da informoj.\n"
+"Ekzistas neniu GARANTIO; nek por NEGOCEBLO nek por ADAPTADO AL IU APARTA "
 "CELO.\n"

-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Motri version"

-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr ""

-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"

-#: src/core/screen.c:583
+#: ../src/core/screen.c:525
 #, c-format
 #| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
+#| "Screen %d on display \"%s\" already has a window manager; try using the --"
+#| "replace option to replace the current window manager.\n"
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"Ekrano “%s” jam havas fenestroadministrilon; provu uzi la opcion --replace "
-"por anstataŭigi la nunan fenestroadministrilon."
+"Ekrano \"%s\" jam havas fenestroadministrilon; provu uzi opcion --replace por "
+"anstataŭigi la nunan fenestroadministrilon."

-#: src/core/screen.c:668
-#, fuzzy, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Ekrano %d en vidigilo “%s” estas nevalida\n"
+#: ../src/core/screen.c:607
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Ekrano %d en vidigilo '%s' estas nevalida\n"

-#: src/core/util.c:120
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutero estis kompilita sen subteno por eksplicita reĝimo\n"

-#: src/wayland/meta-wayland-tablet-pad.c:563
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Reĝim-ŝaltilo: Reĝimo %d"
-
-#: src/x11/session.c:1815
+#: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""

-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:549
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ĉe %s)"
--- a/po/es.po
+++ b/po/es.po
@ -7,14 +7,15 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2002,2003.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-07 18:39+0000\n"
-"PO-Revision-Date: 2018-02-22 12:34+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-02-16 01:44+0000\n"
+"PO-Revision-Date: 2017-02-17 11:38+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Mover la ventana a la última área de trabajo"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mover la ventana un área de trabajo a la izquierda"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mover la ventana un área de trabajo a la derecha"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Subir la ventana un área de trabajo"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Bajar la ventana un área de trabajo"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mover la ventana una pantalla a la izquierda"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mover la ventana una pantalla a la derecha"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Subir la ventana una pantalla"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Bajar la ventana una pantalla"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Cambiar entre aplicaciones"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Cambiar a la aplicación anterior"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Cambiar entre ventanas"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Cambiar a la ventana anterior"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Cambiar entre ventanas de una aplicación"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Cambiar a la ventana anterior de una aplicación"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Cambiar entre controles del sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Cambiar al control del sistema anterior"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Cambiar entre ventanas directamente"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Cambiar directamente a la ventana anterior"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Cambiar entre ventanas de una aplicación directamente"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Cambiar directamente a la ventana anterior de una aplicación"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Cambiar entre controles del sistema directamente"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Cambiar directamente al control del sistema anterior"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Ocultar todas las ventanas normales"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Cambiar al área de trabajo 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Cambiar al área de trabajo 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Cambiar al área de trabajo 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Cambiar al área de trabajo 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Cambiar a la útima área de trabajo"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mover al área de trabajo de la izquierda"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mover al área de trabajo de la derecha"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mover al área de trabajo de la arriba"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mover al área de trabajo de abajo"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@ -172,10 +189,6 @@ msgstr "Mostrar el elemento «ejecutar comando»"
 msgid "Show the activities overview"
 msgstr "Mostrar la vista de actividades"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaurar los atajos de teclado"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ventanas"
@ -201,50 +214,54 @@ msgid "Restore window"
 msgstr "Restaurar la ventana"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Cambiar el estado de enrollado"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Cerrar la ventana"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ocultar la ventana"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mover la ventana"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensionar la ventana"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Conmutar la ventana en todas las áreas de trabajo o sólo en una"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Elevar la ventana si está cubierta, de lo contrario, bajarla"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Elevar la ventana sobre las otras ventanas"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Bajar la ventana por debajo de otras ventanas"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximizar la ventana verticalmente"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximizar la ventana horizontalmente"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Ver división a la izquierda"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Ver división a la derecha"

@ -258,6 +275,11 @@ msgstr ""
 "Modificador que usar para extender las operaciones de gestión sobre ventanas"

 #: data/org.gnome.mutter.gschema.xml.in:8
+#| msgid ""
+#| "This key will initiate the \"overlay\", which is a combination window "
+#| "overview and application launching system. The default is intended to be "
+#| "the \"Windows key\" on PC hardware. It's expected that this binding "
+#| "either the default or set to the empty string."
 msgid ""
 "This key will initiate the “overlay”, which is a combination window overview "
 "and application launching system. The default is intended to be the “Windows "
@ -306,6 +328,10 @@ msgid "Workspaces are managed dynamically"
 msgstr "Las áreas de trabajo se gestionan dinámicamente"

 #: data/org.gnome.mutter.gschema.xml.in:41
+#| msgid ""
+#| "Determines whether workspaces are managed dynamically or whether there's "
+#| "a static number of workspaces (determined by the num-workspaces key in "
+#| "org.gnome.desktop.wm.preferences)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@ -344,6 +370,10 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Retrasar el cambio de foco hasta detener el puntero"

 #: data/org.gnome.mutter.gschema.xml.in:69
+#| msgid ""
+#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+#| "the focus will not be changed immediately when entering a window, but "
+#| "only after the pointer stops moving."
 msgid ""
 "If set to true, and the focus mode is either “sloppy” or “mouse” then the "
 "focus will not be changed immediately when entering a window, but only after "
@ -358,6 +388,9 @@ msgid "Draggable border width"
 msgstr "Anchura arrastrable del borde"

 #: data/org.gnome.mutter.gschema.xml.in:80
+#| msgid ""
+#| "The amount of total draggable borders. If the theme's visible borders are "
+#| "not enough, invisible borders will be added to meet this value."
 msgid ""
 "The amount of total draggable borders. If the theme’s visible borders are "
 "not enough, invisible borders will be added to meet this value."
@ -392,53 +425,14 @@ msgstr ""
 "Cuando es cierto, las ventanas nuevas se colocarán siempre en el centro de "
 "la pantalla activa del monitor."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Activar las características experimentales"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-"Para activar las características experimentales, añada la palabra clave de "
-"la característica a la lista. Depende de la característica que se deba "
-"reiniciar o no el compositor. Cualquier característica experimental puede no "
-"estar disponible o ser configurable. No espere que lo que se añada en este "
-"escenario sirva como prueba futura. Las palabras clave actualmente "
-"disponibles son: • \"scale-monitor-framebuffer\" - convierte a mutter en la "
-"manera predeterminada de disponer monitores lógicos en un espacio lógico de "
-"coordenadas de píxeles, al escalar framebuffers de monitores framebuffers en "
-"lugar del contenido de ventana, para administrar monitores HiDPI. No "
-"requiere un reinicio. • \"remote-desktop\" — activa el escritorio remoto. "
-"Para soportarlo con compartición de pantalla es necesario activar \"screen-"
-"cast\" • \"screen-cast\" — activa el soporte de compartición de pantalla."
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Seleccionar ventana de la pestaña emergente"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Cancelar pestaña emergente"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Cambiar la configuración del monitor"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Rota la configuración del monitor empotrado"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Cambiar al VT 1"
@ -487,84 +481,53 @@ msgstr "Cambiar al VT 11"
 msgid "Switch to VT 12"
 msgstr "Cambiar al VT 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Volver a activar los atajos"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permitir capturas con Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Aplicaciones de Xwayland que pueden capturar el teclado"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:1759
 #, c-format
+#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Cambiar modo (grupo %d)"

 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:1781
 msgid "Switch monitor"
 msgstr "Cambiar monitor"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:1783
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:675
 msgid "Built-in display"
 msgstr "Pantalla integrada"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:698
 msgid "Unknown"
 msgstr "Desconocida"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:700
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:708
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:471
 #, c-format
+#| msgid ""
+#| "Another compositing manager is already running on screen %i on display "
+#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
@ -575,62 +538,17 @@ msgstr ""
 msgid "Bell event"
 msgstr "Evento de campana"

-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
-
-#: src/core/main.c:190
-msgid "Disable connection to session manager"
-msgstr "Desactivar conexión al gestor de sesión"
-
-#: src/core/main.c:196
-msgid "Replace the running window manager"
-msgstr "Reemplazar el gestor de ventanas en ejecución"
-
-#: src/core/main.c:202
-msgid "Specify session management ID"
-msgstr "Especificar el ID se gestión de sesión"
-
-#: src/core/main.c:207
-msgid "X Display to use"
-msgstr "Pantalla X que usar"
-
-#: src/core/main.c:213
-msgid "Initialize session from savefile"
-msgstr "Inicializar sesión desde el archivo de salvaguarda"
-
-#: src/core/main.c:219
-msgid "Make X calls synchronous"
-msgstr "Hacer que las llamadas a las X sean síncronas"
-
-#: src/core/main.c:226
-msgid "Run as a wayland compositor"
-msgstr "Ejecutar como compositor Wayland"
-
-#: src/core/main.c:232
-msgid "Run as a nested compositor"
-msgstr "Ejecutar como compositor anidado"
-
-#: src/core/main.c:240
-msgid "Run as a full display server, rather than nested"
-msgstr "Ejecutar como servidor completo, en lugar de anidado"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Ejecutar con «backend» de X11"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no está respondiendo."

-#: src/core/meta-close-dialog-default.c:149
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "La aplicación no está respondiendo."

-#: src/core/meta-close-dialog-default.c:154
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -638,16 +556,64 @@ msgstr ""
 "Puede elegir esperar un rato para ver si continua o forzar la aplicación "
 "para cerrarla completamente."

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Forzar la salida"

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Esperar"

+#: src/core/display.c:608
+#, c-format
+#| msgid "Failed to open X Window System display '%s'\n"
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Desactivar conexión al gestor de sesión"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Reemplazar el gestor de ventanas en ejecución"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Especificar el ID se gestión de sesión"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Pantalla X que usar"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Inicializar sesión desde el archivo de salvaguarda"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Hacer que las llamadas a las X sean síncronas"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Ejecutar como compositor Wayland"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Ejecutar como compositor anidado"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Ejecutar como servidor completo, en lugar de anidado"
+
 #: src/core/mutter.c:39
 #, c-format
+#| msgid ""
+#| "mutter %s\n"
+#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+#| "This is free software; see the source for copying conditions.\n"
+#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@ -675,8 +641,11 @@ msgstr "Complemento de mutter que usar"
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
+#| msgid ""
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@ -684,8 +653,9 @@ msgstr ""
 "La pantalla «%s» ya tiene un gestor de ventanas; pruebe a usar la opción «--"
 "replace» para reemplazar el gestor de ventanas activo."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
+#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"

@ -698,7 +668,10 @@ msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Cambiar modo: modo %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
+#| msgid ""
+#| "These windows do not support &quot;save current setup&quot; and will have "
+#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@ -711,21 +684,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (on %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mover la ventana un área de trabajo a la izquierda"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mover la ventana un área de trabajo a la derecha"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mover al área de trabajo de la izquierda"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mover al área de trabajo de la derecha"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Cambiar el estado de enrollado"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "no se pudo crear la textura de fondo a partir de archivo"

--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-27 16:47+0200\n"
+"POT-Creation-Date: 2017-02-16 01:44+0000\n"
+"PO-Revision-Date: 2017-02-16 22:07+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@ -270,6 +270,11 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Aldatzailea leihoak kudeatzeko eragiketa hedatuetan erabiltzeko"

 #: data/org.gnome.mutter.gschema.xml.in:8
+#| msgid ""
+#| "This key will initiate the \"overlay\", which is a combination window "
+#| "overview and application launching system. The default is intended to be "
+#| "the \"Windows key\" on PC hardware. It's expected that this binding "
+#| "either the default or set to the empty string."
 msgid ""
 "This key will initiate the “overlay”, which is a combination window overview "
 "and application launching system. The default is intended to be the “Windows "
@ -315,6 +320,10 @@ msgid "Workspaces are managed dynamically"
 msgstr "Laneko areak dinamikoki kudeatzen dira"

 #: data/org.gnome.mutter.gschema.xml.in:41
+#| msgid ""
+#| "Determines whether workspaces are managed dynamically or whether there's "
+#| "a static number of workspaces (determined by the num-workspaces key in "
+#| "org.gnome.desktop.wm.preferences)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@ -353,6 +362,10 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atzeratu fokuaren aldaketa erakuslea mugitzeari utzi arte"

 #: data/org.gnome.mutter.gschema.xml.in:69
+#| msgid ""
+#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+#| "the focus will not be changed immediately when entering a window, but "
+#| "only after the pointer stops moving."
 msgid ""
 "If set to true, and the focus mode is either “sloppy” or “mouse” then the "
 "focus will not be changed immediately when entering a window, but only after "
@ -367,6 +380,9 @@ msgid "Draggable border width"
 msgstr "Ertz arrastragarriaren zabalera"

 #: data/org.gnome.mutter.gschema.xml.in:80
+#| msgid ""
+#| "The amount of total draggable borders. If the theme's visible borders are "
+#| "not enough, invisible borders will be added to meet this value."
 msgid ""
 "The amount of total draggable borders. If the theme’s visible borders are "
 "not enough, invisible borders will be added to meet this value."
@ -398,50 +414,14 @@ msgstr ""
 "TRUE (egia) denean, leiho berriak beti jarriko dira monitorearen pantaila "
 "aktiboaren zentroan."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Gaitu eginbide esperimentalak"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
-msgstr ""
-"Eginbide esperimentalak gaitzeko, gehitu eginbidearen gakoa zerrendari. "
-"Eginbideak osatzailea berrabiaraztea behar duen edo ez emandako eginbidearen "
-"arabera dago. Ez da derrigorrezkoa edozer eginbide esperimental eskuragarri "
-"edo konfiguragarria egotea. Ez uste ezarpen honetan edozer gehitzeak "
-"etorkizuneko "
-"proba izango denik. Gako erabilgarriak: "
-"• “scale-monitor-framebuffer” — honek mutter monitoreen diseinu logikoetara "
-"lehenesten du espazioaren koordenatuko pixel logikoetan (leihoaren edukiaren "
-"ordez "
-"monitorearen framebufferra eskalatzean) HiDPI monitoreak kudeatzeko. Ez du "
-"berrabiaraztea eskatzen."
-
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Hautatu leihoa laster-fitxatik"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Utzi laster-fitxa"

-#: data/org.gnome.mutter.gschema.xml.in:151
-#| msgid "Switch monitor"
-msgid "Switch monitor configurations"
-msgstr "Aldatu monitorearen konfigurazioak"
-
-#: data/org.gnome.mutter.gschema.xml.in:156
-msgid "Rotates the built-in monitor configuration"
-msgstr "Biratu barneko monitorearen konfigurazioa"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Aldatu 1. TBra"
@ -490,65 +470,92 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Gaitu berriro laster-teklak"
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2151
+#: src/backends/meta-input-settings.c:1759
 #, c-format
+#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Modu aldaketa (%d taldea)"

 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2174
+#: src/backends/meta-input-settings.c:1781
 msgid "Switch monitor"
 msgstr "Aldatu monitorea"

-#: src/backends/meta-input-settings.c:2176
+#: src/backends/meta-input-settings.c:1783
 msgid "Show on-screen help"
 msgstr "Erakutsi pantailako laguntza"

-#: src/backends/meta-monitor-manager.c:903
+#: src/backends/meta-monitor-manager.c:675
 msgid "Built-in display"
 msgstr "Bertako pantaila"

-#: src/backends/meta-monitor-manager.c:926
+#: src/backends/meta-monitor-manager.c:698
 msgid "Unknown"
 msgstr "Ezezaguna"

-#: src/backends/meta-monitor-manager.c:928
+#: src/backends/meta-monitor-manager.c:700
 msgid "Unknown Display"
 msgstr "Pantaila ezezaguna"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:936
+#: src/backends/meta-monitor-manager.c:708
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:476
+#: src/compositor/compositor.c:471
 #, c-format
+#| msgid ""
+#| "Another compositing manager is already running on screen %i on display "
+#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ pantailako "
-"%1$i. monitorean."
+"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ "
+"pantailako %1$i. monitorean."

 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Soinuaren gertaera"

+#. Translators: %s is a window title
+#: src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "'%s'(e)k ez du erantzuten."
+
+#: src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "Aplikazioak ez du erantzuten."
+
+#: src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
+"aplikazioa erabat ixtea."
+
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Behartu ixtera"
+
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Itxaron"
+
 #: src/core/display.c:608
 #, c-format
+#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Huts egin du X Window sistemaren “%s“ pantaila irekitzean\n"

@ -588,34 +595,14 @@ msgstr "Exekutatu habiaratutako konposatzaile gisa"
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"

-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
-#, c-format
-msgid "“%s” is not responding."
-msgstr "'%s'(e)k ez du erantzuten."
-
-#: src/core/meta-close-dialog-default.c:149
-msgid "Application is not responding."
-msgstr "Aplikazioak ez du erantzuten."
-
-#: src/core/meta-close-dialog-default.c:154
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr ""
-"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
-"aplikazioa erabat ixtea."
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_Behartu ixtera"
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "_Itxaron"
-
 #: src/core/mutter.c:39
 #, c-format
+#| msgid ""
+#| "mutter %s\n"
+#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+#| "This is free software; see the source for copying conditions.\n"
+#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@ -644,6 +631,9 @@ msgstr "%d. laneko area"

 #: src/core/screen.c:580
 #, c-format
+#| msgid ""
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@ -653,6 +643,7 @@ msgstr ""

 #: src/core/screen.c:665
 #, c-format
+#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "“%2$s“ bistaratzeko %1$d pantaila ez da baliozkoa\n"

@ -666,6 +657,9 @@ msgid "Mode Switch: Mode %d"
 msgstr "Modu aldaketa: %d modua"

 #: src/x11/session.c:1815
+#| msgid ""
+#| "These windows do not support &quot;save current setup&quot; and will have "
+#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Garnacho	8d75ea69e3	wayland: Use weak ref to keep track of buffers Instead of using a one-shot signal meant to happen then the buffer is being destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	a7ee7559e4	compositor: Use redraw clip region to cull out children This will avoid repainting too much of the background if the bounding box turned out to be too large. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	af3475f65f	ClutterStage: Store clip area as a region This will allow drawing optimizations as a region is more concrete than the bounding rectangle. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	77fd682c8b	ClutterActor: Preserve valid paint volumes till the next relayout/repaint Cuts down approximately 55% of paint volumes calculation when there's windows that redraw frequently, but don't move. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	fa8e4f60f6	compositor: Ensure to clip partial shadow redraws Otherwise we end up drawing too far outside the clip area, which brings in artifacts now that we have tighter regions instead of an overlapping rect. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	b98a8d9932	clutter: Avoid rounding compensation when invalidating 2D actors This allows the redraw clip to be more constrained, so MetaCullable doesn't end up rendering portions of window shadows, frame and background when a window invalidates (part of) its contents. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	864bc793aa	cogl: Ensure to only clear the depth buffer if depth testing is enabled The depth buffer is marked as invalid when 1) the framebuffer is just created, and 2) whenever GL_DEPTH_TEST is enabled on it. This will ensure the framebuffers attached depth buffer (if any) is properly cleared before it's actually used, while saving needless clears while depth testing is disabled (the default). https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:10 +02:00
Carlos Garnacho	e5b06754e0	compositor: Remove MetaSurfaceActor::repaint-scheduled signal It's unused now. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:09 +02:00
Carlos Garnacho	3402c50625	compositor: Use queue_redraw vmethod over repaint-scheduled signal https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:09 +02:00
Carlos Garnacho	060543466c	compositor: Avoid changing pipeline/source if shadow is not being painted Avoids some context invalidations in cogl. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:09 +02:00
Carlos Garnacho	65e816908a	clutter: Add ClutterPaintVolume argument to ClutterActor::queue_redraw This is an ABI break, hopefully an unimportant one since this signal/vmethod is barely overridden. The signal has been added an extra ClutterPaintVolume argument, and has been given a boolean return value. The recursion to the parents has been taken out of the default implementation and into the caller, using the returned boolean parameter to control further propagation. Passing the ClutterPaintVolume is easier on performance, as we don't need setting this pointer as gobject data just to retrieve/unset it further in propagation. https://bugzilla.gnome.org/show_bug.cgi?id=782344	2017-05-22 17:43:09 +02:00