wayland: Implement wl_pointer_gestures

The global wl_pointer_gestures object is now created, effectively bridging pinch/swipe gestures with clients, so they're now accessible to clients implementing the protocol.
wayland: Implement the wl_pointer_gesture_pinch interface
2015-08-10 16:48:31 +02:00 · 2015-08-10 16:45:23 +02:00 · 2015-08-10 16:45:23 +02:00 · 2015-08-10 16:45:23 +02:00 · 2015-08-10 16:44:01 +02:00
166 changed files with 12658 additions and 15186 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ mutter
 mutter-restart-helper
 mutter-test-client
 mutter-test-runner
-mutter-test-unit-tests
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
@@ -63,18 +62,14 @@ src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
-src/gtk-primary-selection-protocol.c
-src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
-src/xdg-shell-unstable-v*-protocol.c
-src/xdg-shell-unstable-v*-server-protocol.h
-src/pointer-gestures-unstable-v*-protocol.c
-src/pointer-gestures-unstable-v*-server-protocol.h
-src/relative-pointer-unstable-v*-protocol.c
-src/relative-pointer-unstable-v*-server-protocol.h
-src/pointer-constraints-unstable-v*-protocol.c
-src/pointer-constraints-unstable-v*-server-protocol.h
+src/xdg-shell-protocol.c
+src/xdg-shell-server-protocol.h
+src/pointer-gestures-protocol.c
+src/pointer-gestures-server-protocol.h
+src/xserver-protocol.c
+src/xserver-server-protocol.h
 src/meta/meta-version.h
 doc/reference/*.args
 doc/reference/*.bak
--- a/179
+++ b/179
@@ -1,182 +1,3 @@
-3.20.0
-======
-* Fix crash when using visual bell [Jonas; #763858]
-
-Contributors:
-  Jonas Ådahl, Jasper St. Pierre
-
-Translations:
-  Milo Casagrande [it], Ask Hjorth Larsen [da]
-
-3.19.92
-=======
-* Add system bell support on wayland [Jonas; #763284]
-* Add gtk_surface.present to gtk-shell [Jonas; #763295]
-* Handle DND drops on the root window [Carlos; #762104]
-* Misc. bug fixes [Jonas, Carlos, Rui; #762828, #760745, #763125, #762763,
-  #762661, #762639, #763159]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner
-
-Translations:
-  Rūdolfs Mazurs [lv], Balázs Úr [hu], Claude Paroz [fr], Matej Urbančič [sl],
-  Мирослав Николић [sr, sr@latin], Sebastian Rasmussen [sv], Changwoo Ryu [ko],
-  Gil Forcada [ca], Tom Tryfonidis [el]
-
-3.19.91
-=======
-* Add --nested CLI argument to fix nested wayland session [Jonas; #758658]
-* Fix stack - scene graph stacking synchronization issues [Jonas; #755605]
-* Rate-limit last-device changes to fix freezes [Carlos; #753527]
-* Implement primary selection protocol [Carlos; #762560]
-* Misc. bug fixes [Carlos, Jonas; #762878, #762716]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Tim Lunn
-
-Translations:
-  Piotr Drąg [pl], Artur de Aquino Morais [pt_BR], Marek Černocký [cs],
-  Cédric Valmary [oc], Mario Blättermann [de], Dušan Kazik [sk],
-  Fran Dieguez [gl], Aurimas Černius [lt], Daniel Mustieles [es],
-  Stas Solovey [ru], Yosef Or Boczko [he]
-
-3.19.90
-=======
-* Release buffer after processing commit [Ray; #761312, #761613]
-* Implement pointer motion, locks and confinement on wayland [Jonas; #744104]
-* Add basic startup notification support on wayland [Carlos; #762268]
-* Misc. bug fixes [Rui, Alberts, Florian; #760670, #761543, #752794, #761557]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Florian Müllner, Jasper St. Pierre, Ray Strode
-
-3.19.4
-======
-* Fix updating stacking order when setting transient_for [Jonas; #755606]
-* Support screen rotation when supported by the driver [Carlos; #745079]
-* Protect against broken WM_CLASS property implementations [Sebastian; #759658]
-* Handle wl_pointer v5 events on wayland [Carlos; #760637]
-* Implement DND actions on wayland [Carlos; #760805]
-* Misc. bug fixes [Jonas, Rui, Ray, Marek; #754711, #756789, #759297, #758613,
-  #760330, #760476, #759222, #760670]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Sebastian Keller, Rui Matos,
-  Florian Müllner, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Aurimas Černius [lt]
-
-3.19.3
-======
-* Correct refresh rate units on KMS/Wayland [Daniel; #758653]
-* Fix crash when initial cursor position is not on a monitor [Marek; #756698]
-* Fix crash when more CRTs are enabled than outputs connected [Rui; #751638]
-* Fix touch pointer emulation on wayland [Carlos; #756754]
-* Allow minimizing windows that don't advertise supporting it [Jasper; #758186]
-* Force 2-finger scroll by default if available [Bastien; #759304]
-* Fix crash during XWayland initialization [Marek; #751845]
-* Ensure to send a ConfigureNotify to just mapped windows [Rui; #759492]
-* Misc. bug fixes and cleanups [Carlos, Jonas, Lionel; #758239, #758633,
-  #755503, #759374]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Lionel Landwerlin, Rui Matos,
-  Bastien Nocera, Daniel Stone, Jasper St. Pierre
-
-3.19.2
-======
-* Fix crash on monitor unplug [Rui; #756796]
-* Exit cleanly on initialization errors [Owen; #757311]
-* Allow to determine backend setting from session type [Ray; #741666]
-* Fix DRM device detection for non-PCI devices [Alban; #754911]
-* Don't force placement of windows without buffer on wayland [Marek; #751887]
-* Fix initialization of bypass compositor hint [Rui; #758544]
-
-Contributors:
-  Alban Browaeys, Marek Chalupa, Rui Matos, Florian Müllner, Ray Strode,
-  Owen W. Taylor
-
-3.19.1
-======
-* wayland: Allow to trigger popups through keyboard/touch [Carlos; #756296]
-* Fix modifiers-only input source switching on Ubuntu [Alberts; #756543]
-* Misc. bug fixes [Jonas, Rui, Giovanni, Florian; #756675, #756660, #746420,
-  #756548, #756796, #757101, #757148]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Florian Müllner
-
-Translations:
-  Daniel Șerbănescu [ro]
-
-3.18.1
-======
-* Misc. crash fixes [Jonas, Rui, Carlos, Owen, Florian; #755096, #754979,
-  #755490, #754357, #745785, #756642]
-* Improve HiDPI support on wayland [Jonas; #755097]
-* Fix doubly-scaled cursor on XWayland HiDPI [Jonas; #755099]
-* Stop hiding titlebar buttons in dialogs [Florian; #641630]
-* Add support for fullscreen/unfullscreen animations [Cosimo; #707248]
-* Misc. bug fixes [Rui, Colin, Florian; #743339, #752047, #756074, #756649]
-
-Contributors:
-  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Colin Walters, Owen W. Taylor
-
-3.18.0
-======
-* Misc. fixes [Florian, Jonas; #753434]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-Translations:
-  Rūdolfs Mazurs [lv]
-
-3.17.92
-=======
-* Don't omit the background color for backgrounds that don't fill the screen
-  [Ray; #754476]
-* Fix up key state on FocusIn when running nested [Owen; #753948]
-* Find the right DRM device instead of hardcoding card0 [Marek; #753434]
-* Scale cursor on HiDPI screens [Jonas; #744932]
-* Misc. fixes and cleanups [Lan, Jonas, Javier, Olivier; #754545, #754215,
-  #754621, #754715]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Olivier Fourdan, Javier Jardón, Ting-Wei Lan,
-  Ray Strode, Owen W. Taylor
-
-3.17.91
-=======
-* Send error on pointer-gesture protocol version mismatch [Jonas; #753855]
-* Misc. cleanups [Jonas; #744932]
-
-Contributors:
-  Jonas Ådahl
-
-Translations:
-  Chao-Hsiung Liao [zh_TW], Piotr Drąg [pl]
-
-3.17.90
-=======
-* Fix glitch with some fullscreen apps [Rui; #753020]
-* Fix screen update issue with NVidia driver [Aaron, Rui; #728464]
-* Only call frame callbacks for surfaces that get drawn [Adel; #739163]
-* Misc. bug fixes and cleanups [Jonas, Rui, Ting-Wei; #753222, #752753, #753237,
-  #753380, #744104, #744932]
-
-Contributors:
-  Jonas Ådahl, Adel Gadllah, Carlos Garnacho, Ting-Wei Lan, Rui Matos,
-  Florian Müllner, Aaron Plattner, Jasper St. Pierre
-
-Translations:
-  Akom Chotiphantawanon [th]
-
 3.17.4
 ======
 * nested: Allow basic configuration of dummy outputs [Jonas; #747089]
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [20])
-m4_define([mutter_micro_version], [0])
+m4_define([mutter_minor_version], [17])
+m4_define([mutter_micro_version], [4])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -46,7 +46,6 @@ IT_PROG_INTLTOOL([0.41])
 AC_PROG_CC
 AC_PROG_CC_C_O
 AC_PROG_INSTALL
-AC_PROG_SED
 AC_HEADER_STDC
 PKG_PROG_PKG_CONFIG([0.21])

@@ -59,12 +58,12 @@ CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0

 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.19.8
+   gtk+-3.0 >= 3.9.11
   gio-unix-2.0 >= 2.35.1
   pango >= 1.2.0
   cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.19.3
-   $CLUTTER_PACKAGE >= 1.25.6
+   gsettings-desktop-schemas >= 3.15.92
+   $CLUTTER_PACKAGE >= 1.23.4
   cogl-1.0 >= 1.17.1
   upower-glib >= 0.99.0
   gnome-desktop-3.0
@@ -220,10 +219,6 @@ AS_IF([test "$have_wayland" = "yes"], [
    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
  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.1],
-		    [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"])

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,6 @@
 desktopfiles_in_files = \
-	mutter.desktop.in
+	mutter.desktop.in \
+	mutter-wayland.desktop.in
 desktopfilesdir = $(datadir)/applications
 desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)

--- a/data/mutter-wayland.desktop.in
+++ b/data/mutter-wayland.desktop.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+_Name=Mutter (wayland compositor)
+Exec=mutter --wayland --display-server
+NoDisplay=true
+# name of loadable control center module
+X-GNOME-WMSettingsModule=metacity
+# name we put on the WM spec check window
+X-GNOME-WMName=Mutter
+# back compat only 
+X-GnomeWMSettingsLibrary=metacity
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=mutter
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -29,7 +29,6 @@ eu
 fa
 fi
 fr
-fur
 ga
 gl
 gu
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1 @@
-# List of source files that should NOT be translated.
-# Please keep this file sorted alphabetically.
+data/mutter-wayland.desktop.in
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,23 +6,21 @@
 # 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.
-# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014, 2016.
+# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-13 01:36+0000\n"
-"PO-Revision-Date: 2016-03-13 14:45+0100\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-10 17:33-0400\n"
+"PO-Revision-Date: 2015-03-10 17:33-0400\n"
+"Last-Translator: Jordi Mas <jmas@softcatala.org>\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: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -467,22 +465,22 @@ msgstr "Canvia al terminal virtual 11"
 msgid "Switch to VT 12"
 msgstr "Canvia al terminal virtual 12"

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

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -498,7 +496,7 @@ msgstr ""
 "Ja s'està executant un altre gestor de composició a la pantalla %i a la "
 "visualització «%s»."

-#: ../src/core/bell.c:192
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Esdeveniment de campana"

@@ -527,51 +525,41 @@ msgstr "_Espera"
 msgid "_Force Quit"
 msgstr "_Força'n la sortida"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, 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:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"

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

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

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

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

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

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

-# Notes:
-# Afegeix una nota
-#
-# Camins:
-# ../src/core/main.c:223
-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Funciona com a compositor imbricat"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"

@@ -599,12 +587,12 @@ msgstr "Escriu versió"
 msgid "Mutter plugin to use"
 msgstr "Connector del Mutter a utilitzar"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -613,12 +601,12 @@ 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:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La pantalla %d en la visualització '%s' no és vàlida\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"

--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-27 13:36+0000\n"
+"POT-Creation-Date: 2015-03-24 23:25+0000\n"
 "PO-Revision-Date: 2014-09-22 15:01+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
@@ -238,7 +238,8 @@ msgstr "Přepnout okno na všechny/jednu pracovní plochu"

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

 #: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
@@ -456,22 +457,22 @@ msgstr "Přepnout na VT 11"
 msgid "Switch to VT 12"
 msgstr "Přepnout na VT 12"

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

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -514,44 +515,40 @@ msgstr "_Počkat"
 msgid "_Force Quit"
 msgstr "_Vynutit ukončení"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, 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:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Zakáže připojení ke správci sezení"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Nahradí běžícího správce oken"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Určení ID správy sezení"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Displej X, který použije"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Spustí sezení z uloženého souboru"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Provede volání X synchronně"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
-msgstr "Spustit jako kompozitor protokolu Wayland"
+msgstr "Spustit jako kompozitní program protokolu Wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Spustit jako podkladový kompozitor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"

@@ -579,12 +576,12 @@ msgstr "Vypíše verzi"
 msgid "Mutter plugin to use"
 msgstr "Zásuvný modul Mutter, který se má použít"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -593,12 +590,12 @@ 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:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"

@@ -1275,3 +1272,32 @@ msgstr "%s (na %s)"
 #~ msgid "Move to Another _Workspace"
 #~ msgstr "Přes_unout na jinou plochu"

+#~ msgid "Shift"
+#~ msgstr "Shift"
+
+#~ msgid "Ctrl"
+#~ msgstr "Ctrl"
+
+#~ msgid "Alt"
+#~ msgstr "Alt"
+
+#~ msgid "Meta"
+#~ msgstr "Meta"
+
+#~ msgid "Super"
+#~ msgstr "Super"
+
+#~ msgid "Hyper"
+#~ msgstr "Hyper"
+
+#~ msgid "Mod2"
+#~ msgstr "Mod2"
+
+#~ msgid "Mod3"
+#~ msgstr "Mod3"
+
+#~ msgid "Mod4"
+#~ msgstr "Mod4"
+
+#~ msgid "Mod5"
+#~ msgstr "Mod5"
--- a/po/da.po
+++ b/po/da.po
@@ -1,5 +1,5 @@
 # Danish translation of Mutter.
-# Copyright (C) 2002-2009, 2012-2016.
+# Copyright (C) 2002-2009, 2012-2015.
 # This file is distributed under the same license as the metacity package.
 # Kjartan Maraas <kmaraas@gnome.org>, 2002
 # Keld simonsen <keld@dkuug.dk>, 2002
@@ -8,7 +8,7 @@
 # Lasse Bang Mikkelsen <lbm@fatalerror.dk>, 2006.
 # Kenneth Nielsen <k.nielsen81@gmail.com>, 2008.
 # Joe Hansen <joedalton2@yahoo.dk>, 2011.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15, 16.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15.
 #
 # Konventioner:
 #
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-20 23:17+0100\n"
-"PO-Revision-Date: 2016-03-20 21:46+0100\n"
+"POT-Creation-Date: 2015-03-21 16:30+0100\n"
+"PO-Revision-Date: 2015-03-14 17:01+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -291,7 +291,7 @@ msgstr ""

 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
-msgstr "Fastgør modaldialoger"
+msgstr "Fastgør modaldialogvinduer"

 #: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
@@ -299,8 +299,9 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"Når sand, vil modaldialoger hænge sammen med titellinjen af ophavsvinduet og "
-"flyttes sammen med dette, frem for at have uafhængige titellinjer."
+"Når sand, vil modaldialogvinduer hænge sammen med titellinjen af "
+"ophavsvinduet og flyttes sammen med dette, frem for at have uafhængige "
+"titellinjer."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -462,22 +463,22 @@ msgstr "Skift til VT 11"
 msgid "Switch to VT 12"
 msgstr "Skift til VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Indbygget skærm"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Ukendt skærm"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -492,7 +493,7 @@ msgid ""
 msgstr ""
 "En anden komposithåndtering kører allerede på skærm %i på terminal \"%s\"."

-#: ../src/core/bell.c:192
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Bip-hændelse"

@@ -521,44 +522,40 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tving til at afslutte"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Kunne ikke åbne X Window System-terminalen \"%s\"\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Deaktivér forbindelse til sessionshåndtering"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Erstat den kørende vindueshåndtering"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Angiv sessionhåndterings-id"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X-skærm som bruges"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initialisér session fra gemt fil"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Gør kald til X synkrone"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Kør som en wayland-kompositor"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Kør som en indlejret kompositor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Kør som fuld displayserver, frem for indlejret"

@@ -585,12 +582,12 @@ msgstr "Vis version"
 msgid "Mutter plugin to use"
 msgstr "Mutter-udvidelsesmodul der skal bruges"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -599,12 +596,12 @@ msgstr ""
 "Terminalen \"%s\" har allerede en vindueshåndtering; prøv tilvalget --"
 "replace for at erstatte den aktuelle vindueshåndtering."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skærm %d på terminal \"%s\" er ugyldig\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter blev kompileret uden understøttelse for uddybende tilstand\n"

@@ -1339,6 +1336,9 @@ msgstr "%s (på %s)"
 #~ msgid "_Dialog"
 #~ msgstr "_Dialog"

+#~ msgid "_Modal dialog"
+#~ msgstr "_Modaldialogvindue"
+
 #~ msgid "_Utility"
 #~ msgstr "_Værktøj"

@@ -1402,6 +1402,9 @@ msgstr "%s (på %s)"
 #~ msgid "Border"
 #~ msgstr "Ramme"

+#~ msgid "Attached Modal Dialog"
+#~ msgstr "Fastgjort modaldialogvindue"
+
 #~ msgid "Button layout test %d"
 #~ msgstr "Knaplayouttest %d"

--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # 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.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-28 13:37+0000\n"
-"PO-Revision-Date: 2016-02-28 19:15+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2015-06-20 08:08+0000\n"
+"PO-Revision-Date: 2015-06-18 20:59+0100\n"
+"Last-Translator: Bernd Homuth <dev@hmt.im>\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 1.8.7\n"
+"X-Generator: Poedit 1.8.1\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -463,22 +463,22 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"

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

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -523,44 +523,40 @@ msgstr "_Warten"
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:563
 #, 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:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Als eingebetteten Compositor ausführen"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"

@@ -590,12 +586,12 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -604,12 +600,12 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"

--- a/po/el.po
+++ b/po/el.po
@@ -20,16 +20,16 @@ msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-12 01:36+0000\n"
-"PO-Revision-Date: 2016-03-14 23:05+0200\n"
-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
+"POT-Creation-Date: 2015-02-21 11:31+0000\n"
+"PO-Revision-Date: 2015-02-21 15:43+0200\n"
+"Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Greek, Modern (1453-) <opensuse-translation-el@opensuse.org>\n"
 "Language: el\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 1.8.7\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
@@ -453,41 +453,46 @@ msgid "Switch to VT 7"
 msgstr "Εναλλαγή στο VT 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Εναλλαγή στο VT 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Εναλλαγή στο VT 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Εναλλαγή στο VT 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Εναλλαγή στο VT 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Εναλλαγή στο VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Ενσωματωμένη οθόνη"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Άγνωστη"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -502,7 +507,7 @@ msgid ""
 msgstr ""
 "Εκτελείται ένας άλλος διαχειριστής παραθύρων στην οθόνη %i προβολή \"%s\"."

-#: ../src/core/bell.c:192
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Ηχητικό συμβάν κουδουνιού"

@@ -532,44 +537,40 @@ msgid "_Force Quit"
 msgstr "_Εξαναγκασμός σε τερματισμό"

 # gconf/gconf-internals.c:2416
-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Αποτυχία ανοίγματος οθόνης του συστήματος παραθύρων Χ '%s'\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Απενεργοποίηση σύνδεσης στο διαχειριστή συνεδρίας"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Αντικατάσταση του τρέχοντος διαχειριστή παραθύρων"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Καθορισμός αναγνωριστικού διαχείρισης συνεδρίας"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Εμφάνιση Χ για χρήση"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Εκκίνηση συνεδρίας από savefile"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Να καταστούν σύγχρονες οι κλήσεις του X"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
-msgstr "Εκτέλεση ως wayland compositor"
+msgstr "Εκτέλεση ως συνθετητής wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Εκτέλεση ως ενσωματωμένος compositor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Εκτέλεση ως διακομιστής πλήρους οθόνης, αντί ενσωματωμένης"

@@ -597,13 +598,16 @@ msgstr "Εμφάνιση έκδοσης"
 msgid "Mutter plugin to use"
 msgstr "Πρόσθετα του Mutter για χρήση"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Χώρος εργασίας %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
+#| msgid ""
+#| "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."
@@ -612,12 +616,12 @@ msgstr ""
 "χρησιμοποιήσετε την επιλογή --replace για να αντικαταστήσετε τον τρέχων "
 "διαχειριστή παραθύρων."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Η οθόνη %d στην προβολή '%s' δεν είναι έγκυρη\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Το Mutter έχει μεταγλωττιστεί χωρίς υποστήριξη για λειτουργία εμφάνισης "
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +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.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-28 13:37+0000\n"
-"PO-Revision-Date: 2016-02-29 16:02+0100\n"
+"POT-Creation-Date: 2015-02-23 11:10+0000\n"
+"PO-Revision-Date: 2015-02-23 19:07+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -445,41 +445,46 @@ msgid "Switch to VT 7"
 msgstr "Cambiar al VT 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Cambiar al VT 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Cambiar al VT 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Cambiar al VT 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Cambiar al VT 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Cambiar al VT 12"

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

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -524,45 +529,40 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forzar la salida"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, 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:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Reemplazar el gestor de ventanas en ejecución"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar el ID se gestión de sesión"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Pantalla X que usar"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde el archivo de salvaguarda"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Hacer que las llamadas a las X sean síncronas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Ejecutar como compositor Wayland"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Ejecutar como compositor anidado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Ejecutar como servidor completo, en lugar de anidado"

@@ -589,12 +589,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Complemento de mutter que usar"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -603,12 +603,12 @@ 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:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter fue compilado sin soporte para modo prolijo\n"

--- a/po/eu.po
+++ b/po/eu.po
@@ -2,23 +2,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-#
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015, 2016.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2012, 2013, 2014, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 17:05+0100\n"
-"PO-Revision-Date: 2016-03-23 17:06+0100\n"
-"Last-Translator: dooteo <dooteo@zundan.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-21 15:50+0100\n"
+"PO-Revision-Date: 2015-03-21 15:51+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
@@ -454,22 +455,22 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Bertako pantaila"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -485,7 +486,7 @@ msgstr ""
 "Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen \"%2$s\" "
 "pantailako %1$i. monitorean \"."

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

@@ -514,44 +515,40 @@ msgstr "_Itxaron"
 msgid "_Force Quit"
 msgstr "_Behartu ixtera"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Huts egin du X Window sistemaren '%s' pantaila irekitzean\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desgaitu saio-kudeatzailearen konexioa"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Ordeztu exekutatzen dagoen leiho-kudeatzailea"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Zehaztu saio-kudeatzailearen IDa"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X pantaila erabiltzeko"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Hasieratu saioa babes-fitxategitik"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Egin X deiak sinkronoak izatea"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Exekutatu wayland konposatzaile gisa"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Exekutatu habiaratutako konposatzaile gisa"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"

@@ -578,12 +575,12 @@ msgstr "Erakutsi bertsioa"
 msgid "Mutter plugin to use"
 msgstr "Mutter-en osagaia erabiltzeko"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -592,12 +589,12 @@ msgstr ""
 "'%s' pantailak badu leiho-kudeatzailea; erabili --replace aukera uneko leiho-"
 "kudeatzailea ordezteko."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' bistaratzeko %1$d pantaila ez da baliozkoa\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter modu xehatuaren euskarririk gabe konpilatu da\n"

@@ -679,11 +676,11 @@ msgstr "%s (%s)"
 #~ "\" ez dator bat formatuarekin"

 #~ msgid ""
-#~ "GTK color specification must have the state in brackets, e.g. gtk:"
-#~ "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+#~ "GTK color specification must have the state in brackets, e.g. gtk:fg"
+#~ "[NORMAL] where NORMAL is the state; could not parse \"%s\""
 #~ msgstr ""
-#~ "GTK kolore-zehaztapenak egoera kortxete artean izan behar du, adib. gtk:"
-#~ "fg[NORMAL], NORMAL egoera izanik; \"%s\" ezin da analizatu"
+#~ "GTK kolore-zehaztapenak egoera kortxete artean izan behar du, adib. gtk:fg"
+#~ "[NORMAL], NORMAL egoera izanik; \"%s\" ezin da analizatu"

 #~ msgid ""
 #~ "GTK color specification must have a close bracket after the state, e.g. "
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # French translation of mutter.
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 #
 # Christophe Fergeau <teuf@users.sourceforge.net>, 2002.
@@ -11,7 +11,7 @@
 # Cyprien Le Pannérer <cyplp@free.fr>, 2006.
 # Robert-André Mauchin <zebob.m@gmail.com>, 2007. 
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Claude Paroz <claude@2xlibre.net>, 2008-2016.
+# Claude Paroz <claude@2xlibre.net>, 2008-2015.
 # Bruno Brouard <annoa.b@gmail.com>, 2011-12.
 #
 msgid ""
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-05 13:41+0000\n"
-"PO-Revision-Date: 2016-03-05 17:57+0100\n"
+"POT-Creation-Date: 2015-02-23 23:11+0000\n"
+"PO-Revision-Date: 2015-02-24 10:08+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -468,22 +468,22 @@ msgstr "Passer à l'émulateur de terminal 11"
 msgid "Switch to VT 12"
 msgstr "Passer à l'émulateur de terminal 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Affichage intégré"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Affichage inconnu"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -528,44 +528,40 @@ msgstr "_Attendre"
 msgid "_Force Quit"
 msgstr "_Forcer à quitter"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Impossible d'ouvrir l'affichage « %s » du système X Window\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Désactiver la connexion au gestionnaire de sessions"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Indiquer l'ID de gestion de sessions"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Affichage X à utiliser"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initialiser la session depuis le fichier de sauvegarde"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Rendre synchrones les appels à X"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Lancer comme un compositeur wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Lancer comme un compositeur imbriqué"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"

@@ -593,12 +589,12 @@ msgstr "Afficher la version"
 msgid "Mutter plugin to use"
 msgstr "Greffon de Mutter à utiliser"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -607,12 +603,12 @@ msgstr ""
 "L'affichage « %s » a déjà un gestionnaire de fenêtres ; essayez d'utiliser "
 "l'option --replace pour remplacer le gestionnaire de fenêtres actuel."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "L'écran %d sur l'affichage « %s » n'est pas valide\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"

--- a/po/fur.po
+++ b/po/fur.po
@@ -1,583 +0,0 @@
-# Friulian translation for mutter.
-# Copyright (C) 2016 mutter's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mutter package.
-# Fabio Tomat <f.t.public@gmail.com>, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-25 01:58+0000\n"
-"PO-Revision-Date: 2016-03-25 17:54+0100\n"
-"Language-Team: Friulian <fur@li.org>\n"
-"Language: fur\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
-"X-Generator: Poedit 1.8.5\n"
-
-#: ../data/50-mutter-navigation.xml.in.h:1
-msgid "Navigation"
-msgstr "Navigazion"
-
-#: ../data/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Sposte barcon tal spazi di lavôr 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Sposte barcon tal spazi di lavôr 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Sposte barcon tal spazi di lavôr 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Sposte barcon tal spazi di lavôr 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:6
-msgid "Move window to last workspace"
-msgstr "Sposte barcon tal ultin spazi di lavôr"
-
-#: ../data/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Sposte barcon tal spazi di lavôr a çampe"
-
-#: ../data/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Sposte barcon tal spazi di lavôr a drete"
-
-#: ../data/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Sposte barcon tal spazi di lavôr parsore"
-
-#: ../data/50-mutter-navigation.xml.in.h:10
-msgid "Move window one workspace down"
-msgstr "Sposte barcon tal spazi di lavôr sot"
-
-#: ../data/50-mutter-navigation.xml.in.h:11
-msgid "Move window one monitor to the left"
-msgstr "Sposte barcon tal visôr a çampe"
-
-#: ../data/50-mutter-navigation.xml.in.h:12
-msgid "Move window one monitor to the right"
-msgstr "Sposte barcon tal visôr a drete"
-
-#: ../data/50-mutter-navigation.xml.in.h:13
-msgid "Move window one monitor up"
-msgstr "Sposte barcon tal visôr parsore"
-
-#: ../data/50-mutter-navigation.xml.in.h:14
-msgid "Move window one monitor down"
-msgstr "Sposte barcon tal visôr sot"
-
-#: ../data/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Passâ di une aplicazion in chê altre"
-
-#: ../data/50-mutter-navigation.xml.in.h:16
-msgid "Switch to previous application"
-msgstr "Passe ae aplicazion prime"
-
-#: ../data/50-mutter-navigation.xml.in.h:17
-msgid "Switch windows"
-msgstr "Passâ di un barcon in chel altri"
-
-#: ../data/50-mutter-navigation.xml.in.h:18
-msgid "Switch to previous window"
-msgstr "Passe al barcon prime"
-
-#: ../data/50-mutter-navigation.xml.in.h:19
-msgid "Switch windows of an application"
-msgstr "Passâ di un barcon in chel altri di une aplicazion"
-
-#: ../data/50-mutter-navigation.xml.in.h:20
-msgid "Switch to previous window of an application"
-msgstr "Passe al barcon prime di une aplicazion"
-
-#: ../data/50-mutter-navigation.xml.in.h:21
-msgid "Switch system controls"
-msgstr "Passâ di un control di sisteme in chel altri"
-
-#: ../data/50-mutter-navigation.xml.in.h:22
-msgid "Switch to previous system control"
-msgstr "Passe al control di sisteme precedent"
-
-#: ../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 "Plate ducj i barcons normâi"
-
-#: ../data/50-mutter-navigation.xml.in.h:30
-msgid "Switch to workspace 1"
-msgstr "Passe al spazi di lavôr 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:31
-msgid "Switch to workspace 2"
-msgstr "Passe al spazi di lavôr 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:32
-msgid "Switch to workspace 3"
-msgstr "Passe al spazi di lavôr 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:33
-msgid "Switch to workspace 4"
-msgstr "Passe al spazi di lavôr 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:34
-msgid "Switch to last workspace"
-msgstr "Passe al ultin spazi di lavôr"
-
-#: ../data/50-mutter-navigation.xml.in.h:35
-msgid "Move to workspace left"
-msgstr "Sposte il spazi di lavôr a çampe"
-
-#: ../data/50-mutter-navigation.xml.in.h:36
-msgid "Move to workspace right"
-msgstr "Sposte il spazi di lavôr a drete"
-
-#: ../data/50-mutter-navigation.xml.in.h:37
-msgid "Move to workspace above"
-msgstr "Sposte il spazi di lavôr parsore"
-
-#: ../data/50-mutter-navigation.xml.in.h:38
-msgid "Move to workspace below"
-msgstr "Sposte il spazi di lavôr sot"
-
-#: ../data/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "Sisteme"
-
-#: ../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 "Mostre la panoramiche ativitâts"
-
-#: ../data/50-mutter-windows.xml.in.h:1
-msgid "Windows"
-msgstr "Barcons"
-
-#: ../data/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Ative il menù dal barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Ative/Disative modalitât plen visôr"
-
-#: ../data/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "Ative/Disative il stât slargjât"
-
-#: ../data/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "Slargje il barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Ripristine barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Ative/Disative stât inrodolât"
-
-#: ../data/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Siere il barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Plate il barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Sposte il barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Ridimensione barcon"
-
-#: ../data/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr "Ative/Disative barcon su ducj i spazis di lavôr o nome un"
-
-#: ../data/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Tire sù il barcon se al è cuviert, se no sbassilu"
-
-#: ../data/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "Met il barcon parsore di chei altris"
-
-#: ../data/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Bute il barcon sot di chei altris"
-
-#: ../data/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Slargje il barcon par verticâl"
-
-#: ../data/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Slargje il barcon par orizontâl"
-
-#: ../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 "Mutter"
-
-#: ../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 ""
-
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
-msgid "Attach modal dialogs"
-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 ""
-
-#: ../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 "I spazis di vore a son ministrât in maniere dinamiche"
-
-#: ../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 "Spazis di vore nome tal visôr primari"
-
-#: ../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 "Place i gnûfs barcons tal mieç"
-
-#: ../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
-msgid "Switch to VT 1"
-msgstr "Passe al VT 1"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
-msgid "Switch to VT 2"
-msgstr "Passe al VT 2"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
-msgid "Switch to VT 3"
-msgstr "Passe al VT 3"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
-msgid "Switch to VT 4"
-msgstr "Passe al VT 4"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
-msgid "Switch to VT 5"
-msgstr "Passe al VT 5"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
-msgid "Switch to VT 6"
-msgstr "Passe al VT 6"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
-msgid "Switch to VT 7"
-msgstr "Passe al VT 7"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-msgid "Switch to VT 8"
-msgstr "Passe al VT 8"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-msgid "Switch to VT 9"
-msgstr "Passe al VT 9"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-msgid "Switch to VT 10"
-msgstr "Passe al VT 10"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-msgid "Switch to VT 11"
-msgstr "Passe al VT 11"
-
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-msgid "Switch to VT 12"
-msgstr "Passe al VT 12"
-
-#: ../src/backends/meta-monitor-manager.c:518
-msgid "Built-in display"
-msgstr "Display integrât"
-
-#: ../src/backends/meta-monitor-manager.c:544
-msgid "Unknown"
-msgstr "No cognossût"
-
-#: ../src/backends/meta-monitor-manager.c:546
-msgid "Unknown Display"
-msgstr "Display no cognossût"
-
-#. TRANSLATORS: this is a monitor vendor name, followed by a
-#. * size in inches, like 'Dell 15"'
-#.
-#: ../src/backends/meta-monitor-manager.c:554
-#, 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:456
-#, c-format
-msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
-msgstr ""
-"Un altri compositing manager al è za in esecuzion sul schermi %i sul display "
-"\"%s\"."
-
-#: ../src/core/bell.c:194
-msgid "Bell event"
-msgstr "Event cjampane"
-
-#: ../src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” nol rispuint."
-
-#: ../src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "La aplicazion no rispuint."
-
-#: ../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 "_Wait"
-msgstr "_Spiete"
-
-#: ../src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "Sfuarce _Jessude"
-
-#: ../src/core/display.c:555
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Impussibil vierzi il display '%s' di X Window System\n"
-
-#: ../src/core/main.c:181
-msgid "Disable connection to session manager"
-msgstr ""
-
-#: ../src/core/main.c:187
-msgid "Replace the running window manager"
-msgstr "Rimplace il window manager in vore"
-
-#: ../src/core/main.c:193
-msgid "Specify session management ID"
-msgstr ""
-
-#: ../src/core/main.c:198
-msgid "X Display to use"
-msgstr "Display X di doprâ"
-
-#: ../src/core/main.c:204
-msgid "Initialize session from savefile"
-msgstr "Inizialize session da file salvât"
-
-#: ../src/core/main.c:210
-msgid "Make X calls synchronous"
-msgstr "Fâs lis clamadis X sincronis"
-
-#: ../src/core/main.c:217
-msgid "Run as a wayland compositor"
-msgstr "Eseguìs come compositor wayland"
-
-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Eseguìs come compositor nidiât"
-
-#: ../src/core/main.c:231
-msgid "Run as a full display server, rather than nested"
-msgstr "Eseguìs come servidôr display complet, invezit che nidiât"
-
-#: ../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"
-msgstr ""
-"mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., e altris\n"
-"Chest al è software libar; viodi i sorzints pes condizions di copie.\n"
-"No je NISSUNE garanzie; nancje di COMERCIABILITÂT o IDONEITÂT A UNE "
-"FINALITÂT PARTICOLÂR.\n"
-
-#: ../src/core/mutter.c:53
-msgid "Print version"
-msgstr "Stampe version"
-
-#: ../src/core/mutter.c:59
-msgid "Mutter plugin to use"
-msgstr "Plugin Mutter di doprâ"
-
-#: ../src/core/prefs.c:1997
-#, c-format
-msgid "Workspace %d"
-msgstr "Spazi di lavôr %d"
-
-#: ../src/core/screen.c:521
-#, c-format
-msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option "
-"to replace the current window manager."
-msgstr ""
-"Il display \"%s\" al à za un window manager; prove dopre la opzion --replace "
-"par rimplaçâ chel atuâl."
-
-#: ../src/core/screen.c:603
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Schermi %d su display '%s' no valit\n"
-
-#: ../src/core/util.c:121
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter al è stât compilât cence supuart pe modalitât fetose\n"
-
-#: ../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."
-msgstr ""
-"Chescj barcons no supuartin la funzion &quot;salve impostazions atuâi&quot; "
-"e si scugnarà tornâ a inviâlis a man tal prossim acès."
-
-#: ../src/x11/window-props.c:549
-#, c-format
-msgid "%s (on %s)"
-msgstr "%s (su %s)"
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,21 +9,22 @@
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015, 2016.
+# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-02 09:49+0100\n"
-"PO-Revision-Date: 2016-03-02 09:49+0200\n"
+"POT-Creation-Date: 2015-02-28 22:43+0100\n"
+"PO-Revision-Date: 2015-02-28 22:42+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: gnome-l10n-gl@gnome.org\n"
+"Language-Team: Galician <>\n"
 "Language: gl\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: Virtaal 0.7.1\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -460,22 +461,22 @@ msgstr "Cambiar á VT 11"
 msgid "Switch to VT 12"
 msgstr "Cambiar á VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Pantalla embebida"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Descoñecido"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Pantalla descoñecida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -520,44 +521,40 @@ msgstr "Espe_rar"
 msgid "_Force Quit"
 msgstr "_Forzar a saída"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desactivar a conexión ao xestor de sesión"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituír o xestor de xanelas en execución"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID de xestión de sesión"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Pantalla X que se vai usar"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde o ficheiro de salvagarda"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan sincrónicas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como compositor de wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Executar como compositor anidado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado"

@@ -584,12 +581,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Engadido de mutter que usar"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -598,12 +595,12 @@ msgstr ""
 "A pantalla «%s» ten xa un xestor de xanelas, tente usar a opción --replace "
 "para substituír o xestor de xanelas."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n"

--- a/po/he.po
+++ b/po/he.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-03 14:39+0200\n"
-"PO-Revision-Date: 2016-03-03 14:40+0200\n"
+"POT-Creation-Date: 2015-02-24 19:33+0200\n"
+"PO-Revision-Date: 2015-02-24 19:34+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
 "Language: he\n"
@@ -453,22 +453,22 @@ msgstr "מעבר ל־VT ‏11"
 msgid "Switch to VT 12"
 msgstr "מעבר ל־VT ‏12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "תצוגה מובנית"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "לא ידוע"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -510,44 +510,40 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Replace the running window manager"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Specify session management ID"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X Display to use"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initialize session from savefile"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Make X calls synchronous"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Run as a wayland compositor"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Run as a nested compositor"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Run as a full display server, rather than nested"

@@ -573,12 +569,12 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "מרחב עבודה %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -587,12 +583,12 @@ msgstr ""
 "Display \"%s\" already has a window manager; try using the --replace option "
 "to replace the current window manager."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Screen %d on display '%s' is invalid\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter הודר ללא תמיכה במצב פירוט\n"

--- a/po/hu.po
+++ b/po/hu.po
@@ -1,4 +1,4 @@
-# Hungarian translation of mutter.
+# Hungarian translation of mutter
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 #
@@ -6,14 +6,14 @@
 # Gabor Sari <saga at externet dot hu>, 2003.
 # Laszlo Dvornik <dvornik at gnome dot hu>, 2004.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015, 2016.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-04 13:42+0000\n"
-"PO-Revision-Date: 2016-03-04 20:43+0100\n"
+"POT-Creation-Date: 2015-02-22 11:10+0000\n"
+"PO-Revision-Date: 2015-02-22 20:52+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -436,41 +436,46 @@ msgid "Switch to VT 7"
 msgstr "Váltás a 7. VT-re"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Váltás a 8. VT-re"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Váltás a 9. VT-re"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Váltás a 10. VT-re"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Váltás a 11. VT-re"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Váltás a 12. VT-re"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Beépített kijelző"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Ismeretlen kijelző"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -514,45 +519,40 @@ msgstr "Vá_rakozás"
 msgid "_Force Quit"
 msgstr "_Erőltetett kilépés"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "A munkamenet-kezelőhöz való csatlakozás tiltása"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "A futó ablakkezelő helyettesítése"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "A munkamenet-kezelő azonosítójának megadása"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "A használandó X megjelenítő"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "A munkamenet előkészítése a mentési fájlból"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Az X-hívások szinkronná tétele"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Futtatás wayland betűszedőként"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Futtatás beágyazott betűszedőként"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr ""
 "Futtatás teljes megjelenítő kiszolgálóként az egymásba ágyazott helyett"
@@ -580,12 +580,12 @@ msgstr "Verzió kinyomtatása"
 msgid "Mutter plugin to use"
 msgstr "Használandó Mutter bővítmény"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -594,12 +594,12 @@ msgstr ""
 "A(z) „%s” kijelző már rendelkezik ablakkezelővel; próbálja a --replace "
 "kapcsolóval helyettesíteni a jelenlegi ablakkezelőt."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A(z) %d képernyő a(z) „%s” megjelenítőn érvénytelen\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordították\n"

--- a/po/it.po
+++ b/po/it.po
@@ -5,15 +5,15 @@
 # Pier Luigi Fiorini <plfiorini@libero.it>, 2002.
 # Lapo Calamandrei <lapo.calamandrei@virgilio.it>, 2003.
 # Luca Ferretti <lferrett@gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016.
+# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-17 13:44+0000\n"
-"PO-Revision-Date: 2016-03-17 21:24+0100\n"
+"POT-Creation-Date: 2015-03-04 23:11+0000\n"
+"PO-Revision-Date: 2015-03-05 09:16+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -466,22 +466,22 @@ msgstr "Passa al VT 11"
 msgid "Switch to VT 12"
 msgstr "Passa al VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Display integrato"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Display sconosciuto"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -497,7 +497,7 @@ msgstr ""
 "Un altro compositing manager è già in esecuzione sullo schermo %i sul "
 "display «%s»."

-#: ../src/core/bell.c:192
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Evento campanella"

@@ -526,44 +526,40 @@ msgstr "_Attendi"
 msgid "_Force Quit"
 msgstr "_Forza uscita"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display «%s» di X Window System non riuscita\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Disabilita la connessione al gestore di sessione"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Sostituisce il window manager in esecuzione"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Specifica l'ID di gestione sessione"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Display X da usare"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inizializza la sessione da file salvato"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate X sincrone"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Esegui come compositor Wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Esegui come compositor annidato"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Esegui come display server invece che annidato"

@@ -590,12 +586,12 @@ msgstr "Stampa la versione"
 msgid "Mutter plugin to use"
 msgstr "Plugin Mutter da usare"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -604,12 +600,12 @@ msgstr ""
 "Il display «%s» ha già un window manager; provare a utilizzare l'opzione --"
 "replace per sostituirlo."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Lo schermo %d nel display «%s» non è valido\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Mutter è stato compilato escludendo il supporto per la modalità prolissa\n"
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 #
 # Updated in mutter:
-# Changwoo Ryu <cwryu@debian.org>, 2011-2016.
+# Changwoo Ryu <cwryu@debian.org>, 2011-2015.
 #
 #
 # 주의:
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-12 13:40+0000\n"
-"PO-Revision-Date: 2016-03-13 04:38+0900\n"
+"POT-Creation-Date: 2015-03-07 11:12+0000\n"
+"PO-Revision-Date: 2015-03-08 03:44+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: Korean\n"
@@ -453,22 +453,22 @@ msgstr "가상 터미널 11로 이동"
 msgid "Switch to VT 12"
 msgstr "가상 터미널 12로 이동"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "내장 디스플레이"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "알 수 없음"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -484,7 +484,7 @@ msgstr ""
 "다른 창 구성 관리 프로그램이 이미 디스플레이 \"%2$s\" 화면 %1$i번에서 실행 중"
 "입니다."

-#: ../src/core/bell.c:192
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "삑소리 이벤트"

@@ -511,44 +511,40 @@ msgstr "기다리기(_W)"
 msgid "_Force Quit"
 msgstr "강제로 끝내기(_F)"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'을(를) 여는데 실패하였습니다\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "세션 관리자와 연결 하지 않습니다"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "실행 중인 창 관리자를 바꿉니다"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "세션 관리 ID를 지정합니다"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "사용할 X 디스플레이"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "저장 파일에서 세션을 초기화 합니다"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "동기 X 호출을 합니다"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "웨일랜드 컴포지터로 실행합니다"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "내장 컴포지터로 실행합니다"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "전체 디스플레이 서버로 실행, 내장 프로그램 아님"

@@ -575,26 +571,24 @@ 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:521
+#: ../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."
-msgstr ""
-"디스플레이 \"%s\"에 이미 창 관리자가 있습니다. 현재 창 관리자를 바꾸려면 --"
-"replace 옵션을 써보십시오."
+msgstr "디스플레이 \"%s\"에 이미 창 관리자가 있습니다. 현재 창 관리자를 바꾸려면 --replace 옵션을 써보십시오."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d은(는) 잘못되었습니다\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "머터가 자세한 모드 지원 없이 컴파일 되었습니다\n"

--- a/po/lt.po
+++ b/po/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-26 09:54+0000\n"
-"PO-Revision-Date: 2016-02-25 15:18+0200\n"
+"POT-Creation-Date: 2015-02-28 11:14+0000\n"
+"PO-Revision-Date: 2015-02-28 21:34+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -31,39 +31,39 @@ msgstr "Navigacija"

 #: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
-msgstr "Perkelti langą į darbo sritį Nr.1"
+msgstr "Perkelti langą į darbalaukį Nr.1"

 #: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
-msgstr "Perkelti langą į darbo sritį Nr.2"
+msgstr "Perkelti langą į darbalaukį Nr.2"

 #: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
-msgstr "Perkelti langą į darbo sritį Nr.3"
+msgstr "Perkelti langą į darbalaukį Nr.3"

 #: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
-msgstr "Perkelti langą į darbo sritį Nr.4"
+msgstr "Perkelti langą į darbalaukį Nr.4"

 #: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
-msgstr "Perkelti langą į pastarąją darbo sritį"
+msgstr "Perkelti langą į pastarąjį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
-msgstr "Perkelti langą į kairiau esančią darbo sritį"
+msgstr "Perkelti langą į kairiau esantį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
-msgstr "Perkelti langą į dešiniau esančią darbo sritį"
+msgstr "Perkelti langą į dešiniau esantį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
-msgstr "Perkelti langą į aukščiau esančią darbo sritį"
+msgstr "Perkelti langą į aukščiau esantį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
-msgstr "Perkelti langą į žemiau esančią darbo sritį"
+msgstr "Perkelti langą į žemiau esantį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
@@ -143,39 +143,39 @@ msgstr "Paslėpti visus įprastinius langus"

 #: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
-msgstr "Persijungti į darbo sritį Nr.1"
+msgstr "Persijungti į darbalaukį Nr.1"

 #: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
-msgstr "Persijungti į darbo sritį Nr.2"
+msgstr "Persijungti į darbalaukį Nr.2"

 #: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
-msgstr "Persijungti į darbo sritį Nr.3"
+msgstr "Persijungti į darbalaukį Nr.3"

 #: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
-msgstr "Persijungti į darbo sritį Nr.4"
+msgstr "Persijungti į darbalaukį Nr.4"

 #: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
-msgstr "Persijungti į pastarąją darbo sritį"
+msgstr "Persijungti į pastarąjį darbalaukį"

 #: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
-msgstr "Perkelti į darbo sritį kairėje"
+msgstr "Perkelti į darbalaukį kairėje"

 #: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
-msgstr "Perkelti į darbo sritį dešinėje"
+msgstr "Perkelti į darbalaukį dešinėje"

 #: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
-msgstr "Perkelti į darbo sritį viršuje"
+msgstr "Perkelti į darbalaukį viršuje"

 #: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
-msgstr "Perkelti į darbo sritį apačioje"
+msgstr "Perkelti į darbalaukį apačioje"

 #: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
@@ -235,7 +235,7 @@ msgstr "Keisti lango dydį"

 #: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
-msgstr "Perjungti lango buvimo visose darbo srityse būseną"
+msgstr "Perjungti lango buvimo visuose darbalaukiuose būseną"

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

 #: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
-msgstr "Klavišas, naudojamas kartu su specialiomis lango tvarkymo operacijomis"
+msgstr "Klavišas, naudojamas kartu su specialiais lango valdymo veiksmais"

 #: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
@@ -315,7 +315,7 @@ msgstr ""

 #: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
-msgstr "Darbo sritys tvarkomos dinamiškai"
+msgstr "Darbalaukiai valdomi dinamiškai"

 #: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
@@ -323,21 +323,21 @@ msgid ""
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
-"Nusako, ar darbo sritys yra tvarkomos dinamiškai, ar yra pastovus darbo "
-"sričių skaičius (nusakomas raktu num-workspaces schemoje org.gnome.desktop."
-"wm.preferences)."
+"Nusako, ar darbastaliai yra valdomi dinamiškai, ar yra pastovus darbalaukių "
+"skaičius (nusakomas raktu num-workspaces schemoje org.gnome.desktop.wm."
+"preferences)."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
-msgstr "Darbo sritys tik pagrindiniame"
+msgstr "Darbalaukiai tik pagrindiniame"

 #: ../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 ""
-"Nusako, ar darbo sričių perjungimas turi įvykti langams visuose "
-"monitoriuose, ar tik langams pagrindiniame monitoriuje."
+"Nusako, ar darbalaukių perjungimas turi įvykti langams viusose monitoriuose, "
+"ar tik langams pagrindiniame monitoriuje."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
@@ -438,41 +438,46 @@ msgid "Switch to VT 7"
 msgstr "Persijungti į VT 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Persijungti į VT 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Persijungti į VT 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Persijungti į VT 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Persijungti į VT 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Persijungti į VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Integruotas vaizduoklis"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Nežinomas"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Nežinomas vaizduoklis"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -484,7 +489,7 @@ msgstr "%s %s"
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
-msgstr "Kita kompozicijos tvarkytuvė jau veikia ekrane %i vaizduoklyje „%s“."
+msgstr "Kita kompozicijos valdyklė jau veikia ekrane %i vaizduoklyje „%s“."

 #: ../src/core/bell.c:185
 msgid "Bell event"
@@ -513,46 +518,42 @@ msgstr "_Laukti"
 msgid "_Force Quit"
 msgstr "_Priverstinai išeiti"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepavyko atverti X Window sistemos ekrano „%s“\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
-msgstr "Išjungti susijungimą su sesijos tvarkytuve"
+msgstr "Išjungti susijungimą su sesijos valdykle"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
-msgstr "Pakeisti veikiančią langų tvarkytuvę"
+msgstr "Pakeisti veikiančią langų valdyklę"
+
+#: ../src/core/main.c:188
+msgid "Specify session management ID"
+msgstr "Nurodyti sesijos valdymo ID"

 #: ../src/core/main.c:193
-msgid "Specify session management ID"
-msgstr "Nurodyti sesijos tvarkymo ID"
-
-#: ../src/core/main.c:198
 msgid "X Display to use"
 msgstr "Naudotinas X ekranas"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializuoti sesiją iš išsaugojimo failo"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Sinchronizuoti X iškvietimus"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Vykdyti kaip wayland kompozitorių"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Vykdyti kaip įdėtinį kompozitorių"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
-msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne įdėtinį"
+msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne vidinį"

 #: ../src/core/mutter.c:39
 #, c-format
@@ -579,26 +580,29 @@ msgstr "Parodyti versiją"
 msgid "Mutter plugin to use"
 msgstr "Naudojamas Mutter įskiepis"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
+#| msgid ""
+#| "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."
 msgstr ""
-"Vaizduoklis „%s“ jau turi langų tvarkytuvę; pabandykite pakeisti esamą langų "
-"tvarkytuvę, naudodami parametrą --replace."
+"Vaizduoklis „%s“ jau turi langų valdyklę; pabandykite pakeisti esamą langų "
+"valdyklę naudodami parametrą --replace."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ netinkamas\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"

--- a/po/lv.po
+++ b/po/lv.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@
 # Marek Stępień <marcoos@aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2016.
-# Aviary.pl <gnomepl@aviary.pl>, 2007-2016.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2015.
+# Aviary.pl <gnomepl@aviary.pl>, 2007-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 17:29+0100\n"
-"PO-Revision-Date: 2016-02-25 17:30+0100\n"
+"POT-Creation-Date: 2015-03-05 00:23+0100\n"
+"PO-Revision-Date: 2015-03-05 00:24+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -285,10 +285,10 @@ msgid ""
 "\"Windows key\" on PC hardware. It's expected that this binding either the "
 "default or set to the empty string."
 msgstr ""
-"Ten klawisz inicjuje tryb „overlay” (nakładki), który jest połączeniem "
-"podglądu okien i systemu uruchamiania programów. Domyślnie jest przeznaczony "
-"do powiązania z klawiszem „Windows” na komputerach typu PC. Ustawienie tego "
-"powiązania powinno być domyślne lub puste."
+"Ten klawisz inicjuje tryb \"overlay\", który jest połączeniem podglądu okien "
+"i systemu uruchamiania programów. Domyślnie jest przeznaczony do powiązania "
+"z klawiszem \"Windows\" na komputerach typu PC. Ustawienie tego powiązania "
+"powinno być domyślne lub puste."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
@@ -300,9 +300,9 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"Jeśli wynosi wartość „true”, to modalne okna dialogowe pojawiają się "
-"dołączone do paska tytułowego okna nadrzędnego zamiast posiadać oddzielne "
-"paski tytułowe i są przenoszone razem z nim."
+"Jeśli wynosi \"true\", to modalne okna dialogowe pojawiają się dołączone do "
+"paska tytułowego okna nadrzędnego zamiast posiadać oddzielne paski tytułowe "
+"i są przenoszone razem z nim."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -332,8 +332,8 @@ msgid ""
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Określa, czy obszary robocze są zarządzane dynamicznie, czy istnieje "
-"statyczna liczba obszarów (określona przez klucz „num-workspaces” w „org."
-"gnome.desktop.wm.preferences”)."
+"statyczna liczba obszarów (określona przez klucz \"num-workspaces\" w org."
+"gnome.desktop.wm.preferences)."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@@ -369,9 +369,9 @@ msgid ""
 "the focus will not be changed immediately when entering a window, but only "
 "after the pointer stops moving."
 msgstr ""
-"Jeśli jest ustawione na wartość „true”, a tryb aktywności to „sloppy” lub "
-"„mouse”, to aktywność nie będzie zmieniana od razu po przejściu do okna, ale "
-"dopiero po zatrzymaniu ruchu kursora."
+"Jeśli jest ustawione na wartość \"true\", a tryb aktywności to \"sloppy\" "
+"lub \"mouse\", to aktywność nie będzie zmieniana od razu po przejściu do "
+"okna, ale dopiero po zatrzymaniu ruchu kursora."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -409,7 +409,7 @@ msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
-"Jeśli wynosi wartość „true”, to nowe okna będą zawsze umieszczane na środku "
+"Jeśli wynosi \"true\", to nowe okna będą zawsze umieszczane na środku "
 "aktywnego ekranu monitora."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:21
@@ -468,22 +468,22 @@ msgstr "Przełączenie na 11. konsolę wirtualną"
 msgid "Switch to VT 12"
 msgstr "Przełączenie na 12. konsolę wirtualną"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Wbudowany ekran"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Nieznany ekran"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -496,7 +496,7 @@ msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr ""
-"Inny menedżer składania jest już uruchomiony na podekranie %i ekranu „%s”."
+"Inny menedżer składania jest już uruchomiony na podekranie %i ekranu \"%s\"."

 #: ../src/core/bell.c:185
 msgid "Bell event"
@@ -505,7 +505,7 @@ msgstr "Zdarzenie sygnału dźwiękowego"
 #: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
-msgstr "Okno „%s” nie odpowiada."
+msgstr "Okno \"%s\" nie odpowiada."

 #: ../src/core/delete.c:129
 msgid "Application is not responding."
@@ -525,46 +525,43 @@ msgstr "_Czekaj"
 msgid "_Force Quit"
 msgstr "_Zakończ"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
+msgstr ""
+"Otwarcie połączenia z ekranem \"%s\" systemu X Window się nie powiodło\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Rozłącza połączenie z menedżerem sesji"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Używany ekran X"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicjuje sesję z zapisanego pliku"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Uruchamia jako menedżer składania Wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Uruchamia jako osadzony menedżer składania"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
-msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
+msgstr "Uruchamia pełny serwer wyświetlania zamiast osadzonego"

 #: ../src/core/mutter.c:39
 #, c-format
@@ -588,38 +585,38 @@ msgstr "Wyświetla wersję"

 #: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
-msgstr "Używana wtyczka menedżera Mutter"
+msgstr "Używana wtyczka programu Mutter"

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

-#: ../src/core/screen.c:521
+#: ../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."
 msgstr ""
-"Na ekranie „%s” działa już menedżer okien. Aby zastąpić działającego "
-"menedżera okien, należy użyć opcji „--replace”."
+"Na ekranie \"%s\" działa już menedżer okien. Aby zastąpić działającego "
+"menedżera okien, proszę spróbować użyć opcji --replace."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
+msgstr "Podekran %d ekranu \"%s\" jest nieprawidłowy\n"

 #: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
-"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
+"Program Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"

 #: ../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."
 msgstr ""
-"Te okna nie obsługują opcji zapisu obecnego stanu („save current setup”), "
+"Te okna nie obsługują opcji zapisu obecnego stanu (\"save current setup\"), "
 "więc przy następnym zalogowaniu będą musiały zostać uruchomione ręcznie."

 #: ../src/x11/window-props.c:549
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,23 +15,22 @@
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
 # Enrico Nicoletto <liverig@gmail.com>, 2012, 2014.
-# Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-25 13:40+0000\n"
-"PO-Revision-Date: 2016-02-25 13:41-0300\n"
-"Last-Translator: Artur de Aquino Morais <artur.morais93@outlook.com>\n"
+"POT-Creation-Date: 2015-02-26 11:24+0000\n"
+"PO-Revision-Date: 2015-02-26 17:36-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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 1.8.4\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -473,22 +472,22 @@ msgstr "Trocar para o VT 11"
 msgid "Switch to VT 12"
 msgstr "Trocar para o VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Tela embutida"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Monitor desconhecido"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s de %s"
@@ -532,44 +531,40 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forçar sair"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir a exibição \"%s\" do sistema de janelas X\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Desabilitar a conexão com o gerenciador de sessões"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Substituir o gerenciador de janelas em execução"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Especificar o ID do gerenciador de sessões"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Exibição do X a ser utilizada"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializar a sessão a partir do arquivo salvo"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Fazer X chamadas síncronas"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Executar como um compositor wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Executar como um compositor aninhado"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"

@@ -597,12 +592,12 @@ msgstr "Versão impressa"
 msgid "Mutter plugin to use"
 msgstr "Plug-in do Mutter para usar"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -611,7 +606,7 @@ msgstr ""
 "A exibição \"%s\" já possui um gerenciador de janelas; tente usar a opção --"
 "replace para substituir o gerenciador de janelas atual."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A tela %d na exibição \"%s\" é inválida\n"
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,16 +9,15 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2011.
 # Yuri Myasoedov <ymyasoedov@yandex.ru>, 2012-2014, 2015.
 # Ivan Komaritsyn <vantu5z@mail.ru>, 2015.
-# Stas Solovey <whats_up@tut.by>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-03 01:44+0000\n"
-"PO-Revision-Date: 2016-03-03 13:51+0300\n"
-"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+"POT-Creation-Date: 2015-02-19 23:11+0000\n"
+"PO-Revision-Date: 2015-02-20 13:59+0300\n"
+"Last-Translator: Ivan Komaritsyn <vantu5z@mail.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 2.91.6\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -442,41 +441,46 @@ msgid "Switch to VT 7"
 msgstr "Переключиться на виртуальный терминал 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Переключиться на виртуальный терминал 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Переключиться на виртуальный терминал 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Переключиться на виртуальный терминал 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Переключиться на виртуальный терминал 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Переключиться на виртуальный терминал 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Встроенный дисплей"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Неизвестный"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -517,45 +521,40 @@ msgstr "_Подождать"
 msgid "_Force Quit"
 msgstr "Завер_шить"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не удалось открыть дисплей «%s» системы X Window\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Запретить подключение к менеджеру сеансов"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Заменить запущенный оконный менеджер"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Указать идентификатор управления сеансом"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Используемый дисплей X"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Инициализировать сеанс из сохранённого файла"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Сделать X-вызовы синхронными"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Запустить в качестве композитора wayland"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Запустить в качестве встроенного композитора"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Запустить в качестве полноэкранного сервера вместо встроенного"

@@ -584,12 +583,12 @@ msgstr "Вывести версию"
 msgid "Mutter plugin to use"
 msgstr "Использовать модуль mutter"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -598,12 +597,12 @@ msgstr ""
 "Дисплей «%s» уже использует менеджер окон; попробуйте использовать параметр "
 "--replace, чтобы заменить текущий менеджер окон."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Недопустимый экран %d дисплея «%s»\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter собран без поддержки режима подробных сообщений\n"

--- a/po/sk.po
+++ b/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-01 13:42+0000\n"
-"PO-Revision-Date: 2016-03-01 20:40+0100\n"
+"POT-Creation-Date: 2015-02-21 23:27+0000\n"
+"PO-Revision-Date: 2015-02-22 11:11+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -542,22 +542,22 @@ msgstr "Prepnúť na VT č. 11"
 msgid "Switch to VT 12"
 msgstr "Prepnúť na VT č. 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Vstavaný displej"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Neznámy"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Neznámy displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -602,51 +602,46 @@ msgid "_Force Quit"
 msgstr "_Vynútiť ukončenie"

 # X window system preloz, napr. system na spravu okien X
-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Zlyhalo otvorenie displeja systému na správu okien X „%s“\n"

 # cmd desc
-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Zakáže pripojenia k správcovi relácií"

 # cmd desc
-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Nahradí bežiaceho správcu okien"

 # cmd desc
-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Zadá identifikátor správy relácií"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X displej, ktorý bude použitý"

 # cmd desc
-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Inicializuje reláciu z uloženého súboru"

 # cmd desc
-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Použije synchrónne volania X"

 # cmd desc
-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Spustí ako kompozitor protokolu wayland"

-# cmd desc
-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Spustí ako kompozitor s vnoreným režimom"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustí ako plnohodnotný zobrazovací server, namiesto vnoreného režimu"

@@ -675,12 +670,12 @@ msgstr "Zobrazí verziu"
 msgid "Mutter plugin to use"
 msgstr "Použije zásuvný modul Mutter"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -689,12 +684,12 @@ msgstr ""
 "Displej „%s“ už má správcu okien. Skúste použiť prepínač --replace, aby sa "
 "aktuálny správca nahradil."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka č. %d na displeji „%s“ nie je platná\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n"

--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@
 #
 # Andraž Tori <andraz.tori1@guest.arnes.si>, 2000.
 # Matjaž Horvat <m@owca.info>, 2006.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007-2016.
+# Matej Urbančič <mateju@svn.gnome.org>, 2007-2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-05 21:12+0100\n"
-"PO-Revision-Date: 2016-03-05 21:12+0100\n"
+"POT-Creation-Date: 2015-03-15 11:07+0000\n"
+"PO-Revision-Date: 2015-03-15 14:36+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.5.4\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -455,22 +455,22 @@ msgstr "Preklopi na VT 11"
 msgid "Switch to VT 12"
 msgstr "Preklopi na VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Neznan zaslon"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -514,44 +514,40 @@ msgstr "_Počakaj"
 msgid "_Force Quit"
 msgstr "_Vsili konec"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Zamenjaj trenutni upravljalnik oken"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Začni sejo iz shranjene datoteke"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Zaženi izbirnik wayland"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Zaženi kot gnezden vpisovalnik"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"

@@ -579,12 +575,12 @@ msgid "Mutter plugin to use"
 msgstr "Vstavek Mutter za uporabo"

 # G:1 K:0 O:0
-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -593,12 +589,12 @@ msgstr ""
 "Zaslon \"%s\" že ima določen upravljalnik oken; poskušajte uporabiti možnost "
 "--replace za zamenjavo trenutnega upravljalnika zaslona."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Program Mutter je kodno preveden brez podpore za podrobni način izpisovanja\n"
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,21 +1,19 @@
 # Serbian translation of mutter.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
 # This file is distributed under the same license as the mutter package.
-#
-# Translators: 
 # Горан Ракић <grakic@devbase.net>
 # Данило Шеган <danilo@prevod.org>, 2005.
 # Милош Поповић <gpopac@gmail.com>, 2010.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-09 01:41+0000\n"
-"PO-Revision-Date: 2016-03-09 09:52+0200\n"
+"POT-Creation-Date: 2015-03-04 11:14+0000\n"
+"PO-Revision-Date: 2015-03-04 19:46+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -438,41 +436,46 @@ msgid "Switch to VT 7"
 msgstr "Прелазак на ВТ 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Прелазак на ВТ 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Прелазак на ВТ 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Прелазак на ВТ 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Прелазак на ВТ 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Прелазак на ВТ 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Уграђени дисплеј"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Непознато"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../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:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -516,45 +519,40 @@ msgstr "_Сачекај"
 msgid "_Force Quit"
 msgstr "_Приморај излаз"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Нисам успео да отворим екран „%s“ Икс система прозора\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Искључује везу са управником сесије"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Мења текућег управника прозорима"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Наводи ИБ управника сесије"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Икс екран који ће бити коришћен"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Покреће сесију из датотеке чувања"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Чини Икс позиве усклађеним"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Ради као вајландов саставник"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Ради као угнеждени саставник"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Ради као пуни сервер приказа, уместо као угнеждени"

@@ -568,8 +566,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "матер %s\n"
-"Сва права задржана © 2001–%d Хевок Пенингтон, Ред Хет, Инк., и остали\n"
-"Ово је слободан програм; погледајте изворни кôд за услове коришћења.\n"
+"Сва права задржана (C) 2001–%d Havoc Pennington, Red Hat, Inc., и остали\n"
+"Ово је слободан програм; погледајте изворни код за услове коришћења.\n"
 "НЕ постоји никаква гаранција; чак ни гаранција о ТРЖИШНОЈ ВРЕДНОСТИ или "
 "ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"

@@ -581,26 +579,29 @@ 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:521
+#: ../src/core/screen.c:525
 #, c-format
+#| msgid ""
+#| "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."
 msgstr ""
-"Приказ „%s“ већ има управника прозора; пробајте да користите опцију „--"
-"replace“ да замените тренутног управника прозора."
+"Приказ „%s“ већ има управника прозора; пробајте да користите опцију "
+"„--replace“ да замените тренутног управника прозора."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Приказ „%d“ на екрану „%s“ није исправан\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Матер је преведен без подршке за опширан режим\n"

--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,21 +1,19 @@
 # Serbian translation of mutter.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
 # This file is distributed under the same license as the mutter package.
-#
-# Translators: 
 # Goran Rakić <grakic@devbase.net>
 # Danilo Šegan <danilo@prevod.org>, 2005.
 # Miloš Popović <gpopac@gmail.com>, 2010.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-09 01:41+0000\n"
-"PO-Revision-Date: 2016-03-09 09:52+0200\n"
+"POT-Creation-Date: 2015-03-04 11:14+0000\n"
+"PO-Revision-Date: 2015-03-04 19:46+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -438,41 +436,46 @@ msgid "Switch to VT 7"
 msgstr "Prelazak na VT 7"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 8"
 msgstr "Prelazak na VT 8"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 9"
 msgstr "Prelazak na VT 9"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 10"
 msgstr "Prelazak na VT 10"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 11"
 msgstr "Prelazak na VT 11"

 #: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#| msgid "Switch to VT 1"
 msgid "Switch to VT 12"
 msgstr "Prelazak na VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Ugrađeni displej"

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

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Nepoznat displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -516,45 +519,40 @@ msgstr "_Sačekaj"
 msgid "_Force Quit"
 msgstr "_Primoraj izlaz"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nisam uspeo da otvorim ekran „%s“ Iks sistema prozora\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Isključuje vezu sa upravnikom sesije"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Menja tekućeg upravnika prozorima"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Navodi IB upravnika sesije"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Iks ekran koji će biti korišćen"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Pokreće sesiju iz datoteke čuvanja"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Čini Iks pozive usklađenim"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Radi kao vajlandov sastavnik"

-#: ../src/core/main.c:223
-#| msgid "Run as a wayland compositor"
-msgid "Run as a nested compositor"
-msgstr "Radi kao ugneždeni sastavnik"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Radi kao puni server prikaza, umesto kao ugneždeni"

@@ -568,8 +566,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mater %s\n"
-"Sva prava zadržana © 2001–%d Hevok Penington, Red Het, Ink., i ostali\n"
-"Ovo je slobodan program; pogledajte izvorni kôd za uslove korišćenja.\n"
+"Sva prava zadržana (C) 2001–%d Havoc Pennington, Red Hat, Inc., i ostali\n"
+"Ovo je slobodan program; pogledajte izvorni kod za uslove korišćenja.\n"
 "NE postoji nikakva garancija; čak ni garancija o TRŽIŠNOJ VREDNOSTI ili "
 "PRILAGOĐENOSTI ODREĐENOJ NAMENI.\n"

@@ -581,26 +579,29 @@ msgstr "Ispisuje izdanje"
 msgid "Mutter plugin to use"
 msgstr "Priključci Matera za korišćenje"

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

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
+#| msgid ""
+#| "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."
 msgstr ""
-"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju „--"
-"replace“ da zamenite trenutnog upravnika prozora."
+"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju "
+"„--replace“ da zamenite trenutnog upravnika prozora."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Prikaz „%d“ na ekranu „%s“ nije ispravan\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mater je preveden bez podrške za opširan režim\n"

--- a/po/sv.po
+++ b/po/sv.po
@@ -1,25 +1,24 @@
 # Swedish messages for mutter.
-# Copyright © 2001-2016 Free Software Foundation, Inc.
+# Copyright © 2001-2015 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Mattias Eriksson <snaggen@gmail.com>, 2014.
 # Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
-# Sebastian Rasmussen <sebras@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-05 13:41+0000\n"
-"PO-Revision-Date: 2016-03-06 13:47+0100\n"
-"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
+"POT-Creation-Date: 2015-02-19 21:45+0000\n"
+"PO-Revision-Date: 2015-02-24 17:54+0100\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.7.3\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -271,15 +270,15 @@ msgstr "Modifierare att använda för utökade fönsterhanteringsåtgärder"

 #: ../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 ""
 "Denna nyckel kommer att initiera \"overlay\", som är en kombinerad "
 "fönsteröversikt och programstartare. Standard är tänkt att vara \"Windows-"
-"tangenten\" på PC-maskinvara. Det är förväntat att denna bindning antingen "
-"är standard eller inställd till en tom sträng."
+"tangenten\" på PC-maskinvara. Det är förväntat att denna bindning antingen är "
+"standard eller inställd till en tom sträng."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
@@ -288,12 +287,12 @@ msgstr "Bifoga modala dialogfönster"
 #: ../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."
+"attached to the titlebar of the parent window and are moved together with the "
+"parent window."
 msgstr ""
-"När true kommer, istället för att ha oberoende namnlister, modala "
-"dialogfönster att visas anslutna till namnlisten i föräldrafönstret och "
-"flyttas tillsammans med föräldrafönstret."
+"När true kommer, istället för att ha oberoende namnlister, modala dialogfönster "
+"att visas anslutna till namnlisten i föräldrafönstret och flyttas tillsammans "
+"med föräldrafönstret."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -301,13 +300,13 @@ msgstr "Aktivera kantframhävning när fönster släpps på skärmkanter"

 #: ../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."
+"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 ""
-"Om aktiverad, släppa fönster på vertikala skärmkanter kommer att maximera "
-"dem vertikalt och storleksändra dem horisontellt till att täcka hälften av "
-"den tillgängliga ytan. Släppa fönster på övre skärmkanten maximerar dem helt."
+"Om aktiverad, släppa fönster på vertikala skärmkanter kommer att maximera dem "
+"vertikalt och storleksändra dem horisontellt till att täcka hälften av den "
+"tillgängliga ytan. Släppa fönster på övre skärmkanten maximerar dem helt."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
@@ -316,12 +315,12 @@ msgstr "Arbetsytor hanteras dynamiskt"
 #: ../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 ""
-"Bestämmer huruvida arbetsytor hanteras dynamiskt eller huruvida det finns "
-"ett fast antal arbetsytor (bestäms av nyckeln num-workspaces i org.gnome."
+"static number of workspaces (determined by the num-workspaces key in org.gnome."
 "desktop.wm.preferences)."
+msgstr ""
+"Bestämmer huruvida arbetsytor hanteras dynamiskt eller huruvida det finns ett "
+"fast antal arbetsytor (bestäms av nyckeln num-workspaces i org.gnome.desktop.wm."
+"preferences)."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@@ -329,11 +328,11 @@ msgstr "Arbetsytor endast på primär"

 #: ../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."
+"Determines whether workspace switching should happen for windows on all monitors "
+"or only for windows on the primary monitor."
 msgstr ""
-"Bestämmer huruvida arbetsyteväxling ska hända för alla fönster på alla "
-"skärmar eller endast för fönster på den primära skärmen."
+"Bestämmer huruvida arbetsyteväxling ska hända för alla fönster på alla skärmar "
+"eller endast för fönster på den primära skärmen."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
@@ -341,11 +340,11 @@ msgstr "Ingen flik-popup"

 #: ../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."
+"Determines whether the use of popup and highlight frame should be disabled for "
+"window cycling."
 msgstr ""
-"Bestämmer huruvida användning av popup och framhävning av kontur ska "
-"inaktiveras vid fönsterväxling."
+"Bestämmer huruvida användning av popup och framhävning av kontur ska inaktiveras "
+"vid fönsterväxling."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
@@ -353,13 +352,13 @@ msgstr "Fördröj fokusändringar till muspekaren hålls still"

 #: ../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 ""
 "Om satt till \"true\", och fokusläget är antingen \"sloppy\" eller \"mouse\" "
-"kommer fokus inte att ändras omedelbart när muspekaren går in över ett "
-"fönster, utan först efter att muspekaren slutar röra sig."
+"kommer fokus inte att ändras omedelbart när muspekaren går in över ett fönster, "
+"utan först efter att muspekaren slutar röra sig."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -367,8 +366,8 @@ msgstr "Dragbar rambredd"

 #: ../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."
+"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 ""
 "Mängd av totalt dragbara ramar. Om temats synliga ramar inte är tillräckliga "
 "kommer osynliga ramar att läggas till för att möta detta värde."
@@ -379,8 +378,8 @@ msgstr "Automatiskt maximera fönster vars storlek ligger nära skärmens storle

 #: ../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."
+"If enabled, new windows that are initially the size of the monitor automatically "
+"get maximized."
 msgstr ""
 "Om aktiverad kommer nya fönster med nästan samma storlek som skärmen att bli "
 "automatiskt maximerade."
@@ -391,11 +390,11 @@ msgstr "Placera nya fönster centrerat"

 #: ../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."
+"When true, the new windows will always be put in the center of the active screen "
+"of the monitor."
 msgstr ""
-"När satt till \"true\", kommer nya fönster alltid att placeras centrerat på "
-"den aktiva skärmen."
+"När satt till \"true\", kommer nya fönster alltid att placeras centrerat på den "
+"aktiva skärmen."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
@@ -453,22 +452,22 @@ msgstr "Växla till VT 11"
 msgid "Switch to VT 12"
 msgstr "Växla till VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Inbyggd display"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Okänd"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Okänd display"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -478,9 +477,8 @@ msgstr "%s %s"
 #: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
-msgstr "En annan kompositionshanterare körs redan på skärm %i på display ”%s”."
+"Another compositing manager is already running on screen %i on display \"%s\"."
+msgstr "En annan compositing-hanterare körs redan på skärm %i på display \"%s\"."

 #: ../src/core/bell.c:185
 msgid "Bell event"
@@ -497,8 +495,8 @@ msgstr "Programmet svarar inte."

 #: ../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."
+"You may choose to wait a short while for it to continue or force the application "
+"to quit entirely."
 msgstr ""
 "Du kan välja att vänta en kort stund på det för att fortsätta eller tvinga "
 "programmet att helt avslutas."
@@ -511,44 +509,40 @@ msgstr "_Vänta"
 msgid "_Force Quit"
 msgstr "_Tvinga avslut"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Misslyckades med att öppna X Window System-displayen ”%s”\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Inaktivera anslutning till sessionshanteraren"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Ersätt körande fönsterhanteraren"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Ange sessionshanteringsid"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "X-display att använda"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Initiera session från sparandefil"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Gör X-anrop synkrona"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
-msgstr "Kör som en wayland-kompositionshanterare"
+msgstr "Kör som en wayland-compositor"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Kör som en nästlad kompositionshanterare"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Kör som en full display-tjänst, i stället för nästlad"

@@ -558,8 +552,8 @@ 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"
+"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+"PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc. och andra\n"
@@ -575,33 +569,33 @@ msgstr "Skriv ut version"
 msgid "Mutter plugin to use"
 msgstr "Mutter-insticksmodul att använda"

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

-#: ../src/core/screen.c:521
+#: ../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 ""
-"Display ”%s” har redan en fönsterhanterare; försök med flaggan --replace för "
-"att ersätta den aktuella fönsterhanteraren."
+"Display ”%s” har redan en fönsterhanterare; försök med flaggan --replace för att "
+"ersätta den aktuella fönsterhanteraren."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skärm %d på display ”%s” är ogiltig\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter kompilerades utan stöd för utförligt läge\n"

 #: ../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."
+"These windows do not support &quot;save current setup&quot; and will have to be "
+"restarted manually next time you log in."
 msgstr ""
 "Dessa fönster saknar stöd för &quot;spara nuvarande inställningar&quot; och "
 "kommer att behöva startas om manuellt nästa gång du loggar in."
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,17 +1,17 @@
 # Vietnamese translation for Metacity.
-# Copyright © 2016 GNOME i18n Project for Vietnamese.
+# Copyright © 2015 GNOME i18n Project for Vietnamese.
 # This file is distributed under the same license as the Metacity package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2002-2004, 2007, 2008, 2011-2013.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-26 14:03+0000\n"
-"PO-Revision-Date: 2016-03-27 07:22+0700\n"
+"POT-Creation-Date: 2015-03-09 23:13+0000\n"
+"PO-Revision-Date: 2015-03-10 13:28+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: LocFactoryEditor 1.8\n"

 #: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
-msgstr "Điều hướng"
+msgstr "Di chuyển"

 #: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
@@ -447,22 +447,22 @@ msgstr "Chuyển sang VT 11"
 msgid "Switch to VT 12"
 msgstr "Chuyển sang VT 12"

-#: ../src/backends/meta-monitor-manager.c:518
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "Màn hình tích hợp"

-#: ../src/backends/meta-monitor-manager.c:544
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Không rõ"

-#: ../src/backends/meta-monitor-manager.c:546
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Không hiểu màn hình"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:554
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -477,7 +477,7 @@ msgid ""
 msgstr ""
 "Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày \"%s\"."

-#: ../src/core/bell.c:194
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Sự kiện chuông"

@@ -506,44 +506,40 @@ msgstr "_Chờ"
 msgid "_Force Quit"
 msgstr "_Buộc thoát"

-#: ../src/core/display.c:555
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"

-#: ../src/core/main.c:181
+#: ../src/core/main.c:176
 msgid "Disable connection to session manager"
 msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"

-#: ../src/core/main.c:187
+#: ../src/core/main.c:182
 msgid "Replace the running window manager"
 msgstr "Thay thế bộ quản lý cửa sổ đang chạy"

-#: ../src/core/main.c:193
+#: ../src/core/main.c:188
 msgid "Specify session management ID"
 msgstr "Ghi rõ mã số quản lý phiên làm việc"

-#: ../src/core/main.c:198
+#: ../src/core/main.c:193
 msgid "X Display to use"
 msgstr "Bộ trình bày X cần dùng"

-#: ../src/core/main.c:204
+#: ../src/core/main.c:199
 msgid "Initialize session from savefile"
 msgstr "Khởi động phiên làm việc từ tập tin lưu"

-#: ../src/core/main.c:210
+#: ../src/core/main.c:205
 msgid "Make X calls synchronous"
 msgstr "Khiến các lời gọi X đồng bộ với nhau"

-#: ../src/core/main.c:217
+#: ../src/core/main.c:212
 msgid "Run as a wayland compositor"
 msgstr "Chạy như là một “wayland compositor”"

-#: ../src/core/main.c:223
-msgid "Run as a nested compositor"
-msgstr "Chạy như là một “nested compositor”"
-
-#: ../src/core/main.c:231
+#: ../src/core/main.c:220
 msgid "Run as a full display server, rather than nested"
 msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"

@@ -571,12 +567,12 @@ msgstr "Hiển thị phiên bản"
 msgid "Mutter plugin to use"
 msgstr "Phần bổ sung Mutter cần dùng"

-#: ../src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Vùng làm việc %d"

-#: ../src/core/screen.c:521
+#: ../src/core/screen.c:525
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -585,12 +581,12 @@ msgstr ""
 "Màn hình \"%s\" đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn “--"
 "replace” để thay thế bộ quản lý cửa sổ đang dùng."

-#: ../src/core/screen.c:603
+#: ../src/core/screen.c:607
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Màn hình %d trên bộ trình bày \"%s\" không hợp lệ.\n"

-#: ../src/core/util.c:121
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n"

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-07-21 10:52+0000\n"
+"POT-Creation-Date: 2015-02-20 23:22+0000\n"
 "PO-Revision-Date: 2015-02-21 16:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
@@ -439,22 +439,22 @@ msgstr "切換至 VT 11"
 msgid "Switch to VT 12"
 msgstr "切換至 VT 12"

-#: ../src/backends/meta-monitor-manager.c:500
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr "內建顯示"

-#: ../src/backends/meta-monitor-manager.c:526
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "不明"

-#: ../src/backends/meta-monitor-manager.c:528
+#: ../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:536
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -462,7 +462,7 @@ msgstr "%s %s"
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
 #. 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:451
+#: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -496,14 +496,14 @@ msgstr "等待(_W)"
 msgid "_Force Quit"
 msgstr "強制結束(_F)"

-#: ../src/core/display.c:563
+#: ../src/core/display.c:562
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "無法開啟 X Window 畫面‘%s’\n"

 #: ../src/core/main.c:176
 msgid "Disable connection to session manager"
-msgstr "停用到作業階段管理員的連線"
+msgstr "停用到作業階段管理程式的連線"

 #: ../src/core/main.c:182
 msgid "Replace the running window manager"
@@ -1053,9 +1053,9 @@ msgstr "%s（在 %s）"
 #~ msgid ""
 #~ "\"%s\" found in configuration database is not a valid value for mouse "
 #~ "button modifier\n"
-#~ msgstr "設定資料庫中的“%s”設定值不是有效的滑鼠按鈕修改功能鍵\n"
+#~ msgstr "組態資料庫中的“%s”設定值不是有效的滑鼠按鈕修改功能鍵\n"

 #~ msgid ""
 #~ "\"%s\" found in configuration database is not a valid value for "
 #~ "keybinding \"%s\"\n"
-#~ msgstr "設定資料庫中的“%s”不是按鍵組合“%s”的有效設定值\n"
+#~ msgstr "組態資料庫中的“%s”不是按鍵組合“%s”的有效設定值\n"
--- a/src/Makefile-tests.am
+++ b/src/Makefile-tests.am
@@ -9,7 +9,6 @@ dist_stacking_DATA =				\
 	tests/stacking/basic-wayland.metatest	\
 	tests/stacking/minimized.metatest   	\
 	tests/stacking/mixed-windows.metatest   \
-	tests/stacking/set-parent.metatest	\
 	tests/stacking/override-redirect.metatest

 mutter-all.test: tests/mutter-all.test.in
@@ -19,9 +18,9 @@ installedtestsdir = $(datadir)/installed-tests/mutter
 installedtests_DATA = mutter-all.test

 installedtestsbindir = $(libexecdir)/installed-tests/mutter
-installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner mutter-test-unit-tests
+installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner
 else
-noinst_PROGRAMS += mutter-test-client mutter-test-runner mutter-test-unit-tests
+noinst_PROGRAMS += mutter-test-client mutter-test-runner
 endif

 EXTRA_DIST += tests/mutter-all.test.in
@@ -32,19 +31,11 @@ mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
 mutter_test_runner_SOURCES = tests/test-runner.c
 mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la

-mutter_test_unit_tests_SOURCES = tests/unit-tests.c
-mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter.la
+.PHONY: run-tests

-.PHONY: run-tests run-test-runner-tests run-unit-tests
-
-run-test-runner-tests: mutter-test-client mutter-test-runner
+run-tests: mutter-test-client mutter-test-runner
 	./mutter-test-runner $(dist_stacking_DATA)

-run-unit-tests: mutter-test-unit-tests
-	./mutter-test-unit-tests
-
-run-tests: run-test-runner-tests run-unit-tests
-
 endif

 # Some random test programs for bits of the code
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,24 +45,19 @@ mutter_built_sources = \

 if HAVE_WAYLAND
 mutter_built_sources += \
-	pointer-gestures-unstable-v1-protocol.c				\
-	pointer-gestures-unstable-v1-server-protocol.h			\
+	pointer-gestures-protocol.c		\
+	pointer-gestures-server-protocol.h	\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
-	gtk-primary-selection-protocol.c				\
-	gtk-primary-selection-server-protocol.h				\
-	xdg-shell-unstable-v5-protocol.c				\
-	xdg-shell-unstable-v5-server-protocol.h				\
-	relative-pointer-unstable-v1-protocol.c				\
-	relative-pointer-unstable-v1-server-protocol.h			\
-	pointer-constraints-unstable-v1-protocol.c			\
-	pointer-constraints-unstable-v1-server-protocol.h		\
+	xdg-shell-protocol.c			\
+	xdg-shell-server-protocol.h		\
 	$(NULL)
 endif

 wayland_protocols =				\
+	wayland/protocol/pointer-gestures.xml	\
 	wayland/protocol/gtk-shell.xml		\
-	wayland/protocol/gtk-primary-selection.xml	\
+	wayland/protocol/xdg-shell.xml		\
 	$(NULL)

 libmutter_la_SOURCES =				\
@@ -73,6 +68,7 @@ libmutter_la_SOURCES =				\
 	backends/meta-barrier-private.h		\
 	backends/meta-cursor.c			\
 	backends/meta-cursor.h			\
+	backends/meta-cursor-private.h		\
 	backends/meta-cursor-tracker.c		\
 	backends/meta-cursor-tracker-private.h	\
 	backends/meta-cursor-renderer.c		\
@@ -91,8 +87,6 @@ libmutter_la_SOURCES =				\
 	backends/meta-monitor-manager-private.h	\
 	backends/meta-monitor-manager-dummy.c	\
 	backends/meta-monitor-manager-dummy.h	\
-	backends/meta-pointer-constraint.c	\
-	backends/meta-pointer-constraint.h	\
 	backends/meta-stage.h			\
 	backends/meta-stage.c			\
 	backends/edid-parse.c			\
@@ -103,8 +97,6 @@ libmutter_la_SOURCES =				\
 	backends/x11/meta-barrier-x11.h			\
 	backends/x11/meta-cursor-renderer-x11.c		\
 	backends/x11/meta-cursor-renderer-x11.h		\
-	backends/x11/nested/meta-cursor-renderer-x11-nested.c		\
-	backends/x11/nested/meta-cursor-renderer-x11-nested.h		\
 	backends/x11/meta-idle-monitor-xsync.c		\
 	backends/x11/meta-idle-monitor-xsync.h		\
 	backends/x11/meta-input-settings-x11.c		\
@@ -119,8 +111,6 @@ libmutter_la_SOURCES =				\
 	core/boxes.c				\
 	core/boxes-private.h			\
 	meta/boxes.h				\
-	core/meta-border.c			\
-	core/meta-border.h			\
 	compositor/clutter-utils.c		\
 	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
@@ -201,8 +191,6 @@ libmutter_la_SOURCES =				\
 	core/screen.c				\
 	core/screen-private.h			\
 	meta/screen.h				\
-	core/startup-notification.c		\
-	core/startup-notification-private.h	\
 	meta/types.h				\
 	core/restart.c				\
 	core/stack.c				\
@@ -277,12 +265,6 @@ libmutter_la_SOURCES +=				\
 	wayland/meta-wayland-keyboard.h		\
 	wayland/meta-wayland-pointer.c		\
 	wayland/meta-wayland-pointer.h		\
-	wayland/meta-wayland-pointer-constraints.c	\
-	wayland/meta-wayland-pointer-constraints.h	\
-	wayland/meta-pointer-lock-wayland.c		\
-	wayland/meta-pointer-lock-wayland.h		\
-	wayland/meta-pointer-confinement-wayland.c	\
-	wayland/meta-pointer-confinement-wayland.h	\
 	wayland/meta-wayland-popup.c		\
 	wayland/meta-wayland-popup.h		\
 	wayland/meta-wayland-seat.c		\
@@ -498,20 +480,6 @@ $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml
 		--generate-c-code meta-dbus-login1					\
 		$(srcdir)/org.freedesktop.login1.xml

-.SECONDEXPANSION:
-
-define protostability
-$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
-endef
-
-define protoname
-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
-endef
-
-%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-%-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
 %-protocol.c : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -34,7 +34,6 @@
 #include <meta/meta-idle-monitor.h>
 #include "meta-cursor-renderer.h"
 #include "meta-monitor-manager-private.h"
-#include "backends/meta-pointer-constraint.h"

 #define DEFAULT_XKB_RULES_FILE "evdev"
 #define DEFAULT_XKB_MODEL "pc105+inet"
@@ -52,8 +51,6 @@ struct _MetaBackend

  GHashTable *device_monitors;
  gint current_device_id;
-
-  MetaPointerConstraint *client_pointer_constraint;
 };

 struct _MetaBackendClass
@@ -90,13 +87,6 @@ struct _MetaBackendClass

  void (* update_screen_size) (MetaBackend *backend, int width, int height);
  void (* select_stage_events) (MetaBackend *backend);
-
-  gboolean (* get_relative_motion_deltas) (MetaBackend *backend,
-                                           const        ClutterEvent *event,
-                                           double       *dx,
-                                           double       *dy,
-                                           double       *dx_unaccel,
-                                           double       *dy_unaccel);
 };

 MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
@@ -120,14 +110,4 @@ struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
 void meta_backend_update_last_device (MetaBackend *backend,
                                      int          device_id);

-gboolean meta_backend_get_relative_motion_deltas (MetaBackend *backend,
-                                                  const        ClutterEvent *event,
-                                                  double       *dx,
-                                                  double       *dy,
-                                                  double       *dx_unaccel,
-                                                  double       *dy_unaccel);
-
-void meta_backend_set_client_pointer_constraint (MetaBackend *backend,
-                                                 MetaPointerConstraint *constraint);
-
 #endif /* META_BACKEND_PRIVATE_H */
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -24,8 +24,6 @@

 #include "config.h"

-#include <stdlib.h>
-
 #include <meta/meta-backend.h>
 #include "meta-backend-private.h"
 #include "meta-input-settings-private.h"
@@ -64,8 +62,6 @@ struct _MetaBackendPrivate
  MetaInputSettings *input_settings;

  ClutterActor *stage;
-
-  guint device_update_idle_id;
 };
 typedef struct _MetaBackendPrivate MetaBackendPrivate;

@@ -80,9 +76,6 @@ meta_backend_finalize (GObject *object)
  g_clear_object (&priv->monitor_manager);
  g_clear_object (&priv->input_settings);

-  if (priv->device_update_idle_id)
-    g_source_remove (priv->device_update_idle_id);
-
  g_hash_table_destroy (backend->device_monitors);

  G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
@@ -358,17 +351,6 @@ meta_backend_real_select_stage_events (MetaBackend *backend)
  /* Do nothing */
 }

-static gboolean
-meta_backend_real_get_relative_motion_deltas (MetaBackend *backend,
-                                             const         ClutterEvent *event,
-                                             double        *dx,
-                                             double        *dy,
-                                             double        *dx_unaccel,
-                                             double        *dy_unaccel)
-{
-  return FALSE;
-}
-
 static void
 meta_backend_class_init (MetaBackendClass *klass)
 {
@@ -382,7 +364,6 @@ meta_backend_class_init (MetaBackendClass *klass)
  klass->ungrab_device = meta_backend_real_ungrab_device;
  klass->update_screen_size = meta_backend_real_update_screen_size;
  klass->select_stage_events = meta_backend_real_select_stage_events;
-  klass->get_relative_motion_deltas = meta_backend_real_get_relative_motion_deltas;

  g_signal_new ("keymap-changed",
                G_TYPE_FROM_CLASS (object_class),
@@ -522,44 +503,12 @@ meta_backend_get_stage (MetaBackend *backend)
  return priv->stage;
 }

-static gboolean
-update_last_device (MetaBackend *backend)
-{
-  MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  ClutterInputDeviceType device_type;
-  ClutterDeviceManager *manager;
-  ClutterInputDevice *device;
-
-  priv->device_update_idle_id = 0;
-  manager = clutter_device_manager_get_default ();
-  device = clutter_device_manager_get_device (manager,
-                                              backend->current_device_id);
-  device_type = clutter_input_device_get_device_type (device);
-
-  g_signal_emit_by_name (backend, "last-device-changed",
-                         backend->current_device_id);
-
-  switch (device_type)
-    {
-    case CLUTTER_KEYBOARD_DEVICE:
-      break;
-    case CLUTTER_TOUCHSCREEN_DEVICE:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
-      break;
-    default:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
-      break;
-    }
-
-  return G_SOURCE_REMOVE;
-}
-
 void
 meta_backend_update_last_device (MetaBackend *backend,
                                 int          device_id)
 {
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+  ClutterInputDeviceType device_type;
+  MetaCursorTracker *cursor_tracker;
  ClutterDeviceManager *manager;
  ClutterInputDevice *device;

@@ -573,43 +522,26 @@ meta_backend_update_last_device (MetaBackend *backend,
      clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
    return;

+  device_type = clutter_input_device_get_device_type (device);
+
+  cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
  backend->current_device_id = device_id;
+  g_signal_emit_by_name (backend, "last-device-changed", device_id);

-  if (priv->device_update_idle_id == 0)
+  if (device_type == CLUTTER_KEYBOARD_DEVICE)
+    return;
+
+  switch (device_type)
    {
-      priv->device_update_idle_id =
-        g_idle_add ((GSourceFunc) update_last_device, backend);
-      g_source_set_name_by_id (priv->device_update_idle_id,
-                               "[mutter] update_last_device");
+    case CLUTTER_TOUCHSCREEN_DEVICE:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
+      break;
+    default:
+      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
+      break;
    }
 }

-gboolean
-meta_backend_get_relative_motion_deltas (MetaBackend *backend,
-                                         const        ClutterEvent *event,
-                                         double       *dx,
-                                         double       *dy,
-                                         double       *dx_unaccel,
-                                         double       *dy_unaccel)
-{
-  MetaBackendClass *klass = META_BACKEND_GET_CLASS (backend);
-  return klass->get_relative_motion_deltas (backend,
-                                            event,
-                                            dx, dy,
-                                            dx_unaccel, dy_unaccel);
-}
-
-void
-meta_backend_set_client_pointer_constraint (MetaBackend           *backend,
-                                            MetaPointerConstraint *constraint)
-{
-  g_assert (!constraint || (constraint && !backend->client_pointer_constraint));
-
-  g_clear_object (&backend->client_pointer_constraint);
-  if (constraint)
-    backend->client_pointer_constraint = g_object_ref (constraint);
-}
-
 static GType
 get_backend_type (void)
 {
@@ -694,10 +626,7 @@ meta_clutter_init (void)
  meta_create_backend ();

  if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-    {
-      g_warning ("Unable to initialize Clutter.\n");
-      exit (1);
-    }
+    g_error ("Unable to initialize Clutter.\n");

  /*
   * XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
--- a/src/backends/meta-barrier-private.h
+++ b/src/backends/meta-barrier-private.h
@@ -26,8 +26,6 @@
 #ifndef META_BARRIER_PRIVATE_H
 #define META_BARRIER_PRIVATE_H

-#include "core/meta-border.h"
-
 G_BEGIN_DECLS

 #define META_TYPE_BARRIER_IMPL            (meta_barrier_impl_get_type ())
@@ -69,7 +67,14 @@ G_END_DECLS
 struct _MetaBarrierPrivate
 {
  MetaDisplay *display;
-  MetaBorder border;
+
+  int x1;
+  int y1;
+  int x2;
+  int y2;
+
+  MetaBarrierDirection directions;
+
  MetaBarrierImpl *impl;
 };

--- a/src/backends/meta-barrier.c
+++ b/src/backends/meta-barrier.c
@@ -61,20 +61,19 @@ meta_barrier_get_property (GObject    *object,
      g_value_set_object (value, priv->display);
      break;
    case PROP_X1:
-      g_value_set_int (value, priv->border.line.a.x);
+      g_value_set_int (value, priv->x1);
      break;
    case PROP_Y1:
-      g_value_set_int (value, priv->border.line.a.y);
+      g_value_set_int (value, priv->y1);
      break;
    case PROP_X2:
-      g_value_set_int (value, priv->border.line.b.x);
+      g_value_set_int (value, priv->x2);
      break;
    case PROP_Y2:
-      g_value_set_int (value, priv->border.line.b.y);
+      g_value_set_int (value, priv->y2);
      break;
    case PROP_DIRECTIONS:
-      g_value_set_flags (value,
-                         meta_border_get_allows_directions (&priv->border));
+      g_value_set_flags (value, priv->directions);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -96,20 +95,19 @@ meta_barrier_set_property (GObject      *object,
      priv->display = g_value_get_object (value);
      break;
    case PROP_X1:
-      priv->border.line.a.x = g_value_get_int (value);
+      priv->x1 = g_value_get_int (value);
      break;
    case PROP_Y1:
-      priv->border.line.a.y = g_value_get_int (value);
+      priv->y1 = g_value_get_int (value);
      break;
    case PROP_X2:
-      priv->border.line.b.x = g_value_get_int (value);
+      priv->x2 = g_value_get_int (value);
      break;
    case PROP_Y2:
-      priv->border.line.b.y = g_value_get_int (value);
+      priv->y2 = g_value_get_int (value);
      break;
    case PROP_DIRECTIONS:
-      meta_border_set_allows_directions (&priv->border,
-                                         g_value_get_flags (value));
+      priv->directions = g_value_get_flags (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -168,8 +166,7 @@ meta_barrier_constructed (GObject *object)
  MetaBarrier *barrier = META_BARRIER (object);
  MetaBarrierPrivate *priv = barrier->priv;

-  g_return_if_fail (priv->border.line.a.x == priv->border.line.b.x ||
-                    priv->border.line.a.y == priv->border.line.b.y);
+  g_return_if_fail (priv->x1 == priv->x2 || priv->y1 == priv->y2);

 #if defined(HAVE_NATIVE_BACKEND)
  if (META_IS_BACKEND_NATIVE (meta_get_backend ()))
--- a/src/backends/meta-cursor-private.h
+++ b/src/backends/meta-cursor-private.h
@@ -0,0 +1,66 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Giovanni Campagna <gcampagn@redhat.com>
+ */
+
+#ifndef META_CURSOR_PRIVATE_H
+#define META_CURSOR_PRIVATE_H
+
+#include "meta-cursor.h"
+
+#include <X11/Xcursor/Xcursor.h>
+#include <cogl/cogl.h>
+
+#ifdef HAVE_NATIVE_BACKEND
+#include <gbm.h>
+#endif
+
+typedef struct {
+  CoglTexture2D *texture;
+  int hot_x, hot_y;
+
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_bo *bo;
+#endif
+} MetaCursorImage;
+
+struct _MetaCursorReference {
+  int ref_count;
+
+  int current_frame;
+  XcursorImages *xcursor_images;
+  MetaCursor cursor;
+  MetaCursorImage image;
+};
+
+CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
+                                                     int                 *hot_x,
+                                                     int                 *hot_y);
+
+#ifdef HAVE_NATIVE_BACKEND
+struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
+                                                 int                 *hot_x,
+                                                 int                 *hot_y);
+#endif
+
+gboolean meta_cursor_reference_is_animated            (MetaCursorReference *self);
+void     meta_cursor_reference_tick_frame             (MetaCursorReference *self);
+guint    meta_cursor_reference_get_current_frame_time (MetaCursorReference *self);
+
+#endif /* META_CURSOR_PRIVATE_H */
--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@@ -25,6 +25,7 @@
 #include "config.h"

 #include "meta-cursor-renderer.h"
+#include "meta-cursor-private.h"

 #include <meta/meta-backend.h>
 #include <meta/util.h>
@@ -37,8 +38,9 @@
 struct _MetaCursorRendererPrivate
 {
  int current_x, current_y;
+  MetaRectangle current_rect;

-  MetaCursorSprite *displayed_cursor;
+  MetaCursorReference *displayed_cursor;
  gboolean handled_by_backend;
 };
 typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
@@ -46,33 +48,27 @@ typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);

 static void
-queue_redraw (MetaCursorRenderer *renderer,
-              MetaCursorSprite   *cursor_sprite)
+queue_redraw (MetaCursorRenderer *renderer)
 {
  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
  MetaBackend *backend = meta_get_backend ();
  ClutterActor *stage = meta_backend_get_stage (backend);
  CoglTexture *texture;
-  MetaRectangle rect = { 0 };
-
-  if (cursor_sprite)
-    rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);

  /* During early initialization, we can have no stage */
  if (!stage)
    return;

-  if (cursor_sprite && !priv->handled_by_backend)
-    texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
+  if (priv->displayed_cursor && !priv->handled_by_backend)
+    texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, NULL, NULL);
  else
    texture = NULL;

-  meta_stage_set_cursor (META_STAGE (stage), texture, &rect);
+  meta_stage_set_cursor (META_STAGE (stage), texture, &priv->current_rect);
 }

 static gboolean
-meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer,
-                                         MetaCursorSprite   *cursor_sprite)
+meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer)
 {
  return FALSE;
 }
@@ -88,50 +84,34 @@ meta_cursor_renderer_init (MetaCursorRenderer *renderer)
 {
 }

-MetaRectangle
-meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
-                                     MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererPrivate *priv =
-    meta_cursor_renderer_get_instance_private (renderer);
-  CoglTexture *texture;
-  int hot_x, hot_y;
-  int width, height;
-  float texture_scale;
-
-  texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
-  if (!texture)
-    return (MetaRectangle) { 0 };
-
-  meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
-  texture_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
-  width = cogl_texture_get_width (texture);
-  height = cogl_texture_get_height (texture);
-
-  return (MetaRectangle) {
-    .x = (int)roundf (priv->current_x - (hot_x * texture_scale)),
-    .y = (int)roundf (priv->current_y - (hot_y * texture_scale)),
-    .width = (int)roundf (width * texture_scale),
-    .height = (int)roundf (height * texture_scale),
-  };
-}
-
 static void
-update_cursor (MetaCursorRenderer *renderer,
-               MetaCursorSprite   *cursor_sprite)
+update_cursor (MetaCursorRenderer *renderer)
 {
  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
  gboolean handled_by_backend;
  gboolean should_redraw = FALSE;

-  if (cursor_sprite)
-    meta_cursor_sprite_prepare_at (cursor_sprite,
-                                   priv->current_x,
-                                   priv->current_y);
+  if (priv->displayed_cursor)
+    {
+      CoglTexture *texture;
+      int hot_x, hot_y;

-  handled_by_backend =
-    META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer,
-                                                              cursor_sprite);
+      texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y);
+
+      priv->current_rect.x = priv->current_x - hot_x;
+      priv->current_rect.y = priv->current_y - hot_y;
+      priv->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture));
+      priv->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture));
+    }
+  else
+    {
+      priv->current_rect.x = 0;
+      priv->current_rect.y = 0;
+      priv->current_rect.width = 0;
+      priv->current_rect.height = 0;
+    }
+
+  handled_by_backend = META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer);
  if (handled_by_backend != priv->handled_by_backend)
    {
      priv->handled_by_backend = handled_by_backend;
@@ -142,7 +122,7 @@ update_cursor (MetaCursorRenderer *renderer,
    should_redraw = TRUE;

  if (should_redraw)
-    queue_redraw (renderer, cursor_sprite);
+    queue_redraw (renderer);
 }

 MetaCursorRenderer *
@@ -152,25 +132,23 @@ meta_cursor_renderer_new (void)
 }

 void
-meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
-                                 MetaCursorSprite   *cursor_sprite)
+meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
+                                 MetaCursorReference *cursor)
 {
  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);

-  if (priv->displayed_cursor == cursor_sprite)
+  if (priv->displayed_cursor == cursor)
    return;
-  priv->displayed_cursor = cursor_sprite;

-  update_cursor (renderer, cursor_sprite);
+  priv->displayed_cursor = cursor;
+  update_cursor (renderer);
 }

 void
 meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
 {
-  MetaCursorRendererPrivate *priv =
-    meta_cursor_renderer_get_instance_private (renderer);
-
-  update_cursor (renderer, priv->displayed_cursor);
+  update_cursor (renderer);
+  queue_redraw (renderer);
 }

 void
@@ -184,10 +162,10 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
  priv->current_x = x;
  priv->current_y = y;

-  update_cursor (renderer, priv->displayed_cursor);
+  update_cursor (renderer);
 }

-MetaCursorSprite *
+MetaCursorReference *
 meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
 {
  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
@@ -195,27 +173,10 @@ meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
  return priv->displayed_cursor;
 }

-#ifdef HAVE_WAYLAND
-void
-meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                    MetaCursorSprite   *cursor_sprite,
-                                                    struct wl_resource *buffer)
+const MetaRectangle *
+meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer)
 {
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);

-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
-
-  if (renderer_class->realize_cursor_from_wl_buffer)
-    renderer_class->realize_cursor_from_wl_buffer (renderer, cursor_sprite, buffer);
-}
-#endif
-
-void
-meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                  MetaCursorSprite   *cursor_sprite,
-                                                  XcursorImage       *xc_image)
-{
-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
-
-  if (renderer_class->realize_cursor_from_xcursor)
-    renderer_class->realize_cursor_from_xcursor (renderer, cursor_sprite, xc_image);
+  return &priv->current_rect;
 }
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@@ -26,56 +26,44 @@
 #define META_CURSOR_RENDERER_H

 #include <glib-object.h>
-#include <X11/Xcursor/Xcursor.h>
-#ifdef HAVE_WAYLAND
-#include <wayland-server.h>
-#endif

 #include <meta/screen.h>
 #include "meta-cursor.h"

-#define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
-G_DECLARE_DERIVABLE_TYPE (MetaCursorRenderer, meta_cursor_renderer,
-                          META, CURSOR_RENDERER, GObject);
+#define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ())
+#define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
+#define META_CURSOR_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
+#define META_IS_CURSOR_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER))
+#define META_IS_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_RENDERER))
+#define META_CURSOR_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
+
+typedef struct _MetaCursorRenderer        MetaCursorRenderer;
+typedef struct _MetaCursorRendererClass   MetaCursorRendererClass;
+
+struct _MetaCursorRenderer
+{
+  GObject parent;
+};

 struct _MetaCursorRendererClass
 {
  GObjectClass parent_class;

-  gboolean (* update_cursor) (MetaCursorRenderer *renderer,
-                              MetaCursorSprite   *cursor_sprite);
-#ifdef HAVE_WAYLAND
-  void (* realize_cursor_from_wl_buffer) (MetaCursorRenderer *renderer,
-                                          MetaCursorSprite *cursor_sprite,
-                                          struct wl_resource *buffer);
-#endif
-  void (* realize_cursor_from_xcursor) (MetaCursorRenderer *renderer,
-                                        MetaCursorSprite *cursor_sprite,
-                                        XcursorImage *xc_image);
+  gboolean (* update_cursor) (MetaCursorRenderer *renderer);
 };

+GType meta_cursor_renderer_get_type (void) G_GNUC_CONST;
+
 MetaCursorRenderer * meta_cursor_renderer_new (void);

-void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
-                                      MetaCursorSprite   *cursor_sprite);
+void meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
+                                      MetaCursorReference *cursor);

 void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
                                        int x, int y);
 void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer);

-MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
-
-MetaRectangle meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
-                                                   MetaCursorSprite   *cursor_sprite);
-
-#ifdef HAVE_WAYLAND
-void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                         MetaCursorSprite   *cursor_sprite,
-                                                         struct wl_resource *buffer);
-#endif
-
-void meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                       MetaCursorSprite   *cursor_sprite,
-                                                       XcursorImage       *xc_image);
+MetaCursorReference * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
+const MetaRectangle * meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer);

 #endif /* META_CURSOR_RENDERER_H */
--- a/src/backends/meta-cursor-tracker-private.h
+++ b/src/backends/meta-cursor-tracker-private.h
@@ -34,7 +34,7 @@ struct _MetaCursorTracker {

  gboolean is_showing;

-  MetaCursorSprite *displayed_cursor;
+  MetaCursorReference *displayed_cursor;

  /* Wayland clients can set a NULL buffer as their cursor
   * explicitly, which means that we shouldn't display anything.
@@ -42,12 +42,12 @@ struct _MetaCursorTracker {
   * determine an unset window cursor; we need an extra boolean.
   */
  gboolean has_window_cursor;
-  MetaCursorSprite *window_cursor;
+  MetaCursorReference *window_cursor;

-  MetaCursorSprite *root_cursor;
+  MetaCursorReference *root_cursor;

  /* The cursor from the X11 server. */
-  MetaCursorSprite *xfixes_cursor;
+  MetaCursorReference *xfixes_cursor;
 };

 struct _MetaCursorTrackerClass {
@@ -57,16 +57,16 @@ struct _MetaCursorTrackerClass {
 gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
 					    XEvent            *xevent);

-void     meta_cursor_tracker_set_window_cursor   (MetaCursorTracker *tracker,
-                                                  MetaCursorSprite  *cursor_sprite);
-void     meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker);
-void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker *tracker,
-                                                  MetaCursorSprite  *cursor_sprite);
+void     meta_cursor_tracker_set_window_cursor   (MetaCursorTracker   *tracker,
+                                                  MetaCursorReference *cursor);
+void     meta_cursor_tracker_unset_window_cursor (MetaCursorTracker   *tracker);
+void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker   *tracker,
+                                                  MetaCursorReference *cursor);

 void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
 					      int                new_x,
 					      int                new_y);

-MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
+MetaCursorReference * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);

 #endif
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -43,6 +43,7 @@
 #include <X11/extensions/Xfixes.h>

 #include "meta-backend-private.h"
+#include "meta-cursor-private.h"

 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);

@@ -53,7 +54,7 @@ enum {

 static guint signals[LAST_SIGNAL];

-static MetaCursorSprite *
+static MetaCursorReference *
 get_displayed_cursor (MetaCursorTracker *tracker)
 {
  MetaDisplay *display = meta_get_display ();
@@ -79,14 +80,14 @@ update_displayed_cursor (MetaCursorTracker *tracker)
 static void
 sync_cursor (MetaCursorTracker *tracker)
 {
-  MetaCursorSprite *displayed_cursor = get_displayed_cursor (tracker);
+  MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker);

  if (tracker->displayed_cursor == displayed_cursor)
    return;

-  g_clear_object (&tracker->displayed_cursor);
+  g_clear_pointer (&tracker->displayed_cursor, meta_cursor_reference_unref);
  if (displayed_cursor)
-    tracker->displayed_cursor = g_object_ref (displayed_cursor);
+    tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);

  update_displayed_cursor (tracker);
  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
@@ -107,9 +108,9 @@ meta_cursor_tracker_finalize (GObject *object)
  MetaCursorTracker *self = META_CURSOR_TRACKER (object);

  if (self->displayed_cursor)
-    g_object_unref (self->displayed_cursor);
+    meta_cursor_reference_unref (self->displayed_cursor);
  if (self->root_cursor)
-    g_object_unref (self->root_cursor);
+    meta_cursor_reference_unref (self->root_cursor);

  G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object);
 }
@@ -155,13 +156,13 @@ meta_cursor_tracker_get_for_screen (MetaScreen *screen)
 }

 static void
-set_window_cursor (MetaCursorTracker *tracker,
-                   gboolean           has_cursor,
-                   MetaCursorSprite  *cursor_sprite)
+set_window_cursor (MetaCursorTracker   *tracker,
+                   gboolean             has_cursor,
+                   MetaCursorReference *cursor)
 {
-  g_clear_object (&tracker->window_cursor);
-  if (cursor_sprite)
-    tracker->window_cursor = g_object_ref (cursor_sprite);
+  g_clear_pointer (&tracker->window_cursor, meta_cursor_reference_unref);
+  if (cursor)
+    tracker->window_cursor = meta_cursor_reference_ref (cursor);
  tracker->has_window_cursor = has_cursor;
  sync_cursor (tracker);
 }
@@ -183,12 +184,28 @@ meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
  if (notify_event->subtype != XFixesDisplayCursorNotify)
    return FALSE;

-  g_clear_object (&tracker->xfixes_cursor);
+  g_clear_pointer (&tracker->xfixes_cursor, meta_cursor_reference_unref);
  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);

  return TRUE;
 }

+static MetaCursorReference *
+meta_cursor_reference_take_texture (CoglTexture2D *texture,
+                                    int            hot_x,
+                                    int            hot_y)
+{
+  MetaCursorReference *self;
+
+  self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
+  self->image.texture = texture;
+  self->image.hot_x = hot_x;
+  self->image.hot_y = hot_y;
+
+  return self;
+}
+
 static void
 ensure_xfixes_cursor (MetaCursorTracker *tracker)
 {
@@ -246,13 +263,10 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)

  if (sprite != NULL)
    {
-      MetaCursorSprite *cursor_sprite = meta_cursor_sprite_new ();
-      meta_cursor_sprite_set_texture (cursor_sprite,
-                                      sprite,
-                                      cursor_image->xhot,
-                                      cursor_image->yhot);
-      cogl_object_unref (sprite);
-      tracker->xfixes_cursor = cursor_sprite;
+      MetaCursorReference *cursor = meta_cursor_reference_take_texture (sprite,
+                                                                        cursor_image->xhot,
+                                                                        cursor_image->yhot);
+      tracker->xfixes_cursor = cursor;
    }
  XFree (cursor_image);
 }
@@ -265,22 +279,22 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
 CoglTexture *
 meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)
 {
-  MetaCursorSprite *cursor_sprite;
+  MetaCursorReference *cursor;

  g_return_val_if_fail (META_IS_CURSOR_TRACKER (tracker), NULL);

  if (meta_is_wayland_compositor ())
    {
-      cursor_sprite = tracker->displayed_cursor;
+      cursor = tracker->displayed_cursor;
    }
  else
    {
      ensure_xfixes_cursor (tracker);
-      cursor_sprite = tracker->xfixes_cursor;
+      cursor = tracker->xfixes_cursor;
    }

-  if (cursor_sprite)
-    return meta_cursor_sprite_get_cogl_texture (cursor_sprite);
+  if (cursor)
+    return meta_cursor_reference_get_cogl_texture (cursor, NULL, NULL);
  else
    return NULL;
 }
@@ -297,22 +311,22 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
                             int               *x,
                             int               *y)
 {
-  MetaCursorSprite *cursor_sprite;
+  MetaCursorReference *cursor;

  g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));

  if (meta_is_wayland_compositor ())
    {
-      cursor_sprite = tracker->displayed_cursor;
+      cursor = tracker->displayed_cursor;
    }
  else
    {
      ensure_xfixes_cursor (tracker);
-      cursor_sprite = tracker->xfixes_cursor;
+      cursor = tracker->xfixes_cursor;
    }

-  if (cursor_sprite)
-    meta_cursor_sprite_get_hotspot (cursor_sprite, x, y);
+  if (cursor)
+    meta_cursor_reference_get_cogl_texture (cursor, x, y);
  else
    {
      if (x)
@@ -323,10 +337,10 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
 }

 void
-meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
-                                       MetaCursorSprite  *cursor_sprite)
+meta_cursor_tracker_set_window_cursor (MetaCursorTracker   *tracker,
+                                       MetaCursorReference *cursor)
 {
-  set_window_cursor (tracker, TRUE, cursor_sprite);
+  set_window_cursor (tracker, TRUE, cursor);
 }

 void
@@ -336,12 +350,12 @@ meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker)
 }

 void
-meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
-                                     MetaCursorSprite  *cursor_sprite)
+meta_cursor_tracker_set_root_cursor (MetaCursorTracker   *tracker,
+                                     MetaCursorReference *cursor)
 {
-  g_clear_object (&tracker->root_cursor);
-  if (cursor_sprite)
-    tracker->root_cursor = g_object_ref (cursor_sprite);
+  g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref);
+  if (cursor)
+    tracker->root_cursor = meta_cursor_reference_ref (cursor);

  sync_cursor (tracker);
 }
@@ -361,12 +375,12 @@ get_pointer_position_gdk (int         *x,
                          int         *y,
                          int         *mods)
 {
-  GdkSeat *gseat;
+  GdkDeviceManager *gmanager;
  GdkDevice *gdevice;
  GdkScreen *gscreen;

-  gseat = gdk_display_get_default_seat (gdk_display_get_default ());
-  gdevice = gdk_seat_get_pointer (gseat);
+  gmanager = gdk_display_get_device_manager (gdk_display_get_default ());
+  gdevice = gdk_x11_device_manager_lookup (gmanager, META_VIRTUAL_CORE_POINTER_ID);

  gdk_device_get_position (gdevice, &gscreen, x, y);
  if (mods)
@@ -424,7 +438,7 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
  sync_cursor (tracker);
 }

-MetaCursorSprite *
+MetaCursorReference *
 meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
 {
  return tracker->displayed_cursor;
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -21,7 +21,7 @@

 #include "config.h"

-#include "meta-cursor.h"
+#include "meta-cursor-private.h"

 #include <meta/errors.h>

@@ -29,38 +29,58 @@
 #include "screen-private.h"
 #include "meta-backend-private.h"

+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-cursor-renderer-native.h"
+#endif
+
 #include <string.h>

 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xcursor/Xcursor.h>

-enum {
-  PREPARE_AT,
+#ifdef HAVE_WAYLAND
+#include <cogl/cogl-wayland-server.h>
+#endif

-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-struct _MetaCursorSprite
+MetaCursorReference *
+meta_cursor_reference_ref (MetaCursorReference *self)
 {
-  GObject parent;
+  g_assert (self->ref_count > 0);
+  self->ref_count++;

-  MetaCursor cursor;
+  return self;
+}

-  CoglTexture2D *texture;
-  float texture_scale;
-  int hot_x, hot_y;
+static void
+meta_cursor_image_free (MetaCursorImage *image)
+{
+  if (image->texture)
+    cogl_object_unref (image->texture);

-  int current_frame;
-  XcursorImages *xcursor_images;
+#ifdef HAVE_NATIVE_BACKEND
+  if (image->bo)
+    gbm_bo_destroy (image->bo);
+#endif
+}

-  int theme_scale;
-  gboolean theme_dirty;
-};
+static void
+meta_cursor_reference_free (MetaCursorReference *self)
+{
+  if (self->xcursor_images)
+    XcursorImagesDestroy (self->xcursor_images);
+  meta_cursor_image_free (&self->image);
+  g_slice_free (MetaCursorReference, self);
+}

-G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)
+void
+meta_cursor_reference_unref (MetaCursorReference *self)
+{
+  self->ref_count--;
+
+  if (self->ref_count == 0)
+    meta_cursor_reference_free (self);
+}

 static const char *
 translate_meta_cursor (MetaCursor cursor)
@@ -118,26 +138,92 @@ meta_cursor_create_x_cursor (Display    *xdisplay,
 }

 static XcursorImages *
-load_cursor_on_client (MetaCursor cursor, int scale)
+load_cursor_on_client (MetaCursor cursor)
 {
  return XcursorLibraryLoadImages (translate_meta_cursor (cursor),
                                   meta_prefs_get_cursor_theme (),
-                                   meta_prefs_get_cursor_size () * scale);
+                                   meta_prefs_get_cursor_size ());
 }

+#ifdef HAVE_NATIVE_BACKEND
 static void
-meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
-                                            XcursorImage     *xc_image)
+get_hardware_cursor_size (uint64_t *cursor_width, uint64_t *cursor_height)
 {
  MetaBackend *meta_backend = meta_get_backend ();
  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
+
+  if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
+    {
+      meta_cursor_renderer_native_get_cursor_size (META_CURSOR_RENDERER_NATIVE (renderer), cursor_width, cursor_height);
+      return;
+    }
+
+  g_assert_not_reached ();
+}
+#endif
+
+#ifdef HAVE_NATIVE_BACKEND
+static void
+meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
+                                   MetaCursorImage   *image,
+                                   uint8_t           *pixels,
+                                   uint               width,
+                                   uint               height,
+                                   int                rowstride,
+                                   uint32_t           gbm_format)
+{
+  uint64_t cursor_width, cursor_height;
+  get_hardware_cursor_size (&cursor_width, &cursor_height);
+
+  if (width > cursor_width || height > cursor_height)
+    {
+      meta_warning ("Invalid theme cursor size (must be at most %ux%u)\n",
+                    (unsigned int)cursor_width, (unsigned int)cursor_height);
+      return;
+    }
+
+  if (gbm_device_is_format_supported (gbm, gbm_format,
+                                      GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE))
+    {
+      uint8_t buf[4 * cursor_width * cursor_height];
+      uint i;
+
+      image->bo = gbm_bo_create (gbm, cursor_width, cursor_height,
+                                 gbm_format, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
+
+      memset (buf, 0, sizeof(buf));
+      for (i = 0; i < height; i++)
+        memcpy (buf + i * 4 * cursor_width, pixels + i * rowstride, width * 4);
+
+      gbm_bo_write (image->bo, buf, cursor_width * cursor_height * 4);
+    }
+  else
+    meta_warning ("HW cursor for format %d not supported\n", gbm_format);
+}
+#endif
+
+#ifdef HAVE_NATIVE_BACKEND
+static struct gbm_device *
+get_gbm_device (void)
+{
+  MetaBackend *meta_backend = meta_get_backend ();
+  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
+
+  if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
+    return meta_cursor_renderer_native_get_gbm_device (META_CURSOR_RENDERER_NATIVE (renderer));
+  else
+    return NULL;
+}
+#endif
+
+static void
+meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image,
+                                           XcursorImage      *xc_image)
+{
  uint width, height, rowstride;
  CoglPixelFormat cogl_format;
  ClutterBackend *clutter_backend;
  CoglContext *cogl_context;
-  CoglTexture *texture;
-
-  g_assert (self->texture == NULL);

  width           = xc_image->width;
  height          = xc_image->height;
@@ -149,33 +235,41 @@ meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
  cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
 #endif

+  image->hot_x = xc_image->xhot;
+  image->hot_y = xc_image->yhot;
+
  clutter_backend = clutter_get_default_backend ();
  cogl_context = clutter_backend_get_cogl_context (clutter_backend);
-  texture = cogl_texture_2d_new_from_data (cogl_context,
-                                           width, height,
-                                           cogl_format,
-                                           rowstride,
-                                           (uint8_t *) xc_image->pixels,
-                                           NULL);
-  meta_cursor_sprite_set_texture (self, texture,
-                                  xc_image->xhot, xc_image->yhot);
-  cogl_object_unref (texture);
+  image->texture = cogl_texture_2d_new_from_data (cogl_context,
+                                                  width, height,
+                                                  cogl_format,
+                                                  rowstride,
+                                                  (uint8_t *) xc_image->pixels,
+                                                  NULL);

-  meta_cursor_renderer_realize_cursor_from_xcursor (renderer, self, xc_image);
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_device *gbm = get_gbm_device ();
+  if (gbm)
+    meta_cursor_image_load_gbm_buffer (gbm,
+                                       image,
+                                       (uint8_t *) xc_image->pixels,
+                                       width, height, rowstride,
+                                       GBM_FORMAT_ARGB8888);
+#endif
 }

 static XcursorImage *
-meta_cursor_sprite_get_current_frame_image (MetaCursorSprite *self)
+meta_cursor_reference_get_current_frame_image (MetaCursorReference *self)
 {
  return self->xcursor_images->images[self->current_frame];
 }

 void
-meta_cursor_sprite_tick_frame (MetaCursorSprite *self)
+meta_cursor_reference_tick_frame (MetaCursorReference *self)
 {
  XcursorImage *image;

-  if (!meta_cursor_sprite_is_animated (self))
+  if (!meta_cursor_reference_is_animated (self))
    return;

  self->current_frame++;
@@ -183,176 +277,198 @@ meta_cursor_sprite_tick_frame (MetaCursorSprite *self)
  if (self->current_frame >= self->xcursor_images->nimage)
    self->current_frame = 0;

-  image = meta_cursor_sprite_get_current_frame_image (self);
-
-  g_clear_pointer (&self->texture, cogl_object_unref);
-  meta_cursor_sprite_load_from_xcursor_image (self, image);
+  meta_cursor_image_free (&self->image);
+  image = meta_cursor_reference_get_current_frame_image (self);
+  meta_cursor_image_load_from_xcursor_image (&self->image, image);
 }

 guint
-meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self)
+meta_cursor_reference_get_current_frame_time (MetaCursorReference *self)
 {
-  if (!meta_cursor_sprite_is_animated (self))
+  if (!meta_cursor_reference_is_animated (self))
    return 0;

  return self->xcursor_images->images[self->current_frame]->delay;
 }

 gboolean
-meta_cursor_sprite_is_animated (MetaCursorSprite *self)
+meta_cursor_reference_is_animated (MetaCursorReference *self)
 {
  return (self->xcursor_images &&
          self->xcursor_images->nimage > 1);
 }

-MetaCursorSprite *
-meta_cursor_sprite_new (void)
-{
-  return g_object_new (META_TYPE_CURSOR_SPRITE, NULL);
-}
-
 static void
-meta_cursor_sprite_load_from_theme (MetaCursorSprite *self)
+load_cursor_image (MetaCursorReference *cursor)
 {
  XcursorImage *image;

-  g_assert (self->cursor != META_CURSOR_NONE);
+  /* Either cursors are loaded from X cursors or buffers. Since
+   * buffers are converted over immediately, we can make sure to
+   * load this directly. */
+  g_assert (cursor->cursor != META_CURSOR_NONE);

-  /* We might be reloading with a different scale. If so clear the old data. */
-  if (self->xcursor_images)
+  if (!cursor->xcursor_images)
    {
-      g_clear_pointer (&self->texture, cogl_object_unref);
-      XcursorImagesDestroy (self->xcursor_images);
+      cursor->current_frame = 0;
+      cursor->xcursor_images = load_cursor_on_client (cursor->cursor);
+      if (!cursor->xcursor_images)
+        return;
    }

-  self->current_frame = 0;
-  self->xcursor_images = load_cursor_on_client (self->cursor,
-                                                self->theme_scale);
-  if (!self->xcursor_images)
-    meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
-
-  image = meta_cursor_sprite_get_current_frame_image (self);
-  meta_cursor_sprite_load_from_xcursor_image (self, image);
-
-  self->theme_dirty = FALSE;
+  image = meta_cursor_reference_get_current_frame_image (cursor);
+  meta_cursor_image_load_from_xcursor_image (&cursor->image, image);
 }

-MetaCursorSprite *
-meta_cursor_sprite_from_theme (MetaCursor cursor)
+MetaCursorReference *
+meta_cursor_reference_from_theme (MetaCursor cursor)
 {
-  MetaCursorSprite *self;
-
-  self = meta_cursor_sprite_new ();
-
+  MetaCursorReference *self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
  self->cursor = cursor;
-  self->theme_dirty = TRUE;
-
  return self;
 }

-void
-meta_cursor_sprite_set_texture (MetaCursorSprite *self,
-                                CoglTexture      *texture,
-                                int               hot_x,
-                                int               hot_y)
+#ifdef HAVE_WAYLAND
+static void
+meta_cursor_image_load_from_buffer (MetaCursorImage    *image,
+                                    struct wl_resource *buffer,
+                                    int                 hot_x,
+                                    int                 hot_y)
 {
-  g_clear_pointer (&self->texture, cogl_object_unref);
-  if (texture)
-    self->texture = cogl_object_ref (texture);
-  self->hot_x = hot_x;
-  self->hot_y = hot_y;
+  ClutterBackend *backend;
+  CoglContext *cogl_context;
+
+  image->hot_x = hot_x;
+  image->hot_y = hot_y;
+
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
+
+  image->texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context, buffer, NULL);
+
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_device *gbm = get_gbm_device ();
+  if (gbm)
+    {
+      uint32_t gbm_format;
+      uint64_t cursor_width, cursor_height;
+      uint width, height;
+
+      width = cogl_texture_get_width (COGL_TEXTURE (image->texture));
+      height = cogl_texture_get_height (COGL_TEXTURE (image->texture));
+
+      struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (buffer);
+      if (shm_buffer)
+        {
+          int rowstride = wl_shm_buffer_get_stride (shm_buffer);
+
+          wl_shm_buffer_begin_access (shm_buffer);
+
+          switch (wl_shm_buffer_get_format (shm_buffer))
+            {
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+            case WL_SHM_FORMAT_ARGB8888:
+              gbm_format = GBM_FORMAT_ARGB8888;
+              break;
+            case WL_SHM_FORMAT_XRGB8888:
+              gbm_format = GBM_FORMAT_XRGB8888;
+              break;
+#else
+            case WL_SHM_FORMAT_ARGB8888:
+              gbm_format = GBM_FORMAT_ARGB8888;
+              break;
+            case WL_SHM_FORMAT_XRGB8888:
+              gbm_format = GBM_FORMAT_XRGB8888;
+              break;
+#endif
+            default:
+              g_warn_if_reached ();
+              gbm_format = GBM_FORMAT_ARGB8888;
+            }
+
+          meta_cursor_image_load_gbm_buffer (gbm,
+                                             image,
+                                             (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
+                                             width, height, rowstride,
+                                             gbm_format);
+
+          wl_shm_buffer_end_access (shm_buffer);
+        }
+      else
+        {
+          /* HW cursors have a predefined size (at least 64x64), which usually is bigger than cursor theme
+             size, so themed cursors must be padded with transparent pixels to fill the
+             overlay. This is trivial if we have CPU access to the data, but it's not
+             possible if the buffer is in GPU memory (and possibly tiled too), so if we
+             don't get the right size, we fallback to GL.
+          */
+          get_hardware_cursor_size (&cursor_width, &cursor_height);
+
+          if (width != cursor_width || height != cursor_height)
+            {
+              meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
+              return;
+            }
+
+          image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER, buffer, GBM_BO_USE_CURSOR);
+          if (!image->bo)
+            meta_warning ("Importing HW cursor from wl_buffer failed\n");
+        }
+    }
+#endif
 }

-void
-meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
-                                      float             scale)
+MetaCursorReference *
+meta_cursor_reference_from_buffer (struct wl_resource *buffer,
+                                   int                 hot_x,
+                                   int                 hot_y)
 {
-  self->texture_scale = scale;
-}
+  MetaCursorReference *self;

-void
-meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
-                                    int               theme_scale)
-{
-  if (self->theme_scale != theme_scale)
-    self->theme_dirty = TRUE;
-  self->theme_scale = theme_scale;
+  self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
+  meta_cursor_image_load_from_buffer (&self->image, buffer, hot_x, hot_y);
+
+  return self;
 }
+#endif

 CoglTexture *
-meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self)
+meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
+                                        int                 *hot_x,
+                                        int                 *hot_y)
 {
-  return COGL_TEXTURE (self->texture);
+  if (!cursor->image.texture)
+    load_cursor_image (cursor);
+
+  if (hot_x)
+    *hot_x = cursor->image.hot_x;
+  if (hot_y)
+    *hot_y = cursor->image.hot_y;
+
+  return COGL_TEXTURE (cursor->image.texture);
 }

+#ifdef HAVE_NATIVE_BACKEND
+struct gbm_bo *
+meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
+                                  int                 *hot_x,
+                                  int                 *hot_y)
+{
+  if (!cursor->image.bo)
+    load_cursor_image (cursor);
+
+  if (hot_x)
+    *hot_x = cursor->image.hot_x;
+  if (hot_y)
+    *hot_y = cursor->image.hot_y;
+  return cursor->image.bo;
+}
+#endif
+
 MetaCursor
-meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self)
+meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)
 {
-  return self->cursor;
-}
-
-void
-meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
-                                int              *hot_x,
-                                int              *hot_y)
-{
-  *hot_x = self->hot_x;
-  *hot_y = self->hot_y;
-}
-
-float
-meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self)
-{
-  return self->texture_scale;
-}
-
-void
-meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
-                               int               x,
-                               int               y)
-{
-  g_signal_emit (self, signals[PREPARE_AT], 0, x, y);
-}
-
-void
-meta_cursor_sprite_realize_texture (MetaCursorSprite *self)
-{
-  if (self->theme_dirty)
-    meta_cursor_sprite_load_from_theme (self);
-}
-
-static void
-meta_cursor_sprite_init (MetaCursorSprite *self)
-{
-  self->texture_scale = 1.0f;
-}
-
-static void
-meta_cursor_sprite_finalize (GObject *object)
-{
-  MetaCursorSprite *self = META_CURSOR_SPRITE (object);
-
-  if (self->xcursor_images)
-    XcursorImagesDestroy (self->xcursor_images);
-
-  g_clear_pointer (&self->texture, cogl_object_unref);
-
-  G_OBJECT_CLASS (meta_cursor_sprite_parent_class)->finalize (object);
-}
-
-static void
-meta_cursor_sprite_class_init (MetaCursorSpriteClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_cursor_sprite_finalize;
-
-  signals[PREPARE_AT] = g_signal_new ("prepare-at",
-                                      G_TYPE_FROM_CLASS (object_class),
-                                      G_SIGNAL_RUN_LAST,
-                                      0,
-                                      NULL, NULL, NULL,
-                                      G_TYPE_NONE, 2,
-                                      G_TYPE_INT,
-                                      G_TYPE_INT);
+  return cursor->cursor;
 }
--- a/src/backends/meta-cursor.h
+++ b/src/backends/meta-cursor.h
@@ -22,54 +22,25 @@
 #ifndef META_CURSOR_H
 #define META_CURSOR_H

+typedef struct _MetaCursorReference MetaCursorReference;
+
+MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *cursor);
+void meta_cursor_reference_unref (MetaCursorReference *cursor);
+
 #include <meta/common.h>
-#include <meta/boxes.h>

-typedef struct _MetaCursorSprite MetaCursorSprite;
+MetaCursorReference * meta_cursor_reference_from_theme  (MetaCursor          cursor);

-#define META_TYPE_CURSOR_SPRITE (meta_cursor_sprite_get_type ())
-G_DECLARE_FINAL_TYPE (MetaCursorSprite,
-                      meta_cursor_sprite,
-                      META, CURSOR_SPRITE,
-                      GObject);
+#ifdef HAVE_WAYLAND
+#include <wayland-server.h>
+MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer,
+                                                         int                 hot_x,
+                                                         int                 hot_y);
+#endif

-MetaCursorSprite * meta_cursor_sprite_new (void);
-
-MetaCursorSprite * meta_cursor_sprite_from_theme  (MetaCursor cursor);
-
-
-void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
-                                         int               scale);
-
-MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self);
+MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor);

 Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
                                    MetaCursor  cursor);

-void meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
-                                    int               x,
-                                    int               y);
-
-void meta_cursor_sprite_realize_texture (MetaCursorSprite *self);
-
-void meta_cursor_sprite_set_texture (MetaCursorSprite *self,
-                                     CoglTexture      *texture,
-                                     int               hot_x,
-                                     int               hot_y);
-
-void meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
-                                           float             scale);
-
-CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self);
-
-void meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
-                                     int              *hot_x,
-                                     int              *hot_y);
-
-float meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self);
-
-gboolean meta_cursor_sprite_is_animated            (MetaCursorSprite *self);
-void     meta_cursor_sprite_tick_frame             (MetaCursorSprite *self);
-guint    meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self);
-
 #endif /* META_CURSOR_H */
--- a/src/backends/meta-input-settings-private.h
+++ b/src/backends/meta-input-settings-private.h
@@ -63,9 +63,9 @@ struct _MetaInputSettingsClass
  void (* set_invert_scroll) (MetaInputSettings  *settings,
                              ClutterInputDevice *device,
                              gboolean            inverted);
-  void (* set_edge_scroll)   (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            enabled);
+  void (* set_scroll_method) (MetaInputSettings            *settings,
+                              ClutterInputDevice           *device,
+                              GDesktopTouchpadScrollMethod  mode);
  void (* set_scroll_button) (MetaInputSettings  *settings,
                              ClutterInputDevice *device,
                              guint               button);
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -395,11 +395,11 @@ update_touchpad_tap_enabled (MetaInputSettings  *input_settings,
 }

 static void
-update_touchpad_edge_scroll (MetaInputSettings *input_settings,
-                             ClutterInputDevice *device)
+update_touchpad_scroll_method (MetaInputSettings *input_settings,
+                               ClutterInputDevice *device)
 {
  MetaInputSettingsClass *input_settings_class;
-  gboolean edge_scroll_enabled;
+  GDesktopTouchpadScrollMethod method;
  MetaInputSettingsPrivate *priv;

  if (device &&
@@ -408,19 +408,19 @@ update_touchpad_edge_scroll (MetaInputSettings *input_settings,

  priv = meta_input_settings_get_instance_private (input_settings);
  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  edge_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "edge-scrolling-enabled");
+  method = g_settings_get_enum (priv->touchpad_settings, "scroll-method");

  if (device)
    {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_edge_scroll,
-                                        edge_scroll_enabled);
+      settings_device_set_uint_setting (input_settings, device,
+                                        input_settings_class->set_scroll_method,
+                                        method);
    }
  else
    {
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 (ConfigBoolFunc) input_settings_class->set_edge_scroll,
-                                 edge_scroll_enabled);
+      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 (ConfigUintFunc) input_settings_class->set_scroll_method,
+                                 method);
    }
 }

@@ -429,7 +429,7 @@ update_touchpad_click_method (MetaInputSettings *input_settings,
                              ClutterInputDevice *device)
 {
  MetaInputSettingsClass *input_settings_class;
-  GDesktopTouchpadClickMethod method;
+  GDesktopTouchpadScrollMethod method;
  MetaInputSettingsPrivate *priv;

  if (device &&
@@ -523,13 +523,15 @@ update_trackball_scroll_button (MetaInputSettings  *input_settings,
    }
  else if (!device)
    {
+      MetaInputSettingsPrivate *priv;
      const GSList *devices;

+      priv = meta_input_settings_get_instance_private (input_settings);
      devices = clutter_device_manager_peek_devices (priv->device_manager);

      while (devices)
        {
-          device = devices->data;
+          ClutterInputDevice *device = devices->data;

          if (device_is_trackball (device))
            input_settings_class->set_scroll_button (input_settings, device, button);
@@ -645,8 +647,8 @@ meta_input_settings_changed_cb (GSettings  *settings,
        update_touchpad_tap_enabled (input_settings, NULL);
      else if (strcmp (key, "send-events") == 0)
        update_touchpad_send_events (input_settings, NULL);
-      else if (strcmp (key, "edge-scrolling-enabled") == 0)
-        update_touchpad_edge_scroll (input_settings, NULL);
+      else if (strcmp (key, "scroll-method") == 0)
+        update_touchpad_scroll_method (input_settings, NULL);
      else if (strcmp (key, "click-method") == 0)
        update_touchpad_click_method (input_settings, NULL);
    }
@@ -771,7 +773,7 @@ apply_device_settings (MetaInputSettings  *input_settings,
  update_device_natural_scroll (input_settings, device);
  update_touchpad_tap_enabled (input_settings, device);
  update_touchpad_send_events (input_settings, device);
-  update_touchpad_edge_scroll (input_settings, device);
+  update_touchpad_scroll_method (input_settings, device);
  update_touchpad_click_method (input_settings, device);

  update_trackball_scroll_button (input_settings, device);
--- a/src/backends/meta-monitor-config.c
+++ b/src/backends/meta-monitor-config.c
@@ -1846,7 +1846,7 @@ crtc_assignment_assign (CrtcAssignment       *assign,
    }
  else
    {
-      info = g_slice_new0 (MetaCRTCInfo);
+      MetaCRTCInfo *info = g_slice_new0 (MetaCRTCInfo);

      info->crtc = crtc;
      info->mode = mode;
--- a/src/backends/meta-monitor-manager-dummy.c
+++ b/src/backends/meta-monitor-manager-dummy.c
@@ -197,7 +197,7 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
        {
          MetaMonitorMode *mode;
          MetaOutput *output;
-          unsigned int j;
+          int i, n_outputs;
          int width, height;

          mode = crtc_info->mode;
@@ -223,9 +223,10 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
          screen_width = MAX (screen_width, crtc_info->x + width);
          screen_height = MAX (screen_height, crtc_info->y + height);

-          for (j = 0; j < crtc_info->outputs->len; j++)
+          n_outputs = crtc_info->outputs->len;
+          for (i = 0; i < n_outputs; i++)
            {
-              output = ((MetaOutput**)crtc_info->outputs->pdata)[j];
+              output = ((MetaOutput**)crtc_info->outputs->pdata)[i];

              output->is_dirty = TRUE;
              output->crtc = crtc;
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -174,8 +174,7 @@ struct _MetaCRTC
  /* Used when changing configuration */
  gboolean is_dirty;

-  /* Used by cursor renderer backend */
-  void *cursor_renderer_private;
+  MetaCursorReference *cursor;

  gpointer driver_private;
  GDestroyNotify driver_notify;
@@ -414,10 +413,6 @@ gint               meta_monitor_manager_get_monitor_at_point (MetaMonitorManager
                                                              gfloat              x,
                                                              gfloat              y);

-void meta_monitor_manager_clear_output (MetaOutput *output);
-void meta_monitor_manager_clear_mode (MetaMonitorMode *mode);
-void meta_monitor_manager_clear_crtc (MetaCRTC *crtc);
-
 /* Returns true if transform causes width and height to be inverted
   This is true for the odd transforms in the enum */
 static inline gboolean
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -178,7 +178,7 @@ make_logical_config (MetaMonitorManager *manager)
  unsigned int i, j;

  monitor_infos = g_array_sized_new (FALSE, TRUE, sizeof (MetaMonitorInfo),
-                                     manager->n_crtcs);
+                                     manager->n_outputs);

  /* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
     for each of them, unless they reference a rectangle that
@@ -346,23 +346,6 @@ meta_monitor_manager_constructed (GObject *object)
  manager->in_init = FALSE;
 }

-void
-meta_monitor_manager_clear_output (MetaOutput *output)
-{
-  g_free (output->name);
-  g_free (output->vendor);
-  g_free (output->product);
-  g_free (output->serial);
-  g_free (output->modes);
-  g_free (output->possible_crtcs);
-  g_free (output->possible_clones);
-
-  if (output->driver_notify)
-    output->driver_notify (output);
-
-  memset (output, 0, sizeof (*output));
-}
-
 static void
 meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
                                        int         n_old_outputs)
@@ -370,22 +353,22 @@ meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
  int i;

  for (i = 0; i < n_old_outputs; i++)
-    meta_monitor_manager_clear_output (&old_outputs[i]);
+    {
+      g_free (old_outputs[i].name);
+      g_free (old_outputs[i].vendor);
+      g_free (old_outputs[i].product);
+      g_free (old_outputs[i].serial);
+      g_free (old_outputs[i].modes);
+      g_free (old_outputs[i].possible_crtcs);
+      g_free (old_outputs[i].possible_clones);
+
+      if (old_outputs[i].driver_notify)
+        old_outputs[i].driver_notify (&old_outputs[i]);
+    }

  g_free (old_outputs);
 }

-void
-meta_monitor_manager_clear_mode (MetaMonitorMode *mode)
-{
-  g_free (mode->name);
-
-  if (mode->driver_notify)
-    mode->driver_notify (mode);
-
-  memset (mode, 0, sizeof (*mode));
-}
-
 static void
 meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
                                      int              n_old_modes)
@@ -393,20 +376,16 @@ meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
  int i;

  for (i = 0; i < n_old_modes; i++)
-    meta_monitor_manager_clear_mode (&old_modes[i]);
+    {
+      g_free (old_modes[i].name);
+
+      if (old_modes[i].driver_notify)
+        old_modes[i].driver_notify (&old_modes[i]);
+    }

  g_free (old_modes);
 }

-void
-meta_monitor_manager_clear_crtc (MetaCRTC *crtc)
-{
-  if (crtc->driver_notify)
-    crtc->driver_notify (crtc);
-
-  memset (crtc, 0, sizeof (*crtc));
-}
-
 static void
 meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
                                      int       n_old_crtcs)
@@ -414,7 +393,10 @@ meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
  int i;

  for (i = 0; i < n_old_crtcs; i++)
-    meta_monitor_manager_clear_crtc (&old_crtcs[i]);
+    {
+      if (old_crtcs[i].driver_notify)
+        old_crtcs[i].driver_notify (&old_crtcs[i]);
+    }

  g_free (old_crtcs);
 }
@@ -902,7 +884,8 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
          crtc_info->y = 0;
        }

-      if (transform > META_MONITOR_TRANSFORM_FLIPPED_270 ||
+      if (transform < META_MONITOR_TRANSFORM_NORMAL ||
+          transform > META_MONITOR_TRANSFORM_FLIPPED_270 ||
          ((crtc->all_transforms & (1 << transform)) == 0))
        {
          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
--- a/src/backends/meta-pointer-constraint.c
+++ b/src/backends/meta-pointer-constraint.c
@@ -1,57 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#include "config.h"
-
-#include "backends/meta-pointer-constraint.h"
-
-#include <glib-object.h>
-
-G_DEFINE_TYPE (MetaPointerConstraint, meta_pointer_constraint, G_TYPE_OBJECT);
-
-static void
-meta_pointer_constraint_init (MetaPointerConstraint *constraint)
-{
-}
-
-static void
-meta_pointer_constraint_class_init (MetaPointerConstraintClass *klass)
-{
-}
-
-void
-meta_pointer_constraint_constrain (MetaPointerConstraint *constraint,
-                                   ClutterInputDevice    *device,
-                                   guint32                time,
-                                   float                  prev_x,
-                                   float                  prev_y,
-                                   float                  *x,
-                                   float                  *y)
-{
-  META_POINTER_CONSTRAINT_GET_CLASS (constraint)->constrain (constraint,
-                                                             device,
-                                                             time,
-                                                             prev_x, prev_y,
-                                                             x, y);
-}
--- a/src/backends/meta-pointer-constraint.h
+++ b/src/backends/meta-pointer-constraint.h
@@ -1,60 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef META_POINTER_CONSTRAINT_H
-#define META_POINTER_CONSTRAINT_H
-
-#include <glib-object.h>
-#include <clutter/clutter.h>
-
-G_BEGIN_DECLS
-
-#define META_TYPE_POINTER_CONSTRAINT (meta_pointer_constraint_get_type ())
-G_DECLARE_DERIVABLE_TYPE (MetaPointerConstraint, meta_pointer_constraint,
-                          META, POINTER_CONSTRAINT, GObject);
-
-struct _MetaPointerConstraintClass
-{
-  GObjectClass parent_class;
-
-  void (*constrain) (MetaPointerConstraint *constraint,
-                     ClutterInputDevice *device,
-                     guint32 time,
-                     float prev_x,
-                     float prev_y,
-                     float *x,
-                     float *y);
-};
-
-void meta_pointer_constraint_constrain (MetaPointerConstraint *constraint,
-                                        ClutterInputDevice    *device,
-                                        guint32                time,
-                                        float                  prev_x,
-                                        float                  prev_y,
-                                        float                 *x,
-                                        float                 *y);
-
-G_END_DECLS
-
-#endif /* META_POINTER_CONSTRAINT_H */
--- a/src/backends/meta-stage.c
+++ b/src/backends/meta-stage.c
@@ -24,6 +24,7 @@

 #include "meta-stage.h"

+#include "meta-cursor-private.h"
 #include <meta/meta-backend.h>
 #include <meta/util.h>

--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -36,10 +36,6 @@
 #include "meta-monitor-manager-kms.h"
 #include "meta-cursor-renderer-native.h"
 #include "meta-launcher.h"
-#include "backends/meta-cursor-tracker-private.h"
-#include "backends/meta-pointer-constraint.h"
-
-#include <stdlib.h>

 struct _MetaBackendNativePrivate
 {
@@ -141,24 +137,6 @@ constrain_to_barriers (ClutterInputDevice *device,
                                       new_x, new_y);
 }

-static void
-constrain_to_client_constraint (ClutterInputDevice *device,
-                                guint32             time,
-                                float               prev_x,
-                                float               prev_y,
-                                float              *x,
-                                float              *y)
-{
-  MetaBackend *backend = meta_get_backend ();
-  MetaPointerConstraint *constraint = backend->client_pointer_constraint;
-
-  if (!constraint)
-    return;
-
-  meta_pointer_constraint_constrain (constraint, device,
-                                     time, prev_x, prev_y, x, y);
-}
-
 /*
 * The pointer constrain code is mostly a rip-off of the XRandR code from Xorg.
 * (from xserver/randr/rrcrtc.c, RRConstrainCursorHarder)
@@ -213,12 +191,10 @@ constrain_all_screen_monitors (ClutterInputDevice *device,

 static void
 pointer_constrain_callback (ClutterInputDevice *device,
-                            guint32             time,
-                            float               prev_x,
-                            float               prev_y,
-                            float              *new_x,
-                            float              *new_y,
-                            gpointer            user_data)
+			    guint32             time,
+			    float              *new_x,
+			    float              *new_y,
+			    gpointer            user_data)
 {
  MetaMonitorManager *monitor_manager;
  MetaMonitorInfo *monitors;
@@ -227,9 +203,6 @@ pointer_constrain_callback (ClutterInputDevice *device,
  /* Constrain to barriers */
  constrain_to_barriers (device, time, new_x, new_y);

-  /* Constrain to pointer lock */
-  constrain_to_client_constraint (device, time, prev_x, prev_y, new_x, new_y);
-
  monitor_manager = meta_monitor_manager_get ();
  monitors = meta_monitor_manager_get_monitor_infos (monitor_manager, &n_monitors);

@@ -280,16 +253,11 @@ meta_backend_native_warp_pointer (MetaBackend *backend,
 {
  ClutterDeviceManager *manager = clutter_device_manager_get_default ();
  ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);
-  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);

  /* XXX */
  guint32 time_ = 0;

-  /* Warp the input device pointer state. */
  clutter_evdev_warp_pointer (device, time_, x, y);
-
-  /* Warp displayed pointer cursor. */
-  meta_cursor_tracker_update_position (tracker, x, y);
 }

 static void
@@ -336,19 +304,6 @@ meta_backend_native_lock_layout_group (MetaBackend *backend,
  g_signal_emit_by_name (backend, "keymap-layout-group-changed", idx, 0);
 }

-static gboolean
-meta_backend_native_get_relative_motion_deltas (MetaBackend *backend,
-                                                const        ClutterEvent *event,
-                                                double       *dx,
-                                                double       *dy,
-                                                double       *dx_unaccel,
-                                                double       *dy_unaccel)
-{
-  return clutter_evdev_event_get_relative_motion (event,
-                                                  dx, dy,
-                                                  dx_unaccel, dy_unaccel);
-}
-
 static void
 meta_backend_native_class_init (MetaBackendNativeClass *klass)
 {
@@ -366,21 +321,15 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass)
  backend_class->set_keymap = meta_backend_native_set_keymap;
  backend_class->get_keymap = meta_backend_native_get_keymap;
  backend_class->lock_layout_group = meta_backend_native_lock_layout_group;
-  backend_class->get_relative_motion_deltas = meta_backend_native_get_relative_motion_deltas;
 }

 static void
 meta_backend_native_init (MetaBackendNative *native)
 {
  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
-  GError *error = NULL;

-  priv->launcher = meta_launcher_new (&error);
-  if (priv->launcher == NULL)
-    {
-      g_warning ("Can't initialize KMS backend: %s\n", error->message);
-      exit (1);
-    }
+  /* We're a display server, so start talking to weston-launch. */
+  priv->launcher = meta_launcher_new ();

  priv->barrier_manager = meta_barrier_manager_native_new ();

--- a/src/backends/native/meta-barrier-native.c
+++ b/src/backends/native/meta-barrier-native.c
@@ -93,18 +93,126 @@ next_serial (void)
  return barrier_serial;
 }

+typedef struct _Vector2
+{
+  float x, y;
+} Vector2;
+
+static float
+vector2_cross_product (Vector2 a, Vector2 b)
+{
+  return a.x * b.y - a.y * b.x;
+}
+
+static Vector2
+vector2_add (Vector2 a, Vector2 b)
+{
+  return (Vector2) {
+    .x = a.x + b.x,
+    .y = a.y + b.y,
+  };
+}
+
+static Vector2
+vector2_subtract (Vector2 a, Vector2 b)
+{
+  return (Vector2) {
+    .x = a.x - b.x,
+    .y = a.y - b.y,
+  };
+}
+
+static Vector2
+vector2_multiply_constant (float c, Vector2 a)
+{
+  return (Vector2) {
+    .x = c * a.x,
+    .y = c * a.y,
+  };
+}
+
+typedef struct _Line2
+{
+  Vector2 a;
+  Vector2 b;
+} Line2;
+
+static gboolean
+lines_intersect (Line2 *line1, Line2 *line2, Vector2 *intersection)
+{
+  Vector2 p = line1->a;
+  Vector2 r = vector2_subtract (line1->b, line1->a);
+  Vector2 q = line2->a;
+  Vector2 s = vector2_subtract (line2->b, line2->a);
+  float rxs;
+  float sxr;
+  float t;
+  float u;
+
+  /*
+   * The line (p, r) and (q, s) intersects where
+   *
+   *   p + t r = q + u s
+   *
+   * Calculate t:
+   *
+   *   (p + t r) × s = (q + u s) × s
+   *   p × s + t (r × s) = q × s + u (s × s)
+   *   p × s + t (r × s) = q × s
+   *   t (r × s) = q × s - p × s
+   *   t (r × s) = (q - p) × s
+   *   t = ((q - p) × s) / (r × s)
+   *
+   * Using the same method, for u we get:
+   *
+   *   u = ((p - q) × r) / (s × r)
+   */
+
+  rxs = vector2_cross_product (r, s);
+  sxr = vector2_cross_product (s, r);
+
+  /* If r × s = 0 then the lines are either parallel or collinear. */
+  if (fabs ( rxs) < DBL_MIN)
+    return FALSE;
+
+  t = vector2_cross_product (vector2_subtract (q, p), s) / rxs;
+  u = vector2_cross_product (vector2_subtract (p, q), r) / sxr;
+
+
+  /* The lines only intersect if 0 ≤ t ≤ 1 and 0 ≤ u ≤ 1. */
+  if (t < 0.0 || t > 1.0 || u < 0.0 || u > 1.0)
+    return FALSE;
+
+  *intersection = vector2_add (p, vector2_multiply_constant (t, r));
+
+  return TRUE;
+}
+
 static gboolean
 is_barrier_horizontal (MetaBarrier *barrier)
 {
-  return meta_border_is_horizontal (&barrier->priv->border);
+  return barrier->priv->y1 == barrier->priv->y2;
 }

 static gboolean
 is_barrier_blocking_directions (MetaBarrier         *barrier,
                                MetaBarrierDirection directions)
 {
-  return meta_border_is_blocking_directions (&barrier->priv->border,
-                                             directions);
+  /* Barriers doesn't block parallel motions. */
+  if (is_barrier_horizontal (barrier))
+    {
+      if ((directions & (META_BARRIER_DIRECTION_POSITIVE_Y |
+                         META_BARRIER_DIRECTION_NEGATIVE_Y)) == 0)
+        return FALSE;
+    }
+  else
+    {
+      if ((directions & (META_BARRIER_DIRECTION_POSITIVE_X |
+                         META_BARRIER_DIRECTION_NEGATIVE_X)) == 0)
+        return FALSE;
+    }
+
+  return (barrier->priv->directions & directions) != directions;
 }

 static void
@@ -116,16 +224,31 @@ dismiss_pointer (MetaBarrierImplNative *self)
  priv->state = META_BARRIER_STATE_LEFT;
 }

+static Line2
+barrier_to_line (MetaBarrier *barrier)
+{
+  return (Line2) {
+    .a = (Vector2) {
+      .x = MIN (barrier->priv->x1, barrier->priv->x2),
+      .y = MIN (barrier->priv->y1, barrier->priv->y2),
+    },
+    .b = (Vector2) {
+      .x = MAX (barrier->priv->x1, barrier->priv->x2),
+      .y = MAX (barrier->priv->y1, barrier->priv->y2),
+    },
+  };
+}
+
 /*
 * Calculate the hit box for a held motion. The hit box is a 2 px wide region
 * in the opposite direction of every direction the barrier blocks. The purpose
 * of this is to allow small movements without receiving a "left" signal. This
 * heuristic comes from the X.org pointer barrier implementation.
 */
-static MetaLine2
+static Line2
 calculate_barrier_hit_box (MetaBarrier *barrier)
 {
-  MetaLine2 hit_box = barrier->priv->border.line;
+  Line2 hit_box = barrier_to_line (barrier);

  if (is_barrier_horizontal (barrier))
    {
@@ -150,8 +273,7 @@ calculate_barrier_hit_box (MetaBarrier *barrier)
 }

 static gboolean
-is_within_box (MetaLine2   box,
-               MetaVector2 point)
+is_within_box (Line2 box, Vector2 point)
 {
  return (point.x >= box.a.x && point.x < box.b.x &&
          point.y >= box.a.y && point.y < box.b.y);
@@ -166,8 +288,8 @@ maybe_release_barrier (gpointer key,
  MetaBarrierImplNativePrivate *priv =
    meta_barrier_impl_native_get_instance_private (self);
  MetaBarrier *barrier = priv->barrier;
-  MetaLine2 *motion = user_data;
-  MetaLine2 hit_box;
+  Line2 *motion = user_data;
+  Line2 hit_box;

  if (priv->state != META_BARRIER_STATE_HELD)
    return;
@@ -175,10 +297,8 @@ maybe_release_barrier (gpointer key,
  /* Release if we end up outside barrier end points. */
  if (is_barrier_horizontal (barrier))
    {
-      if (motion->b.x > MAX (barrier->priv->border.line.a.x,
-                             barrier->priv->border.line.b.x) ||
-          motion->b.x < MIN (barrier->priv->border.line.a.x,
-                             barrier->priv->border.line.b.x))
+      if (motion->b.x > MAX (barrier->priv->x1, barrier->priv->x2) ||
+          motion->b.x < MIN (barrier->priv->x1, barrier->priv->x2))
        {
          dismiss_pointer (self);
          return;
@@ -186,10 +306,8 @@ maybe_release_barrier (gpointer key,
    }
  else
    {
-      if (motion->b.y > MAX (barrier->priv->border.line.a.y,
-                             barrier->priv->border.line.b.y) ||
-          motion->b.y < MIN (barrier->priv->border.line.a.y,
-                             barrier->priv->border.line.b.y))
+      if (motion->b.y > MAX (barrier->priv->y1, barrier->priv->y2) ||
+          motion->b.y < MIN (barrier->priv->y1, barrier->priv->y2))
        {
          dismiss_pointer (self);
          return;
@@ -212,7 +330,7 @@ maybe_release_barriers (MetaBarrierManagerNative *manager,
                        float                     x,
                        float                     y)
 {
-  MetaLine2 motion = {
+  Line2 motion = {
    .a = {
      .x = prev_x,
      .y = prev_y,
@@ -232,7 +350,7 @@ typedef struct _MetaClosestBarrierData
 {
  struct
  {
-    MetaLine2                   motion;
+    Line2                       motion;
    MetaBarrierDirection        directions;
  } in;

@@ -253,7 +371,8 @@ update_closest_barrier (gpointer key,
    meta_barrier_impl_native_get_instance_private (self);
  MetaBarrier *barrier = priv->barrier;
  MetaClosestBarrierData *data = user_data;
-  MetaVector2 intersection;
+  Line2 barrier_line;
+  Vector2 intersection;
  float dx, dy;
  float distance_2;

@@ -272,9 +391,17 @@ update_closest_barrier (gpointer key,

  /* Check if the motion intersects with the barrier, and retrieve the
   * intersection point if any. */
-  if (!meta_line2_intersects_with (&barrier->priv->border.line,
-                                   &data->in.motion,
-                                   &intersection))
+  barrier_line = (Line2) {
+    .a = {
+      .x = barrier->priv->x1,
+      .y = barrier->priv->y1
+    },
+    .b = {
+      .x = barrier->priv->x2,
+      .y = barrier->priv->y2
+    },
+  };
+  if (!lines_intersect (&barrier_line, &data->in.motion, &intersection))
    return;

  /* Calculate the distance to the barrier and keep track of the closest
@@ -443,9 +570,9 @@ clamp_to_barrier (MetaBarrierImplNative *self,
  if (is_barrier_horizontal (barrier))
    {
      if (*motion_dir & META_BARRIER_DIRECTION_POSITIVE_Y)
-        *y = barrier->priv->border.line.a.y;
+        *y = barrier->priv->y1;
      else if (*motion_dir & META_BARRIER_DIRECTION_NEGATIVE_Y)
-        *y = barrier->priv->border.line.a.y;
+        *y = barrier->priv->y1;

      priv->blocked_dir = *motion_dir & (META_BARRIER_DIRECTION_POSITIVE_Y |
                                         META_BARRIER_DIRECTION_NEGATIVE_Y);
@@ -455,9 +582,9 @@ clamp_to_barrier (MetaBarrierImplNative *self,
  else
    {
      if (*motion_dir & META_BARRIER_DIRECTION_POSITIVE_X)
-        *x = barrier->priv->border.line.a.x;
+        *x = barrier->priv->x1;
      else if (*motion_dir & META_BARRIER_DIRECTION_NEGATIVE_X)
-        *x = barrier->priv->border.line.a.x;
+        *x = barrier->priv->x1;

      priv->blocked_dir = *motion_dir & (META_BARRIER_DIRECTION_POSITIVE_X |
                                         META_BARRIER_DIRECTION_NEGATIVE_X);
--- a/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c
@@ -26,16 +26,11 @@

 #include "meta-cursor-renderer-native.h"

-#include <string.h>
 #include <gbm.h>
 #include <xf86drm.h>
-#include <errno.h>
-
-#include <meta/util.h>
-#include <meta/meta-backend.h>

+#include "meta-cursor-private.h"
 #include "meta-monitor-manager-private.h"
-#include "meta/boxes.h"

 #ifndef DRM_CAP_CURSOR_WIDTH
 #define DRM_CAP_CURSOR_WIDTH 0x8
@@ -44,26 +39,11 @@
 #define DRM_CAP_CURSOR_HEIGHT 0x9
 #endif

-/* When animating a cursor, we usually call drmModeSetCursor2 once per frame.
- * Though, testing shows that we need to triple buffer the cursor buffer in
- * order to avoid glitches when animating the cursor, at least when running on
- * Intel. The reason for this might be (but is not confirmed to be) due to
- * the user space gbm_bo cache, making us reuse and overwrite the kernel side
- * buffer content before it was scanned out. To avoid this, we keep a user space
- * reference to each buffer we set until at least one frame after it was drawn.
- * In effect, this means we three active cursor gbm_bo's: one that that just has
- * been set, one that was previously set and may or may not have been scanned
- * out, and one pending that will be replaced if the cursor sprite changes.
- */
-#define HW_CURSOR_BUFFER_COUNT 3
-
-static GQuark quark_cursor_sprite = 0;
-
 struct _MetaCursorRendererNativePrivate
 {
  gboolean has_hw_cursor;

-  MetaCursorSprite *last_cursor;
+  MetaCursorReference *last_cursor;
  guint animation_timeout_id;

  int drm_fd;
@@ -74,25 +54,8 @@ struct _MetaCursorRendererNativePrivate
 };
 typedef struct _MetaCursorRendererNativePrivate MetaCursorRendererNativePrivate;

-typedef enum _MetaCursorGbmBoState
-{
-  META_CURSOR_GBM_BO_STATE_NONE,
-  META_CURSOR_GBM_BO_STATE_SET,
-  META_CURSOR_GBM_BO_STATE_INVALIDATED,
-} MetaCursorGbmBoState;
-
-typedef struct _MetaCursorNativePrivate
-{
-  guint active_bo;
-  MetaCursorGbmBoState pending_bo_state;
-  struct gbm_bo *bos[HW_CURSOR_BUFFER_COUNT];
-} MetaCursorNativePrivate;
-
 G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRendererNative, meta_cursor_renderer_native, META_TYPE_CURSOR_RENDERER);

-static MetaCursorNativePrivate *
-ensure_cursor_priv (MetaCursorSprite *cursor_sprite);
-
 static void
 meta_cursor_renderer_native_finalize (GObject *object)
 {
@@ -102,139 +65,69 @@ meta_cursor_renderer_native_finalize (GObject *object)
  if (priv->animation_timeout_id)
    g_source_remove (priv->animation_timeout_id);

+  if (priv->gbm)
+    gbm_device_destroy (priv->gbm);
+
  G_OBJECT_CLASS (meta_cursor_renderer_native_parent_class)->finalize (object);
 }

-static guint
-get_pending_cursor_sprite_gbm_bo_index (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-
-  return (cursor_priv->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
-}
-
-static struct gbm_bo *
-get_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-  guint pending_bo;
-
-  if (!cursor_priv)
-    return NULL;
-
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  return cursor_priv->bos[pending_bo];
-}
-
-static struct gbm_bo *
-get_active_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-
-  if (!cursor_priv)
-    return NULL;
-
-  return cursor_priv->bos[cursor_priv->active_bo];
-}
-
-static void
-set_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite,
-                                  struct gbm_bo    *bo)
-{
-  MetaCursorNativePrivate *cursor_priv;
-  guint pending_bo;
-
-  cursor_priv = ensure_cursor_priv (cursor_sprite);
-
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  cursor_priv->bos[pending_bo] = bo;
-  cursor_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_SET;
-}
-
 static void
 set_crtc_cursor (MetaCursorRendererNative *native,
                 MetaCRTC                 *crtc,
-                 MetaCursorSprite         *cursor_sprite,
+                 MetaCursorReference      *cursor,
                 gboolean                  force)
 {
  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);

-  if (cursor_sprite)
+  if (crtc->cursor == cursor && !force)
+    return;
+
+  crtc->cursor = cursor;
+
+  if (cursor)
    {
-      MetaCursorNativePrivate *cursor_priv =
-        g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
      struct gbm_bo *bo;
      union gbm_bo_handle handle;
      int hot_x, hot_y;

-      if (cursor_priv->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
-        bo = get_pending_cursor_sprite_gbm_bo (cursor_sprite);
-      else
-        bo = get_active_cursor_sprite_gbm_bo (cursor_sprite);
-
-      if (!force && bo == crtc->cursor_renderer_private)
-        return;
-
-      crtc->cursor_renderer_private = bo;
+      bo = meta_cursor_reference_get_gbm_bo (cursor, &hot_x, &hot_y);

      handle = gbm_bo_get_handle (bo);
-      meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
-
      drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32,
                         priv->cursor_width, priv->cursor_height, hot_x, hot_y);
-
-      if (cursor_priv->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
-        {
-          cursor_priv->active_bo =
-            (cursor_priv->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
-          cursor_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_NONE;
-        }
    }
  else
    {
-      if (force || crtc->cursor_renderer_private != NULL)
-        {
-          drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
-          crtc->cursor_renderer_private = NULL;
-        }
+      drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
    }
 }

 static void
 update_hw_cursor (MetaCursorRendererNative *native,
-                  MetaCursorSprite         *cursor_sprite,
                  gboolean                  force)
 {
  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
  MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
+  const MetaRectangle *cursor_rect = meta_cursor_renderer_get_rect (renderer);
+  MetaCursorReference *cursor = meta_cursor_renderer_get_cursor (renderer);
  MetaMonitorManager *monitors;
  MetaCRTC *crtcs;
  unsigned int i, n_crtcs;
-  MetaRectangle rect;

  monitors = meta_monitor_manager_get ();
  meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);

-  if (cursor_sprite)
-    rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
-  else
-    rect = (MetaRectangle) { 0 };
-
  for (i = 0; i < n_crtcs; i++)
    {
-      gboolean crtc_should_use_cursor;
-      MetaCursorSprite *crtc_cursor;
+      gboolean crtc_should_have_cursor;
+      MetaCursorReference *crtc_cursor;
      MetaRectangle *crtc_rect;

      crtc_rect = &crtcs[i].rect;

-      crtc_should_use_cursor = (priv->has_hw_cursor &&
-                                meta_rectangle_overlap (&rect, crtc_rect));
-      if (crtc_should_use_cursor)
-        crtc_cursor = cursor_sprite;
+      crtc_should_have_cursor = (priv->has_hw_cursor && meta_rectangle_overlap (cursor_rect, crtc_rect));
+      if (crtc_should_have_cursor)
+        crtc_cursor = cursor;
      else
        crtc_cursor = NULL;

@@ -243,111 +136,49 @@ update_hw_cursor (MetaCursorRendererNative *native,
      if (crtc_cursor)
        {
          drmModeMoveCursor (priv->drm_fd, crtcs[i].crtc_id,
-                             rect.x - crtc_rect->x,
-                             rect.y - crtc_rect->y);
+                             cursor_rect->x - crtc_rect->x,
+                             cursor_rect->y - crtc_rect->y);
        }
    }
 }

 static gboolean
-has_valid_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
+should_have_hw_cursor (MetaCursorRenderer *renderer)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
+  MetaCursorReference *cursor = meta_cursor_renderer_get_cursor (renderer);

-  if (!cursor_priv)
+  if (cursor)
+    return (meta_cursor_reference_get_gbm_bo (cursor, NULL, NULL) != NULL);
+  else
    return FALSE;
-
-  switch (cursor_priv->pending_bo_state)
-    {
-    case META_CURSOR_GBM_BO_STATE_NONE:
-      return get_active_cursor_sprite_gbm_bo (cursor_sprite) != NULL;
-    case META_CURSOR_GBM_BO_STATE_SET:
-      return TRUE;
-    case META_CURSOR_GBM_BO_STATE_INVALIDATED:
-      return FALSE;
-    }
-
-  g_assert_not_reached ();
-
-  return FALSE;
-}
-
-static gboolean
-cursor_over_transformed_crtc (MetaCursorRenderer *renderer,
-                              MetaCursorSprite   *cursor_sprite)
-{
-  MetaMonitorManager *monitors;
-  MetaCRTC *crtcs;
-  unsigned int i, n_crtcs;
-  MetaRectangle rect;
-
-  monitors = meta_monitor_manager_get ();
-  meta_monitor_manager_get_resources (monitors, NULL, NULL,
-                                      &crtcs, &n_crtcs, NULL, NULL);
-  rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
-
-  for (i = 0; i < n_crtcs; i++)
-    {
-      if (!meta_rectangle_overlap (&rect, &crtcs[i].rect))
-        continue;
-
-      if (crtcs[i].transform != META_MONITOR_TRANSFORM_NORMAL)
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-should_have_hw_cursor (MetaCursorRenderer *renderer,
-                       MetaCursorSprite   *cursor_sprite)
-{
-  CoglTexture *texture;
-
-  if (!cursor_sprite)
-    return FALSE;
-
-  if (cursor_over_transformed_crtc (renderer, cursor_sprite))
-    return FALSE;
-
-  texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
-  if (!texture)
-    return FALSE;
-
-  if (meta_cursor_sprite_get_texture_scale (cursor_sprite) != 1)
-    return FALSE;
-
-  if (!has_valid_cursor_sprite_gbm_bo (cursor_sprite))
-    return FALSE;
-
-  return TRUE;
 }

 static gboolean
 meta_cursor_renderer_native_update_animation (MetaCursorRendererNative *native)
 {
  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
-  MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
-  MetaCursorSprite *cursor_sprite = meta_cursor_renderer_get_cursor (renderer);
+  MetaCursorReference *cursor;

  priv->animation_timeout_id = 0;
-  meta_cursor_sprite_tick_frame (cursor_sprite);
-  meta_cursor_renderer_force_update (renderer);
+  cursor = meta_cursor_renderer_get_cursor (META_CURSOR_RENDERER (native));
+  meta_cursor_reference_tick_frame (cursor);
+  meta_cursor_renderer_force_update (META_CURSOR_RENDERER (native));
+  meta_cursor_renderer_native_force_update (native);

  return G_SOURCE_REMOVE;
 }

 static void
-meta_cursor_renderer_native_trigger_frame (MetaCursorRendererNative *native,
-                                           MetaCursorSprite         *cursor_sprite)
+meta_cursor_renderer_native_trigger_frame (MetaCursorRendererNative *native)
 {
  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorReference *cursor;
  gboolean cursor_change;
  guint delay;

-  cursor_change = cursor_sprite != priv->last_cursor;
-  priv->last_cursor = cursor_sprite;
+  cursor = meta_cursor_renderer_get_cursor (META_CURSOR_RENDERER (native));
+  cursor_change = cursor != priv->last_cursor;
+  priv->last_cursor = cursor;

  if (!cursor_change && priv->animation_timeout_id)
    return;
@@ -358,9 +189,9 @@ meta_cursor_renderer_native_trigger_frame (MetaCursorRendererNative *native,
      priv->animation_timeout_id = 0;
    }

-  if (cursor_sprite && meta_cursor_sprite_is_animated (cursor_sprite))
+  if (cursor && meta_cursor_reference_is_animated (cursor))
    {
-      delay = meta_cursor_sprite_get_current_frame_time (cursor_sprite);
+      delay = meta_cursor_reference_get_current_frame_time (cursor);

      if (delay == 0)
        return;
@@ -375,250 +206,18 @@ meta_cursor_renderer_native_trigger_frame (MetaCursorRendererNative *native,
 }

 static gboolean
-meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *renderer,
-                                           MetaCursorSprite   *cursor_sprite)
+meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *renderer)
 {
  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);

-  if (cursor_sprite)
-    meta_cursor_sprite_realize_texture (cursor_sprite);
+  meta_cursor_renderer_native_trigger_frame (native);

-  meta_cursor_renderer_native_trigger_frame (native, cursor_sprite);
-
-  priv->has_hw_cursor = should_have_hw_cursor (renderer, cursor_sprite);
-  update_hw_cursor (native, cursor_sprite, FALSE);
+  priv->has_hw_cursor = should_have_hw_cursor (renderer);
+  update_hw_cursor (native, FALSE);
  return priv->has_hw_cursor;
 }

-static void
-get_hardware_cursor_size (MetaCursorRendererNative *native,
-                          uint64_t *width, uint64_t *height)
-{
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
-
-  *width = priv->cursor_width;
-  *height = priv->cursor_height;
-}
-
-static void
-cursor_priv_free (gpointer data)
-{
-  MetaCursorNativePrivate *cursor_priv = data;
-  guint i;
-
-  if (!data)
-    return;
-
-  for (i = 0; i < HW_CURSOR_BUFFER_COUNT; i++)
-    g_clear_pointer (&cursor_priv->bos[0], (GDestroyNotify) gbm_bo_destroy);
-  g_slice_free (MetaCursorNativePrivate, cursor_priv);
-}
-
-static MetaCursorNativePrivate *
-ensure_cursor_priv (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-
-  if (!cursor_priv)
-    {
-      cursor_priv = g_slice_new0 (MetaCursorNativePrivate);
-      g_object_set_qdata_full (G_OBJECT (cursor_sprite),
-                               quark_cursor_sprite,
-                               cursor_priv,
-                               cursor_priv_free);
-    }
-
-  return cursor_priv;
-}
-
-static void
-load_cursor_sprite_gbm_buffer (MetaCursorRendererNative *native,
-                               MetaCursorSprite         *cursor_sprite,
-                               uint8_t                  *pixels,
-                               uint                      width,
-                               uint                      height,
-                               int                       rowstride,
-                               uint32_t                  gbm_format)
-{
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
-  uint64_t cursor_width, cursor_height;
-
-  get_hardware_cursor_size (native, &cursor_width, &cursor_height);
-
-  if (width > cursor_width || height > cursor_height)
-    {
-      meta_warning ("Invalid theme cursor size (must be at most %ux%u)\n",
-                    (unsigned int)cursor_width, (unsigned int)cursor_height);
-      return;
-    }
-
-  if (gbm_device_is_format_supported (priv->gbm, gbm_format,
-                                      GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE))
-    {
-      struct gbm_bo *bo;
-      uint8_t buf[4 * cursor_width * cursor_height];
-      uint i;
-
-      bo = gbm_bo_create (priv->gbm, cursor_width, cursor_height,
-                          gbm_format, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
-      if (!bo)
-        {
-          meta_warning ("Failed to allocate HW cursor buffer\n");
-          return;
-        }
-
-      memset (buf, 0, sizeof(buf));
-      for (i = 0; i < height; i++)
-        memcpy (buf + i * 4 * cursor_width, pixels + i * rowstride, width * 4);
-      if (gbm_bo_write (bo, buf, cursor_width * cursor_height * 4) != 0)
-        {
-          meta_warning ("Failed to write cursors buffer data: %s",
-                        g_strerror (errno));
-          gbm_bo_destroy (bo);
-          return;
-        }
-
-      set_pending_cursor_sprite_gbm_bo (cursor_sprite, bo);
-    }
-  else
-    {
-      meta_warning ("HW cursor for format %d not supported\n", gbm_format);
-    }
-}
-
-static void
-invalidate_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-  guint pending_bo;
-
-  if (!cursor_priv)
-    return;
-
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  g_clear_pointer (&cursor_priv->bos[pending_bo],
-                   (GDestroyNotify) gbm_bo_destroy);
-  cursor_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED;
-}
-
-#ifdef HAVE_WAYLAND
-static void
-meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                           MetaCursorSprite *cursor_sprite,
-                                                           struct wl_resource *buffer)
-{
-  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
-  uint32_t gbm_format;
-  uint64_t cursor_width, cursor_height;
-  CoglTexture *texture;
-  uint width, height;
-
-  /* Destroy any previous pending cursor buffer; we'll always either fail (which
-   * should unset, or succeed, which will set new buffer.
-   */
-  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite);
-
-  texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
-  width = cogl_texture_get_width (texture);
-  height = cogl_texture_get_height (texture);
-
-  struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (buffer);
-  if (shm_buffer)
-    {
-      int rowstride = wl_shm_buffer_get_stride (shm_buffer);
-      uint8_t *buffer_data;
-
-      wl_shm_buffer_begin_access (shm_buffer);
-
-      switch (wl_shm_buffer_get_format (shm_buffer))
-        {
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-        case WL_SHM_FORMAT_ARGB8888:
-          gbm_format = GBM_FORMAT_ARGB8888;
-          break;
-        case WL_SHM_FORMAT_XRGB8888:
-          gbm_format = GBM_FORMAT_XRGB8888;
-          break;
-#else
-        case WL_SHM_FORMAT_ARGB8888:
-          gbm_format = GBM_FORMAT_ARGB8888;
-          break;
-        case WL_SHM_FORMAT_XRGB8888:
-          gbm_format = GBM_FORMAT_XRGB8888;
-          break;
-#endif
-        default:
-          g_warn_if_reached ();
-          gbm_format = GBM_FORMAT_ARGB8888;
-        }
-
-      buffer_data = wl_shm_buffer_get_data (shm_buffer);
-      load_cursor_sprite_gbm_buffer (native,
-                                     cursor_sprite,
-                                     buffer_data,
-                                     width, height, rowstride,
-                                     gbm_format);
-
-      wl_shm_buffer_end_access (shm_buffer);
-    }
-  else
-    {
-      struct gbm_bo *bo;
-
-      /* HW cursors have a predefined size (at least 64x64), which usually is
-       * bigger than cursor theme size, so themed cursors must be padded with
-       * transparent pixels to fill the overlay. This is trivial if we have CPU
-       * access to the data, but it's not possible if the buffer is in GPU
-       * memory (and possibly tiled too), so if we don't get the right size, we
-       * fallback to GL. */
-      get_hardware_cursor_size (native, &cursor_width, &cursor_height);
-
-      if (width != cursor_width || height != cursor_height)
-        {
-          meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
-          return;
-        }
-
-      bo = gbm_bo_import (priv->gbm,
-                          GBM_BO_IMPORT_WL_BUFFER,
-                          buffer,
-                          GBM_BO_USE_CURSOR);
-      if (!bo)
-        {
-          meta_warning ("Importing HW cursor from wl_buffer failed\n");
-          return;
-        }
-
-      set_pending_cursor_sprite_gbm_bo (cursor_sprite, bo);
-    }
-}
-#endif
-
-static void
-meta_cursor_renderer_native_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                         MetaCursorSprite *cursor_sprite,
-                                                         XcursorImage *xc_image)
-{
-  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
-
-  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite);
-
-  load_cursor_sprite_gbm_buffer (native,
-                                 cursor_sprite,
-                                 (uint8_t *) xc_image->pixels,
-                                 xc_image->width,
-                                 xc_image->height,
-                                 xc_image->width * 4,
-                                 GBM_FORMAT_ARGB8888);
-}
-
 static void
 meta_cursor_renderer_native_class_init (MetaCursorRendererNativeClass *klass)
 {
@@ -627,22 +226,6 @@ meta_cursor_renderer_native_class_init (MetaCursorRendererNativeClass *klass)

  object_class->finalize = meta_cursor_renderer_native_finalize;
  renderer_class->update_cursor = meta_cursor_renderer_native_update_cursor;
-#ifdef HAVE_WAYLAND
-  renderer_class->realize_cursor_from_wl_buffer =
-    meta_cursor_renderer_native_realize_cursor_from_wl_buffer;
-#endif
-  renderer_class->realize_cursor_from_xcursor =
-    meta_cursor_renderer_native_realize_cursor_from_xcursor;
-
-  quark_cursor_sprite = g_quark_from_static_string ("-meta-cursor-native");
-}
-
-static void
-force_update_hw_cursor (MetaCursorRendererNative *native)
-{
-  MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
-
-  update_hw_cursor (native, meta_cursor_renderer_get_cursor (renderer), TRUE);
 }

 static void
@@ -650,7 +233,7 @@ on_monitors_changed (MetaMonitorManager       *monitors,
                     MetaCursorRendererNative *native)
 {
  /* Our tracking is all messed up, so force an update. */
-  force_update_hw_cursor (native);
+  update_hw_cursor (native, TRUE);
 }

 static void
@@ -669,7 +252,7 @@ meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
    {
      CoglRenderer *cogl_renderer = cogl_display_get_renderer (cogl_context_get_display (ctx));
      priv->drm_fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
-      priv->gbm = cogl_kms_renderer_get_gbm (cogl_renderer);
+      priv->gbm = gbm_create_device (priv->drm_fd);

      uint64_t width, height;
      if (drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_WIDTH, &width) == 0 &&
@@ -695,8 +278,18 @@ meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *native)
  return priv->gbm;
 }

+void
+meta_cursor_renderer_native_get_cursor_size (MetaCursorRendererNative *native,
+                                             uint64_t *width, uint64_t *height)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+
+  *width = priv->cursor_width;
+  *height = priv->cursor_height;
+}
+
 void
 meta_cursor_renderer_native_force_update (MetaCursorRendererNative *native)
 {
-  force_update_hw_cursor (native);
+  update_hw_cursor (native, TRUE);
 }
--- a/src/backends/native/meta-idle-monitor-native.c
+++ b/src/backends/native/meta-idle-monitor-native.c
@@ -164,36 +164,56 @@ meta_idle_monitor_native_init (MetaIdleMonitorNative *monitor_native)
  monitor->watches = g_hash_table_new_full (NULL, NULL, NULL, free_watch);
 }

+typedef struct {
+  MetaIdleMonitorNative *monitor_native;
+  GList *fired_watches;
+} CheckNativeClosure;
+
+static gboolean
+check_native_watch (gpointer key,
+                    gpointer value,
+                    gpointer user_data)
+{
+  MetaIdleMonitorWatchNative *watch_native = value;
+  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_native;
+  CheckNativeClosure *closure = user_data;
+  gboolean steal;
+
+  if (watch->timeout_msec == 0)
+    {
+      closure->fired_watches = g_list_prepend (closure->fired_watches, watch);
+      steal = TRUE;
+    }
+  else
+    {
+      g_source_set_ready_time (watch_native->timeout_source,
+                               closure->monitor_native->last_event_time +
+                               watch->timeout_msec * 1000);
+      steal = FALSE;
+    }
+
+  return steal;
+}
+
+static void
+fire_native_watch (gpointer watch,
+                   gpointer data)
+{
+  _meta_idle_monitor_watch_fire (watch);
+}
+
 void
 meta_idle_monitor_native_reset_idletime (MetaIdleMonitor *monitor)
 {
  MetaIdleMonitorNative *monitor_native = META_IDLE_MONITOR_NATIVE (monitor);
-  GList *node, *watch_ids;
+  CheckNativeClosure closure;

  monitor_native->last_event_time = g_get_monotonic_time ();

-  watch_ids = g_hash_table_get_keys (monitor->watches);
+  closure.monitor_native = monitor_native;
+  closure.fired_watches = NULL;
+  g_hash_table_foreach_steal (monitor->watches, check_native_watch, &closure);

-  for (node = watch_ids; node != NULL; node = node->next)
-    {
-      guint watch_id = GPOINTER_TO_UINT (node->data);
-      MetaIdleMonitorWatchNative *watch;
-
-      watch = g_hash_table_lookup (monitor->watches, GUINT_TO_POINTER (watch_id));
-      if (!watch)
-        continue;
-
-      if (watch->base.timeout_msec == 0)
-        {
-          _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
-        }
-      else
-        {
-          g_source_set_ready_time (watch->timeout_source,
-                                   monitor_native->last_event_time +
-                                   watch->base.timeout_msec * 1000);
-        }
-    }
-
-  g_list_free (watch_ids);
+  g_list_foreach (closure.fired_watches, fire_native_watch, NULL);
+  g_list_free (closure.fired_watches);
 }
--- a/src/backends/native/meta-input-settings-native.c
+++ b/src/backends/native/meta-input-settings-native.c
@@ -154,30 +154,30 @@ device_set_click_method (struct libinput_device            *libinput_device,
 }

 static void
-meta_input_settings_native_set_edge_scroll (MetaInputSettings            *settings,
-                                            ClutterInputDevice           *device,
-                                            gboolean                      edge_scrolling_enabled)
+meta_input_settings_native_set_scroll_method (MetaInputSettings            *settings,
+                                              ClutterInputDevice           *device,
+                                              GDesktopTouchpadScrollMethod  mode)
 {
  enum libinput_config_scroll_method scroll_method = 0;
  struct libinput_device *libinput_device;
-  enum libinput_config_scroll_method supported;

  libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-  supported = libinput_device_config_scroll_get_methods (libinput_device);

-  if (supported & LIBINPUT_CONFIG_SCROLL_2FG)
-    {
-      scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
-    }
-  else if (supported & LIBINPUT_CONFIG_SCROLL_EDGE &&
-           edge_scrolling_enabled)
-    {
-      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
-    }
-  else
+  switch (mode)
    {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
      scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
-    }
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+      break;
+    default:
+      g_assert_not_reached ();
+      return;
+  }

  device_set_scroll_method (libinput_device, scroll_method);
 }
@@ -252,7 +252,7 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass)
  input_settings_class->set_left_handed = meta_input_settings_native_set_left_handed;
  input_settings_class->set_tap_enabled = meta_input_settings_native_set_tap_enabled;
  input_settings_class->set_invert_scroll = meta_input_settings_native_set_invert_scroll;
-  input_settings_class->set_edge_scroll = meta_input_settings_native_set_edge_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_native_set_scroll_method;
  input_settings_class->set_scroll_button = meta_input_settings_native_set_scroll_button;
  input_settings_class->set_click_method = meta_input_settings_native_set_click_method;
  input_settings_class->set_keyboard_repeat = meta_input_settings_native_set_keyboard_repeat;
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@@ -37,7 +37,6 @@
 #include <unistd.h>

 #include <systemd/sd-login.h>
-#include <gudev/gudev.h>

 #include "dbus-utils.h"
 #include "meta-dbus-login1.h"
@@ -46,12 +45,6 @@
 #include "meta-cursor-renderer-native.h"
 #include "meta-idle-monitor-native.h"

-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(Login1Session, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(Login1Seat, g_object_unref)
-
 struct _MetaLauncher
 {
  Login1Session *session_proxy;
@@ -61,21 +54,14 @@ struct _MetaLauncher
 };

 static Login1Session *
-get_session_proxy (GCancellable *cancellable,
-                   GError      **error)
+get_session_proxy (GCancellable *cancellable)
 {
-  g_autofree char *proxy_path = NULL;
-  g_autofree char *session_id = NULL;
+  char *proxy_path;
+  char *session_id;
  Login1Session *session_proxy;

  if (sd_pid_get_session (getpid (), &session_id) < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get session ID: %m");
-      return NULL;
-    }
+    return NULL;

  proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/session", session_id);

@@ -83,37 +69,31 @@ get_session_proxy (GCancellable *cancellable,
                                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
                                                         "org.freedesktop.login1",
                                                         proxy_path,
-                                                         cancellable, error);
-  if (!session_proxy)
-    g_prefix_error(error, "Could not get session proxy: ");
+                                                         cancellable, NULL);
+  free (proxy_path);

  return session_proxy;
 }

 static Login1Seat *
-get_seat_proxy (GCancellable *cancellable,
-                GError      **error)
+get_seat_proxy (GCancellable *cancellable)
 {
-  Login1Seat *seat = login1_seat_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                                                         "org.freedesktop.login1",
-                                                         "/org/freedesktop/login1/seat/self",
-                                                         cancellable, error);
-  if (!seat)
-    g_prefix_error(error, "Could not get seat proxy: ");
-
-  return seat;
+  return login1_seat_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                             G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                             "org.freedesktop.login1",
+                                             "/org/freedesktop/login1/seat/self",
+                                             cancellable, NULL);
 }

 static void
 session_unpause (void)
 {
-  ClutterBackend *clutter_backend;
+  ClutterBackend *backend;
  CoglContext *cogl_context;
  CoglDisplay *cogl_display;

-  clutter_backend = clutter_get_default_backend ();
-  cogl_context = clutter_backend_get_cogl_context (clutter_backend);
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
  cogl_display = cogl_context_get_display (cogl_context);
  cogl_kms_display_queue_modes_reset (cogl_display);

@@ -282,111 +262,25 @@ on_active_changed (Login1Session *session,
  sync_active (self);
 }

-static gchar *
-get_primary_gpu_path (const gchar *seat_name)
-{
-  const gchar *subsystems[] = {"drm", NULL};
-  gchar *path = NULL;
-  GList *devices, *tmp;
-
-  g_autoptr (GUdevClient) gudev_client = g_udev_client_new (subsystems);
-  g_autoptr (GUdevEnumerator) enumerator = g_udev_enumerator_new (gudev_client);
-
-  g_udev_enumerator_add_match_name (enumerator, "card*");
-  g_udev_enumerator_add_match_tag (enumerator, "seat");
-
-  devices = g_udev_enumerator_execute (enumerator);
-  if (!devices)
-    goto out;
-
-  for (tmp = devices; tmp != NULL; tmp = tmp->next)
-    {
-      g_autoptr (GUdevDevice) platform_device = NULL;
-      g_autoptr (GUdevDevice) pci_device = NULL;
-      GUdevDevice *dev = tmp->data;
-      gint boot_vga;
-      const gchar *device_seat;
-
-      /* filter out devices that are not character device, like card0-VGA-1 */
-      if (g_udev_device_get_device_type (dev) != G_UDEV_DEVICE_TYPE_CHAR)
-        continue;
-
-      device_seat = g_udev_device_get_property (dev, "ID_SEAT");
-      if (!device_seat)
-        {
-          /* when ID_SEAT is not set, it means seat0 */
-          device_seat = "seat0";
-        }
-      else if (g_strcmp0 (device_seat, "seat0") != 0)
-        {
-          /* if the device has been explicitly assigned other seat
-           * than seat0, it is probably the right device to use */
-          path = g_strdup (g_udev_device_get_device_file (dev));
-          break;
-        }
-
-      /* skip devices that do not belong to our seat */
-      if (g_strcmp0 (seat_name, device_seat))
-        continue;
-
-      platform_device = g_udev_device_get_parent_with_subsystem (dev, "platform", NULL);
-      if (platform_device != NULL)
-        {
-          path = g_strdup (g_udev_device_get_device_file (dev));
-          break;
-        }
-
-      pci_device = g_udev_device_get_parent_with_subsystem (dev, "pci", NULL);
-      if (pci_device != NULL)
-        {
-          /* get value of boot_vga attribute or 0 if the device has no boot_vga */
-          boot_vga = g_udev_device_get_sysfs_attr_as_int (pci_device, "boot_vga");
-          if (boot_vga == 1)
-            {
-              /* found the boot_vga device */
-              path = g_strdup (g_udev_device_get_device_file (dev));
-              break;
-            }
-        }
-    }
-
-  g_list_free_full (devices, g_object_unref);
-
-out:
-  return path;
-}
-
 static gboolean
 get_kms_fd (Login1Session *session_proxy,
-            const gchar   *seat_id,
-            int           *fd_out,
-            GError       **error)
+            int *fd_out)
 {
  int major, minor;
  int fd;
+  GError *error = NULL;

-  g_autofree gchar *path = get_primary_gpu_path (seat_id);
-  if (!path)
+  /* XXX -- use udev to find the DRM master device */
+  if (!get_device_info_from_path ("/dev/dri/card0", &major, &minor))
    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "could not find drm kms device");
+      g_warning ("Could not stat /dev/dri/card0: %m");
      return FALSE;
    }

-  if (!get_device_info_from_path (path, &major, &minor))
+  if (!take_device (session_proxy, major, minor, &fd, NULL, &error))
    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get device info for path %s: %m", path);
-      return FALSE;
-    }
-
-  if (!take_device (session_proxy, major, minor, &fd, NULL, error))
-    {
-      g_prefix_error (error, "Could not open DRM device: ");
+      g_warning ("Could not open DRM device: %s\n", error->message);
+      g_error_free (error);
      return FALSE;
    }

@@ -395,72 +289,28 @@ get_kms_fd (Login1Session *session_proxy,
  return TRUE;
 }

-static gchar *
-get_seat_id (GError **error)
-{
-  g_autofree char *session_id = NULL;
-  char *seat_id = NULL;
-  int r;
-
-  r = sd_pid_get_session (0, &session_id);
-  if (r < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get session for PID: %s", g_strerror (-r));
-      return NULL;
-    }
-
-  r = sd_session_get_seat (session_id, &seat_id);
-  if (r < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get seat for session: %s", g_strerror (-r));
-      return NULL;
-    }
-
-  return seat_id;
-}
-
 MetaLauncher *
-meta_launcher_new (GError **error)
+meta_launcher_new (void)
 {
  MetaLauncher *self = NULL;
-  g_autoptr (Login1Session) session_proxy = NULL;
-  g_autoptr (Login1Seat) seat_proxy = NULL;
-  g_autofree char *seat_id = NULL;
-  gboolean have_control = FALSE;
+  Login1Session *session_proxy;
+  GError *error = NULL;
  int kms_fd;

-  session_proxy = get_session_proxy (NULL, error);
-  if (!session_proxy)
-    goto fail;
-
-  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, error))
+  session_proxy = get_session_proxy (NULL);
+  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, &error))
    {
-      g_prefix_error (error, "Could not take control: ");
-      goto fail;
+      g_warning ("Could not take control: %s", error->message);
+      g_error_free (error);
+      goto out;
    }

-  have_control = TRUE;
-
-  seat_id = get_seat_id (error);
-  if (!seat_id)
-    goto fail;
-
-  seat_proxy = get_seat_proxy (NULL, error);
-  if (!seat_proxy)
-    goto fail;
-
-  if (!get_kms_fd (session_proxy, seat_id, &kms_fd, error))
-    goto fail;
+  if (!get_kms_fd (session_proxy, &kms_fd))
+    goto out;

  self = g_slice_new0 (MetaLauncher);
  self->session_proxy = g_object_ref (session_proxy);
-  self->seat_proxy = g_object_ref (seat_proxy);
+  self->seat_proxy = get_seat_proxy (NULL);

  self->session_active = TRUE;

@@ -470,12 +320,11 @@ meta_launcher_new (GError **error)
                                      self);

  g_signal_connect (self->session_proxy, "notify::active", G_CALLBACK (on_active_changed), self);
-  return self;

- fail:
-  if (have_control)
-    login1_session_call_release_control_sync (session_proxy, NULL, NULL);
-  return NULL;
+out:
+  g_object_unref (session_proxy);
+
+  return self;
 }

 void
--- a/src/backends/native/meta-launcher.h
+++ b/src/backends/native/meta-launcher.h
@@ -24,7 +24,7 @@

 typedef struct _MetaLauncher MetaLauncher;

-MetaLauncher     *meta_launcher_new                     (GError       **error);
+MetaLauncher     *meta_launcher_new                     (void);
 void              meta_launcher_free                    (MetaLauncher  *self);

 gboolean          meta_launcher_activate_session        (MetaLauncher  *self,
--- a/src/backends/native/meta-monitor-manager-kms.c
+++ b/src/backends/native/meta-monitor-manager-kms.c
@@ -42,8 +42,6 @@

 #include <gudev/gudev.h>

-#define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
-
 typedef struct {
  drmModeConnector *connector;

@@ -68,9 +66,6 @@ typedef struct {
  uint32_t underscan_prop_id;
  uint32_t underscan_hborder_prop_id;
  uint32_t underscan_vborder_prop_id;
-  uint32_t primary_plane_id;
-  uint32_t rotation_prop_id;
-  uint32_t rotation_map[ALL_TRANSFORMS];
 } MetaCRTCKms;

 struct _MetaMonitorManagerKms
@@ -434,137 +429,6 @@ get_output_scale (MetaMonitorManager *manager,
    return compute_scale (output);
 }

-static int
-find_property_index (MetaMonitorManager         *manager,
-                     drmModeObjectPropertiesPtr  props,
-                     const gchar                *prop_name,
-                     drmModePropertyPtr         *found)
-{
-  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
-  unsigned int i;
-
-  for (i = 0; i < props->count_props; i++)
-    {
-      drmModePropertyPtr prop;
-
-      prop = drmModeGetProperty (manager_kms->fd, props->props[i]);
-      if (!prop)
-        continue;
-
-      if (strcmp (prop->name, prop_name) == 0)
-        {
-          *found = prop;
-          return i;
-        }
-
-      drmModeFreeProperty (prop);
-    }
-
-  return -1;
-}
-
-static void
-parse_transforms (MetaMonitorManager *manager,
-                  drmModePropertyPtr  prop,
-                  MetaCRTC           *crtc)
-{
-  MetaCRTCKms *crtc_kms = crtc->driver_private;
-  int i;
-
-  for (i = 0; i < prop->count_enums; i++)
-    {
-      int cur = -1;
-
-      if (strcmp (prop->enums[i].name, "rotate-0") == 0)
-        cur = META_MONITOR_TRANSFORM_NORMAL;
-      else if (strcmp (prop->enums[i].name, "rotate-90") == 0)
-        cur = META_MONITOR_TRANSFORM_90;
-      else if (strcmp (prop->enums[i].name, "rotate-180") == 0)
-        cur = META_MONITOR_TRANSFORM_180;
-      else if (strcmp (prop->enums[i].name, "rotate-270") == 0)
-        cur = META_MONITOR_TRANSFORM_270;
-
-      if (cur != -1)
-        {
-          crtc->all_transforms |= 1 << cur;
-          crtc_kms->rotation_map[cur] = 1 << prop->enums[i].value;
-        }
-    }
-}
-
-static gboolean
-is_primary_plane (MetaMonitorManager         *manager,
-                  drmModeObjectPropertiesPtr  props)
-{
-  drmModePropertyPtr prop;
-  int idx;
-
-  idx = find_property_index (manager, props, "type", &prop);
-  if (idx < 0)
-    return FALSE;
-
-  drmModeFreeProperty (prop);
-  return props->prop_values[idx] == DRM_PLANE_TYPE_PRIMARY;
-}
-
-static void
-init_crtc_rotations (MetaMonitorManager *manager,
-                     MetaCRTC           *crtc,
-                     unsigned int        idx)
-{
-  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
-  drmModeObjectPropertiesPtr props;
-  drmModePlaneRes *planes;
-  drmModePlane *drm_plane;
-  MetaCRTCKms *crtc_kms;
-  unsigned int i;
-
-  crtc_kms = crtc->driver_private;
-
-  planes = drmModeGetPlaneResources(manager_kms->fd);
-  if (planes == NULL)
-    return;
-
-  for (i = 0; i < planes->count_planes; i++)
-    {
-      drmModePropertyPtr prop;
-
-      drm_plane = drmModeGetPlane (manager_kms->fd, planes->planes[i]);
-
-      if (!drm_plane)
-        continue;
-
-      if ((drm_plane->possible_crtcs & (1 << idx)))
-        {
-          props = drmModeObjectGetProperties (manager_kms->fd,
-                                              drm_plane->plane_id,
-                                              DRM_MODE_OBJECT_PLANE);
-
-          if (props && is_primary_plane (manager, props))
-            {
-              int rotation_idx;
-
-              crtc_kms->primary_plane_id = drm_plane->plane_id;
-              rotation_idx = find_property_index (manager, props, "rotation", &prop);
-
-              if (rotation_idx >= 0)
-                {
-                  crtc_kms->rotation_prop_id = props->props[rotation_idx];
-                  parse_transforms (manager, prop, crtc);
-                  drmModeFreeProperty (prop);
-                }
-            }
-
-          if (props)
-            drmModeFreeObjectProperties (props);
-        }
-
-      drmModeFreePlane (drm_plane);
-    }
-
-  drmModeFreePlaneResources (planes);
-}
-
 static void
 meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
 {
@@ -632,18 +496,8 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
      meta_mode->name = g_strndup (mode->name, DRM_DISPLAY_MODE_LEN);
      meta_mode->width = mode->hdisplay;
      meta_mode->height = mode->vdisplay;
-
-      /* Calculate refresh rate in milliHz first for extra precision. */
-      meta_mode->refresh_rate = (mode->clock * 1000000LL) / mode->htotal;
-      meta_mode->refresh_rate += (mode->vtotal / 2);
-      meta_mode->refresh_rate /= mode->vtotal;
-      if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-	meta_mode->refresh_rate *= 2;
-      if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-        meta_mode->refresh_rate /= 2;
-      if (mode->vscan > 1)
-        meta_mode->refresh_rate /= mode->vscan;
-      meta_mode->refresh_rate /= 1000.0;
+      meta_mode->refresh_rate = (1000 * mode->clock /
+                                 ((float)mode->htotal * mode->vtotal));

      meta_mode->driver_private = g_slice_dup (drmModeModeInfo, mode);
      meta_mode->driver_notify = (GDestroyNotify)meta_monitor_mode_destroy_notify;
@@ -692,7 +546,6 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
      meta_crtc->driver_private = g_new0 (MetaCRTCKms, 1);
      meta_crtc->driver_notify = (GDestroyNotify) meta_crtc_destroy_notify;
      find_crtc_properties (manager_kms, meta_crtc);
-      init_crtc_rotations (manager, meta_crtc, i);

      drmModeFreeCrtc (crtc);
    }
@@ -1075,7 +928,6 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
    {
      MetaCRTCInfo *crtc_info = crtcs[i];
      MetaCRTC *crtc = crtc_info->crtc;
-      MetaCRTCKms *crtc_kms = crtc->driver_private;
      CoglKmsCrtc *cogl_crtc;

      crtc->is_dirty = TRUE;
@@ -1148,13 +1000,6 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
          crtc->current_mode = mode;
          crtc->transform = crtc_info->transform;
        }
-
-      if (crtc->all_transforms & (1 << crtc->transform))
-        drmModeObjectSetProperty (manager_kms->fd,
-                                  crtc_kms->primary_plane_id,
-                                  DRM_MODE_OBJECT_PLANE,
-                                  crtc_kms->rotation_prop_id,
-                                  crtc_kms->rotation_map[crtc->transform]);
    }

  /* Disable CRTCs not mentioned in the list (they have is_dirty == FALSE,
@@ -1307,8 +1152,6 @@ meta_monitor_manager_kms_init (MetaMonitorManagerKms *manager_kms)

  manager_kms->fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);

-  drmSetClientCap (manager_kms->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
-
  const char *subsystems[2] = { "drm", NULL };
  manager_kms->udev = g_udev_client_new (subsystems);
  g_signal_connect (manager_kms->udev, "uevent",
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -40,15 +40,12 @@
 #include "meta-idle-monitor-xsync.h"
 #include "meta-monitor-manager-xrandr.h"
 #include "backends/meta-monitor-manager-dummy.h"
-#include "backends/x11/nested/meta-cursor-renderer-x11-nested.h"
 #include "meta-cursor-renderer-x11.h"
-#ifdef HAVE_WAYLAND
-#include "wayland/meta-wayland.h"
-#endif

 #include <meta/util.h>
 #include "display-private.h"
 #include "compositor/compositor-private.h"
+#include "compositor/meta-sync-ring.h"

 typedef enum {
  /* We're a traditional CM running under the host. */
@@ -82,7 +79,6 @@ struct _MetaBackendX11Private
  gchar *keymap_layouts;
  gchar *keymap_variants;
  gchar *keymap_options;
-  int locked_group;
 };
 typedef struct _MetaBackendX11Private MetaBackendX11Private;

@@ -159,9 +155,10 @@ translate_crossing_event (MetaBackendX11 *x11,
    }

  Window stage_window = meta_backend_x11_get_xwindow (x11);
-  if (enter_event->event != stage_window &&
-      priv->mode == META_BACKEND_X11_MODE_COMPOSITOR)
+  if (enter_event->event != stage_window)
    {
+      /* See above for the rationale for this... */
+      g_assert (priv->mode == META_BACKEND_X11_MODE_COMPOSITOR);
      enter_event->event = meta_backend_x11_get_xwindow (x11);
      enter_event->event_x = enter_event->root_x;
      enter_event->event_y = enter_event->root_y;
@@ -271,50 +268,25 @@ handle_host_xevent (MetaBackend *backend,
        MetaCompositor *compositor = display->compositor;
        if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
          bypass_clutter = TRUE;
+        if (compositor->have_x11_sync_object)
+          meta_sync_ring_handle_event (event);
      }
  }

-  if (priv->mode == META_BACKEND_X11_MODE_NESTED && event->type == FocusIn)
-    {
-#ifdef HAVE_WAYLAND
-      Window xwin = meta_backend_x11_get_xwindow(x11);
-      XEvent xev;
-
-      if (event->xfocus.window == xwin)
-        {
-          /* Since we've selected for KeymapStateMask, every FocusIn is followed immediately
-           * by a KeymapNotify event */
-          XMaskEvent(priv->xdisplay, KeymapStateMask, &xev);
-          MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
-          meta_wayland_compositor_update_key_state (compositor, xev.xkeymap.key_vector, 32, 8);
-        }
-#else
-      g_assert_not_reached ();
-#endif
-    }
-
  if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))
    handle_alarm_notify (backend, event);

  if (event->type == priv->xkb_event_base)
    {
-      XkbEvent *xkb_ev = (XkbEvent *) event;
+      XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;

-      if (xkb_ev->any.device == META_VIRTUAL_CORE_KEYBOARD_ID)
+      if (xkb_ev->device == META_VIRTUAL_CORE_KEYBOARD_ID)
        {
-          switch (xkb_ev->any.xkb_type)
+          switch (xkb_ev->xkb_type)
            {
            case XkbNewKeyboardNotify:
            case XkbMapNotify:
              keymap_changed (backend);
-              break;
-            case XkbStateNotify:
-              if (xkb_ev->state.changed & XkbGroupLockMask)
-                {
-                  if (priv->locked_group != xkb_ev->state.locked_group)
-                    XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, priv->locked_group);
-                }
-              break;
            default:
              break;
            }
@@ -450,7 +422,6 @@ meta_backend_x11_post_init (MetaBackend *backend)
  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
  int major, minor;
-  gboolean has_xi = FALSE;

  priv->xdisplay = clutter_x11_get_default_display ();

@@ -460,23 +431,27 @@ meta_backend_x11_post_init (MetaBackend *backend)
      !XSyncInitialize (priv->xdisplay, &major, &minor))
    meta_fatal ("Could not initialize XSync");

-  if (XQueryExtension (priv->xdisplay,
-                       "XInputExtension",
-                       &priv->xinput_opcode,
-                       &priv->xinput_error_base,
-                       &priv->xinput_event_base))
-    {
-      major = 2; minor = 3;
-      if (XIQueryVersion (priv->xdisplay, &major, &minor) == Success)
-        {
-          int version = (major * 10) + minor;
-          if (version >= 22)
-            has_xi = TRUE;
-        }
-    }
+  {
+    int major = 2, minor = 3;
+    gboolean has_xi = FALSE;

-  if (!has_xi)
-    meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
+    if (XQueryExtension (priv->xdisplay,
+                         "XInputExtension",
+                         &priv->xinput_opcode,
+                         &priv->xinput_error_base,
+                         &priv->xinput_event_base))
+      {
+        if (XIQueryVersion (priv->xdisplay, &major, &minor) == Success)
+          {
+            int version = (major * 10) + minor;
+            if (version >= 22)
+              has_xi = TRUE;
+          }
+      }
+
+    if (!has_xi)
+      meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
+  }

  /* We only take the passive touch grab if we are a X11 compositor */
  if (priv->mode == META_BACKEND_X11_MODE_COMPOSITOR)
@@ -528,20 +503,7 @@ meta_backend_x11_create_monitor_manager (MetaBackend *backend)
 static MetaCursorRenderer *
 meta_backend_x11_create_cursor_renderer (MetaBackend *backend)
 {
-  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
-  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
-
-  switch (priv->mode)
-    {
-    case META_BACKEND_X11_MODE_COMPOSITOR:
-      return g_object_new (META_TYPE_CURSOR_RENDERER_X11, NULL);
-      break;
-    case META_BACKEND_X11_MODE_NESTED:
-      return g_object_new (META_TYPE_CURSOR_RENDERER_X11_NESTED, NULL);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
+  return g_object_new (META_TYPE_CURSOR_RENDERER_X11, NULL);
 }

 static gboolean
@@ -769,9 +731,6 @@ meta_backend_x11_get_keymap (MetaBackend *backend)
                                                     priv->xcb,
                                                     xkb_x11_get_core_keyboard_device_id (priv->xcb),
                                                     XKB_KEYMAP_COMPILE_NO_FLAGS);
-      if (priv->keymap == NULL)
-        priv->keymap = xkb_keymap_new_from_names (context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS);
-
      xkb_context_unref (context);
    }

@@ -785,7 +744,6 @@ meta_backend_x11_lock_layout_group (MetaBackend *backend,
  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);

-  priv->locked_group = idx;
  XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, idx);
 }

@@ -805,6 +763,8 @@ meta_backend_x11_update_screen_size (MetaBackend *backend,
    }
  else
    {
+      MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+      MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
      Window xwin = meta_backend_x11_get_xwindow (x11);
      XResizeWindow (priv->xdisplay, xwin, width, height);
    }
@@ -844,20 +804,6 @@ meta_backend_x11_select_stage_events (MetaBackend *backend)
    }

  XISelectEvents (priv->xdisplay, xwin, &mask, 1);
-
-  if (priv->mode == META_BACKEND_X11_MODE_NESTED)
-    {
-      /* We have no way of tracking key changes when the stage doesn't have
-       * focus, so we select for KeymapStateMask so that we get a complete
-       * dump of the keyboard state in a KeymapNotify event that immediately
-       * follows each FocusIn (and EnterNotify, but we ignore that.)
-       */
-      XWindowAttributes xwa;
-
-      XGetWindowAttributes(priv->xdisplay, xwin, &xwa);
-      XSelectInput(priv->xdisplay, xwin,
-                   xwa.your_event_mask | FocusChangeMask | KeymapStateMask);
-    }
 }

 static void
--- a/src/backends/x11/meta-barrier-x11.c
+++ b/src/backends/x11/meta-barrier-x11.c
@@ -107,7 +107,6 @@ meta_barrier_impl_x11_new (MetaBarrier *barrier)
  MetaDisplay *display = barrier->priv->display;
  Display *dpy;
  Window root;
-  unsigned int allowed_motion_dirs;

  if (display == NULL)
    {
@@ -122,14 +121,12 @@ meta_barrier_impl_x11_new (MetaBarrier *barrier)
  dpy = display->xdisplay;
  root = DefaultRootWindow (dpy);

-  allowed_motion_dirs =
-    meta_border_get_allows_directions (&barrier->priv->border);
  priv->xbarrier = XFixesCreatePointerBarrier (dpy, root,
-                                               barrier->priv->border.line.a.x,
-                                               barrier->priv->border.line.a.y,
-                                               barrier->priv->border.line.b.x,
-                                               barrier->priv->border.line.b.y,
-                                               allowed_motion_dirs,
+                                               barrier->priv->x1,
+                                               barrier->priv->y1,
+                                               barrier->priv->x2,
+                                               barrier->priv->y2,
+                                               barrier->priv->directions,
                                               0, NULL);

  g_hash_table_insert (display->xids, &priv->xbarrier, barrier);
--- a/src/backends/x11/meta-cursor-renderer-x11.c
+++ b/src/backends/x11/meta-cursor-renderer-x11.c
@@ -40,29 +40,25 @@ typedef struct _MetaCursorRendererX11Private MetaCursorRendererX11Private;
 G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRendererX11, meta_cursor_renderer_x11, META_TYPE_CURSOR_RENDERER);

 static gboolean
-meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer,
-                                        MetaCursorSprite   *cursor_sprite)
+meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer)
 {
  MetaCursorRendererX11 *x11 = META_CURSOR_RENDERER_X11 (renderer);
  MetaCursorRendererX11Private *priv = meta_cursor_renderer_x11_get_instance_private (x11);

  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
  Window xwindow = meta_backend_x11_get_xwindow (backend);
-  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);

  if (xwindow == None)
-    {
-      if (cursor_sprite)
-        meta_cursor_sprite_realize_texture (cursor_sprite);
-      return FALSE;
-    }
+    return FALSE;

+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
+
+  MetaCursorReference *cursor_ref = meta_cursor_renderer_get_cursor (renderer);
  gboolean has_server_cursor = FALSE;

-  if (cursor_sprite)
+  if (cursor_ref)
    {
-      MetaCursor cursor = meta_cursor_sprite_get_meta_cursor (cursor_sprite);
-
+      MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref);
      if (cursor != META_CURSOR_NONE)
        {
          Cursor xcursor = meta_cursor_create_x_cursor (xdisplay, cursor);
@@ -84,9 +80,6 @@ meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer,
      priv->server_cursor_visible = has_server_cursor;
    }

-  if (!priv->server_cursor_visible && cursor_sprite)
-    meta_cursor_sprite_realize_texture (cursor_sprite);
-
  return priv->server_cursor_visible;
 }

--- a/src/backends/x11/meta-idle-monitor-xsync.c
+++ b/src/backends/x11/meta-idle-monitor-xsync.c
@@ -107,6 +107,20 @@ set_alarm_enabled (Display    *dpy,
  XSyncChangeAlarm (dpy, alarm, XSyncCAEvents, &attr);
 }

+static void
+check_x11_watch (gpointer data,
+                 gpointer user_data)
+{
+  MetaIdleMonitorWatchXSync *watch_xsync = data;
+  MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_xsync;
+  XSyncAlarm alarm = (XSyncAlarm) user_data;
+
+  if (watch_xsync->xalarm != alarm)
+    return;
+
+  _meta_idle_monitor_watch_fire (watch);
+}
+
 static char *
 counter_name_for_device (int device_id)
 {
@@ -313,38 +327,13 @@ meta_idle_monitor_xsync_init (MetaIdleMonitorXSync *monitor_xsync)
  monitor_xsync->alarms = g_hash_table_new (NULL, NULL);
 }

-static void
-check_x11_watches (MetaIdleMonitor *monitor,
-                   XSyncAlarm       alarm)
-{
-  GList *node, *watch_ids;
-
-  /* we get the keys and do explicit look ups in case
-   * an early iteration of the loop ends up leading
-   * to watches from later iterations getting invalidated
-   */
-  watch_ids = g_hash_table_get_keys (monitor->watches);
-
-  for (node = watch_ids; node != NULL; node = node->next)
-    {
-      guint watch_id = GPOINTER_TO_UINT (node->data);
-      MetaIdleMonitorWatchXSync *watch;
-
-      watch = g_hash_table_lookup (monitor->watches, GUINT_TO_POINTER (watch_id));
-
-      if (watch && watch->xalarm == alarm)
-        _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
-    }
-
-  g_list_free (watch_ids);
-}
-
 void
 meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
                                       XSyncAlarmNotifyEvent *alarm_event)
 {
  MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor);
  XSyncAlarm alarm;
+  GList *watches;
  gboolean has_alarm;

  if (alarm_event->state != XSyncAlarmActive)
@@ -369,5 +358,10 @@ meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
    }

  if (has_alarm)
-    check_x11_watches (monitor, alarm);
+    {
+      watches = g_hash_table_get_values (monitor->watches);
+
+      g_list_foreach (watches, check_x11_watch, (gpointer) alarm);
+      g_list_free (watches);
+    }
 }
--- a/src/backends/x11/meta-input-settings-x11.c
+++ b/src/backends/x11/meta-input-settings-x11.c
@@ -199,9 +199,9 @@ meta_input_settings_x11_set_invert_scroll (MetaInputSettings  *settings,
 }

 static void
-meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
-                                         ClutterInputDevice           *device,
-                                         gboolean                      edge_scroll_enabled)
+meta_input_settings_x11_set_scroll_method (MetaInputSettings            *settings,
+                                           ClutterInputDevice           *device,
+                                           GDesktopTouchpadScrollMethod  mode)
 {
  guchar values[3] = { 0 }; /* 2fg, edge, button. The last value is unused */
  guchar *available;
@@ -211,21 +211,26 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
  if (!available)
    return;

-  if (available[0])
-    {
-      values[0] = 1;
-    }
-  else if (available[1] && edge_scroll_enabled)
+  switch (mode)
    {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
      values[1] = 1;
-    }
-  else
-    {
-      /* Disabled */
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      values[0] = 1;
+      break;
+    default:
+      g_assert_not_reached ();
    }

-  change_property (device, "libinput Scroll Method Enabled",
-                   XA_INTEGER, 8, &values, 3);
+  if ((values[0] && !available[0]) || (values[1] && !available[1]))
+    g_warning ("Device '%s' does not support scroll mode %d\n",
+               clutter_input_device_get_device_name (device), mode);
+  else
+    change_property (device, "libinput Scroll Method Enabled",
+                     XA_INTEGER, 8, &values, 3);

  meta_XFree (available);
 }
@@ -316,7 +321,7 @@ meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass)
  input_settings_class->set_left_handed = meta_input_settings_x11_set_left_handed;
  input_settings_class->set_tap_enabled = meta_input_settings_x11_set_tap_enabled;
  input_settings_class->set_invert_scroll = meta_input_settings_x11_set_invert_scroll;
-  input_settings_class->set_edge_scroll = meta_input_settings_x11_set_edge_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_x11_set_scroll_method;
  input_settings_class->set_scroll_button = meta_input_settings_x11_set_scroll_button;
  input_settings_class->set_click_method = meta_input_settings_x11_set_click_method;
  input_settings_class->set_keyboard_repeat = meta_input_settings_x11_set_keyboard_repeat;
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -419,6 +419,12 @@ read_output_edid (MetaMonitorManagerXrandr *manager_xrandr,
      result = get_edid_property (manager_xrandr->xdisplay, winsys_id, edid_atom, &len);
    }

+  if (!result)
+    {
+      edid_atom = XInternAtom (manager_xrandr->xdisplay, "XFree86_DDC_EDID1_RAWDATA", FALSE);
+      result = get_edid_property (manager_xrandr->xdisplay, winsys_id, edid_atom, &len);
+    }
+
  if (result)
    {
      if (len > 0 && len % 128 == 0)
@@ -631,70 +637,6 @@ output_get_connector_type (MetaMonitorManagerXrandr *manager_xrandr,
  return META_CONNECTOR_TYPE_Unknown;
 }

-static void
-output_get_modes (MetaMonitorManager *manager,
-                  MetaOutput         *meta_output,
-                  XRROutputInfo      *output)
-{
-  guint j, k;
-  guint n_actual_modes;
-
-  meta_output->modes = g_new0 (MetaMonitorMode *, output->nmode);
-
-  n_actual_modes = 0;
-  for (j = 0; j < (guint)output->nmode; j++)
-    {
-      for (k = 0; k < manager->n_modes; k++)
-        {
-          if (output->modes[j] == (XID)manager->modes[k].mode_id)
-            {
-              meta_output->modes[n_actual_modes] = &manager->modes[k];
-              n_actual_modes += 1;
-              break;
-            }
-        }
-    }
-  meta_output->n_modes = n_actual_modes;
-  if (n_actual_modes > 0)
-    meta_output->preferred_mode = meta_output->modes[0];
-}
-
-static void
-output_get_crtcs (MetaMonitorManager *manager,
-                  MetaOutput         *meta_output,
-                  XRROutputInfo      *output)
-{
-  guint j, k;
-  guint n_actual_crtcs;
-
-  meta_output->possible_crtcs = g_new0 (MetaCRTC *, output->ncrtc);
-
-  n_actual_crtcs = 0;
-  for (j = 0; j < (unsigned)output->ncrtc; j++)
-    {
-      for (k = 0; k < manager->n_crtcs; k++)
-        {
-          if ((XID)manager->crtcs[k].crtc_id == output->crtcs[j])
-            {
-              meta_output->possible_crtcs[n_actual_crtcs] = &manager->crtcs[k];
-              n_actual_crtcs += 1;
-              break;
-            }
-        }
-    }
-  meta_output->n_possible_crtcs = n_actual_crtcs;
-
-  meta_output->crtc = NULL;
-  for (j = 0; j < manager->n_crtcs; j++)
-    {
-      if ((XID)manager->crtcs[j].crtc_id == output->crtc)
-        {
-          meta_output->crtc = &manager->crtcs[j];
-          break;
-        }
-    }
-}
-
 static char *
 get_xmode_name (XRRModeInfo *xmode)
 {
@@ -831,8 +773,6 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
      MetaOutput *meta_output;

      output = XRRGetOutputInfo (manager_xrandr->xdisplay, resources, resources->outputs[i]);
-      if (!output)
-        continue;

      meta_output = &manager->outputs[n_actual_outputs];

@@ -856,8 +796,44 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
          meta_output->connector_type = output_get_connector_type (manager_xrandr, meta_output);

 	  output_get_tile_info (manager_xrandr, meta_output);
-	  output_get_modes (manager, meta_output, output);
-          output_get_crtcs (manager, meta_output, output);
+	  meta_output->n_modes = output->nmode;
+	  meta_output->modes = g_new0 (MetaMonitorMode *, meta_output->n_modes);
+	  for (j = 0; j < meta_output->n_modes; j++)
+	    {
+	      for (k = 0; k < manager->n_modes; k++)
+		{
+		  if (output->modes[j] == (XID)manager->modes[k].mode_id)
+		    {
+		      meta_output->modes[j] = &manager->modes[k];
+		      break;
+		    }
+		}
+	    }
+	  meta_output->preferred_mode = meta_output->modes[0];
+
+	  meta_output->n_possible_crtcs = output->ncrtc;
+	  meta_output->possible_crtcs = g_new0 (MetaCRTC *, meta_output->n_possible_crtcs);
+	  for (j = 0; j < (unsigned)output->ncrtc; j++)
+	    {
+	      for (k = 0; k < manager->n_crtcs; k++)
+		{
+		  if ((XID)manager->crtcs[k].crtc_id == output->crtcs[j])
+		    {
+		      meta_output->possible_crtcs[j] = &manager->crtcs[k];
+		      break;
+		    }
+		}
+	    }
+
+	  meta_output->crtc = NULL;
+	  for (j = 0; j < manager->n_crtcs; j++)
+	    {
+	      if ((XID)manager->crtcs[j].crtc_id == output->crtc)
+		{
+		  meta_output->crtc = &manager->crtcs[j];
+		  break;
+		}
+	    }

 	  meta_output->n_possible_clones = output->nclone;
 	  meta_output->possible_clones = g_new0 (MetaOutput *, meta_output->n_possible_clones);
@@ -881,10 +857,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 	  else
 	    meta_output->backlight = -1;

-          if (meta_output->n_modes == 0 || meta_output->n_possible_crtcs == 0)
-            meta_monitor_manager_clear_output (meta_output);
-          else
-            n_actual_outputs++;
+	  n_actual_outputs++;
 	}

      XRRFreeOutputInfo (output);
@@ -1160,16 +1133,17 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
      if (crtc_info->mode != NULL)
        {
          MetaMonitorMode *mode;
-          g_autofree XID *output_ids = NULL;
-          unsigned int j, n_output_ids;
+          g_autofree XID *outputs = NULL;
+          unsigned int j, n_outputs;
+          int width, height;
          Status ok;

          mode = crtc_info->mode;

-          n_output_ids = crtc_info->outputs->len;
-          output_ids = g_new (XID, n_output_ids);
+          n_outputs = crtc_info->outputs->len;
+          outputs = g_new (XID, n_outputs);

-          for (j = 0; j < n_output_ids; j++)
+          for (j = 0; j < n_outputs; j++)
            {
              MetaOutput *output;

@@ -1178,7 +1152,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
              output->is_dirty = TRUE;
              output->crtc = crtc;

-              output_ids[j] = output->winsys_id;
+              outputs[j] = output->winsys_id;
            }

          ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
@@ -1188,7 +1162,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
                                 crtc_info->x, crtc_info->y,
                                 (XID)mode->mode_id,
                                 meta_monitor_transform_to_xrandr (crtc_info->transform),
-                                 output_ids, n_output_ids);
+                                 outputs, n_outputs);

          if (ok != Success)
            {
--- a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c
+++ b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.c
@@ -1,89 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#include "config.h"
-
-#include "backends/x11/nested/meta-cursor-renderer-x11-nested.h"
-
-#include "backends/x11/meta-backend-x11.h"
-
-struct _MetaCursorRendererX11Nested
-{
-  MetaCursorRenderer parent;
-};
-
-G_DEFINE_TYPE (MetaCursorRendererX11Nested, meta_cursor_renderer_x11_nested,
-               META_TYPE_CURSOR_RENDERER);
-
-static gboolean
-meta_cursor_renderer_x11_nested_update_cursor (MetaCursorRenderer *renderer,
-                                               MetaCursorSprite   *cursor_sprite)
-{
-  if (cursor_sprite)
-    meta_cursor_sprite_realize_texture (cursor_sprite);
-  return FALSE;
-}
-
-static Cursor
-create_empty_cursor (Display *xdisplay)
-{
-  XcursorImage *image;
-  XcursorPixel *pixels;
-  Cursor xcursor;
-
-  image = XcursorImageCreate (1, 1);
-  if (image == NULL)
-    return None;
-
-  image->xhot = 0;
-  image->yhot = 0;
-
-  pixels = image->pixels;
-  pixels[0] = 0;
-
-  xcursor = XcursorImageLoadCursor (xdisplay, image);
-  XcursorImageDestroy (image);
-
-  return xcursor;
-}
-
-static void
-meta_cursor_renderer_x11_nested_init (MetaCursorRendererX11Nested *x11_nested)
-{
-  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
-  Window xwindow = meta_backend_x11_get_xwindow (backend);
-  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
-
-  Cursor empty_xcursor = create_empty_cursor (xdisplay);
-  XDefineCursor (xdisplay, xwindow, empty_xcursor);
-  XFreeCursor (xdisplay, empty_xcursor);
-}
-
-static void
-meta_cursor_renderer_x11_nested_class_init (MetaCursorRendererX11NestedClass *klass)
-{
-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_CLASS (klass);
-
-  renderer_class->update_cursor = meta_cursor_renderer_x11_nested_update_cursor;
-}
--- a/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h
+++ b/src/backends/x11/nested/meta-cursor-renderer-x11-nested.h
@@ -1,38 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef META_CURSOR_RENDERER_X11_NESTED_NESTED_H
-#define META_CURSOR_RENDERER_X11_NESTED_NESTED_H
-
-#include <glib-object.h>
-
-#include "backends/meta-cursor-renderer.h"
-
-#define META_TYPE_CURSOR_RENDERER_X11_NESTED (meta_cursor_renderer_x11_nested_get_type ())
-G_DECLARE_FINAL_TYPE (MetaCursorRendererX11Nested,
-                      meta_cursor_renderer_x11_nested,
-                      META, CURSOR_RENDERER_X11_NESTED,
-                      MetaCursorRenderer);
-
-#endif /* META_CURSOR_RENDERER_X11_NESTED_NESTED_H */
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -60,7 +60,4 @@ void     meta_end_modal_for_plugin   (MetaCompositor   *compositor,
 gint64 meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
                                                      gint64       monotonic_time);

-void meta_compositor_flash_window (MetaCompositor *compositor,
-                                   MetaWindow     *window);
-
 #endif /* META_COMPOSITOR_PRIVATE_H */
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -529,7 +529,8 @@ meta_compositor_manage (MetaCompositor *compositor)
       */
      XMapWindow (xdisplay, compositor->output);

-      compositor->have_x11_sync_object = meta_sync_ring_init (xdisplay);
+      compositor->have_x11_sync_object =
+        meta_sync_ring_init (meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)));
    }

  redirect_windows (display->screen);
@@ -731,9 +732,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
        process_damage (compositor, (XDamageNotifyEvent *) event, window);
    }

-  if (compositor->have_x11_sync_object)
-    meta_sync_ring_handle_event (event);
-
  /* Clutter needs to know about MapNotify events otherwise it will
     think the stage is invisible */
  if (!meta_is_wayland_compositor () && event->type == MapNotify)
@@ -779,7 +777,7 @@ meta_compositor_size_change_window (MetaCompositor    *compositor,
                                    MetaRectangle     *old_buffer_rect)
 {
  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  meta_window_actor_size_change (window_actor, which_change, old_frame_rect, old_buffer_rect);
+  meta_window_actor_size_change (window_actor, META_SIZE_CHANGE_MAXIMIZE, old_frame_rect, old_buffer_rect);
 }

 void
@@ -1249,48 +1247,6 @@ meta_compositor_flash_screen (MetaCompositor *compositor,
  clutter_actor_restore_easing_state (flash);
 }

-static void
-window_flash_out_completed (ClutterTimeline *timeline,
-                            gboolean         is_finished,
-                            gpointer         user_data)
-{
-  ClutterActor *flash = CLUTTER_ACTOR (user_data);
-  clutter_actor_destroy (flash);
-}
-
-void
-meta_compositor_flash_window (MetaCompositor *compositor,
-                              MetaWindow     *window)
-{
-  ClutterActor *window_actor =
-    CLUTTER_ACTOR (meta_window_get_compositor_private (window));
-  ClutterActor *flash;
-  ClutterTransition *transition;
-
-  flash = clutter_actor_new ();
-  clutter_actor_set_background_color (flash, CLUTTER_COLOR_Black);
-  clutter_actor_set_size (flash, window->rect.width, window->rect.height);
-  clutter_actor_set_position (flash,
-                              window->custom_frame_extents.left,
-                              window->custom_frame_extents.top);
-  clutter_actor_set_opacity (flash, 0);
-  clutter_actor_add_child (window_actor, flash);
-
-  clutter_actor_save_easing_state (flash);
-  clutter_actor_set_easing_mode (flash, CLUTTER_EASE_IN_QUAD);
-  clutter_actor_set_easing_duration (flash, FLASH_TIME_MS);
-  clutter_actor_set_opacity (flash, 192);
-
-  transition = clutter_actor_get_transition (flash, "opacity");
-  clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (transition), TRUE);
-  clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (transition), 2);
-
-  g_signal_connect (transition, "stopped",
-                    G_CALLBACK (window_flash_out_completed), flash);
-
-  clutter_actor_restore_easing_state (flash);
-}
-
 /**
 * meta_compositor_monotonic_time_to_server_time:
 * @display: a #MetaDisplay
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
@@ -22,8 +22,6 @@
 #include "meta-background-private.h"
 #include "cogl-utils.h"

-#include <string.h>
-
 enum
 {
  CHANGED,
@@ -73,8 +71,6 @@ enum

 G_DEFINE_TYPE (MetaBackground, meta_background, G_TYPE_OBJECT)

-static gboolean texture_has_alpha (CoglTexture *texture);
-
 static GSList *all_backgrounds = NULL;

 static void
@@ -478,7 +474,7 @@ get_texture_area (MetaBackground          *self,
    }
 }

-static gboolean
+static void
 draw_texture (MetaBackground        *self,
              CoglFramebuffer       *framebuffer,
              CoglPipeline          *pipeline,
@@ -487,7 +483,6 @@ draw_texture (MetaBackground        *self,
 {
  MetaBackgroundPrivate *priv = self->priv;
  cairo_rectangle_int_t texture_area;
-  gboolean bare_region_visible;

  get_texture_area (self, monitor_area, texture, &texture_area);

@@ -508,9 +503,6 @@ draw_texture (MetaBackground        *self,
                                                - texture_area.y / (float)texture_area.height,
                                                (monitor_area->width - texture_area.x) / (float)texture_area.width,
                                                (monitor_area->height - texture_area.y) / (float)texture_area.height);
-
-      bare_region_visible = texture_has_alpha (texture);
-
      /* Draw just the texture */
      break;
    case G_DESKTOP_BACKGROUND_STYLE_CENTERED:
@@ -521,16 +513,11 @@ draw_texture (MetaBackground        *self,
                                                texture_area.x + texture_area.width,
                                                texture_area.y + texture_area.height,
                                                0, 0, 1.0, 1.0);
-      bare_region_visible = texture_has_alpha (texture) || memcmp (&texture_area, monitor_area, sizeof (cairo_rectangle_int_t)) != 0;
-      break;
    case G_DESKTOP_BACKGROUND_STYLE_NONE:
-      bare_region_visible = TRUE;
      break;
    default:
-      g_return_val_if_reached(FALSE);
+      g_return_if_reached();
    }
-
-  return bare_region_visible;
 }

 static void
@@ -761,7 +748,6 @@ meta_background_get_texture (MetaBackground         *self,
  if (monitor->dirty)
    {
      CoglError *catch_error = NULL;
-      gboolean bare_region_visible = FALSE;

      if (monitor->texture == NULL)
        {
@@ -797,9 +783,9 @@ meta_background_get_texture (MetaBackground         *self,
          cogl_pipeline_set_layer_texture (pipeline, 0, texture2);
          cogl_pipeline_set_layer_wrap_mode (pipeline, 0, get_wrap_mode (priv->style));

-          bare_region_visible = draw_texture (self,
-                                              monitor->fbo, pipeline,
-                                              texture2, &monitor_area);
+          draw_texture (self,
+                        monitor->fbo, pipeline,
+                        texture2, &monitor_area);

          cogl_object_unref (pipeline);
        }
@@ -810,7 +796,8 @@ meta_background_get_texture (MetaBackground         *self,
                                    0.0, 0.0, 0.0, 0.0);
        }

-      if (texture1 != NULL && priv->blend_factor != 1.0)
+      if (texture1 != NULL &&
+          !(texture2 != NULL && priv->blend_factor == 1.0 && !texture_has_alpha (texture2)))
        {
          CoglPipeline *pipeline = create_pipeline (PIPELINE_ADD);
          cogl_pipeline_set_color4f (pipeline,
@@ -821,14 +808,15 @@ meta_background_get_texture (MetaBackground         *self,
          cogl_pipeline_set_layer_texture (pipeline, 0, texture1);
          cogl_pipeline_set_layer_wrap_mode (pipeline, 0, get_wrap_mode (priv->style));

-          bare_region_visible = bare_region_visible || draw_texture (self,
-                                                                     monitor->fbo, pipeline,
-                                                                     texture1, &monitor_area);
+          draw_texture (self,
+                        monitor->fbo, pipeline,
+                        texture1, &monitor_area);

          cogl_object_unref (pipeline);
        }

-      if (bare_region_visible)
+      if (!((texture2 != NULL && priv->blend_factor == 1.0 && !texture_has_alpha (texture2)) ||
+            (texture1 != NULL && !texture_has_alpha (texture1))))
        {
          CoglPipeline *pipeline = create_pipeline (PIPELINE_OVER_REVERSE);

--- a/src/compositor/meta-shaped-texture-private.h
+++ b/src/compositor/meta-shaped-texture-private.h
@@ -36,6 +36,5 @@ void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
                                            guint              fallback_width,
                                            guint              fallback_height);
 gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
-cairo_region_t * meta_shaped_texture_get_opaque_region (MetaShapedTexture *stex);

 #endif
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -303,7 +303,6 @@ set_cogl_texture (MetaShapedTexture *stex,
    {
      priv->tex_width = width;
      priv->tex_height = height;
-      meta_shaped_texture_set_mask_texture (stex, NULL);
      clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
      g_signal_emit (stex, signals[SIZE_CHANGED], 0);
    }
@@ -790,13 +789,6 @@ meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
    priv->opaque_region = NULL;
 }

-cairo_region_t *
-meta_shaped_texture_get_opaque_region (MetaShapedTexture *stex)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  return priv->opaque_region;
-}
-
 /**
 * meta_shaped_texture_get_image:
 * @stex: A #MetaShapedTexture
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -36,14 +36,6 @@

 #include "compositor/region-utils.h"

-enum {
-  PAINTING,
-
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
 struct _MetaSurfaceActorWaylandPrivate
 {
  MetaWaylandSurface *surface;
@@ -136,8 +128,7 @@ meta_surface_actor_wayland_get_subsurface_rect (MetaSurfaceActorWayland *self,
                                                MetaRectangle           *rect)
 {
  MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface (self);
-  MetaWaylandBuffer *buffer = meta_wayland_surface_get_buffer (surface);
-  CoglTexture *texture = buffer->texture;
+  CoglTexture *texture = surface->buffer->texture;
  MetaWindow *toplevel_window;
  int monitor_scale;
  float x, y;
@@ -302,12 +293,8 @@ static MetaWindow *
 meta_surface_actor_wayland_get_window (MetaSurfaceActor *actor)
 {
  MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (META_SURFACE_ACTOR_WAYLAND (actor));
-  MetaWaylandSurface *surface = priv->surface;

-  if (!surface)
-    return NULL;
-
-  return surface->window;
+  return priv->surface->window;
 }

 static void
@@ -356,13 +343,12 @@ meta_surface_actor_wayland_paint (ClutterActor *actor)
  if (priv->surface)
    {
      MetaWaylandCompositor *compositor = priv->surface->compositor;
+      meta_wayland_surface_update_outputs (priv->surface);

      wl_list_insert_list (&compositor->frame_callbacks, &priv->frame_callback_list);
      wl_list_init (&priv->frame_callback_list);
    }

-  g_signal_emit (actor, signals[PAINTING], 0);
-
  CLUTTER_ACTOR_CLASS (meta_surface_actor_wayland_parent_class)->paint (actor);
 }

@@ -398,13 +384,6 @@ meta_surface_actor_wayland_class_init (MetaSurfaceActorWaylandClass *klass)
  surface_actor_class->get_window = meta_surface_actor_wayland_get_window;

  object_class->dispose = meta_surface_actor_wayland_dispose;
-
-  signals[PAINTING] = g_signal_new ("painting",
-                                    G_TYPE_FROM_CLASS (object_class),
-                                    G_SIGNAL_RUN_LAST,
-                                    0,
-                                    NULL, NULL, NULL,
-                                    G_TYPE_NONE, 0);
 }

 static void
@@ -444,14 +423,8 @@ meta_surface_actor_wayland_get_surface (MetaSurfaceActorWayland *self)
 void
 meta_surface_actor_wayland_surface_destroyed (MetaSurfaceActorWayland *self)
 {
-  MetaWaylandFrameCallback *callback, *next;
  MetaSurfaceActorWaylandPrivate *priv =
    meta_surface_actor_wayland_get_instance_private (self);

-  wl_list_for_each_safe (callback, next, &priv->frame_callback_list, link)
-    {
-      wl_resource_destroy (callback->resource);
-    }
-
  priv->surface = NULL;
 }
--- a/src/compositor/meta-surface-actor-x11.c
+++ b/src/compositor/meta-surface-actor-x11.c
@@ -238,33 +238,6 @@ meta_surface_actor_x11_is_visible (MetaSurfaceActor *actor)
  return is_visible (self);
 }

-static gboolean
-meta_surface_actor_x11_is_opaque (MetaSurfaceActor *actor)
-{
-  MetaSurfaceActorX11 *self = META_SURFACE_ACTOR_X11 (actor);
-  MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
-
-  /* If we're not ARGB32, then we're opaque. */
-  if (!meta_surface_actor_is_argb32 (actor))
-    return TRUE;
-
-  cairo_region_t *opaque_region = meta_surface_actor_get_opaque_region (actor);
-
-  /* If we have no opaque region, then no pixels are opaque. */
-  if (!opaque_region)
-    return FALSE;
-
-  MetaWindow *window = priv->window;
-  cairo_rectangle_int_t client_area;
-  meta_window_get_client_area_rect (window, &client_area);
-
-  /* Otherwise, check if our opaque region covers our entire surface. */
-  if (cairo_region_contains_rectangle (opaque_region, &client_area) == CAIRO_REGION_OVERLAP_IN)
-    return TRUE;
-
-  return FALSE;
-}
-
 static gboolean
 meta_surface_actor_x11_should_unredirect (MetaSurfaceActor *actor)
 {
@@ -282,15 +255,15 @@ meta_surface_actor_x11_should_unredirect (MetaSurfaceActor *actor)
  if (window->shape_region != NULL)
    return FALSE;

+  if (meta_surface_actor_is_argb32 (actor) && !meta_window_requested_bypass_compositor (window))
+    return FALSE;
+
  if (!meta_window_is_monitor_sized (window))
    return FALSE;

  if (meta_window_requested_bypass_compositor (window))
    return TRUE;

-  if (!meta_surface_actor_x11_is_opaque (actor))
-    return FALSE;
-
  if (meta_window_is_override_redirect (window))
    return TRUE;

--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -235,13 +235,6 @@ meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
  meta_shaped_texture_set_opaque_region (priv->texture, region);
 }

-cairo_region_t *
-meta_surface_actor_get_opaque_region (MetaSurfaceActor *actor)
-{
-  MetaSurfaceActorPrivate *priv = actor->priv;
-  return meta_shaped_texture_get_opaque_region (priv->texture);
-}
-
 static gboolean
 is_frozen (MetaSurfaceActor *self)
 {
--- a/src/compositor/meta-surface-actor.h
+++ b/src/compositor/meta-surface-actor.h
@@ -60,7 +60,6 @@ void meta_surface_actor_set_input_region (MetaSurfaceActor *self,
                                          cairo_region_t   *region);
 void meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
                                           cairo_region_t   *region);
-cairo_region_t * meta_surface_actor_get_opaque_region (MetaSurfaceActor *self);

 void meta_surface_actor_process_damage (MetaSurfaceActor *actor,
                                        int x, int y, int width, int height);
--- a/src/compositor/meta-sync-ring.c
+++ b/src/compositor/meta-sync-ring.c
@@ -322,7 +322,7 @@ meta_sync_new (Display *xdisplay)
  self->xdisplay = xdisplay;

  self->xfence = XSyncCreateFence (xdisplay, DefaultRootWindow (xdisplay), FALSE);
-  self->gl_x11_sync = 0;
+  self->gl_x11_sync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
  self->gpu_fence = 0;

  self->xcounter = XSyncCreateCounter (xdisplay, SYNC_VALUE_ZERO);
@@ -347,13 +347,6 @@ meta_sync_new (Display *xdisplay)
  return self;
 }

-static void
-meta_sync_import (MetaSync *self)
-{
-  g_return_if_fail (self->gl_x11_sync == 0);
-  self->gl_x11_sync = meta_gl_import_sync (GL_SYNC_X11_FENCE_EXT, self->xfence, 0);
-}
-
 static Bool
 alarm_event_predicate (Display  *dpy,
                       XEvent   *event,
@@ -444,12 +437,6 @@ meta_sync_ring_init (Display *xdisplay)
      ring->syncs_array[i] = sync;
      g_hash_table_replace (ring->alarm_to_sync, (gpointer) sync->xalarm, sync);
    }
-  /* Since the connection we create the X fences on isn't the same as
-   * the one used for the GLX context, we need to XSync() here to
-   * ensure glImportSync() succeeds. */
-  XSync (xdisplay, False);
-  for (i = 0; i < NUM_SYNCS; ++i)
-    meta_sync_import (ring->syncs_array[i]);

  ring->current_sync_idx = 0;
  ring->current_sync = ring->syncs_array[0];
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -817,6 +817,13 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
      meta_window_is_fullscreen (priv->window))
    return FALSE;

+  /*
+   * If we have two snap-tiled windows, we don't want the shadow to obstruct
+   * the other window.
+   */
+  if (meta_window_get_tile_match (priv->window))
+    return FALSE;
+
  /*
   * Always put a shadow around windows with a frame - This should override
   * the restriction about not putting a shadow around ARGB windows.
@@ -825,23 +832,21 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
    return TRUE;

  /*
-   * Do not add shadows to non-opaque (ARGB32) windows, as we can't easily
-   * generate shadows for them.
+   * Do not add shadows to non-opaque windows; eventually we should generate
+   * a shadow from the input shape for such windows.
   */
  if (is_non_opaque (self))
    return FALSE;

  /*
-   * If a window specifies that it has custom frame extents, that likely
-   * means that it is drawing a shadow itself. Don't draw our own.
+   * Add shadows to override redirect windows on X11 unless the toolkit
+   * indicates that it is handling shadows itself (e.g., Gtk menus).
   */
-  if (priv->window->has_custom_frame_extents)
-    return FALSE;
+  if (priv->window->override_redirect &&
+      !priv->window->has_custom_frame_extents)
+    return TRUE;

-  /*
-   * Generate shadows for all other windows.
-   */
-  return TRUE;
+  return FALSE;
 }

 /**
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -255,31 +255,6 @@ get_actor_private (MetaWindowActor *actor)
  return priv;
 }

-static ClutterTimeline *
-actor_animate (ClutterActor         *actor,
-               ClutterAnimationMode  mode,
-               guint                 duration,
-               const gchar          *first_property,
-               ...)
-{
-  va_list args;
-  ClutterTransition *transition;
-
-  clutter_actor_save_easing_state (actor);
-  clutter_actor_set_easing_mode (actor, mode);
-  clutter_actor_set_easing_duration (actor, duration);
-
-  va_start (args, first_property);
-  g_object_set_valist (G_OBJECT (actor), first_property, args);
-  va_end (args);
-
-  transition = clutter_actor_get_transition (actor, first_property);
-
-  clutter_actor_restore_easing_state (actor);
-
-  return CLUTTER_TIMELINE (transition);
-}
-
 static void
 on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
 {
@@ -296,10 +271,7 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)

      if (apriv->orig_parent)
        {
-          g_object_ref (a);
-          clutter_actor_remove_child (clutter_actor_get_parent (a), a);
-          clutter_actor_add_child (apriv->orig_parent, a);
-          g_object_unref (a);
+          clutter_actor_reparent (a, apriv->orig_parent);
          apriv->orig_parent = NULL;
        }

@@ -388,10 +360,11 @@ switch_workspace (MetaPlugin *plugin,
  MetaScreen *screen;
  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
  GList        *l;
-  ClutterActor *workspace0  = clutter_actor_new ();
-  ClutterActor *workspace1  = clutter_actor_new ();
+  ClutterActor *workspace0  = clutter_group_new ();
+  ClutterActor *workspace1  = clutter_group_new ();
  ClutterActor *stage;
  int           screen_width, screen_height;
+  ClutterAnimation *animation;

  screen = meta_plugin_get_screen (plugin);
  stage = meta_get_stage_for_screen (screen);
@@ -400,15 +373,17 @@ switch_workspace (MetaPlugin *plugin,
                        &screen_width,
                        &screen_height);

-  clutter_actor_set_pivot_point (workspace1, 1.0, 1.0);
+  clutter_actor_set_anchor_point (workspace1,
+                                  screen_width,
+                                  screen_height);
  clutter_actor_set_position (workspace1,
                              screen_width,
                              screen_height);

  clutter_actor_set_scale (workspace1, 0.0, 0.0);

-  clutter_actor_add_child (stage, workspace1);
-  clutter_actor_add_child (stage, workspace0);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace1);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace0);

  if (from == to)
    {
@@ -431,15 +406,12 @@ switch_workspace (MetaPlugin *plugin,

      if (win_workspace == to || win_workspace == from)
        {
-          ClutterActor *parent = win_workspace == to ? workspace1 : workspace0;
          apriv->orig_parent = clutter_actor_get_parent (actor);

-          g_object_ref (actor);
-          clutter_actor_remove_child (clutter_actor_get_parent (actor), actor);
-          clutter_actor_add_child (parent, actor);
-          clutter_actor_show (actor);
-          clutter_actor_set_child_below_sibling (parent, actor, NULL);
-          g_object_unref (actor);
+          clutter_actor_reparent (actor,
+				  win_workspace == to ? workspace1 : workspace0);
+          clutter_actor_show_all (actor);
+          clutter_actor_raise_top (actor);
        }
      else if (win_workspace < 0)
        {
@@ -459,21 +431,23 @@ switch_workspace (MetaPlugin *plugin,
  priv->desktop1 = workspace0;
  priv->desktop2 = workspace1;

-  priv->tml_switch_workspace1 = actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
-                                               SWITCH_TIMEOUT,
-                                               "scale-x", 1.0,
-                                               "scale-y", 1.0,
-                                               NULL);
+  animation = clutter_actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 1.0,
+                                     "scale-y", 1.0,
+                                     NULL);
+  priv->tml_switch_workspace1 = clutter_animation_get_timeline (animation);
  g_signal_connect (priv->tml_switch_workspace1,
                    "completed",
                    G_CALLBACK (on_switch_workspace_effect_complete),
                    plugin);

-  priv->tml_switch_workspace2 = actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
-                                               SWITCH_TIMEOUT,
-                                               "scale-x", 0.0,
-                                               "scale-y", 0.0,
-                                               NULL);
+  animation = clutter_actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 0.0,
+                                     "scale-y", 0.0,
+                                     NULL);
+  priv->tml_switch_workspace2 = clutter_animation_get_timeline (animation);
 }


@@ -530,17 +504,19 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)

  if (type == META_WINDOW_NORMAL)
    {
+      ClutterAnimation *animation;
      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
      ActorPrivate *apriv = get_actor_private (window_actor);

-      apriv->tml_minimize = actor_animate (actor,
-                                           CLUTTER_EASE_IN_SINE,
-                                           MINIMIZE_TIMEOUT,
-                                           "scale-x", 0.0,
-                                           "scale-y", 0.0,
-                                           "x", (double)icon_geometry.x,
-                                           "y", (double)icon_geometry.y,
-                                           NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         MINIMIZE_TIMEOUT,
+                                         "scale-x", 0.0,
+                                         "scale-y", 0.0,
+                                         "x", (double)icon_geometry.x,
+                                         "y", (double)icon_geometry.y,
+                                         NULL);
+      apriv->tml_minimize = clutter_animation_get_timeline (animation);
      data->plugin = plugin;
      data->actor = actor;
      g_signal_connect (apriv->tml_minimize, "completed",
@@ -585,6 +561,7 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)

  if (type == META_WINDOW_NORMAL)
    {
+      ClutterAnimation *animation;
      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
      ActorPrivate *apriv = get_actor_private (window_actor);

@@ -593,13 +570,14 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)
      clutter_actor_set_scale (actor, 0.5, 0.5);
      clutter_actor_show (actor);

-      apriv->tml_map = actor_animate (actor,
-                                      CLUTTER_EASE_OUT_QUAD,
-                                      MAP_TIMEOUT,
-                                      "opacity", 255,
-                                      "scale-x", 1.0,
-                                      "scale-y", 1.0,
-                                      NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_OUT_QUAD,
+                                         MAP_TIMEOUT,
+                                         "opacity", 255,
+                                         "scale-x", 1.0,
+                                         "scale-y", 1.0,
+                                         NULL);
+      apriv->tml_map = clutter_animation_get_timeline (animation);
      data->actor = actor;
      data->plugin = plugin;
      g_signal_connect (apriv->tml_map, "completed",
@@ -640,16 +618,18 @@ destroy (MetaPlugin *plugin, MetaWindowActor *window_actor)

  if (type == META_WINDOW_NORMAL)
    {
+      ClutterAnimation *animation;
      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
      ActorPrivate *apriv = get_actor_private (window_actor);

-      apriv->tml_destroy = actor_animate (actor,
-                                          CLUTTER_EASE_OUT_QUAD,
-                                          DESTROY_TIMEOUT,
-                                          "opacity", 0,
-                                          "scale-x", 0.8,
-                                          "scale-y", 0.8,
-                                          NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_OUT_QUAD,
+                                         DESTROY_TIMEOUT,
+                                         "opacity", 0,
+                                         "scale-x", 0.8,
+                                         "scale-y", 0.8,
+                                         NULL);
+      apriv->tml_destroy = clutter_animation_get_timeline (animation);
      data->plugin = plugin;
      data->actor = actor;
      g_signal_connect (apriv->tml_destroy, "completed",
@@ -722,9 +702,7 @@ show_tile_preview (MetaPlugin    *plugin,
  clutter_actor_show (preview->actor);

  window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
-  clutter_actor_set_child_below_sibling (clutter_actor_get_parent (preview->actor),
-                                         preview->actor,
-                                         window_actor);
+  clutter_actor_lower (preview->actor, window_actor);

  preview->tile_rect = *tile_rect;
 }
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -52,7 +52,6 @@
 #include "screen-private.h"
 #include "window-private.h"
 #include "util-private.h"
-#include "compositor/compositor-private.h"
 #include <meta/prefs.h>
 #include <meta/compositor.h>
 #ifdef HAVE_LIBCANBERRA
@@ -132,12 +131,6 @@ bell_flash_window_frame (MetaWindow *window)
  g_source_set_name_by_id (id, "[mutter] bell_unflash_frame");
 }

-static void
-bell_flash_window (MetaWindow *window)
-{
-  meta_compositor_flash_window (window->display->compositor, window);
-}
-
 /**
 * bell_flash_frame:
 * @display:  The display the bell event came in on
@@ -152,8 +145,6 @@ bell_flash_frame (MetaDisplay *display,
 {
  if (window && window->frame)
    bell_flash_window_frame (window);
-  else if (window)
-    bell_flash_window (window);
  else
    bell_flash_fullscreen (display);
 }
@@ -212,18 +203,33 @@ bell_audible_notify (MetaDisplay *display,
  return FALSE;
 }

-gboolean
+void
 meta_bell_notify (MetaDisplay *display,
-                  MetaWindow  *window)
+		  XkbAnyEvent *xkb_ev)
 {
+  MetaWindow *window;
+  XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent*) xkb_ev;
+
+  window = meta_display_lookup_x_window (display, xkb_bell_event->window);
+  if (!window && display->focus_window && display->focus_window->frame)
+    window = display->focus_window;
+
  /* flash something */
  if (meta_prefs_get_visual_bell ())
    bell_visual_notify (display, window);

  if (meta_prefs_bell_is_audible ())
-    return bell_audible_notify (display, window);
-
-  return TRUE;
+    {
+      if (!bell_audible_notify (display, window))
+        {
+          /* Force a classic bell if the libcanberra bell failed. */
+          XkbForceDeviceBell (display->xdisplay,
+                              xkb_bell_event->device,
+                              xkb_bell_event->bell_class,
+                              xkb_bell_event->bell_id,
+                              xkb_bell_event->percent);
+        }
+    }
 }

 void
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -25,14 +25,15 @@
 /**
 * meta_bell_notify:
 * @display: The display the bell event came in on
- * @window: The window the bell event was received on
+ * @xkb_ev: The bell event we just received
 *
- * Gives the user some kind of aural or visual feedback, such as a bell sound
- * or flash. What type of feedback is invoked depends on the configuration.
- * If the aural feedback could not be invoked, FALSE is returned.
+ * Gives the user some kind of visual bell; in fact, this is our response
+ * to any kind of bell request, but we set it up so that we only get
+ * notified about visual bells, and X deals with audible ones.
+ *
+ * If the configure script found we had no XKB, this does not exist.
 */
-gboolean meta_bell_notify (MetaDisplay *display,
-                           MetaWindow  *window);
+void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);

 /**
 * meta_bell_set_audible:
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -97,7 +97,7 @@ typedef enum
  PRIORITY_ENTIRELY_VISIBLE_ON_WORKAREA = 1,
  PRIORITY_SIZE_HINTS_INCREMENTS = 1,
  PRIORITY_MAXIMIZATION = 2,
-  PRIORITY_CONSTRAINED_EDGES = 2,
+  PRIORITY_TILING = 2,
  PRIORITY_FULLSCREEN = 2,
  PRIORITY_SIZE_HINTS_LIMITS = 3,
  PRIORITY_TITLEBAR_VISIBLE = 4,
@@ -152,7 +152,7 @@ static gboolean constrain_maximization       (MetaWindow         *window,
                                              ConstraintInfo     *info,
                                              ConstraintPriority  priority,
                                              gboolean            check_only);
-static gboolean constrain_constrained_edges  (MetaWindow         *window,
+static gboolean constrain_tiling             (MetaWindow         *window,
                                              ConstraintInfo     *info,
                                              ConstraintPriority  priority,
                                              gboolean            check_only);
@@ -213,7 +213,7 @@ typedef struct {
 static const Constraint all_constraints[] = {
  {constrain_modal_dialog,       "constrain_modal_dialog"},
  {constrain_maximization,       "constrain_maximization"},
-  {constrain_constrained_edges,  "constrain_constrained_edges"},
+  {constrain_tiling,             "constrain_tiling"},
  {constrain_fullscreen,         "constrain_fullscreen"},
  {constrain_size_increments,    "constrain_size_increments"},
  {constrain_size_limits,        "constrain_size_limits"},
@@ -701,11 +701,16 @@ constrain_maximization (MetaWindow         *window,
    return TRUE;

  /* Determine whether constraint applies; exit if it doesn't */
-  if (!window->maximized_horizontally && !window->maximized_vertically)
+  if ((!window->maximized_horizontally && !window->maximized_vertically) ||
+      META_WINDOW_TILED_SIDE_BY_SIDE (window))
    return TRUE;

  /* Calculate target_size = maximized size of (window + frame) */
-  if (META_WINDOW_MAXIMIZED (window))
+  if (META_WINDOW_TILED_MAXIMIZED (window))
+    {
+      meta_window_get_current_tile_area (window, &target_size);
+    }
+  else if (META_WINDOW_MAXIMIZED (window))
    {
      target_size = info->work_area_monitor;
    }
@@ -768,6 +773,58 @@ constrain_maximization (MetaWindow         *window,
  return TRUE;
 }

+static gboolean
+constrain_tiling (MetaWindow         *window,
+                  ConstraintInfo     *info,
+                  ConstraintPriority  priority,
+                  gboolean            check_only)
+{
+  MetaRectangle target_size;
+  MetaRectangle min_size, max_size;
+  gboolean hminbad, vminbad;
+  gboolean horiz_equal, vert_equal;
+  gboolean constraint_already_satisfied;
+
+  if (priority > PRIORITY_TILING)
+    return TRUE;
+
+  /* Determine whether constraint applies; exit if it doesn't */
+  if (!META_WINDOW_TILED_SIDE_BY_SIDE (window))
+    return TRUE;
+
+  /* Calculate target_size - as the tile previews need this as well, we
+   * use an external function for the actual calculation
+   */
+  meta_window_get_current_tile_area (window, &target_size);
+
+  /* Check min size constraints; max size constraints are ignored as for
+   * maximized windows.
+   */
+  get_size_limits (window, &min_size, &max_size);
+  hminbad = target_size.width < min_size.width;
+  vminbad = target_size.height < min_size.height;
+  if (hminbad || vminbad)
+    return TRUE;
+
+  /* Determine whether constraint is already satisfied; exit if it is */
+  horiz_equal = target_size.x      == info->current.x &&
+                target_size.width  == info->current.width;
+  vert_equal  = target_size.y      == info->current.y &&
+                target_size.height == info->current.height;
+  constraint_already_satisfied = horiz_equal && vert_equal;
+  if (check_only || constraint_already_satisfied)
+    return constraint_already_satisfied;
+
+  /*** Enforce constraint ***/
+  info->current.x      = target_size.x;
+  info->current.width  = target_size.width;
+  info->current.y      = target_size.y;
+  info->current.height = target_size.height;
+
+  return TRUE;
+}
+
+
 static gboolean
 constrain_fullscreen (MetaWindow         *window,
                      ConstraintInfo     *info,
@@ -803,45 +860,6 @@ constrain_fullscreen (MetaWindow         *window,
  return TRUE;
 }

-static gboolean
-constrain_constrained_edges (MetaWindow         *window,
-                             ConstraintInfo     *info,
-                             ConstraintPriority  priority,
-                             gboolean            check_only)
-{
-  MetaRectangle monitor, new_rectangle;
-  gboolean constraint_already_satisfied;
-
-  if (priority > PRIORITY_CONSTRAINED_EDGES)
-    return TRUE;
-
-  /* Determine whether constraint applies; exit if it doesn't */
-  if (!window->constrained_edges)
-    return TRUE;
-
-  new_rectangle = info->current;
-  monitor = info->work_area_monitor;
-
-  if (window->constrained_edges & META_DIRECTION_LEFT)
-    new_rectangle.x = monitor.x;
-  if (window->constrained_edges & META_DIRECTION_RIGHT)
-    new_rectangle.x = monitor.x + monitor.width - new_rectangle.width;
-  if (window->constrained_edges & META_DIRECTION_TOP)
-    new_rectangle.y = monitor.y;
-  if (window->constrained_edges & META_DIRECTION_BOTTOM)
-    new_rectangle.y = monitor.y + monitor.height - new_rectangle.height;
-
-  constraint_already_satisfied =
-    meta_rectangle_equal (&info->current, &new_rectangle);
-
-  if (check_only || constraint_already_satisfied)
-    return constraint_already_satisfied;
-
-  /*** Enforce constraint ***/
-  info->current = new_rectangle;
-  return TRUE;
-}
-
 static gboolean
 constrain_size_increments (MetaWindow         *window,
                           ConstraintInfo     *info,
@@ -859,6 +877,7 @@ constrain_size_increments (MetaWindow         *window,

  /* Determine whether constraint applies; exit if it doesn't */
  if (META_WINDOW_MAXIMIZED (window) || window->fullscreen ||
+      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
      info->action_type == ACTION_MOVE)
    return TRUE;

@@ -1001,6 +1020,7 @@ constrain_aspect_ratio (MetaWindow         *window,
  constraints_are_inconsistent = minr > maxr;
  if (constraints_are_inconsistent ||
      META_WINDOW_MAXIMIZED (window) || window->fullscreen ||
+      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
      info->action_type == ACTION_MOVE)
    return TRUE;

--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -35,7 +35,6 @@
 #include <meta/boxes.h>
 #include <meta/display.h>
 #include "keybindings-private.h"
-#include "startup-notification-private.h"
 #include "meta-gesture-tracker-private.h"
 #include <meta/prefs.h>
 #include <meta/barrier.h>
@@ -74,6 +73,13 @@ typedef enum {
 */
 #define N_IGNORED_CROSSING_SERIALS  10

+typedef enum {
+  META_TILE_NONE,
+  META_TILE_LEFT,
+  META_TILE_RIGHT,
+  META_TILE_MAXIMIZED
+} MetaTileMode;
+
 typedef enum {
  /* Normal interaction where you're interacting with windows.
   * Events go to windows normally. */
@@ -204,6 +210,8 @@ struct _MetaDisplay
  int         grab_anchor_root_x;
  int         grab_anchor_root_y;
  MetaRectangle grab_anchor_window_pos;
+  MetaTileMode  grab_tile_mode;
+  int           grab_tile_monitor_number;
  int         grab_latest_motion_x;
  int         grab_latest_motion_y;
  guint       grab_have_pointer : 1;
@@ -268,8 +276,9 @@ struct _MetaDisplay
  int xinput_event_base;
  int xinput_opcode;

-  MetaStartupNotification *startup_notification;
-
+#ifdef HAVE_STARTUP_NOTIFICATION
+  SnDisplay *sn_display;
+#endif
  int xsync_event_base;
  int xsync_error_base;
  int shape_event_base;
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -400,6 +400,28 @@ meta_display_remove_pending_pings_for_window (MetaDisplay *display,
 }


+#ifdef HAVE_STARTUP_NOTIFICATION
+static void
+sn_error_trap_push (SnDisplay *sn_display,
+                    Display   *xdisplay)
+{
+  MetaDisplay *display;
+  display = meta_display_for_x_display (xdisplay);
+  if (display != NULL)
+    meta_error_trap_push (display);
+}
+
+static void
+sn_error_trap_pop (SnDisplay *sn_display,
+                   Display   *xdisplay)
+{
+  MetaDisplay *display;
+  display = meta_display_for_x_display (xdisplay);
+  if (display != NULL)
+    meta_error_trap_pop (display);
+}
+#endif
+
 static void
 enable_compositor (MetaDisplay *display)
 {
@@ -505,20 +527,6 @@ gesture_tracker_state_changed (MetaGestureTracker   *tracker,
    }
 }

-static void
-on_startup_notification_changed (MetaStartupNotification *sn,
-                                 gpointer                 sequence,
-                                 MetaDisplay             *display)
-{
-  if (!display->screen)
-    return;
-
-  g_slist_free (display->screen->startup_sequences);
-  display->screen->startup_sequences =
-    meta_startup_notification_get_sequences (display->startup_notification);
-  g_signal_emit_by_name (display->screen, "startup-sequence-changed", sequence);
-}
-
 /**
 * meta_display_open:
 *
@@ -539,7 +547,7 @@ meta_display_open (void)
  guint32 timestamp;

  /* A list of all atom names, so that we can intern them in one go. */
-  const char *atom_names[] = {
+  char *atom_names[] = {
 #define item(x) #x,
 #include <x11/atomnames.h>
 #undef item
@@ -597,13 +605,14 @@ meta_display_open (void)
  meta_prefs_add_listener (prefs_changed_callback, display);

  meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
-  XInternAtoms (display->xdisplay, (char **)atom_names, G_N_ELEMENTS (atom_names),
+  XInternAtoms (display->xdisplay, atom_names, G_N_ELEMENTS (atom_names),
                False, atoms);
-
-  i = 0;
+  {
+    int i = 0;
 #define item(x) display->atom_##x = atoms[i++];
 #include <x11/atomnames.h>
 #undef item
+  }

  display->prop_hooks = NULL;
  meta_display_init_window_prop_hooks (display);
@@ -622,6 +631,12 @@ meta_display_open (void)

  display->screen = NULL;

+#ifdef HAVE_STARTUP_NOTIFICATION
+  display->sn_display = sn_display_new (display->xdisplay,
+                                        sn_error_trap_push,
+                                        sn_error_trap_pop);
+#endif
+
  /* Get events */
  meta_display_init_events (display);
  meta_display_init_events_x11 (display);
@@ -649,6 +664,8 @@ meta_display_open (void)

  display->grab_op = META_GRAB_OP_NONE;
  display->grab_window = NULL;
+  display->grab_tile_mode = META_TILE_NONE;
+  display->grab_tile_monitor_number = -1;

  display->grab_edge_resistance_data = NULL;

@@ -900,10 +917,6 @@ meta_display_open (void)

  display->screen = screen;

-  display->startup_notification = meta_startup_notification_get (display);
-  g_signal_connect (display->startup_notification, "changed",
-                    G_CALLBACK (on_startup_notification_changed), display);
-
  meta_screen_init_workspaces (screen);

  enable_compositor (display);
@@ -1088,7 +1101,6 @@ meta_display_close (MetaDisplay *display,

  meta_display_remove_autoraise_callback (display);

-  g_clear_object (&display->startup_notification);
  g_clear_object (&display->gesture_tracker);

  if (display->focus_timeout_id)
@@ -1101,6 +1113,14 @@ meta_display_close (MetaDisplay *display,

  meta_screen_free (display->screen, timestamp);

+#ifdef HAVE_STARTUP_NOTIFICATION
+  if (display->sn_display)
+    {
+      sn_display_unref (display->sn_display);
+      display->sn_display = NULL;
+    }
+#endif
+
  /* Must be after all calls to meta_window_unmanage() since they
   * unregister windows
   */
@@ -1210,7 +1230,7 @@ meta_grab_op_is_moving (MetaGrabOp op)
 }

 /**
- * meta_display_windows_are_interactable:
+ * meta_grab_op_windows_are_interactable:
 * @op: A #MetaGrabOp
 *
 * Whether windows can be interacted with.
@@ -1892,6 +1912,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
  display->grab_op = op;
  display->grab_window = grab_window;
  display->grab_button = button;
+  display->grab_tile_mode = grab_window->tile_mode;
+  display->grab_tile_monitor_number = grab_window->tile_monitor_number;
  display->grab_anchor_root_x = root_x;
  display->grab_anchor_root_y = root_y;
  display->grab_latest_motion_x = root_x;
@@ -1942,12 +1964,9 @@ meta_display_end_grab_op (MetaDisplay *display,
  meta_topic (META_DEBUG_WINDOW_OPS,
              "Ending grab op %u at time %u\n", grab_op, timestamp);

-  if (display->event_route == META_EVENT_ROUTE_NORMAL ||
-      display->event_route == META_EVENT_ROUTE_COMPOSITOR_GRAB)
+  if (display->event_route == META_EVENT_ROUTE_NORMAL)
    return;

-  g_assert (grab_window != NULL);
-
  g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                 display->screen, grab_window, grab_op);

@@ -1989,6 +2008,8 @@ meta_display_end_grab_op (MetaDisplay *display,

  display->event_route = META_EVENT_ROUTE_NORMAL;
  display->grab_window = NULL;
+  display->grab_tile_mode = META_TILE_NONE;
+  display->grab_tile_monitor_number = -1;

  meta_display_update_cursor (display);

--- a/src/core/events.c
+++ b/src/core/events.c
@@ -182,25 +182,10 @@ meta_display_handle_event (MetaDisplay        *display,
  sequence = clutter_event_get_event_sequence (event);

  /* Set the pointer emulating sequence on touch begin, if eligible */
-  if (event->type == CLUTTER_TOUCH_BEGIN)
-    {
-      if (sequence_is_pointer_emulated (display, event))
-        {
-          /* This is the new pointer emulating sequence */
-          display->pointer_emulating_sequence = sequence;
-        }
-      else if (display->pointer_emulating_sequence == sequence)
-        {
-          /* This sequence was "pointer emulating" in a prior incarnation,
-           * but now it isn't. We unset the pointer emulating sequence at
-           * this point so the current sequence is not mistaken as pointer
-           * emulating, while we've ensured that it's been deemed
-           * "pointer emulating" throughout all of the event processing
-           * of the previous incarnation.
-           */
-          display->pointer_emulating_sequence = NULL;
-        }
-    }
+  if (event->type == CLUTTER_TOUCH_BEGIN &&
+      !display->pointer_emulating_sequence &&
+      sequence_is_pointer_emulated (display, event))
+    display->pointer_emulating_sequence = sequence;

 #ifdef HAVE_WAYLAND
  MetaWaylandCompositor *compositor = NULL;
@@ -221,8 +206,8 @@ meta_display_handle_event (MetaDisplay        *display,

  if (meta_is_wayland_compositor () && event->type == CLUTTER_MOTION)
    {
-      meta_cursor_tracker_update_position (meta_cursor_tracker_get_for_screen (NULL),
-                                           event->motion.x, event->motion.y);
+      MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
+      meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
      display->monitor_cache_invalidated = TRUE;
    }

@@ -350,6 +335,11 @@ meta_display_handle_event (MetaDisplay        *display,
    }
 #endif

+  /* Unset the pointer emulating sequence after its end event is processed */
+  if (event->type == CLUTTER_TOUCH_END &&
+      display->pointer_emulating_sequence == sequence)
+    display->pointer_emulating_sequence = NULL;
+
  display->current_time = CurrentTime;
  return bypass_clutter;
 }
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -274,6 +274,12 @@ meta_frame_get_flags (MetaFrame *frame)
  if (META_WINDOW_MAXIMIZED (frame->window))
    flags |= META_FRAME_MAXIMIZED;

+  if (META_WINDOW_TILED_LEFT (frame->window))
+    flags |= META_FRAME_TILED_LEFT;
+
+  if (META_WINDOW_TILED_RIGHT (frame->window))
+    flags |= META_FRAME_TILED_RIGHT;
+
  if (frame->window->fullscreen)
    flags |= META_FRAME_FULLSCREEN;

@@ -283,18 +289,6 @@ meta_frame_get_flags (MetaFrame *frame)
  if (frame->window->wm_state_above)
    flags |= META_FRAME_ABOVE;

-  if (frame->window->constrained_edges & META_DIRECTION_LEFT)
-    flags |= META_FRAME_CONSTRAINED_LEFT_EDGE;
-
-  if (frame->window->constrained_edges & META_DIRECTION_RIGHT)
-    flags |= META_FRAME_CONSTRAINED_RIGHT_EDGE;
-
-  if (frame->window->constrained_edges & META_DIRECTION_TOP)
-    flags |= META_FRAME_CONSTRAINED_TOP_EDGE;
-
-  if (frame->window->constrained_edges & META_DIRECTION_BOTTOM)
-    flags |= META_FRAME_CONSTRAINED_BOTTOM_EDGE;
-
  return flags;
 }

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -188,7 +188,7 @@ reload_modmap (MetaKeyBindingManager *keys)

  /* Modifiers to find. */
  struct {
-    const char *name;
+    char *name;
    xkb_mod_mask_t *mask_p;
  } mods[] = {
    { "ScrollLock", &scroll_lock_mask },
@@ -2001,13 +2001,23 @@ process_mouse_move_resize_grab (MetaDisplay     *display,

  if (event->keyval == CLUTTER_KEY_Escape)
    {
+      /* Hide the tiling preview if necessary */
+      if (window->tile_mode != META_TILE_NONE)
+        meta_screen_hide_tile_preview (screen);
+
+      /* Restore the original tile mode */
+      window->tile_mode = display->grab_tile_mode;
+      window->tile_monitor_number = display->grab_tile_monitor_number;
+
      /* End move or resize and restore to original state.  If the
       * window was a maximized window that had been "shaken loose" we
       * need to remaximize it.  In normal cases, we need to do a
       * moveresize now to get the position back to the original.
       */
-      if (window->shaken_loose)
+      if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED)
        meta_window_maximize (window, META_MAXIMIZE_BOTH);
+      else if (window->tile_mode != META_TILE_NONE)
+        meta_window_tile (window);
      else
        meta_window_move_resize_frame (display->grab_window,
                                       TRUE,
@@ -2929,25 +2939,41 @@ handle_toggle_above       (MetaDisplay     *display,
 }

 static void
-handle_toggle_tiled_left (MetaDisplay     *display,
-                          MetaScreen      *screen,
-                          MetaWindow      *window,
-                          ClutterKeyEvent *event,
-                          MetaKeyBinding  *binding,
-                          gpointer         dummy)
+handle_toggle_tiled (MetaDisplay     *display,
+                     MetaScreen      *screen,
+                     MetaWindow      *window,
+                     ClutterKeyEvent *event,
+                     MetaKeyBinding  *binding,
+                     gpointer         dummy)
 {
-  meta_window_toggle_tile (window, META_TILE_ZONE_W);
-}
+  MetaTileMode mode = binding->handler->data;

-static void
-handle_toggle_tiled_right (MetaDisplay     *display,
-                           MetaScreen      *screen,
-                           MetaWindow      *window,
-                           ClutterKeyEvent *event,
-                           MetaKeyBinding  *binding,
-                           gpointer         dummy)
-{
-  meta_window_toggle_tile (window, META_TILE_ZONE_E);
+  if ((META_WINDOW_TILED_LEFT (window) && mode == META_TILE_LEFT) ||
+      (META_WINDOW_TILED_RIGHT (window) && mode == META_TILE_RIGHT))
+    {
+      window->tile_monitor_number = window->saved_maximize ? window->monitor->number
+        : -1;
+      window->tile_mode = window->saved_maximize ? META_TILE_MAXIMIZED
+        : META_TILE_NONE;
+
+      if (window->saved_maximize)
+        meta_window_maximize (window, META_MAXIMIZE_BOTH);
+      else
+        meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
+    }
+  else if (meta_window_can_tile_side_by_side (window))
+    {
+      window->tile_monitor_number = window->monitor->number;
+      window->tile_mode = mode;
+      /* Maximization constraints beat tiling constraints, so if the window
+       * is maximized, tiling won't have any effect unless we unmaximize it
+       * horizontally first; rather than calling meta_window_unmaximize(),
+       * we just set the flag and rely on meta_window_tile() syncing it to
+       * save an additional roundtrip.
+       */
+      window->maximized_horizontally = FALSE;
+      meta_window_tile (window);
+    }
 }

 static void
@@ -3680,14 +3706,14 @@ init_builtin_key_bindings (MetaDisplay *display)
                          mutter_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
-                          handle_toggle_tiled_left, 0);
+                          handle_toggle_tiled, META_TILE_LEFT);

  add_builtin_keybinding (display,
                          "toggle-tiled-right",
                          mutter_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
-                          handle_toggle_tiled_right, 0);
+                          handle_toggle_tiled, META_TILE_RIGHT);

  add_builtin_keybinding (display,
                          "toggle-above",
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -80,10 +80,6 @@

 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland.h"
-# endif
-
-#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
-#include <systemd/sd-login.h>
 #endif

 /*
@@ -168,7 +164,6 @@ static gboolean  opt_disable_sm;
 static gboolean  opt_sync;
 #ifdef HAVE_WAYLAND
 static gboolean  opt_wayland;
-static gboolean  opt_nested;
 #endif
 #ifdef HAVE_NATIVE_BACKEND
 static gboolean  opt_display_server;
@@ -217,12 +212,6 @@ static GOptionEntry meta_options[] = {
    N_("Run as a wayland compositor"),
    NULL
  },
-  {
-    "nested", 0, 0, G_OPTION_ARG_NONE,
-    &opt_nested,
-    N_("Run as a nested compositor"),
-    NULL
-  },
 #endif
 #ifdef HAVE_NATIVE_BACKEND
  {
@@ -302,104 +291,6 @@ on_sigterm (gpointer user_data)
  return G_SOURCE_REMOVE;
 }

-#if defined(HAVE_WAYLAND) && defined(HAVE_NATIVE_BACKEND)
-static char *
-find_logind_session_type (void)
-{
-  char **sessions;
-  char *session_id;
-  char *session_type;
-  int ret, i;
-
-  ret = sd_pid_get_session (0, &session_id);
-
-  if (ret == 0 && session_id != NULL)
-    {
-      ret = sd_session_get_type (session_id, &session_type);
-      free (session_id);
-
-      if (ret < 0)
-        session_type = NULL;
-
-      goto out;
-    }
-  session_type = NULL;
-
-  ret = sd_uid_get_sessions (getuid (), TRUE, &sessions);
-
-  if (ret < 0 || sessions == NULL)
-    goto out;
-
-  for (i = 0; sessions[i] != NULL; i++)
-    {
-      ret = sd_session_get_type (sessions[i], &session_type);
-
-      if (ret < 0)
-        continue;
-
-      if (g_strcmp0 (session_type, "x11") == 0||
-          g_strcmp0 (session_type, "wayland") == 0)
-        break;
-
-      g_clear_pointer (&session_type, (GDestroyNotify) free);
-    }
-
-  for (i = 0; sessions[i] != NULL; i++)
-    free (sessions[i]);
-  free (sessions);
-
-out:
-  return session_type;
-}
-
-static gboolean
-check_for_wayland_session_type (void)
-{
-  char *session_type = NULL;
-  gboolean is_wayland = FALSE;
-
-  session_type = find_logind_session_type ();
-
-  if (session_type != NULL)
-    {
-      is_wayland = g_strcmp0 (session_type, "wayland") == 0;
-      free (session_type);
-    }
-
-  return is_wayland;
-}
-#endif
-
-static void
-init_backend (void)
-{
-#ifdef HAVE_WAYLAND
-  gboolean run_as_wayland_compositor = opt_wayland;
-
-#ifdef HAVE_NATIVE_BACKEND
-  if (opt_nested && opt_display_server)
-    {
-      meta_warning ("Can't run both as nested and as a display server\n");
-      meta_exit (META_EXIT_ERROR);
-    }
-
-  if (!run_as_wayland_compositor)
-    run_as_wayland_compositor = check_for_wayland_session_type ();
-
-#ifdef CLUTTER_WINDOWING_EGL
-  if (opt_display_server || (run_as_wayland_compositor && !opt_nested))
-    clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
-  else
-#endif
-#endif
-#endif
-    clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
-
-#ifdef HAVE_WAYLAND
-  meta_set_is_wayland_compositor (run_as_wayland_compositor);
-#endif
-}
-
 /**
 * meta_init: (skip)
 *
@@ -432,7 +323,16 @@ meta_init (void)
  if (g_getenv ("MUTTER_DEBUG"))
    meta_set_debugging (TRUE);

-  init_backend ();
+#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
+  if (opt_display_server)
+    clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
+  else
+#endif
+    clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+
+#ifdef HAVE_WAYLAND
+  meta_set_is_wayland_compositor (opt_wayland);
+#endif

  if (g_get_home_dir ())
    if (chdir (g_get_home_dir ()) < 0)
--- a/src/core/meta-border.c
+++ b/src/core/meta-border.c
@@ -1,154 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#include "config.h"
-
-#include "core/meta-border.h"
-
-#include <math.h>
-
-static inline float
-meta_vector2_cross_product (const MetaVector2 a,
-                            const MetaVector2 b)
-{
-  return a.x * b.y - a.y * b.x;
-}
-
-static inline MetaVector2
-meta_vector2_add (const MetaVector2 a,
-                  const MetaVector2 b)
-{
-  return (MetaVector2) {
-    .x = a.x + b.x,
-    .y = a.y + b.y,
-  };
-}
-
-static inline MetaVector2
-meta_vector2_multiply_constant (const float       c,
-                                const MetaVector2 a)
-{
-  return (MetaVector2) {
-    .x = c * a.x,
-    .y = c * a.y,
-  };
-}
-
-gboolean
-meta_line2_intersects_with (const MetaLine2 *line1,
-                            const MetaLine2 *line2,
-                            MetaVector2     *intersection)
-{
-  MetaVector2 p = line1->a;
-  MetaVector2 r = meta_vector2_subtract (line1->b, line1->a);
-  MetaVector2 q = line2->a;
-  MetaVector2 s = meta_vector2_subtract (line2->b, line2->a);
-  float rxs;
-  float sxr;
-  float t;
-  float u;
-
-  /*
-   * The line (p, r) and (q, s) intersects where
-   *
-   *   p + t r = q + u s
-   *
-   * Calculate t:
-   *
-   *   (p + t r) × s = (q + u s) × s
-   *   p × s + t (r × s) = q × s + u (s × s)
-   *   p × s + t (r × s) = q × s
-   *   t (r × s) = q × s - p × s
-   *   t (r × s) = (q - p) × s
-   *   t = ((q - p) × s) / (r × s)
-   *
-   * Using the same method, for u we get:
-   *
-   *   u = ((p - q) × r) / (s × r)
-   */
-
-  rxs = meta_vector2_cross_product (r, s);
-  sxr = meta_vector2_cross_product (s, r);
-
-  /* If r × s = 0 then the lines are either parallel or collinear. */
-  if (fabsf (rxs) < FLT_MIN)
-    return FALSE;
-
-  t = meta_vector2_cross_product (meta_vector2_subtract (q, p), s) / rxs;
-  u = meta_vector2_cross_product (meta_vector2_subtract (p, q), r) / sxr;
-
-  /* The lines only intersect if 0 ≤ t ≤ 1 and 0 ≤ u ≤ 1. */
-  if (t < 0.0 || t > 1.0 || u < 0.0 || u > 1.0)
-    return FALSE;
-
-  *intersection = meta_vector2_add (p, meta_vector2_multiply_constant (t, r));
-
-  return TRUE;
-}
-
-gboolean
-meta_border_is_horizontal (MetaBorder *border)
-{
-  return border->line.a.y == border->line.b.y;
-}
-
-gboolean
-meta_border_is_blocking_directions (MetaBorder               *border,
-                                    MetaBorderMotionDirection directions)
-{
-  if (meta_border_is_horizontal (border))
-    {
-      if ((directions & (META_BORDER_MOTION_DIRECTION_POSITIVE_Y |
-                         META_BORDER_MOTION_DIRECTION_NEGATIVE_Y)) == 0)
-        return FALSE;
-    }
-  else
-    {
-      if ((directions & (META_BORDER_MOTION_DIRECTION_POSITIVE_X |
-                         META_BORDER_MOTION_DIRECTION_NEGATIVE_X)) == 0)
-        return FALSE;
-    }
-
-  return (~border->blocking_directions & directions) != directions;
-}
-
-unsigned int
-meta_border_get_allows_directions (MetaBorder *border)
-{
-  return ~border->blocking_directions &
-    (META_BORDER_MOTION_DIRECTION_POSITIVE_X |
-     META_BORDER_MOTION_DIRECTION_POSITIVE_Y |
-     META_BORDER_MOTION_DIRECTION_NEGATIVE_X |
-     META_BORDER_MOTION_DIRECTION_NEGATIVE_Y);
-}
-
-void
-meta_border_set_allows_directions (MetaBorder *border, unsigned int directions)
-{
-  border->blocking_directions =
-    ~directions & (META_BORDER_MOTION_DIRECTION_POSITIVE_X |
-                   META_BORDER_MOTION_DIRECTION_POSITIVE_Y |
-                   META_BORDER_MOTION_DIRECTION_NEGATIVE_X |
-                   META_BORDER_MOTION_DIRECTION_NEGATIVE_Y);
-}
--- a/src/core/meta-border.h
+++ b/src/core/meta-border.h
@@ -1,84 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2015 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.
- *
- * Written by:
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef META_BORDER_H
-#define META_BORDER_H
-
-#include <glib.h>
-
-typedef enum
-{
-  META_BORDER_MOTION_DIRECTION_POSITIVE_X = 1 << 0,
-  META_BORDER_MOTION_DIRECTION_POSITIVE_Y = 1 << 1,
-  META_BORDER_MOTION_DIRECTION_NEGATIVE_X = 1 << 2,
-  META_BORDER_MOTION_DIRECTION_NEGATIVE_Y = 1 << 3,
-} MetaBorderMotionDirection;
-
-typedef struct _MetaVector2
-{
-  float x;
-  float y;
-} MetaVector2;
-
-typedef struct _MetaLine2
-{
-  MetaVector2 a;
-  MetaVector2 b;
-} MetaLine2;
-
-typedef struct _MetaBorder
-{
-  MetaLine2 line;
-  MetaBorderMotionDirection blocking_directions;
-} MetaBorder;
-
-static inline MetaVector2
-meta_vector2_subtract (const MetaVector2 a,
-                       const MetaVector2 b)
-{
-  return (MetaVector2) {
-    .x = a.x - b.x,
-    .y = a.y - b.y,
-  };
-}
-
-gboolean
-meta_line2_intersects_with (const MetaLine2 *line1,
-                            const MetaLine2 *line2,
-                            MetaVector2     *intersection);
-
-gboolean
-meta_border_is_horizontal (MetaBorder *border);
-
-gboolean
-meta_border_is_blocking_directions (MetaBorder               *border,
-                                    MetaBorderMotionDirection directions);
-
-unsigned int
-meta_border_get_allows_directions (MetaBorder *border);
-
-void
-meta_border_set_allows_directions (MetaBorder *border, unsigned int directions);
-
-#endif /* META_BORDER_H */
--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@@ -44,7 +44,7 @@ print_version (const gchar    *option_name,
  exit (0);
 }

-static const char *plugin = "default";
+static gchar *plugin = "default";

 GOptionEntry mutter_options[] = {
  {
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -96,10 +96,6 @@ static gboolean bell_is_audible = TRUE;
 static gboolean gnome_accessibility = FALSE;
 static gboolean gnome_animations = TRUE;
 static char *cursor_theme = NULL;
-/* cursor_size will, when running as an X11 compositing window manager, be the
- * actual cursor size, multiplied with the global window scaling factor. On
- * Wayland, it will be the actual cursor size retrieved from gsettings.
- */
 static int   cursor_size = 24;
 static int   draggable_border_width = 10;
 static int   drag_threshold;
@@ -127,9 +123,6 @@ static gboolean update_binding         (MetaKeyPref *binding,
 static gboolean update_key_binding     (const char  *key,
                                        gchar      **strokes);

-static void wayland_settings_changed (GSettings      *settings,
-                                      gchar          *key,
-                                      gpointer        data);
 static void settings_changed (GSettings      *settings,
                              gchar          *key,
                              gpointer        data);
@@ -141,10 +134,9 @@ static void shell_shows_app_menu_changed (GtkSettings *settings,
                                          GParamSpec  *pspec,
                                          gpointer     data);

-static void update_cursor_size_from_gtk (GtkSettings *settings,
-                                         GParamSpec *pspec,
-                                         gpointer data);
-static void update_cursor_size (void);
+static void update_cursor_size (GtkSettings *settings,
+                                GParamSpec *pspec,
+                                gpointer data);

 static void queue_changed (MetaPreference  pref);

@@ -169,8 +161,8 @@ typedef struct

 typedef struct
 {
-  const char *key;
-  const char *schema;
+  char *key;
+  char *schema;
  MetaPreference pref;
 } MetaBasePreference;

@@ -971,18 +963,14 @@ meta_prefs_init (void)
                    G_CALLBACK (settings_changed), NULL);
  g_signal_connect (settings, "changed::" KEY_GNOME_CURSOR_THEME,
                    G_CALLBACK (settings_changed), NULL);
-  if (meta_is_wayland_compositor ())
-    g_signal_connect (settings, "changed::cursor-size",
-                      G_CALLBACK (wayland_settings_changed), NULL);
  g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_INTERFACE), settings);

  g_signal_connect (gtk_settings_get_default (),
                    "notify::gtk-shell-shows-app-menu",
                    G_CALLBACK (shell_shows_app_menu_changed), NULL);

-  if (!meta_is_wayland_compositor ())
-    g_signal_connect (gtk_settings_get_default (), "notify::gtk-cursor-theme-size",
-                      G_CALLBACK (update_cursor_size_from_gtk), NULL);
+  g_signal_connect (gtk_settings_get_default (), "notify::gtk-cursor-theme-size",
+                    G_CALLBACK (update_cursor_size), NULL);

  settings = g_settings_new (SCHEMA_INPUT_SOURCES);
  g_signal_connect (settings, "changed::" KEY_XKB_OPTIONS,
@@ -1004,7 +992,7 @@ meta_prefs_init (void)
  handle_preference_init_string_array ();
  handle_preference_init_int ();

-  update_cursor_size ();
+  update_cursor_size (gtk_settings_get_default (), NULL, NULL);
  shell_shows_app_menu_changed (gtk_settings_get_default (), NULL, NULL);

  init_bindings ();
@@ -1145,20 +1133,6 @@ meta_prefs_override_preference_schema (const char *key, const char *schema)
 /****************************************************************************/


-static void
-wayland_settings_changed (GSettings      *settings,
-                          gchar          *key,
-                          gpointer        data)
-{
-  GVariant *value = g_settings_get_value (settings, key);
-  const GVariantType *type = g_variant_get_type (value);
-
-  g_return_if_fail (g_variant_type_equal (type, G_VARIANT_TYPE_INT32));
-  g_return_if_fail (g_str_equal (key, "cursor-size"));
-
-  update_cursor_size ();
-}
-
 static void
 settings_changed (GSettings *settings,
                  gchar *key,
@@ -1242,29 +1216,9 @@ shell_shows_app_menu_changed (GtkSettings *settings,
 }

 static void
-update_cursor_size (void)
-{
-  if (meta_is_wayland_compositor ())
-    {
-      /* When running as a Wayland compositor, since we size of the cursor
-       * depends on what output it is on, we cannot use the GTK+
-       * "gtk-cursor-theme-size" setting because it has already been multiplied
-       * by the primary monitor scale. So, instead get the non-premultiplied
-       * cursor size value directly from gsettings instead.
-       */
-      cursor_size =
-        g_settings_get_int (SETTINGS (SCHEMA_INTERFACE), "cursor-size");
-    }
-  else
-    {
-      update_cursor_size_from_gtk (gtk_settings_get_default (), NULL, NULL);
-    }
-}
-
-static void
-update_cursor_size_from_gtk (GtkSettings *settings,
-                             GParamSpec *pspec,
-                             gpointer data)
+update_cursor_size (GtkSettings *settings,
+                    GParamSpec *pspec,
+                    gpointer data)
 {
  GdkScreen *screen = gdk_screen_get_default ();
  GValue value = G_VALUE_INIT;
@@ -1477,11 +1431,42 @@ button_function_from_string (const char *str)
    return META_BUTTON_FUNCTION_MAXIMIZE;
  else if (strcmp (str, "close") == 0)
    return META_BUTTON_FUNCTION_CLOSE;
+  else if (strcmp (str, "shade") == 0)
+    return META_BUTTON_FUNCTION_SHADE;
+  else if (strcmp (str, "above") == 0)
+    return META_BUTTON_FUNCTION_ABOVE;
+  else if (strcmp (str, "stick") == 0)
+    return META_BUTTON_FUNCTION_STICK;
  else
    /* don't know; give up */
    return META_BUTTON_FUNCTION_LAST;
 }

+static MetaButtonFunction
+button_opposite_function (MetaButtonFunction ofwhat)
+{
+  switch (ofwhat)
+    {
+    case META_BUTTON_FUNCTION_SHADE:
+      return META_BUTTON_FUNCTION_UNSHADE;
+    case META_BUTTON_FUNCTION_UNSHADE:
+      return META_BUTTON_FUNCTION_SHADE;
+
+    case META_BUTTON_FUNCTION_ABOVE:
+      return META_BUTTON_FUNCTION_UNABOVE;
+    case META_BUTTON_FUNCTION_UNABOVE:
+      return META_BUTTON_FUNCTION_ABOVE;
+
+    case META_BUTTON_FUNCTION_STICK:
+      return META_BUTTON_FUNCTION_UNSTICK;
+    case META_BUTTON_FUNCTION_UNSTICK:
+      return META_BUTTON_FUNCTION_STICK;
+
+    default:
+      return META_BUTTON_FUNCTION_LAST;
+    }
+}
+
 static gboolean
 button_layout_handler (GVariant *value,
                       gpointer *result,
@@ -1525,6 +1510,12 @@ button_layout_handler (GVariant *value,
          if (i > 0 && strcmp("spacer", buttons[b]) == 0)
            {
              new_layout.left_buttons_has_spacer[i-1] = TRUE;
+              f = button_opposite_function (f);
+
+              if (f != META_BUTTON_FUNCTION_LAST)
+                {
+                  new_layout.left_buttons_has_spacer[i-2] = TRUE;
+                }
            }
          else
            {
@@ -1533,6 +1524,11 @@ button_layout_handler (GVariant *value,
                  new_layout.left_buttons[i] = f;
                  used[f] = TRUE;
                  ++i;
+
+                  f = button_opposite_function (f);
+
+                  if (f != META_BUTTON_FUNCTION_LAST)
+                      new_layout.left_buttons[i++] = f;
                }
              else
                {
@@ -1576,6 +1572,11 @@ button_layout_handler (GVariant *value,
          if (i > 0 && strcmp("spacer", buttons[b]) == 0)
            {
              new_layout.right_buttons_has_spacer[i-1] = TRUE;
+              f = button_opposite_function (f);
+              if (f != META_BUTTON_FUNCTION_LAST)
+                {
+                  new_layout.right_buttons_has_spacer[i-2] = TRUE;
+                }
            }
          else
            {
@@ -1584,6 +1585,12 @@ button_layout_handler (GVariant *value,
                  new_layout.right_buttons[i] = f;
                  used[f] = TRUE;
                  ++i;
+
+                  f = button_opposite_function (f);
+
+                  if (f != META_BUTTON_FUNCTION_LAST)
+                      new_layout.right_buttons[i++] = f;
+
                }
              else
                {
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -57,13 +57,7 @@ struct _MetaScreen
  MetaRectangle rect;  /* Size of screen; rect.x & rect.y are always 0 */
  MetaUI *ui;

-  struct {
-    gboolean exists;
-    guint timeout_id;
-    MetaWindow *window;
-    MetaRectangle area;
-    int monitor;
-  } tile_preview;
+  guint tile_preview_timeout_id;

  MetaWorkspace *active_workspace;

@@ -91,7 +85,11 @@ struct _MetaScreen
  /* Cache the current monitor */
  int last_monitor_index;

+#ifdef HAVE_STARTUP_NOTIFICATION
+  SnMonitorContext *sn_context;
  GSList *startup_sequences;
+  guint startup_sequence_timeout;
+#endif

  Window wm_cm_selection_window;
  guint work_area_later;
@@ -138,12 +136,9 @@ void          meta_screen_foreach_window      (MetaScreen                 *scree

 void          meta_screen_update_cursor       (MetaScreen                 *screen);

-void          meta_screen_update_tile_preview (MetaScreen    *screen,
-                                               MetaWindow    *window,
-                                               MetaRectangle  area,
-                                               int            monitor,
-                                               gboolean       delay);
-void          meta_screen_hide_tile_preview   (MetaScreen *screen);
+void          meta_screen_update_tile_preview          (MetaScreen    *screen,
+                                                        gboolean       delay);
+void          meta_screen_hide_tile_preview            (MetaScreen    *screen);

 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
                                                MetaWindow                 *not_this_one);
@@ -157,10 +152,6 @@ const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen
 const MetaMonitorInfo* meta_screen_calculate_monitor_for_window (MetaScreen    *screen,
                                                                 MetaWindow    *window);

-const MetaMonitorInfo* meta_screen_get_monitor_for_point (MetaScreen    *screen,
-                                                          int            x,
-                                                          int            y);
-

 const MetaMonitorInfo* meta_screen_get_monitor_neighbor (MetaScreen *screen,
                                                         int         which_monitor,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Garnacho	3b17f67b97	wayland: Implement wl_pointer_gestures The global wl_pointer_gestures object is now created, effectively bridging pinch/swipe gestures with clients, so they're now accessible to clients implementing the protocol.	2015-08-10 16:48:31 +02:00
Carlos Garnacho	0db347d642	wayland: Implement the wl_pointer_gesture_pinch interface The pinch gesture resources are part of the MetaWaylandPointerClient, which will be used during the propagation of CLUTTER_TOUCHPAD_PINCH events.	2015-08-10 16:45:23 +02:00
Carlos Garnacho	6963dbef16	wayland: Implement the wl_pointer_gesture_swipe interface The swipe gesture resources are part of the MetaWaylandPointerClient, which will be used during the emission of CLUTTER_TOUCHPAD_SWIPE events.	2015-08-10 16:45:23 +02:00
Carlos Garnacho	2b96fc7d0c	wayland: Add gestures protocol XML	2015-08-10 16:45:23 +02:00
Jonas Ådahl	109389acf0	MetaWaylandPointer: Put client resources in its own struct Instead of moving around all the bound pointer resources for a client when changing focus, keep all the resources bound by a client in a per client struct, and track the focus by having a pointer to the current active pointer client struct instance. This will simplify having wl_pointer extensinos sharing the pointer focus of the wl_pointer by only having to add them to the pointer client. https://bugzilla.gnome.org/show_bug.cgi?id=744104	2015-08-10 16:44:01 +02:00