WIP: Implement the primary selection protocol

wayland: Implement gtk-shell v3
Implement the gtk_shell.set_startup_id request, so that the ID is removed from the sequences list, and feedback updated accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=762268
2016-02-20 01:37:01 +01:00 · 2016-02-19 17:41:03 +01:00 · 2016-02-19 17:41:03 +01:00 · 2016-02-19 17:41:03 +01:00 · 2016-02-19 08:57:56 -05:00 · 2016-02-19 08:57:56 -05:00
115 changed files with 8268 additions and 6052 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -64,12 +64,14 @@ src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
 src/gtk-shell-protocol.c
 src/gtk-shell-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/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/meta/meta-version.h
 doc/reference/*.args
 doc/reference/*.bak
--- a/85
+++ b/85
@@ -1,3 +1,88 @@
+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
--- 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], [17])
-m4_define([mutter_micro_version], [92])
+m4_define([mutter_minor_version], [19])
+m4_define([mutter_micro_version], [4])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -46,6 +46,7 @@ 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])

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

 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.9.11
+   gtk+-3.0 >= 3.19.8
   gio-unix-2.0 >= 2.35.1
   pango >= 1.2.0
   cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.15.92
-   $CLUTTER_PACKAGE >= 1.23.4
+   gsettings-desktop-schemas >= 3.19.3
+   $CLUTTER_PACKAGE >= 1.25.1
   cogl-1.0 >= 1.17.1
   upower-glib >= 0.99.0
   gnome-desktop-3.0
@@ -219,6 +220,10 @@ 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,6 +1,5 @@
 desktopfiles_in_files = \
-	mutter.desktop.in \
-	mutter-wayland.desktop.in
+	mutter.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
@@ -1,17 +0,0 @@
-[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/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,2 @@
-data/mutter-wayland.desktop.in
+# List of source files that should NOT be translated.
+# Please keep this file sorted alphabetically.
--- 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: 2015-02-28 11:14+0000\n"
-"PO-Revision-Date: 2015-02-28 21:34+0200\n"
+"POT-Creation-Date: 2016-01-05 13:43+0000\n"
+"PO-Revision-Date: 2016-01-05 18:04+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: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.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ą į darbalaukį Nr.1"
+msgstr "Perkelti langą į darbo sritį Nr.1"

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

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

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

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

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

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

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

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

 #: ../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 į darbalaukį Nr.1"
+msgstr "Persijungti į darbo sritį Nr.1"

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

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

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

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

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

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

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

 #: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
-msgstr "Perkelti į darbalaukį apačioje"
+msgstr "Perkelti į darbo sritį 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 visuose darbalaukiuose būseną"
+msgstr "Perjungti lango buvimo visose darbo srityse 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 specialiais lango valdymo veiksmais"
+msgstr "Klavišas, naudojamas kartu su specialiomis lango tvarkymo operacijomis"

 #: ../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 "Darbalaukiai valdomi dinamiškai"
+msgstr "Darbo sritys tvarkomos 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 darbastaliai yra valdomi dinamiškai, ar yra pastovus darbalaukių "
-"skaičius (nusakomas raktu num-workspaces schemoje org.gnome.desktop.wm."
-"preferences)."
+"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)."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
-msgstr "Darbalaukiai tik pagrindiniame"
+msgstr "Darbo sritys 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 darbalaukių perjungimas turi įvykti langams viusose monitoriuose, "
-"ar tik langams pagrindiniame monitoriuje."
+"Nusako, ar darbo sričių perjungimas turi įvykti langams visuose "
+"monitoriuose, ar tik langams pagrindiniame monitoriuje."

 #: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
@@ -438,46 +438,41 @@ 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:364
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Integruotas vaizduoklis"

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

-#: ../src/backends/meta-monitor-manager.c:393
+#: ../src/backends/meta-monitor-manager.c:546
 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:401
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -489,7 +484,7 @@ msgstr "%s %s"
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
-msgstr "Kita kompozicijos valdyklė jau veikia ekrane %i vaizduoklyje „%s“."
+msgstr "Kita kompozicijos tvarkytuvė jau veikia ekrane %i vaizduoklyje „%s“."

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

-#: ../src/core/display.c:562
+#: ../src/core/display.c:563
 #, 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:176
+#: ../src/core/main.c:180
 msgid "Disable connection to session manager"
-msgstr "Išjungti susijungimą su sesijos valdykle"
+msgstr "Išjungti susijungimą su sesijos tvarkytuve"

-#: ../src/core/main.c:182
+#: ../src/core/main.c:186
 msgid "Replace the running window manager"
-msgstr "Pakeisti veikiančią langų valdyklę"
+msgstr "Pakeisti veikiančią langų tvarkytuvę"

-#: ../src/core/main.c:188
+#: ../src/core/main.c:192
 msgid "Specify session management ID"
-msgstr "Nurodyti sesijos valdymo ID"
+msgstr "Nurodyti sesijos tvarkymo ID"

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

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

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

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

-#: ../src/core/main.c:220
+#: ../src/core/main.c:224
 msgid "Run as a full display server, rather than nested"
 msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne vidinį"

@@ -580,24 +575,21 @@ msgstr "Parodyti versiją"
 msgid "Mutter plugin to use"
 msgstr "Naudojamas Mutter įskiepis"

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

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

-#: ../src/core/screen.c:607
+#: ../src/core/screen.c:608
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ netinkamas\n"
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/src/Makefile-tests.am
+++ b/src/Makefile-tests.am
@@ -9,6 +9,7 @@ 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
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,19 +45,23 @@ mutter_built_sources = \

 if HAVE_WAYLAND
 mutter_built_sources += \
-	pointer-gestures-protocol.c		\
-	pointer-gestures-server-protocol.h	\
+	primary-selection-unstable-v1-protocol.c			\
+	primary-selection-unstable-v1-server-protocol.h			\
+	pointer-gestures-unstable-v1-protocol.c				\
+	pointer-gestures-unstable-v1-server-protocol.h			\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
-	xdg-shell-protocol.c			\
-	xdg-shell-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		\
 	$(NULL)
 endif

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

 libmutter_la_SOURCES =				\
@@ -86,6 +90,8 @@ 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			\
@@ -112,6 +118,8 @@ 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			\
@@ -192,6 +200,8 @@ 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				\
@@ -266,6 +276,12 @@ 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		\
@@ -481,6 +497,20 @@ $(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,6 +34,7 @@
 #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"
@@ -51,6 +52,8 @@ struct _MetaBackend

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

 struct _MetaBackendClass
@@ -87,6 +90,13 @@ 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,
@@ -110,4 +120,14 @@ 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,6 +24,8 @@

 #include "config.h"

+#include <stdlib.h>
+
 #include <meta/meta-backend.h>
 #include "meta-backend-private.h"
 #include "meta-input-settings-private.h"
@@ -351,6 +353,17 @@ 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)
 {
@@ -364,6 +377,7 @@ 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),
@@ -542,6 +556,32 @@ meta_backend_update_last_device (MetaBackend *backend,
    }
 }

+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)
 {
@@ -626,7 +666,10 @@ meta_clutter_init (void)
  meta_create_backend ();

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

  /*
   * 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,6 +26,8 @@
 #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 ())
@@ -67,14 +69,7 @@ G_END_DECLS
 struct _MetaBarrierPrivate
 {
  MetaDisplay *display;
-
-  int x1;
-  int y1;
-  int x2;
-  int y2;
-
-  MetaBarrierDirection directions;
-
+  MetaBorder border;
  MetaBarrierImpl *impl;
 };

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

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

 #if defined(HAVE_NATIVE_BACKEND)
  if (META_IS_BACKEND_NATIVE (meta_get_backend ()))
--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@@ -27,6 +27,8 @@
 #include "meta-cursor-renderer.h"

 #include <meta/meta-backend.h>
+#include <backends/meta-backend-private.h>
+#include <backends/meta-monitor-manager-private.h>
 #include <meta/util.h>

 #include <cogl/cogl.h>
@@ -116,6 +118,14 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
  };
 }

+static gboolean
+is_cursor_in_monitors_area (int x, int y)
+{
+  MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
+  return meta_monitor_manager_get_monitor_at_point (monitor_manager,
+                                                    (gfloat) x, (gfloat) y) >= 0;
+}
+
 static void
 update_cursor (MetaCursorRenderer *renderer,
               MetaCursorSprite   *cursor_sprite)
@@ -124,6 +134,11 @@ update_cursor (MetaCursorRenderer *renderer,
  gboolean handled_by_backend;
  gboolean should_redraw = FALSE;

+  /* do not render cursor if it is not on any monitor. Such situation
+   * can occur e. g. after monitor hot-plug */
+  if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
+    return;
+
  if (cursor_sprite)
    meta_cursor_sprite_prepare_at (cursor_sprite,
                                   priv->current_x,
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@@ -54,8 +54,6 @@ struct _MetaCursorRendererClass
                                        XcursorImage *xc_image);
 };

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

 void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -361,12 +361,12 @@ get_pointer_position_gdk (int         *x,
                          int         *y,
                          int         *mods)
 {
-  GdkDeviceManager *gmanager;
+  GdkSeat *gseat;
  GdkDevice *gdevice;
  GdkScreen *gscreen;

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

  gdk_device_get_position (gdevice, &gscreen, x, y);
  if (mods)
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -60,8 +60,6 @@ struct _MetaCursorSprite
  gboolean theme_dirty;
 };

-GType meta_cursor_sprite_get_type (void) G_GNUC_CONST;
-
 G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)

 static const char *
--- 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_scroll_method) (MetaInputSettings            *settings,
-                              ClutterInputDevice           *device,
-                              GDesktopTouchpadScrollMethod  mode);
+  void (* set_edge_scroll)   (MetaInputSettings  *settings,
+                              ClutterInputDevice *device,
+                              gboolean            enabled);
  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_scroll_method (MetaInputSettings *input_settings,
-                               ClutterInputDevice *device)
+update_touchpad_edge_scroll (MetaInputSettings *input_settings,
+                             ClutterInputDevice *device)
 {
  MetaInputSettingsClass *input_settings_class;
-  GDesktopTouchpadScrollMethod method;
+  gboolean edge_scroll_enabled;
  MetaInputSettingsPrivate *priv;

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

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

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

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

  if (device &&
@@ -523,15 +523,13 @@ 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)
        {
-          ClutterInputDevice *device = devices->data;
+          device = devices->data;

          if (device_is_trackball (device))
            input_settings_class->set_scroll_button (input_settings, device, button);
@@ -647,8 +645,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, "scroll-method") == 0)
-        update_touchpad_scroll_method (input_settings, NULL);
+      else if (strcmp (key, "edge-scrolling-enabled") == 0)
+        update_touchpad_edge_scroll (input_settings, NULL);
      else if (strcmp (key, "click-method") == 0)
        update_touchpad_click_method (input_settings, NULL);
    }
@@ -773,7 +771,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_scroll_method (input_settings, device);
+  update_touchpad_edge_scroll (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
    {
-      MetaCRTCInfo *info = g_slice_new0 (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;
-          int i, n_outputs;
+          unsigned int j;
          int width, height;

          mode = crtc_info->mode;
@@ -223,10 +223,9 @@ 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);

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

              output->is_dirty = TRUE;
              output->crtc = crtc;
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -414,6 +414,10 @@ 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_outputs);
+                                     manager->n_crtcs);

  /* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
     for each of them, unless they reference a rectangle that
@@ -346,6 +346,23 @@ 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)
@@ -353,22 +370,22 @@ meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
  int i;

  for (i = 0; i < n_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]);
-    }
+    meta_monitor_manager_clear_output (&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)
@@ -376,16 +393,20 @@ meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
  int i;

  for (i = 0; i < n_old_modes; i++)
-    {
-      g_free (old_modes[i].name);
-
-      if (old_modes[i].driver_notify)
-        old_modes[i].driver_notify (&old_modes[i]);
-    }
+    meta_monitor_manager_clear_mode (&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)
@@ -393,10 +414,7 @@ meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
  int i;

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

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

-      if (transform < META_MONITOR_TRANSFORM_NORMAL ||
-          transform > META_MONITOR_TRANSFORM_FLIPPED_270 ||
+      if (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
@@ -0,0 +1,57 @@
+/* -*- 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
@@ -0,0 +1,60 @@
+/* -*- 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/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -36,6 +36,10 @@
 #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
 {
@@ -137,6 +141,24 @@ 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)
@@ -191,10 +213,12 @@ constrain_all_screen_monitors (ClutterInputDevice *device,

 static void
 pointer_constrain_callback (ClutterInputDevice *device,
-			    guint32             time,
-			    float              *new_x,
-			    float              *new_y,
-			    gpointer            user_data)
+                            guint32             time,
+                            float               prev_x,
+                            float               prev_y,
+                            float              *new_x,
+                            float              *new_y,
+                            gpointer            user_data)
 {
  MetaMonitorManager *monitor_manager;
  MetaMonitorInfo *monitors;
@@ -203,6 +227,9 @@ 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);

@@ -253,11 +280,16 @@ 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
@@ -304,6 +336,19 @@ 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)
 {
@@ -321,14 +366,22 @@ 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);
+    }

-  priv->launcher = meta_launcher_new ();
  priv->barrier_manager = meta_barrier_manager_native_new ();

  priv->up_client = up_client_new ();
--- a/src/backends/native/meta-barrier-native.c
+++ b/src/backends/native/meta-barrier-native.c
@@ -93,126 +93,18 @@ 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 barrier->priv->y1 == barrier->priv->y2;
+  return meta_border_is_horizontal (&barrier->priv->border);
 }

 static gboolean
 is_barrier_blocking_directions (MetaBarrier         *barrier,
                                MetaBarrierDirection 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;
+  return meta_border_is_blocking_directions (&barrier->priv->border,
+                                             directions);
 }

 static void
@@ -224,31 +116,16 @@ 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 Line2
+static MetaLine2
 calculate_barrier_hit_box (MetaBarrier *barrier)
 {
-  Line2 hit_box = barrier_to_line (barrier);
+  MetaLine2 hit_box = barrier->priv->border.line;

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

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

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

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

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

  /* Check if the motion intersects with the barrier, and retrieve the
   * intersection point if any. */
-  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))
+  if (!meta_line2_intersects_with (&barrier->priv->border.line,
+                                   &data->in.motion,
+                                   &intersection))
    return;

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

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

      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
@@ -102,9 +102,6 @@ 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);
 }

@@ -258,6 +255,9 @@ has_valid_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 FALSE;
+
  switch (cursor_priv->pending_bo_state)
    {
    case META_CURSOR_GBM_BO_STATE_NONE:
@@ -273,6 +273,32 @@ has_valid_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
  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)
@@ -282,6 +308,9 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
  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;
@@ -640,7 +669,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 = gbm_create_device (priv->drm_fd);
+      priv->gbm = cogl_kms_renderer_get_gbm (cogl_renderer);

      uint64_t width, height;
      if (drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_WIDTH, &width) == 0 &&
--- a/src/backends/native/meta-idle-monitor-native.c
+++ b/src/backends/native/meta-idle-monitor-native.c
@@ -164,56 +164,36 @@ 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);
-  CheckNativeClosure closure;
+  GList *node, *watch_ids;

  monitor_native->last_event_time = g_get_monotonic_time ();

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

-  g_list_foreach (closure.fired_watches, fire_native_watch, NULL);
-  g_list_free (closure.fired_watches);
+  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);
 }
--- 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_scroll_method (MetaInputSettings            *settings,
-                                              ClutterInputDevice           *device,
-                                              GDesktopTouchpadScrollMethod  mode)
+meta_input_settings_native_set_edge_scroll (MetaInputSettings            *settings,
+                                            ClutterInputDevice           *device,
+                                            gboolean                      edge_scrolling_enabled)
 {
  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);

-  switch (mode)
+  if (supported & LIBINPUT_CONFIG_SCROLL_2FG)
    {
-    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;
-  }
+    }
+  else if (supported & LIBINPUT_CONFIG_SCROLL_EDGE &&
+           edge_scrolling_enabled)
+    {
+      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+    }
+  else
+    {
+      scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+    }

  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_scroll_method = meta_input_settings_native_set_scroll_method;
+  input_settings_class->set_edge_scroll = meta_input_settings_native_set_edge_scroll;
  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
@@ -46,6 +46,12 @@
 #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;
@@ -54,48 +60,47 @@ struct _MetaLauncher
  gboolean session_active;
 };

-static void
-report_error_and_die (const char *prefix,
-                      GError *error)
-{
-  /* if a function returns due to g_return_val_if_fail,
-   * then the error may not be set */
-  if (error)
-    g_error ("%s: %s", prefix, error->message);
-  else
-    g_error (prefix);
-
-  /* the error is not freed, but it is ok as g_error aborts the process */
-}
-
 static Login1Session *
-get_session_proxy (GCancellable *cancellable)
+get_session_proxy (GCancellable *cancellable,
+                   GError      **error)
 {
+  g_autofree char *proxy_path = NULL;
+  g_autofree char *session_id = NULL;
  Login1Session *session_proxy;
-  GError *error = NULL;
+
+  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;
+    }
+
+  proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/session", session_id);

  session_proxy = login1_session_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                         G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
                                                         "org.freedesktop.login1",
-                                                         "/org/freedesktop/login1/session/self",
-                                                         cancellable, &error);
+                                                         proxy_path,
+                                                         cancellable, error);
  if (!session_proxy)
-    report_error_and_die ("Failed getting session proxy", error);
+    g_prefix_error(error, "Could not get session proxy: ");

  return session_proxy;
 }

 static Login1Seat *
-get_seat_proxy (GCancellable *cancellable)
+get_seat_proxy (GCancellable *cancellable,
+                GError      **error)
 {
-  GError *error = NULL;
  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);
+                                                         cancellable, error);
  if (!seat)
-    report_error_and_die ("Could not get seat proxy", error);
+    g_prefix_error(error, "Could not get seat proxy: ");

  return seat;
 }
@@ -103,12 +108,12 @@ get_seat_proxy (GCancellable *cancellable)
 static void
 session_unpause (void)
 {
-  ClutterBackend *backend;
+  ClutterBackend *clutter_backend;
  CoglContext *cogl_context;
  CoglDisplay *cogl_display;

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

@@ -284,8 +289,8 @@ get_primary_gpu_path (const gchar *seat_name)
  gchar *path = NULL;
  GList *devices, *tmp;

-  GUdevClient *gudev_client = g_udev_client_new (subsystems);
-  GUdevEnumerator *enumerator = g_udev_enumerator_new (gudev_client);
+  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");
@@ -296,7 +301,8 @@ get_primary_gpu_path (const gchar *seat_name)

  for (tmp = devices; tmp != NULL; tmp = tmp->next)
    {
-      GUdevDevice *pci_device;
+      g_autoptr (GUdevDevice) platform_device = NULL;
+      g_autoptr (GUdevDevice) pci_device = NULL;
      GUdevDevice *dev = tmp->data;
      gint boot_vga;
      const gchar *device_seat;
@@ -323,94 +329,138 @@ get_primary_gpu_path (const gchar *seat_name)
      if (g_strcmp0 (seat_name, device_seat))
        continue;

-      pci_device = g_udev_device_get_parent_with_subsystem (dev, "pci", NULL);
-      if (!pci_device)
-          continue;
-
-      /* 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");
-      g_object_unref (pci_device);
-
-      if (boot_vga == 1)
+      platform_device = g_udev_device_get_parent_with_subsystem (dev, "platform", NULL);
+      if (platform_device != NULL)
        {
-          /* found the boot_vga device */
          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:
-  g_object_unref (enumerator);
-  g_object_unref (gudev_client);
-
  return path;
 }

-static void
+static gboolean
 get_kms_fd (Login1Session *session_proxy,
-            const gchar *seat_id,
-            int *fd_out)
+            const gchar   *seat_id,
+            int           *fd_out,
+            GError       **error)
 {
  int major, minor;
  int fd;
-  gchar *path;
-  GError *error = NULL;

-  path = get_primary_gpu_path (seat_id);
+  g_autofree gchar *path = get_primary_gpu_path (seat_id);
  if (!path)
-    g_error ("could not find drm kms device");
+    {
+      g_set_error (error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_NOT_FOUND,
+                   "could not find drm kms device");
+      return FALSE;
+    }

  if (!get_device_info_from_path (path, &major, &minor))
-    g_error ("Could not stat %s: %m", path);
+    {
+      g_set_error (error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_NOT_FOUND,
+                   "Could not get device info for path %s: %m", path);
+      return FALSE;
+    }

-  g_free (path);
-
-  if (!take_device (session_proxy, major, minor, &fd, NULL, &error))
-    report_error_and_die ("Could not open DRM device", error);
+  if (!take_device (session_proxy, major, minor, &fd, NULL, error))
+    {
+      g_prefix_error (error, "Could not open DRM device: ");
+      return FALSE;
+    }

  *fd_out = fd;
+
+  return TRUE;
 }

 static gchar *
-get_seat_id (void)
+get_seat_id (GError **error)
 {
-  char *session_id, *seat_id = NULL;
+  g_autofree char *session_id = NULL;
+  char *seat_id = NULL;
+  int r;

-  if (sd_pid_get_session (0, &session_id) < 0)
-    return NULL;
+  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;
+    }

-  /* on error the seat_id will remain NULL */
-  sd_session_get_seat (session_id, &seat_id);
-  free (session_id);
+  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 (void)
+meta_launcher_new (GError **error)
 {
  MetaLauncher *self = NULL;
-  Login1Session *session_proxy;
-  char *seat_id;
-  GError *error = NULL;
+  g_autoptr (Login1Session) session_proxy = NULL;
+  g_autoptr (Login1Seat) seat_proxy = NULL;
+  g_autofree char *seat_id = NULL;
+  gboolean have_control = FALSE;
  int kms_fd;

-  session_proxy = get_session_proxy (NULL);
-  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, &error))
-    report_error_and_die ("Could not take control", error);
+  session_proxy = get_session_proxy (NULL, error);
+  if (!session_proxy)
+    goto fail;

-  seat_id = get_seat_id ();
+  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, error))
+    {
+      g_prefix_error (error, "Could not take control: ");
+      goto fail;
+    }
+
+  have_control = TRUE;
+
+  seat_id = get_seat_id (error);
  if (!seat_id)
-    g_error ("Failed getting seat id");
+    goto fail;

-  get_kms_fd (session_proxy, seat_id, &kms_fd);
-  free (seat_id);
+  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;

  self = g_slice_new0 (MetaLauncher);
-  self->session_proxy = session_proxy;
-  self->seat_proxy = get_seat_proxy (NULL);
+  self->session_proxy = g_object_ref (session_proxy);
+  self->seat_proxy = g_object_ref (seat_proxy);

  self->session_active = TRUE;

@@ -420,8 +470,12 @@ meta_launcher_new (void)
                                      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;
 }

 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                     (void);
+MetaLauncher     *meta_launcher_new                     (GError       **error);
 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,6 +42,8 @@

 #include <gudev/gudev.h>

+#define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
+
 typedef struct {
  drmModeConnector *connector;

@@ -66,6 +68,9 @@ 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
@@ -429,6 +434,137 @@ 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)
 {
@@ -496,8 +632,18 @@ 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;
-      meta_mode->refresh_rate = (1000 * mode->clock /
-                                 ((float)mode->htotal * mode->vtotal));
+
+      /* 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->driver_private = g_slice_dup (drmModeModeInfo, mode);
      meta_mode->driver_notify = (GDestroyNotify)meta_monitor_mode_destroy_notify;
@@ -546,6 +692,7 @@ 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);
    }
@@ -928,6 +1075,7 @@ 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;
@@ -1000,6 +1148,13 @@ 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,
@@ -1152,6 +1307,8 @@ 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
@@ -82,6 +82,7 @@ struct _MetaBackendX11Private
  gchar *keymap_layouts;
  gchar *keymap_variants;
  gchar *keymap_options;
+  int locked_group;
 };
 typedef struct _MetaBackendX11Private MetaBackendX11Private;

@@ -297,15 +298,23 @@ handle_host_xevent (MetaBackend *backend,

  if (event->type == priv->xkb_event_base)
    {
-      XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;
+      XkbEvent *xkb_ev = (XkbEvent *) event;

-      if (xkb_ev->device == META_VIRTUAL_CORE_KEYBOARD_ID)
+      if (xkb_ev->any.device == META_VIRTUAL_CORE_KEYBOARD_ID)
        {
-          switch (xkb_ev->xkb_type)
+          switch (xkb_ev->any.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;
            }
@@ -441,6 +450,7 @@ 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 ();

@@ -450,27 +460,23 @@ meta_backend_x11_post_init (MetaBackend *backend)
      !XSyncInitialize (priv->xdisplay, &major, &minor))
    meta_fatal ("Could not initialize XSync");

-  {
-    int major = 2, minor = 3;
-    gboolean has_xi = FALSE;
+  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;
+        }
+    }

-    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");
-  }
+  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)
@@ -763,6 +769,9 @@ 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);
    }

@@ -776,6 +785,7 @@ 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);
 }

@@ -795,8 +805,6 @@ 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);
    }
--- a/src/backends/x11/meta-barrier-x11.c
+++ b/src/backends/x11/meta-barrier-x11.c
@@ -107,6 +107,7 @@ meta_barrier_impl_x11_new (MetaBarrier *barrier)
  MetaDisplay *display = barrier->priv->display;
  Display *dpy;
  Window root;
+  unsigned int allowed_motion_dirs;

  if (display == NULL)
    {
@@ -121,12 +122,14 @@ 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->x1,
-                                               barrier->priv->y1,
-                                               barrier->priv->x2,
-                                               barrier->priv->y2,
-                                               barrier->priv->directions,
+                                               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,
                                               0, NULL);

  g_hash_table_insert (display->xids, &priv->xbarrier, barrier);
--- a/src/backends/x11/meta-idle-monitor-xsync.c
+++ b/src/backends/x11/meta-idle-monitor-xsync.c
@@ -107,20 +107,6 @@ 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)
 {
@@ -327,13 +313,38 @@ 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)
@@ -358,10 +369,5 @@ meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
    }

  if (has_alarm)
-    {
-      watches = g_hash_table_get_values (monitor->watches);
-
-      g_list_foreach (watches, check_x11_watch, (gpointer) alarm);
-      g_list_free (watches);
-    }
+    check_x11_watches (monitor, alarm);
 }
--- 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_scroll_method (MetaInputSettings            *settings,
-                                           ClutterInputDevice           *device,
-                                           GDesktopTouchpadScrollMethod  mode)
+meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
+                                         ClutterInputDevice           *device,
+                                         gboolean                      edge_scroll_enabled)
 {
  guchar values[3] = { 0 }; /* 2fg, edge, button. The last value is unused */
  guchar *available;
@@ -211,26 +211,21 @@ meta_input_settings_x11_set_scroll_method (MetaInputSettings            *setting
  if (!available)
    return;

-  switch (mode)
+  if (available[0])
    {
-    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
-      break;
-    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
-      values[1] = 1;
-      break;
-    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
      values[0] = 1;
-      break;
-    default:
-      g_assert_not_reached ();
+    }
+  else if (available[1] && edge_scroll_enabled)
+    {
+      values[1] = 1;
+    }
+  else
+    {
+      /* Disabled */
    }

-  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);
+  change_property (device, "libinput Scroll Method Enabled",
+                   XA_INTEGER, 8, &values, 3);

  meta_XFree (available);
 }
@@ -321,7 +316,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_scroll_method = meta_input_settings_x11_set_scroll_method;
+  input_settings_class->set_edge_scroll = meta_input_settings_x11_set_edge_scroll;
  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,12 +419,6 @@ 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)
@@ -637,6 +631,70 @@ 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)
 {
@@ -773,6 +831,8 @@ 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];

@@ -796,44 +856,8 @@ 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);
-	  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;
-		}
-	    }
+	  output_get_modes (manager, meta_output, output);
+          output_get_crtcs (manager, meta_output, output);

 	  meta_output->n_possible_clones = output->nclone;
 	  meta_output->possible_clones = g_new0 (MetaOutput *, meta_output->n_possible_clones);
@@ -857,7 +881,10 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 	  else
 	    meta_output->backlight = -1;

-	  n_actual_outputs++;
+          if (meta_output->n_modes == 0 || meta_output->n_possible_crtcs == 0)
+            meta_monitor_manager_clear_output (meta_output);
+          else
+            n_actual_outputs++;
 	}

      XRRFreeOutputInfo (output);
@@ -1133,17 +1160,16 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
      if (crtc_info->mode != NULL)
        {
          MetaMonitorMode *mode;
-          g_autofree XID *outputs = NULL;
-          unsigned int j, n_outputs;
-          int width, height;
+          g_autofree XID *output_ids = NULL;
+          unsigned int j, n_output_ids;
          Status ok;

          mode = crtc_info->mode;

-          n_outputs = crtc_info->outputs->len;
-          outputs = g_new (XID, n_outputs);
+          n_output_ids = crtc_info->outputs->len;
+          output_ids = g_new (XID, n_output_ids);

-          for (j = 0; j < n_outputs; j++)
+          for (j = 0; j < n_output_ids; j++)
            {
              MetaOutput *output;

@@ -1152,7 +1178,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
              output->is_dirty = TRUE;
              output->crtc = crtc;

-              outputs[j] = output->winsys_id;
+              output_ids[j] = output->winsys_id;
            }

          ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
@@ -1162,7 +1188,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),
-                                 outputs, n_outputs);
+                                 output_ids, n_output_ids);

          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
@@ -33,8 +33,6 @@ struct _MetaCursorRendererX11Nested
  MetaCursorRenderer parent;
 };

-GType meta_cursor_renderer_x11_nested_get_type (void) G_GNUC_CONST;
-
 G_DEFINE_TYPE (MetaCursorRendererX11Nested, meta_cursor_renderer_x11_nested,
               META_TYPE_CURSOR_RENDERER);

--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -779,7 +779,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, META_SIZE_CHANGE_MAXIMIZE, old_frame_rect, old_buffer_rect);
+  meta_window_actor_size_change (window_actor, which_change, old_frame_rect, old_buffer_rect);
 }

 void
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -36,6 +36,14 @@

 #include "compositor/region-utils.h"

+enum {
+  PAINTING,
+
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
 struct _MetaSurfaceActorWaylandPrivate
 {
  MetaWaylandSurface *surface;
@@ -347,12 +355,13 @@ 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);
 }

@@ -388,6 +397,13 @@ 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
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -832,21 +832,23 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
    return TRUE;

  /*
-   * Do not add shadows to non-opaque windows; eventually we should generate
-   * a shadow from the input shape for such windows.
+   * Do not add shadows to non-opaque (ARGB32) windows, as we can't easily
+   * generate shadows for them.
   */
  if (is_non_opaque (self))
    return FALSE;

  /*
-   * Add shadows to override redirect windows on X11 unless the toolkit
-   * indicates that it is handling shadows itself (e.g., Gtk menus).
+   * 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.
   */
-  if (priv->window->override_redirect &&
-      !priv->window->has_custom_frame_extents)
-    return TRUE;
+  if (priv->window->has_custom_frame_extents)
+    return FALSE;

-  return FALSE;
+  /*
+   * Generate shadows for all other windows.
+   */
+  return TRUE;
 }

 /**
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -255,6 +255,31 @@ 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)
 {
@@ -271,7 +296,10 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)

      if (apriv->orig_parent)
        {
-          clutter_actor_reparent (a, 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);
          apriv->orig_parent = NULL;
        }

@@ -360,11 +388,10 @@ switch_workspace (MetaPlugin *plugin,
  MetaScreen *screen;
  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
  GList        *l;
-  ClutterActor *workspace0  = clutter_group_new ();
-  ClutterActor *workspace1  = clutter_group_new ();
+  ClutterActor *workspace0  = clutter_actor_new ();
+  ClutterActor *workspace1  = clutter_actor_new ();
  ClutterActor *stage;
  int           screen_width, screen_height;
-  ClutterAnimation *animation;

  screen = meta_plugin_get_screen (plugin);
  stage = meta_get_stage_for_screen (screen);
@@ -373,17 +400,15 @@ switch_workspace (MetaPlugin *plugin,
                        &screen_width,
                        &screen_height);

-  clutter_actor_set_anchor_point (workspace1,
-                                  screen_width,
-                                  screen_height);
+  clutter_actor_set_pivot_point (workspace1, 1.0, 1.0);
  clutter_actor_set_position (workspace1,
                              screen_width,
                              screen_height);

  clutter_actor_set_scale (workspace1, 0.0, 0.0);

-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace1);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace0);
+  clutter_actor_add_child (stage, workspace1);
+  clutter_actor_add_child (stage, workspace0);

  if (from == to)
    {
@@ -406,12 +431,15 @@ 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);

-          clutter_actor_reparent (actor,
-				  win_workspace == to ? workspace1 : workspace0);
-          clutter_actor_show_all (actor);
-          clutter_actor_raise_top (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);
        }
      else if (win_workspace < 0)
        {
@@ -431,23 +459,21 @@ switch_workspace (MetaPlugin *plugin,
  priv->desktop1 = workspace0;
  priv->desktop2 = workspace1;

-  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);
+  priv->tml_switch_workspace1 = actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
+                                               SWITCH_TIMEOUT,
+                                               "scale-x", 1.0,
+                                               "scale-y", 1.0,
+                                               NULL);
  g_signal_connect (priv->tml_switch_workspace1,
                    "completed",
                    G_CALLBACK (on_switch_workspace_effect_complete),
                    plugin);

-  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);
+  priv->tml_switch_workspace2 = actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
+                                               SWITCH_TIMEOUT,
+                                               "scale-x", 0.0,
+                                               "scale-y", 0.0,
+                                               NULL);
 }


@@ -504,19 +530,17 @@ 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);

-      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);
+      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);
      data->plugin = plugin;
      data->actor = actor;
      g_signal_connect (apriv->tml_minimize, "completed",
@@ -561,7 +585,6 @@ 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);

@@ -570,14 +593,13 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)
      clutter_actor_set_scale (actor, 0.5, 0.5);
      clutter_actor_show (actor);

-      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);
+      apriv->tml_map = actor_animate (actor,
+                                      CLUTTER_EASE_OUT_QUAD,
+                                      MAP_TIMEOUT,
+                                      "opacity", 255,
+                                      "scale-x", 1.0,
+                                      "scale-y", 1.0,
+                                      NULL);
      data->actor = actor;
      data->plugin = plugin;
      g_signal_connect (apriv->tml_map, "completed",
@@ -618,18 +640,16 @@ 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);

-      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);
+      apriv->tml_destroy = actor_animate (actor,
+                                          CLUTTER_EASE_OUT_QUAD,
+                                          DESTROY_TIMEOUT,
+                                          "opacity", 0,
+                                          "scale-x", 0.8,
+                                          "scale-y", 0.8,
+                                          NULL);
      data->plugin = plugin;
      data->actor = actor;
      g_signal_connect (apriv->tml_destroy, "completed",
@@ -702,7 +722,9 @@ show_tile_preview (MetaPlugin    *plugin,
  clutter_actor_show (preview->actor);

  window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
-  clutter_actor_lower (preview->actor, window_actor);
+  clutter_actor_set_child_below_sibling (clutter_actor_get_parent (preview->actor),
+                                         preview->actor,
+                                         window_actor);

  preview->tile_rect = *tile_rect;
 }
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -35,6 +35,7 @@
 #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>
@@ -276,9 +277,8 @@ struct _MetaDisplay
  int xinput_event_base;
  int xinput_opcode;

-#ifdef HAVE_STARTUP_NOTIFICATION
-  SnDisplay *sn_display;
-#endif
+  MetaStartupNotification *startup_notification;
+
  int xsync_event_base;
  int xsync_error_base;
  int shape_event_base;
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -400,28 +400,6 @@ 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)
 {
@@ -527,6 +505,20 @@ 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:
 *
@@ -547,7 +539,7 @@ meta_display_open (void)
  guint32 timestamp;

  /* A list of all atom names, so that we can intern them in one go. */
-  char *atom_names[] = {
+  const char *atom_names[] = {
 #define item(x) #x,
 #include <x11/atomnames.h>
 #undef item
@@ -605,14 +597,13 @@ 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, atom_names, G_N_ELEMENTS (atom_names),
+  XInternAtoms (display->xdisplay, (char **)atom_names, G_N_ELEMENTS (atom_names),
                False, atoms);
-  {
-    int i = 0;
+
+  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);
@@ -631,12 +622,6 @@ 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);
@@ -917,6 +902,10 @@ 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);
@@ -1101,6 +1090,7 @@ 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)
@@ -1113,14 +1103,6 @@ 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
   */
@@ -1964,9 +1946,12 @@ 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)
+  if (display->event_route == META_EVENT_ROUTE_NORMAL ||
+      display->event_route == META_EVENT_ROUTE_COMPOSITOR_GRAB)
    return;

+  g_assert (grab_window != NULL);
+
  g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                 display->screen, grab_window, grab_op);

--- a/src/core/events.c
+++ b/src/core/events.c
@@ -182,10 +182,25 @@ 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 &&
-      !display->pointer_emulating_sequence &&
-      sequence_is_pointer_emulated (display, event))
-    display->pointer_emulating_sequence = sequence;
+  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;
+        }
+    }

 #ifdef HAVE_WAYLAND
  MetaWaylandCompositor *compositor = NULL;
@@ -206,8 +221,8 @@ meta_display_handle_event (MetaDisplay        *display,

  if (meta_is_wayland_compositor () && event->type == CLUTTER_MOTION)
    {
-      MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
-      meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
+      meta_cursor_tracker_update_position (meta_cursor_tracker_get_for_screen (NULL),
+                                           event->motion.x, event->motion.y);
      display->monitor_cache_invalidated = TRUE;
    }

@@ -335,11 +350,6 @@ 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/keybindings.c
+++ b/src/core/keybindings.c
@@ -188,7 +188,7 @@ reload_modmap (MetaKeyBindingManager *keys)

  /* Modifiers to find. */
  struct {
-    char *name;
+    const char *name;
    xkb_mod_mask_t *mask_p;
  } mods[] = {
    { "ScrollLock", &scroll_lock_mask },
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -80,6 +80,10 @@

 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland.h"
+# endif
+
+#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
+#include <systemd/sd-login.h>
 #endif

 /*
@@ -291,6 +295,95 @@ 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)
+{
+  gboolean session_type_is_wayland = FALSE;
+
+#if defined(HAVE_WAYLAND) && defined(HAVE_NATIVE_BACKEND)
+  session_type_is_wayland = check_for_wayland_session_type ();
+#endif
+
+#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
+  if (opt_display_server || session_type_is_wayland)
+    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 || session_type_is_wayland);
+#endif
+}
+
 /**
 * meta_init: (skip)
 *
@@ -323,16 +416,7 @@ meta_init (void)
  if (g_getenv ("MUTTER_DEBUG"))
    meta_set_debugging (TRUE);

-#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
+  init_backend ();

  if (g_get_home_dir ())
    if (chdir (g_get_home_dir ()) < 0)
--- a/src/core/meta-border.c
+++ b/src/core/meta-border.c
@@ -0,0 +1,154 @@
+/* -*- 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
@@ -0,0 +1,84 @@
+/* -*- 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 gchar *plugin = "default";
+static const char *plugin = "default";

 GOptionEntry mutter_options[] = {
  {
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -96,6 +96,10 @@ 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;
@@ -123,6 +127,9 @@ 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);
@@ -134,9 +141,10 @@ static void shell_shows_app_menu_changed (GtkSettings *settings,
                                          GParamSpec  *pspec,
                                          gpointer     data);

-static void update_cursor_size (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 queue_changed (MetaPreference  pref);

@@ -161,8 +169,8 @@ typedef struct

 typedef struct
 {
-  char *key;
-  char *schema;
+  const char *key;
+  const char *schema;
  MetaPreference pref;
 } MetaBasePreference;

@@ -963,14 +971,18 @@ 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);

-  g_signal_connect (gtk_settings_get_default (), "notify::gtk-cursor-theme-size",
-                    G_CALLBACK (update_cursor_size), 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);

  settings = g_settings_new (SCHEMA_INPUT_SOURCES);
  g_signal_connect (settings, "changed::" KEY_XKB_OPTIONS,
@@ -992,7 +1004,7 @@ meta_prefs_init (void)
  handle_preference_init_string_array ();
  handle_preference_init_int ();

-  update_cursor_size (gtk_settings_get_default (), NULL, NULL);
+  update_cursor_size ();
  shell_shows_app_menu_changed (gtk_settings_get_default (), NULL, NULL);

  init_bindings ();
@@ -1133,6 +1145,20 @@ 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,
@@ -1216,9 +1242,29 @@ shell_shows_app_menu_changed (GtkSettings *settings,
 }

 static void
-update_cursor_size (GtkSettings *settings,
-                    GParamSpec *pspec,
-                    gpointer data)
+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)
 {
  GdkScreen *screen = gdk_screen_get_default ();
  GValue value = G_VALUE_INIT;
@@ -1431,42 +1477,11 @@ 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,
@@ -1510,12 +1525,6 @@ 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
            {
@@ -1524,11 +1533,6 @@ 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
                {
@@ -1572,11 +1576,6 @@ 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
            {
@@ -1585,12 +1584,6 @@ 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
@@ -85,11 +85,7 @@ 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;
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -71,11 +71,6 @@ static void prefs_changed_callback (MetaPreference pref,
 static void set_desktop_geometry_hint (MetaScreen *screen);
 static void set_desktop_viewport_hint (MetaScreen *screen);

-#ifdef HAVE_STARTUP_NOTIFICATION
-static void meta_screen_sn_event   (SnMonitorEvent *event,
-                                    void           *user_data);
-#endif
-
 static void on_monitors_changed (MetaMonitorManager *manager,
                                 MetaScreen         *screen);

@@ -730,17 +725,6 @@ meta_screen_new (MetaDisplay *display,

  meta_prefs_add_listener (prefs_changed_callback, screen);

-#ifdef HAVE_STARTUP_NOTIFICATION
-  screen->sn_context =
-    sn_monitor_context_new (screen->display->sn_display,
-                            screen->number,
-                            meta_screen_sn_event,
-                            screen,
-                            NULL);
-  screen->startup_sequences = NULL;
-  screen->startup_sequence_timeout = 0;
-#endif
-
  meta_verbose ("Added screen %d ('%s') root 0x%lx\n",
                screen->number, screen->screen_name, screen->xroot);

@@ -800,24 +784,6 @@ meta_screen_free (MetaScreen *screen,

  meta_screen_ungrab_keys (screen);

-#ifdef HAVE_STARTUP_NOTIFICATION
-  g_slist_foreach (screen->startup_sequences,
-                   (GFunc) sn_startup_sequence_unref, NULL);
-  g_slist_free (screen->startup_sequences);
-  screen->startup_sequences = NULL;
-
-  if (screen->startup_sequence_timeout != 0)
-    {
-      g_source_remove (screen->startup_sequence_timeout);
-      screen->startup_sequence_timeout = 0;
-    }
-  if (screen->sn_context)
-    {
-      sn_monitor_context_unref (screen->sn_context);
-      screen->sn_context = NULL;
-    }
-#endif
-
  meta_ui_free (screen->ui);

  meta_stack_free (screen->stack);
@@ -2100,7 +2066,7 @@ meta_screen_queue_workarea_recalc (MetaScreen *screen)


 #ifdef WITH_VERBOSE_MODE
-static char *
+static const char *
 meta_screen_corner_to_string (MetaScreenCorner corner)
 {
  switch (corner)
@@ -2538,208 +2504,6 @@ meta_screen_unshow_desktop (MetaScreen *screen)
  meta_screen_update_showing_desktop_hint (screen);
 }

-
-#ifdef HAVE_STARTUP_NOTIFICATION
-static gboolean startup_sequence_timeout (void *data);
-
-static void
-update_startup_feedback (MetaScreen *screen)
-{
-  if (screen->startup_sequences != NULL)
-    {
-      meta_topic (META_DEBUG_STARTUP,
-                  "Setting busy cursor\n");
-      meta_screen_set_cursor (screen, META_CURSOR_BUSY);
-    }
-  else
-    {
-      meta_topic (META_DEBUG_STARTUP,
-                  "Setting default cursor\n");
-      meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
-    }
-}
-
-static void
-add_sequence (MetaScreen        *screen,
-              SnStartupSequence *sequence)
-{
-  meta_topic (META_DEBUG_STARTUP,
-              "Adding sequence %s\n",
-              sn_startup_sequence_get_id (sequence));
-  sn_startup_sequence_ref (sequence);
-  screen->startup_sequences = g_slist_prepend (screen->startup_sequences,
-                                               sequence);
-
-  /* our timeout just polls every second, instead of bothering
-   * to compute exactly when we may next time out
-   */
-  if (screen->startup_sequence_timeout == 0)
-    {
-      screen->startup_sequence_timeout = g_timeout_add_seconds (1,
-                                                                startup_sequence_timeout,
-                                                                screen);
-      g_source_set_name_by_id (screen->startup_sequence_timeout,
-                               "[mutter] startup_sequence_timeout");
-    }
-
-  update_startup_feedback (screen);
-}
-
-static void
-remove_sequence (MetaScreen        *screen,
-                 SnStartupSequence *sequence)
-{
-  meta_topic (META_DEBUG_STARTUP,
-              "Removing sequence %s\n",
-              sn_startup_sequence_get_id (sequence));
-
-  screen->startup_sequences = g_slist_remove (screen->startup_sequences,
-                                              sequence);
-
-  if (screen->startup_sequences == NULL &&
-      screen->startup_sequence_timeout != 0)
-    {
-      g_source_remove (screen->startup_sequence_timeout);
-      screen->startup_sequence_timeout = 0;
-    }
-
-  update_startup_feedback (screen);
-
-  sn_startup_sequence_unref (sequence);
-}
-
-typedef struct
-{
-  GSList *list;
-  GTimeVal now;
-} CollectTimedOutData;
-
-/* This should be fairly long, as it should never be required unless
- * apps or .desktop files are buggy, and it's confusing if
- * OpenOffice or whatever seems to stop launching - people
- * might decide they need to launch it again.
- */
-#define STARTUP_TIMEOUT 15000
-
-static void
-collect_timed_out_foreach (void *element,
-                           void *data)
-{
-  CollectTimedOutData *ctod = data;
-  SnStartupSequence *sequence = element;
-  long tv_sec, tv_usec;
-  double elapsed;
-
-  sn_startup_sequence_get_last_active_time (sequence, &tv_sec, &tv_usec);
-
-  elapsed =
-    ((((double)ctod->now.tv_sec - tv_sec) * G_USEC_PER_SEC +
-      (ctod->now.tv_usec - tv_usec))) / 1000.0;
-
-  meta_topic (META_DEBUG_STARTUP,
-              "Sequence used %g seconds vs. %g max: %s\n",
-              elapsed, (double) STARTUP_TIMEOUT,
-              sn_startup_sequence_get_id (sequence));
-
-  if (elapsed > STARTUP_TIMEOUT)
-    ctod->list = g_slist_prepend (ctod->list, sequence);
-}
-
-static gboolean
-startup_sequence_timeout (void *data)
-{
-  MetaScreen *screen = data;
-  CollectTimedOutData ctod;
-  GSList *l;
-
-  ctod.list = NULL;
-  g_get_current_time (&ctod.now);
-  g_slist_foreach (screen->startup_sequences,
-                   collect_timed_out_foreach,
-                   &ctod);
-
-  for (l = ctod.list; l != NULL; l = l->next)
-    {
-      SnStartupSequence *sequence = l->data;
-
-      meta_topic (META_DEBUG_STARTUP,
-                  "Timed out sequence %s\n",
-                  sn_startup_sequence_get_id (sequence));
-
-      sn_startup_sequence_complete (sequence);
-    }
-
-  g_slist_free (ctod.list);
-
-  if (screen->startup_sequences != NULL)
-    {
-      return TRUE;
-    }
-  else
-    {
-      /* remove */
-      screen->startup_sequence_timeout = 0;
-      return FALSE;
-    }
-}
-
-static void
-meta_screen_sn_event (SnMonitorEvent *event,
-                      void           *user_data)
-{
-  MetaScreen *screen;
-  SnStartupSequence *sequence;
-
-  screen = user_data;
-
-  sequence = sn_monitor_event_get_startup_sequence (event);
-
-  sn_startup_sequence_ref (sequence);
-
-  switch (sn_monitor_event_get_type (event))
-    {
-    case SN_MONITOR_EVENT_INITIATED:
-      {
-        const char *wmclass;
-
-        wmclass = sn_startup_sequence_get_wmclass (sequence);
-
-        meta_topic (META_DEBUG_STARTUP,
-                    "Received startup initiated for %s wmclass %s\n",
-                    sn_startup_sequence_get_id (sequence),
-                    wmclass ? wmclass : "(unset)");
-        add_sequence (screen, sequence);
-      }
-      break;
-
-    case SN_MONITOR_EVENT_COMPLETED:
-      {
-        meta_topic (META_DEBUG_STARTUP,
-                    "Received startup completed for %s\n",
-                    sn_startup_sequence_get_id (sequence));
-        remove_sequence (screen,
-                         sn_monitor_event_get_startup_sequence (event));
-      }
-      break;
-
-    case SN_MONITOR_EVENT_CHANGED:
-      meta_topic (META_DEBUG_STARTUP,
-                  "Received startup changed for %s\n",
-                  sn_startup_sequence_get_id (sequence));
-      break;
-
-    case SN_MONITOR_EVENT_CANCELED:
-      meta_topic (META_DEBUG_STARTUP,
-                  "Received startup canceled for %s\n",
-                  sn_startup_sequence_get_id (sequence));
-      break;
-    }
-
-  g_signal_emit (G_OBJECT (screen), screen_signals[STARTUP_SEQUENCE_CHANGED], 0, sequence);
-
-  sn_startup_sequence_unref (sequence);
-}
-
 /**
 * meta_screen_get_startup_sequences: (skip)
 * @screen:
@@ -2751,7 +2515,6 @@ meta_screen_get_startup_sequences (MetaScreen *screen)
 {
  return screen->startup_sequences;
 }
-#endif

 /* Sets the initial_timestamp and initial_workspace properties
 * of a window according to information given us by the
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1055,7 +1055,7 @@ stack_sync_to_xserver (MetaStack *stack)
  all_root_children_stacked = g_array_new (FALSE, FALSE, sizeof (guint64));
  x11_hidden_stack_ids = g_array_new (FALSE, FALSE, sizeof (guint64));

-  meta_topic (META_DEBUG_STACK, "Top to bottom: ");
+  meta_topic (META_DEBUG_STACK, "Bottom to top: ");
  meta_push_no_msg_prefix ();

  for (tmp = g_list_last(stack->sorted); tmp != NULL; tmp = tmp->prev)
@@ -1088,11 +1088,7 @@ stack_sync_to_xserver (MetaStack *stack)
      if (w->hidden)
 	{
          if (w->client_type == META_WINDOW_CLIENT_TYPE_X11)
-            {
-              guint64 stack_id = top_level_window;
-
-              g_array_append_val (x11_hidden_stack_ids, stack_id);
-            }
+            g_array_append_val (x11_hidden_stack_ids, top_level_window);
 	  continue;
 	}

--- a/src/core/startup-notification-private.h
+++ b/src/core/startup-notification-private.h
@@ -0,0 +1,48 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2001, 2002 Havoc Pennington
+ * Copyright (C) 2002, 2003 Red Hat Inc.
+ * Some ICCCM manager selection code derived from fvwm2,
+ * Copyright (C) 2001 Dominik Vogt, Matthias Clasen, and fvwm2 team
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
+ *
+ * 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/>.
+ */
+
+#ifndef META_STARTUP_NOTIFICATION_PRIVATE_H
+#define META_STARTUP_NOTIFICATION_PRIVATE_H
+
+#include "display-private.h"
+
+#define META_TYPE_STARTUP_NOTIFICATION (meta_startup_notification_get_type ())
+
+G_DECLARE_FINAL_TYPE (MetaStartupNotification,
+                      meta_startup_notification,
+                      META, STARTUP_NOTIFICATION,
+                      GObject)
+
+MetaStartupNotification *
+         meta_startup_notification_get             (MetaDisplay             *display);
+
+gboolean meta_startup_notification_handle_xevent   (MetaStartupNotification *sn,
+                                                    XEvent                  *xevent);
+
+void     meta_startup_notification_remove_sequence (MetaStartupNotification *sn,
+                                                    const gchar             *id);
+
+GSList * meta_startup_notification_get_sequences   (MetaStartupNotification *sn);
+
+#endif /* META_STARTUP_NOTIFICATION_PRIVATE_H */
--- a/src/core/startup-notification.c
+++ b/src/core/startup-notification.c
@@ -0,0 +1,767 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2001, 2002 Havoc Pennington
+ * Copyright (C) 2002, 2003 Red Hat Inc.
+ * Some ICCCM manager selection code derived from fvwm2,
+ * Copyright (C) 2001 Dominik Vogt, Matthias Clasen, and fvwm2 team
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
+ *
+ * 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/>.
+ */
+
+#include <config.h>
+
+#include <glib-object.h>
+
+#include <meta/errors.h>
+#include "display-private.h"
+#include "screen-private.h"
+#include "startup-notification-private.h"
+
+/* This should be fairly long, as it should never be required unless
+ * apps or .desktop files are buggy, and it's confusing if
+ * OpenOffice or whatever seems to stop launching - people
+ * might decide they need to launch it again.
+ */
+#define STARTUP_TIMEOUT 15000000
+
+typedef struct _MetaStartupNotificationSequence MetaStartupNotificationSequence;
+typedef struct _MetaStartupNotificationSequenceClass MetaStartupNotificationSequenceClass;
+
+enum {
+  PROP_SN_0,
+  PROP_SN_DISPLAY,
+  N_SN_PROPS
+};
+
+enum {
+  PROP_SEQ_0,
+  PROP_SEQ_ID,
+  PROP_SEQ_TIMESTAMP,
+  N_SEQ_PROPS
+};
+
+enum {
+  SN_CHANGED,
+  N_SN_SIGNALS
+};
+
+static guint sn_signals[N_SN_SIGNALS];
+static GParamSpec *sn_props[N_SN_PROPS];
+static GParamSpec *seq_props[N_SEQ_PROPS];
+
+typedef struct
+{
+  GSList *list;
+  gint64 now;
+} CollectTimedOutData;
+
+struct _MetaStartupNotification
+{
+  GObject parent_instance;
+  MetaDisplay *display;
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+  SnDisplay *sn_display;
+  SnMonitorContext *sn_context;
+#endif
+
+  GSList *startup_sequences;
+  guint startup_sequence_timeout;
+};
+
+#define META_TYPE_STARTUP_NOTIFICATION_SEQUENCE \
+  (meta_startup_notification_sequence_get_type ())
+
+G_DECLARE_DERIVABLE_TYPE (MetaStartupNotificationSequence,
+                          meta_startup_notification_sequence,
+                          META, STARTUP_NOTIFICATION_SEQUENCE,
+                          GObject)
+
+typedef struct {
+  gchar *id;
+  time_t timestamp;
+} MetaStartupNotificationSequencePrivate;
+
+struct _MetaStartupNotificationSequenceClass {
+  GObjectClass parent_class;
+
+  void (* complete) (MetaStartupNotificationSequence *sequence);
+};
+
+G_DEFINE_TYPE (MetaStartupNotification,
+               meta_startup_notification,
+               G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (MetaStartupNotificationSequence,
+                            meta_startup_notification_sequence,
+                            G_TYPE_OBJECT)
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+
+enum {
+  PROP_SEQ_X11_0,
+  PROP_SEQ_X11_SEQ,
+  N_SEQ_X11_PROPS
+};
+
+struct _MetaStartupNotificationSequenceX11 {
+  MetaStartupNotificationSequence parent_instance;
+  SnStartupSequence *seq;
+};
+
+static GParamSpec *seq_x11_props[N_SEQ_X11_PROPS];
+
+#define META_TYPE_STARTUP_NOTIFICATION_SEQUENCE_X11 \
+  (meta_startup_notification_sequence_x11_get_type ())
+
+G_DECLARE_FINAL_TYPE (MetaStartupNotificationSequenceX11,
+                      meta_startup_notification_sequence_x11,
+                      META, STARTUP_NOTIFICATION_SEQUENCE_X11,
+                      MetaStartupNotificationSequence)
+
+G_DEFINE_TYPE (MetaStartupNotificationSequenceX11,
+               meta_startup_notification_sequence_x11,
+               META_TYPE_STARTUP_NOTIFICATION_SEQUENCE)
+
+static void meta_startup_notification_ensure_timeout  (MetaStartupNotification *sn);
+
+#endif
+
+static void
+meta_startup_notification_update_feedback (MetaStartupNotification *sn)
+{
+  MetaScreen *screen = sn->display->screen;
+
+  if (sn->startup_sequences != NULL)
+    {
+      meta_topic (META_DEBUG_STARTUP,
+                  "Setting busy cursor\n");
+      meta_screen_set_cursor (screen, META_CURSOR_BUSY);
+    }
+  else
+    {
+      meta_topic (META_DEBUG_STARTUP,
+                  "Setting default cursor\n");
+      meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
+    }
+}
+
+static void
+meta_startup_notification_sequence_init (MetaStartupNotificationSequence *seq)
+{
+}
+
+static void
+meta_startup_notification_sequence_finalize (GObject *object)
+{
+  MetaStartupNotificationSequence *seq;
+  MetaStartupNotificationSequencePrivate *priv;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE (object);
+  priv = meta_startup_notification_sequence_get_instance_private (seq);
+  g_free (priv->id);
+
+  G_OBJECT_CLASS (meta_startup_notification_sequence_parent_class)->finalize (object);
+}
+
+static void
+meta_startup_notification_sequence_set_property (GObject      *object,
+                                                 guint         prop_id,
+                                                 const GValue *value,
+                                                 GParamSpec   *pspec)
+{
+  MetaStartupNotificationSequence *seq;
+  MetaStartupNotificationSequencePrivate *priv;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE (object);
+  priv = meta_startup_notification_sequence_get_instance_private (seq);
+
+  switch (prop_id)
+    {
+    case PROP_SEQ_ID:
+      priv->id = g_value_dup_string (value);
+      break;
+    case PROP_SEQ_TIMESTAMP:
+      priv->timestamp = g_value_get_int64 (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_startup_notification_sequence_get_property (GObject    *object,
+                                                 guint       prop_id,
+                                                 GValue     *value,
+                                                 GParamSpec *pspec)
+{
+  MetaStartupNotificationSequence *seq;
+  MetaStartupNotificationSequencePrivate *priv;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE (object);
+  priv = meta_startup_notification_sequence_get_instance_private (seq);
+
+  switch (prop_id)
+    {
+    case PROP_SEQ_ID:
+      g_value_set_string (value, priv->id);
+      break;
+    case PROP_SEQ_TIMESTAMP:
+      g_value_set_int64 (value, priv->timestamp);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_startup_notification_sequence_class_init (MetaStartupNotificationSequenceClass *klass)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = meta_startup_notification_sequence_finalize;
+  object_class->set_property = meta_startup_notification_sequence_set_property;
+  object_class->get_property = meta_startup_notification_sequence_get_property;
+
+  seq_props[PROP_SEQ_ID] =
+    g_param_spec_string ("id",
+                         "ID",
+                         "ID",
+                         NULL,
+                         G_PARAM_READWRITE |
+                         G_PARAM_CONSTRUCT_ONLY);
+  seq_props[PROP_SEQ_TIMESTAMP] =
+    g_param_spec_int64 ("timestamp",
+                        "Timestamp",
+                        "Timestamp",
+                        G_MININT64, G_MAXINT64, 0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (object_class, N_SEQ_PROPS, seq_props);
+}
+
+static const gchar *
+meta_startup_notification_sequence_get_id (MetaStartupNotificationSequence *seq)
+{
+  MetaStartupNotificationSequencePrivate *priv;
+
+  priv = meta_startup_notification_sequence_get_instance_private (seq);
+  return priv->id;
+}
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+static gint64
+meta_startup_notification_sequence_get_timestamp (MetaStartupNotificationSequence *seq)
+{
+  MetaStartupNotificationSequencePrivate *priv;
+
+  priv = meta_startup_notification_sequence_get_instance_private (seq);
+  return priv->timestamp;
+}
+
+static void
+meta_startup_notification_sequence_complete (MetaStartupNotificationSequence *seq)
+{
+  MetaStartupNotificationSequenceClass *klass;
+
+  klass = META_STARTUP_NOTIFICATION_SEQUENCE_GET_CLASS (seq);
+
+  if (klass->complete)
+    klass->complete (seq);
+}
+#endif
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+static void
+meta_startup_notification_sequence_x11_complete (MetaStartupNotificationSequence *seq)
+{
+  MetaStartupNotificationSequenceX11 *seq_x11;
+
+  seq_x11 = META_STARTUP_NOTIFICATION_SEQUENCE_X11 (seq);
+  sn_startup_sequence_complete (seq_x11->seq);
+}
+
+static void
+meta_startup_notification_sequence_x11_finalize (GObject *object)
+{
+  MetaStartupNotificationSequenceX11 *seq;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE_X11 (object);
+  sn_startup_sequence_unref (seq->seq);
+
+  G_OBJECT_CLASS (meta_startup_notification_sequence_x11_parent_class)->finalize (object);
+}
+
+static void
+meta_startup_notification_sequence_x11_set_property (GObject      *object,
+                                                     guint         prop_id,
+                                                     const GValue *value,
+                                                     GParamSpec   *pspec)
+{
+  MetaStartupNotificationSequenceX11 *seq;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE_X11 (object);
+
+  switch (prop_id)
+    {
+    case PROP_SEQ_X11_SEQ:
+      seq->seq = g_value_get_pointer (value);
+      sn_startup_sequence_ref (seq->seq);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_startup_notification_sequence_x11_get_property (GObject    *object,
+                                                     guint       prop_id,
+                                                     GValue     *value,
+                                                     GParamSpec *pspec)
+{
+  MetaStartupNotificationSequenceX11 *seq;
+
+  seq = META_STARTUP_NOTIFICATION_SEQUENCE_X11 (object);
+
+  switch (prop_id)
+    {
+    case PROP_SEQ_X11_SEQ:
+      g_value_set_pointer (value, seq->seq);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_startup_notification_sequence_x11_init (MetaStartupNotificationSequenceX11 *seq)
+{
+}
+
+static void
+meta_startup_notification_sequence_x11_class_init (MetaStartupNotificationSequenceX11Class *klass)
+{
+  MetaStartupNotificationSequenceClass *seq_class;
+  GObjectClass *object_class;
+
+  seq_class = META_STARTUP_NOTIFICATION_SEQUENCE_CLASS (klass);
+  seq_class->complete = meta_startup_notification_sequence_x11_complete;
+
+  object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = meta_startup_notification_sequence_x11_finalize;
+  object_class->set_property = meta_startup_notification_sequence_x11_set_property;
+  object_class->get_property = meta_startup_notification_sequence_x11_get_property;
+
+  seq_x11_props[PROP_SEQ_X11_SEQ] =
+    g_param_spec_pointer ("seq",
+                          "Sequence",
+                          "Sequence",
+                          G_PARAM_READWRITE |
+                          G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (object_class, N_SEQ_X11_PROPS,
+                                     seq_x11_props);
+}
+
+static MetaStartupNotificationSequence *
+meta_startup_notification_sequence_x11_new (SnStartupSequence *seq)
+{
+  return g_object_new (META_TYPE_STARTUP_NOTIFICATION_SEQUENCE_X11,
+                       "id", sn_startup_sequence_get_id (seq),
+                       "timestamp", sn_startup_sequence_get_timestamp (seq) * 1000,
+                       "seq", seq,
+                       NULL);
+}
+
+static void
+meta_startup_notification_add_sequence_internal (MetaStartupNotification         *sn,
+                                                 MetaStartupNotificationSequence *seq)
+{
+  sn->startup_sequences = g_slist_prepend (sn->startup_sequences,
+                                           g_object_ref (seq));
+
+  meta_startup_notification_ensure_timeout (sn);
+  meta_startup_notification_update_feedback (sn);
+}
+
+static void
+collect_timed_out_foreach (void *element,
+                           void *data)
+{
+  MetaStartupNotificationSequence *sequence = element;
+  CollectTimedOutData *ctod = data;
+  gint64 elapsed, timestamp;
+
+  timestamp = meta_startup_notification_sequence_get_timestamp (sequence);
+  elapsed = ctod->now - timestamp;
+
+  meta_topic (META_DEBUG_STARTUP,
+              "Sequence used %ld ms vs. %d max: %s\n",
+              elapsed, STARTUP_TIMEOUT,
+              meta_startup_notification_sequence_get_id (sequence));
+
+  if (elapsed > STARTUP_TIMEOUT)
+    ctod->list = g_slist_prepend (ctod->list, sequence);
+}
+
+static gboolean
+startup_sequence_timeout (void *data)
+{
+  MetaStartupNotification *sn = data;
+  CollectTimedOutData ctod;
+  GSList *l;
+
+  ctod.list = NULL;
+  ctod.now = g_get_monotonic_time ();
+  g_slist_foreach (sn->startup_sequences,
+                   collect_timed_out_foreach,
+                   &ctod);
+
+  for (l = ctod.list; l != NULL; l = l->next)
+    {
+      MetaStartupNotificationSequence *sequence = l->data;
+
+      meta_topic (META_DEBUG_STARTUP,
+                  "Timed out sequence %s\n",
+                  meta_startup_notification_sequence_get_id (sequence));
+
+      meta_startup_notification_sequence_complete (sequence);
+    }
+
+  g_slist_free (ctod.list);
+
+  if (sn->startup_sequences != NULL)
+    {
+      return TRUE;
+    }
+  else
+    {
+      /* remove */
+      sn->startup_sequence_timeout = 0;
+      return FALSE;
+    }
+}
+
+static void
+meta_startup_notification_ensure_timeout (MetaStartupNotification *sn)
+{
+  if (sn->startup_sequence_timeout != 0)
+    return;
+
+  /* our timeout just polls every second, instead of bothering
+   * to compute exactly when we may next time out
+   */
+  sn->startup_sequence_timeout = g_timeout_add_seconds (1,
+                                                        startup_sequence_timeout,
+                                                        sn);
+  g_source_set_name_by_id (sn->startup_sequence_timeout,
+                           "[mutter] startup_sequence_timeout");
+}
+#endif
+
+static void
+meta_startup_notification_remove_sequence_internal (MetaStartupNotification         *sn,
+                                                    MetaStartupNotificationSequence *seq)
+{
+  sn->startup_sequences = g_slist_remove (sn->startup_sequences, seq);
+  meta_startup_notification_update_feedback (sn);
+
+  if (sn->startup_sequences == NULL &&
+      sn->startup_sequence_timeout != 0)
+    {
+      g_source_remove (sn->startup_sequence_timeout);
+      sn->startup_sequence_timeout = 0;
+    }
+
+  g_object_unref (seq);
+}
+
+static MetaStartupNotificationSequence *
+meta_startup_notification_lookup_sequence (MetaStartupNotification *sn,
+                                           const gchar             *id)
+{
+  MetaStartupNotificationSequence *seq;
+  const gchar *seq_id;
+  GSList *l;
+
+  for (l = sn->startup_sequences; l; l = l->next)
+    {
+      seq = l->data;
+      seq_id = meta_startup_notification_sequence_get_id (seq);
+
+      if (g_str_equal (seq_id, id))
+        return l->data;
+    }
+
+  return NULL;
+}
+
+static void
+meta_startup_notification_init (MetaStartupNotification *sn)
+{
+}
+
+static void
+meta_startup_notification_finalize (GObject *object)
+{
+  MetaStartupNotification *sn = META_STARTUP_NOTIFICATION (object);
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+  sn_monitor_context_unref (sn->sn_context);
+  sn_display_unref (sn->sn_display);
+#endif
+
+  if (sn->startup_sequence_timeout)
+    g_source_remove (sn->startup_sequence_timeout);
+
+  g_slist_foreach (sn->startup_sequences, (GFunc) g_object_unref, NULL);
+  g_slist_free (sn->startup_sequences);
+  sn->startup_sequences = NULL;
+
+  G_OBJECT_CLASS (meta_startup_notification_parent_class)->finalize (object);
+}
+
+static void
+meta_startup_notification_set_property (GObject      *object,
+                                        guint         prop_id,
+                                        const GValue *value,
+                                        GParamSpec   *pspec)
+{
+  MetaStartupNotification *sn = META_STARTUP_NOTIFICATION (object);
+
+  switch (prop_id)
+    {
+    case PROP_SN_DISPLAY:
+      sn->display = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_startup_notification_get_property (GObject    *object,
+                                        guint       prop_id,
+                                        GValue     *value,
+                                        GParamSpec *pspec)
+{
+  MetaStartupNotification *sn = META_STARTUP_NOTIFICATION (object);
+
+  switch (prop_id)
+    {
+    case PROP_SN_DISPLAY:
+      g_value_set_object (value, sn->display);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+#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);
+}
+
+static void
+meta_startup_notification_sn_event (SnMonitorEvent *event,
+                                    void           *user_data)
+{
+  MetaStartupNotification *sn = user_data;
+  MetaStartupNotificationSequence *seq;
+  SnStartupSequence *sequence;
+
+  sequence = sn_monitor_event_get_startup_sequence (event);
+
+  sn_startup_sequence_ref (sequence);
+
+  switch (sn_monitor_event_get_type (event))
+    {
+    case SN_MONITOR_EVENT_INITIATED:
+      {
+        const char *wmclass;
+
+        wmclass = sn_startup_sequence_get_wmclass (sequence);
+
+        meta_topic (META_DEBUG_STARTUP,
+                    "Received startup initiated for %s wmclass %s\n",
+                    sn_startup_sequence_get_id (sequence),
+                    wmclass ? wmclass : "(unset)");
+
+        seq = meta_startup_notification_sequence_x11_new (sequence);
+        meta_startup_notification_add_sequence_internal (sn, seq);
+        g_object_unref (seq);
+      }
+      break;
+
+    case SN_MONITOR_EVENT_COMPLETED:
+      {
+        meta_topic (META_DEBUG_STARTUP,
+                    "Received startup completed for %s\n",
+                    sn_startup_sequence_get_id (sequence));
+
+        meta_startup_notification_remove_sequence (sn, sn_startup_sequence_get_id (sequence));
+      }
+      break;
+
+    case SN_MONITOR_EVENT_CHANGED:
+      meta_topic (META_DEBUG_STARTUP,
+                  "Received startup changed for %s\n",
+                  sn_startup_sequence_get_id (sequence));
+      break;
+
+    case SN_MONITOR_EVENT_CANCELED:
+      meta_topic (META_DEBUG_STARTUP,
+                  "Received startup canceled for %s\n",
+                  sn_startup_sequence_get_id (sequence));
+      break;
+    }
+
+  g_signal_emit (sn, sn_signals[SN_CHANGED], 0, sequence);
+
+  sn_startup_sequence_unref (sequence);
+}
+#endif
+
+static void
+meta_startup_notification_constructed (GObject *object)
+{
+  MetaStartupNotification *sn = META_STARTUP_NOTIFICATION (object);
+
+  g_assert (sn->display != NULL);
+
+#ifdef HAVE_STARTUP_NOTIFICATION
+  sn->sn_display = sn_display_new (sn->display->xdisplay,
+                                   sn_error_trap_push,
+                                   sn_error_trap_pop);
+  sn->sn_context =
+    sn_monitor_context_new (sn->sn_display,
+                            sn->display->screen->number,
+                            meta_startup_notification_sn_event,
+                            sn,
+                            NULL);
+#endif
+  sn->startup_sequences = NULL;
+  sn->startup_sequence_timeout = 0;
+}
+
+static void
+meta_startup_notification_class_init (MetaStartupNotificationClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_startup_notification_constructed;
+  object_class->finalize = meta_startup_notification_finalize;
+  object_class->set_property = meta_startup_notification_set_property;
+  object_class->get_property = meta_startup_notification_get_property;
+
+  sn_props[PROP_SN_DISPLAY] =
+    g_param_spec_object ("display",
+                         "Display",
+                         "Display",
+                         META_TYPE_DISPLAY,
+                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_STATIC_STRINGS);
+
+  sn_signals[SN_CHANGED] =
+    g_signal_new ("changed",
+                  META_TYPE_STARTUP_NOTIFICATION,
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+  g_object_class_install_properties (object_class, N_SN_PROPS, sn_props);
+}
+
+MetaStartupNotification *
+meta_startup_notification_get (MetaDisplay *display)
+{
+  static MetaStartupNotification *notification = NULL;
+
+  if (!notification)
+    notification = g_object_new (META_TYPE_STARTUP_NOTIFICATION,
+                                 "display", display,
+                                 NULL);
+
+  return notification;
+}
+
+void
+meta_startup_notification_remove_sequence (MetaStartupNotification *sn,
+                                           const gchar             *id)
+{
+  MetaStartupNotificationSequence *seq;
+
+  seq = meta_startup_notification_lookup_sequence (sn, id);
+  if (seq)
+    meta_startup_notification_remove_sequence_internal (sn, seq);
+}
+
+gboolean
+meta_startup_notification_handle_xevent (MetaStartupNotification *sn,
+                                         XEvent                  *xevent)
+{
+#ifdef HAVE_STARTUP_NOTIFICATION
+  return sn_display_process_event (sn->sn_display, xevent);
+#endif
+  return FALSE;
+}
+
+GSList *
+meta_startup_notification_get_sequences (MetaStartupNotification *sn)
+{
+  GSList *sequences = NULL;
+#ifdef HAVE_STARTUP_NOTIFICATION
+  GSList *l;
+
+  /* We return a list of SnStartupSequences here */
+  for (l = sn->startup_sequences; l; l = l->next)
+    {
+      MetaStartupNotificationSequenceX11 *seq_x11;
+
+      if (!META_IS_STARTUP_NOTIFICATION_SEQUENCE_X11 (l->data))
+        continue;
+
+      seq_x11 = META_STARTUP_NOTIFICATION_SEQUENCE_X11 (l->data);
+      sequences = g_slist_prepend (sequences, seq_x11->seq);
+    }
+#endif
+
+  return sequences;
+}
--- a/src/core/testboxes.c
+++ b/src/core/testboxes.c
@@ -30,7 +30,7 @@
 #define NUM_RANDOM_RUNS 10000

 static void
-init_random_ness ()
+init_random_ness (void)
 {
  srand(time(NULL));
 }
@@ -99,7 +99,7 @@ new_monitor_edge (int x, int y, int width, int height, int side_type)
 }

 static void
-test_area ()
+test_area (void)
 {
  MetaRectangle temp;
  int i;
@@ -116,7 +116,7 @@ test_area ()
 }

 static void
-test_intersect ()
+test_intersect (void)
 {
  MetaRectangle a = {100, 200,  50,  40};
  MetaRectangle b = {  0,  50, 110, 152};
@@ -144,7 +144,7 @@ test_intersect ()
 }

 static void
-test_equal ()
+test_equal (void)
 {
  MetaRectangle a = {10, 12, 4, 18};
  MetaRectangle b = a;
@@ -163,7 +163,7 @@ test_equal ()
 }

 static void
-test_overlap_funcs ()
+test_overlap_funcs (void)
 {
  MetaRectangle temp1, temp2;
  int i;
@@ -186,7 +186,7 @@ test_overlap_funcs ()
 }

 static void
-test_basic_fitting ()
+test_basic_fitting (void)
 {
  MetaRectangle temp1, temp2, temp3;
  int i;
@@ -357,7 +357,7 @@ get_monitor_edges (int which_monitor_set, int which_strut_set)

 #if 0
 static void
-test_merge_regions ()
+test_merge_regions (void)
 {
  /* logarithmically distributed random number of struts (range?)
   * logarithmically distributed random size of struts (up to screen size???)
@@ -579,7 +579,7 @@ verify_lists_are_equal (GList *code, GList *answer)
 }

 static void
-test_regions_okay ()
+test_regions_okay (void)
 {
  GList* region;
  GList* tmp;
@@ -665,7 +665,7 @@ test_regions_okay ()
 }

 static void
-test_region_fitting ()
+test_region_fitting (void)
 {
  GList* region;
  MetaRectangle rect;
@@ -709,7 +709,7 @@ test_region_fitting ()
 }

 static void
-test_clamping_to_region ()
+test_clamping_to_region (void)
 {
  GList* region;
  MetaRectangle rect;
@@ -826,7 +826,7 @@ rect_overlaps_region (const GList         *spanning_rects,
 gboolean time_to_print = FALSE;

 static void
-test_clipping_to_region ()
+test_clipping_to_region (void)
 {
  GList* region;
  MetaRectangle rect, temp;
@@ -888,7 +888,7 @@ test_clipping_to_region ()
 }

 static void
-test_shoving_into_region ()
+test_shoving_into_region (void)
 {
  GList* region;
  MetaRectangle rect, temp;
@@ -1005,7 +1005,7 @@ verify_edge_lists_are_equal (GList *code, GList *answer)
 }

 static void
-test_find_onscreen_edges ()
+test_find_onscreen_edges (void)
 {
  GList* edges;
  GList* tmp;
@@ -1138,7 +1138,7 @@ test_find_onscreen_edges ()
 }

 static void
-test_find_nonintersected_monitor_edges ()
+test_find_nonintersected_monitor_edges (void)
 {
  GList* edges;
  GList* tmp;
@@ -1227,7 +1227,7 @@ test_find_nonintersected_monitor_edges ()
 }

 static void
-test_gravity_resize ()
+test_gravity_resize (void)
 {
  MetaRectangle oldrect, rect, temp;

@@ -1329,7 +1329,7 @@ test_gravity_resize ()

 #define EPSILON 0.000000001
 static void
-test_find_closest_point_to_line ()
+test_find_closest_point_to_line (void)
 {
  double x1, y1, x2, y2, px, py, rx, ry;
  double answer_x, answer_y;
@@ -1381,7 +1381,7 @@ test_find_closest_point_to_line ()
 }

 int
-main()
+main(void)
 {
  init_random_ness ();
  test_area ();
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -46,7 +46,7 @@
 static void
 meta_topic_real_valist (MetaDebugTopic topic,
                        const char    *format,
-                        va_list        args);
+                        va_list        args) G_GNUC_PRINTF(2, 0);
 #endif

 static gint verbose_topics = 0;
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -763,10 +763,22 @@ meta_window_update_desc (MetaWindow *window)
 {
  g_clear_pointer (&window->desc, g_free);

-  if (window->title)
-    window->desc = g_strdup_printf ("0x%lx (%.10s)", window->xwindow, window->title);
+  if (window->client_type == META_WINDOW_CLIENT_TYPE_X11)
+    {
+      if (window->title)
+        window->desc = g_strdup_printf ("0x%lx (%.10s)", window->xwindow, window->title);
+      else
+        window->desc = g_strdup_printf ("0x%lx", window->xwindow);
+    }
  else
-    window->desc = g_strdup_printf ("0x%lx", window->xwindow);
+    {
+      guint64 small_stamp = window->stamp - G_GUINT64_CONSTANT(0x100000000);
+
+      if (window->title)
+        window->desc = g_strdup_printf ("W%" G_GUINT64_FORMAT " (%.10s)", small_stamp, window->title);
+      else
+        window->desc = g_strdup_printf ("W%" G_GUINT64_FORMAT , small_stamp);
+    }
 }

 static void
@@ -1567,8 +1579,10 @@ implement_showing (MetaWindow *window,
       * windows we might want to know where they are on the screen,
       * so we should place the window even if we're hiding it rather
       * than showing it.
+       * Force placing windows only when they should be already mapped,
+       * see #751887
       */
-      if (!window->placed)
+      if (!window->placed && client_window_should_be_mapped (window))
        meta_window_force_placement (window);

      meta_window_hide (window);
@@ -3183,12 +3197,23 @@ meta_window_make_fullscreen (MetaWindow  *window)

  if (!window->fullscreen)
    {
-      meta_window_make_fullscreen_internal (window);
+      MetaRectangle old_frame_rect, old_buffer_rect;

+      meta_window_get_frame_rect (window, &old_frame_rect);
+      meta_window_get_buffer_rect (window, &old_buffer_rect);
+
+      meta_window_make_fullscreen_internal (window);
      meta_window_move_resize_internal (window,
-                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
+                                        (META_MOVE_RESIZE_MOVE_ACTION |
+                                         META_MOVE_RESIZE_RESIZE_ACTION |
+                                         META_MOVE_RESIZE_STATE_CHANGED |
+                                         META_MOVE_RESIZE_DONT_SYNC_COMPOSITOR),
                                        NorthWestGravity,
                                        window->unconstrained_rect);
+
+      meta_compositor_size_change_window (window->display->compositor,
+                                          window, META_SIZE_CHANGE_FULLSCREEN,
+                                          &old_frame_rect, &old_buffer_rect);
    }
 }

@@ -3199,7 +3224,7 @@ meta_window_unmake_fullscreen (MetaWindow  *window)

  if (window->fullscreen)
    {
-      MetaRectangle target_rect;
+      MetaRectangle old_frame_rect, old_buffer_rect, target_rect;

      meta_topic (META_DEBUG_WINDOW_OPS,
                  "Unfullscreening %s\n", window->desc);
@@ -3208,6 +3233,8 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
      target_rect = window->saved_rect;

      meta_window_frame_size_changed (window);
+      meta_window_get_frame_rect (window, &old_frame_rect);
+      meta_window_get_buffer_rect (window, &old_buffer_rect);

      /* Window's size hints may have changed while maximized, making
       * saved_rect invalid.  #329152
@@ -3222,10 +3249,17 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
      set_net_wm_state (window);

      meta_window_move_resize_internal (window,
-                                        META_MOVE_RESIZE_MOVE_ACTION | META_MOVE_RESIZE_RESIZE_ACTION | META_MOVE_RESIZE_STATE_CHANGED,
+                                        (META_MOVE_RESIZE_MOVE_ACTION |
+                                         META_MOVE_RESIZE_RESIZE_ACTION |
+                                         META_MOVE_RESIZE_STATE_CHANGED |
+                                         META_MOVE_RESIZE_DONT_SYNC_COMPOSITOR),
                                        NorthWestGravity,
                                        target_rect);

+      meta_compositor_size_change_window (window->display->compositor,
+                                          window, META_SIZE_CHANGE_UNFULLSCREEN,
+                                          &old_frame_rect, &old_buffer_rect);
+
      meta_window_update_layer (window);

      g_object_notify_by_pspec (G_OBJECT (window), obj_props[PROP_FULLSCREEN]);
@@ -3502,10 +3536,7 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
 {
  const MetaMonitorInfo *old, *new;

-  if (window->type == META_WINDOW_DESKTOP)
-    return;
-
-  if (window->override_redirect)
+  if (window->override_redirect || window->type == META_WINDOW_DESKTOP)
    {
      meta_window_update_monitor (window, FALSE);
      return;
@@ -4312,8 +4343,8 @@ set_workspace_state (MetaWindow    *window,
      GList *l;
      for (l = window->screen->workspaces; l != NULL; l = l->next)
        {
-          MetaWorkspace *workspace = l->data;
-          meta_workspace_remove_window (workspace, window);
+          MetaWorkspace *ws = l->data;
+          meta_workspace_remove_window (ws, window);
        }
    }

@@ -4327,8 +4358,8 @@ set_workspace_state (MetaWindow    *window,
      GList *l;
      for (l = window->screen->workspaces; l != NULL; l = l->next)
        {
-          MetaWorkspace *workspace = l->data;
-          meta_workspace_add_window (workspace, window);
+          MetaWorkspace *ws = l->data;
+          meta_workspace_add_window (ws, window);
        }
    }

@@ -5271,6 +5302,11 @@ meta_window_recalc_features (MetaWindow *window)

  meta_window_recalc_skip_features (window);

+  /* To prevent users from losing windows, let's prevent users from
+   * minimizing skip-taskbar windows through the window decorations. */
+  if (window->skip_taskbar)
+    window->has_minimize_func = FALSE;
+
  meta_topic (META_DEBUG_WINDOW_OPS,
              "Window %s decorated = %d border_only = %d has_close = %d has_minimize = %d has_maximize = %d has_move = %d has_shade = %d skip_taskbar = %d skip_pager = %d\n",
              window->desc,
@@ -6272,7 +6308,7 @@ find_ancestor_func (MetaWindow *window,
 * so by traversing the @transient's ancestors until it either locates @window
 * or reaches an ancestor that is not transient.
 *
- * Return Value: (transfer none): %TRUE if window is an ancestor of transient.
+ * Return Value: %TRUE if window is an ancestor of transient.
 */
 gboolean
 meta_window_is_ancestor_of_transient (MetaWindow *window,
@@ -7010,7 +7046,7 @@ meta_window_get_transient_for (MetaWindow *window)
 * Returns pid of the process that created this window, if known (obtained from
 * the _NET_WM_PID property).
 *
- * Return value: (transfer none): the pid, or -1 if not known.
+ * Return value: the pid, or -1 if not known.
 */
 int
 meta_window_get_pid (MetaWindow *window)
@@ -7352,10 +7388,31 @@ meta_window_set_gtk_dbus_properties (MetaWindow *window,
  g_object_thaw_notify (G_OBJECT (window));
 }

+static gboolean
+check_transient_for_loop (MetaWindow *window,
+                          MetaWindow *parent)
+{
+  while (parent)
+    {
+      if (parent->transient_for == window)
+          return TRUE;
+      parent = parent->transient_for;
+    }
+
+  return FALSE;
+}
+
 void
 meta_window_set_transient_for (MetaWindow *window,
                               MetaWindow *parent)
 {
+  if (check_transient_for_loop (window, parent))
+    {
+      meta_warning ("Setting %s transient for %s would create a loop.\n",
+                    window->desc, parent->desc);
+      return;
+    }
+
  if (meta_window_appears_focused (window) && window->transient_for != NULL)
    meta_window_propagate_focus_appearance (window, FALSE);

@@ -7381,14 +7438,14 @@ meta_window_set_transient_for (MetaWindow *window,
        }
    }

-  /* update stacking constraints */
-  if (!window->override_redirect)
-    meta_stack_update_transient (window->screen->stack, window);
-
  /* We know this won't create a reference cycle because we check for loops */
  g_clear_object (&window->transient_for);
  window->transient_for = parent ? g_object_ref (parent) : NULL;

+  /* update stacking constraints */
+  if (!window->override_redirect)
+    meta_stack_update_transient (window->screen->stack, window);
+
  /* possibly change its group. We treat being a window's transient as
   * equivalent to making it your group leader, to work around shortcomings
   * in programs such as xmms-- see #328211.
@@ -7399,7 +7456,7 @@ meta_window_set_transient_for (MetaWindow *window,
    meta_window_group_leader_changed (window);

  if (!window->constructing && !window->override_redirect)
-    meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
+    meta_window_queue (window, META_QUEUE_MOVE_RESIZE | META_QUEUE_CALC_SHOWING);

  if (meta_window_appears_focused (window) && window->transient_for != NULL)
    meta_window_propagate_focus_appearance (window, TRUE);
@@ -7638,13 +7695,29 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
  MetaDisplay *display = window->display;
  gboolean unmodified;
  gboolean is_window_grab;
+  ClutterModifierType grab_mods, event_mods;
+  gfloat x, y;
+  guint button;

  if (window->frame && meta_ui_frame_handle_event (window->frame->ui_frame, event))
    return;

-  if (event->type != CLUTTER_BUTTON_PRESS)
+  if (event->type != CLUTTER_BUTTON_PRESS &&
+      event->type != CLUTTER_TOUCH_BEGIN)
    return;

+  if (event->type == CLUTTER_TOUCH_BEGIN)
+    {
+      ClutterEventSequence *sequence;
+
+      button = 1;
+      sequence = clutter_event_get_event_sequence (event);
+      if (!meta_display_is_pointer_emulating_sequence (window->display, sequence))
+        return;
+    }
+  else
+    button = clutter_event_get_button (event);
+
  if (display->grab_op != META_GRAB_OP_NONE)
    return;

@@ -7655,6 +7728,22 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
  if (window->override_redirect)
    return;

+  /* Don't focus panels--they must explicitly request focus.
+   * See bug 160470
+   */
+  if (window->type != META_WINDOW_DOCK)
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "Focusing %s due to button %u press (display.c)\n",
+                  window->desc, button);
+      meta_window_focus (window, event->any.time);
+    }
+  else
+    /* However, do allow terminals to lose focus due to new
+     * window mappings after the user clicks on a panel.
+     */
+    display->allow_terminal_deactivation = TRUE;
+
  /* We have three passive button grabs:
   * - on any button, without modifiers => focuses and maybe raises the window
   * - on resize button, with modifiers => start an interactive resizing
@@ -7675,9 +7764,12 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
   * care about. Just let the event through.
   */

-  ClutterModifierType grab_mods = meta_display_get_window_grab_modifiers (display);
-  unmodified = (event->button.modifier_state & grab_mods) == 0;
-  is_window_grab = (event->button.modifier_state & grab_mods) == grab_mods;
+  grab_mods = meta_display_get_window_grab_modifiers (display);
+  event_mods = clutter_event_get_state (event);
+  unmodified = (event_mods & grab_mods) == 0;
+  is_window_grab = (event_mods & grab_mods) == grab_mods;
+
+  clutter_event_get_coords (event, &x, &y);

  if (unmodified)
    {
@@ -7686,27 +7778,8 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
      else
        meta_topic (META_DEBUG_FOCUS,
                    "Not raising window on click due to don't-raise-on-click option\n");
-
-      /* Don't focus panels--they must explicitly request focus.
-       * See bug 160470
-       */
-      if (window->type != META_WINDOW_DOCK)
-        {
-          meta_topic (META_DEBUG_FOCUS,
-                      "Focusing %s due to unmodified button %u press (display.c)\n",
-                      window->desc, event->button.button);
-          meta_window_focus (window, event->any.time);
-        }
-      else
-        /* However, do allow terminals to lose focus due to new
-         * window mappings after the user clicks on a panel.
-         */
-        display->allow_terminal_deactivation = TRUE;
-
-      meta_verbose ("Allowing events time %u\n",
-                    (unsigned int)event->button.time);
    }
-  else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_resize ())
+  else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_resize ())
    {
      if (window->has_resize_func)
        {
@@ -7717,10 +7790,10 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,

          meta_window_get_frame_rect (window, &frame_rect);

-          west = event->button.x < (frame_rect.x + 1 * frame_rect.width / 3);
-          east = event->button.x > (frame_rect.x + 2 * frame_rect.width / 3);
-          north = event->button.y < (frame_rect.y + 1 * frame_rect.height / 3);
-          south = event->button.y > (frame_rect.y + 2 * frame_rect.height / 3);
+          west = x < (frame_rect.x + 1 * frame_rect.width / 3);
+          east = x > (frame_rect.x + 2 * frame_rect.width / 3);
+          north = y < (frame_rect.y + 1 * frame_rect.height / 3);
+          south = y > (frame_rect.y + 2 * frame_rect.height / 3);

          if (west)
            op |= META_GRAB_OP_WINDOW_DIR_WEST;
@@ -7738,23 +7811,21 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
                                        op,
                                        TRUE,
                                        FALSE,
-                                        event->button.button,
+                                        button,
                                        0,
                                        event->any.time,
-                                        event->button.x,
-                                        event->button.y);
+                                        x, y);
        }
    }
-  else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_menu ())
+  else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_menu ())
    {
      if (meta_prefs_get_raise_on_click ())
        meta_window_raise (window);
      meta_window_show_menu (window,
                             META_WINDOW_MENU_WM,
-                             event->button.x,
-                             event->button.y);
+                             x, y);
    }
-  else if (is_window_grab && (int) event->button.button == 1)
+  else if (is_window_grab && (int) button == 1)
    {
      if (window->has_move_func)
        {
@@ -7764,11 +7835,10 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
                                      META_GRAB_OP_MOVING,
                                      TRUE,
                                      FALSE,
-                                      event->button.button,
+                                      button,
                                      0,
                                      event->any.time,
-                                      event->button.x,
-                                      event->button.y);
+                                      x, y);
        }
    }
 }
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1055,7 +1055,7 @@ meta_workspace_get_onmonitor_region (MetaWorkspace *workspace,
 }

 #ifdef WITH_VERBOSE_MODE
-static char *
+static const char *
 meta_motion_direction_to_string (MetaMotionDirection direction)
 {
  switch (direction)
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -372,12 +372,6 @@ typedef enum
 * @META_BUTTON_FUNCTION_MINIMIZE: Minimize
 * @META_BUTTON_FUNCTION_MAXIMIZE: Maximize
 * @META_BUTTON_FUNCTION_CLOSE: Close
- * @META_BUTTON_FUNCTION_SHADE: Shade
- * @META_BUTTON_FUNCTION_ABOVE: Above
- * @META_BUTTON_FUNCTION_STICK: Stick
- * @META_BUTTON_FUNCTION_UNSHADE: Unshade
- * @META_BUTTON_FUNCTION_UNABOVE: Unabove
- * @META_BUTTON_FUNCTION_UNSTICK: Unstick
 * @META_BUTTON_FUNCTION_LAST: Marks the end of the #MetaButtonFunction enumeration
 *
 * Function a window button can have.  Note, you can't add stuff here
@@ -390,12 +384,6 @@ typedef enum
  META_BUTTON_FUNCTION_MINIMIZE,
  META_BUTTON_FUNCTION_MAXIMIZE,
  META_BUTTON_FUNCTION_CLOSE,
-  META_BUTTON_FUNCTION_SHADE,
-  META_BUTTON_FUNCTION_ABOVE,
-  META_BUTTON_FUNCTION_STICK,
-  META_BUTTON_FUNCTION_UNSHADE,
-  META_BUTTON_FUNCTION_UNABOVE,
-  META_BUTTON_FUNCTION_UNSTICK,
  META_BUTTON_FUNCTION_APPMENU,
  META_BUTTON_FUNCTION_LAST
 } MetaButtonFunction;
@@ -405,10 +393,10 @@ typedef enum
 /* Keep array size in sync with MAX_BUTTONS_PER_CORNER */
 /**
 * MetaButtonLayout:
- * @left_buttons: (array fixed-size=11):
- * @right_buttons: (array fixed-size=11):
- * @left_buttons_has_spacer: (array fixed-size=11):
- * @right_buttons_has_spacer: (array fixed-size=11):
+ * @left_buttons: (array fixed-size=5):
+ * @right_buttons: (array fixed-size=5):
+ * @left_buttons_has_spacer: (array fixed-size=5):
+ * @right_buttons_has_spacer: (array fixed-size=5):
 */
 typedef struct _MetaButtonLayout MetaButtonLayout;
 struct _MetaButtonLayout
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -57,6 +57,8 @@ typedef enum
 typedef enum {
  META_SIZE_CHANGE_MAXIMIZE,
  META_SIZE_CHANGE_UNMAXIMIZE,
+  META_SIZE_CHANGE_FULLSCREEN,
+  META_SIZE_CHANGE_UNFULLSCREEN,
 } MetaSizeChange;

 MetaCompositor *meta_compositor_new     (MetaDisplay    *display);
--- a/src/meta/main.h
+++ b/src/meta/main.h
@@ -49,7 +49,7 @@ typedef enum
 } MetaExitCode;

 /* exit immediately */
-void meta_exit (MetaExitCode code);
+void meta_exit (MetaExitCode code) G_GNUC_NORETURN;

 /* g_main_loop_quit() then fall out of main() */
 void meta_quit (MetaExitCode code);
--- a/src/org.freedesktop.login1.xml
+++ b/src/org.freedesktop.login1.xml
@@ -9,6 +9,8 @@
    <method name="TakeControl">
      <arg name="force" type="b"/>
    </method>
+    <method name="ReleaseControl">
+    </method>
    <method name="TakeDevice">
      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
      <arg name="major" type="u" direction="in"/>
--- a/src/tests/stacking/set-parent.metatest
+++ b/src/tests/stacking/set-parent.metatest
@@ -0,0 +1,14 @@
+new_client 1 wayland
+create 1/1
+show 1/1
+create 1/2
+show 1/2
+wait
+assert_stacking 1/1 1/2
+
+set_parent 1/1 2
+wait
+assert_stacking 1/2 1/1
+
+local_activate 1/2
+assert_stacking 1/2 1/1
--- a/src/tests/test-client.c
+++ b/src/tests/test-client.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <X11/extensions/sync.h>

-char *client_id = "0";
+const char *client_id = "0";
 static gboolean wayland;
 GHashTable *windows;

@@ -41,6 +41,16 @@ lookup_window (const char *window_id)
  return window;
 }

+static void
+on_after_paint  (GdkFrameClock *clock,
+                 GMainLoop     *loop)
+{
+  g_signal_handlers_disconnect_by_func (clock,
+                                        (gpointer) on_after_paint,
+                                        loop);
+  g_main_loop_quit (loop);
+}
+
 static void
 process_line (const char *line)
 {
@@ -126,6 +136,31 @@ process_line (const char *line)
        }

    }
+  else if (strcmp (argv[0], "set_parent") == 0)
+    {
+      if (argc != 3)
+        {
+          g_print ("usage: menu <window-id> <parent-id>");
+          goto out;
+        }
+
+      GtkWidget *window = lookup_window (argv[1]);
+      if (!window)
+        {
+          g_print ("unknown window %s", argv[1]);
+          goto out;
+        }
+
+      GtkWidget *parent_window = lookup_window (argv[2]);
+      if (!parent_window)
+        {
+          g_print ("unknown parent window %s", argv[2]);
+          goto out;
+        }
+
+      gtk_window_set_transient_for (GTK_WINDOW (window),
+                                    GTK_WINDOW (parent_window));
+    }
  else if (strcmp (argv[0], "show") == 0)
    {
      if (argc != 2)
@@ -135,10 +170,25 @@ process_line (const char *line)
        }

      GtkWidget *window = lookup_window (argv[1]);
+      GdkWindow *gdk_window = gtk_widget_get_window (window);
      if (!window)
        goto out;

      gtk_widget_show (window);
+
+      /* When a Wayland client, we cannot be really sure that the window has
+       * been mappable until after we have painted. So, in order to have the
+       * test runner rely on the "show" command to have done what the client
+       * needs to do in order for a window to be mappable compositor side, lets
+       * wait with returning until after the first frame.
+       */
+      GdkFrameClock *frame_clock = gdk_window_get_frame_clock (gdk_window);
+      GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+      g_signal_connect (frame_clock, "after-paint",
+                        G_CALLBACK (on_after_paint),
+                        loop);
+      g_main_loop_run (loop);
+      g_main_loop_unref (loop);
    }
  else if (strcmp (argv[0], "hide") == 0)
    {
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -767,6 +767,23 @@ test_case_do (TestCase *test,
                           NULL))
        return FALSE;
    }
+  else if (strcmp (argv[0], "set_parent") == 0)
+    {
+      if (argc != 3)
+        BAD_COMMAND("usage: %s <client-id>/<window-id> <parent-window-id>",
+                    argv[0]);
+
+      TestClient *client;
+      const char *window_id;
+      if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error))
+        return FALSE;
+
+      if (!test_client_do (client, error,
+                           "set_parent", window_id,
+                           argv[2],
+                           NULL))
+        return FALSE;
+    }
  else if (strcmp (argv[0], "show") == 0 ||
           strcmp (argv[0], "hide") == 0 ||
           strcmp (argv[0], "activate") == 0 ||
@@ -1094,7 +1111,6 @@ main (int argc, char **argv)
  if (all_tests)
    {
      GFile *test_dir = g_file_new_for_path (MUTTER_PKGDATADIR "/tests");
-      GError *error = NULL;

      if (!find_metatests_in_directory (test_dir, tests, &error))
        {
@@ -1120,7 +1136,7 @@ main (int argc, char **argv)

  /* Then initalize mutter with a different set of arguments */

-  char *fake_args[] = { NULL, "--wayland" };
+  char *fake_args[] = { NULL, (char *)"--wayland" };
  fake_args[0] = argv[0];
  char **fake_argv = fake_args;
  int fake_argc = 2;
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -447,7 +447,7 @@ meta_frames_new (int screen_number)
 }

 static const char *
-get_theme_variant_override (MetaFrames *frames)
+get_global_theme_variant (MetaFrames *frames)
 {
  GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (frames));
  GtkSettings *settings = gtk_settings_get_for_screen (screen);
@@ -474,19 +474,15 @@ meta_ui_frame_attach_style (MetaUIFrame *frame)
 {
  MetaFrames *frames = frame->frames;
  const char *variant;
-  const char *variant_override;

  if (frame->style_info != NULL)
    meta_style_info_unref (frame->style_info);

-  variant_override = get_theme_variant_override (frame->frames);
+  variant = frame->meta_window->gtk_theme_variant;
+  if (variant == NULL)
+    variant = get_global_theme_variant (frame->frames);;

-  if (variant_override)
-    variant = variant_override;
-  else
-    variant = frame->meta_window->gtk_theme_variant;
-
-  if (variant == NULL || strcmp(variant, "normal") == 0)
+  if (variant == NULL || *variant == '\0')
    frame->style_info = meta_style_info_ref (frames->normal_style);
  else
    frame->style_info = meta_style_info_ref (meta_frames_get_theme_variant (frames,
@@ -970,12 +966,6 @@ meta_frame_left_click_event (MetaUIFrame *frame,
    case META_FRAME_CONTROL_UNMAXIMIZE:
    case META_FRAME_CONTROL_MINIMIZE:
    case META_FRAME_CONTROL_DELETE:
-    case META_FRAME_CONTROL_SHADE:
-    case META_FRAME_CONTROL_UNSHADE:
-    case META_FRAME_CONTROL_ABOVE:
-    case META_FRAME_CONTROL_UNABOVE:
-    case META_FRAME_CONTROL_STICK:
-    case META_FRAME_CONTROL_UNSTICK:
    case META_FRAME_CONTROL_MENU:
    case META_FRAME_CONTROL_APPMENU:
      frame->grab_button = event->button;
@@ -1074,7 +1064,10 @@ handle_button_press_event (MetaUIFrame *frame,

  control = get_control (frame, event->x, event->y);

-  /* focus on click, even if click was on client area */
+  /* don't do the rest of this if on client area */
+  if (control == META_FRAME_CONTROL_CLIENT_AREA)
+    return FALSE; /* not on the frame, just passed through from client */
+
  if (event->button == 1 &&
      !(control == META_FRAME_CONTROL_MINIMIZE ||
        control == META_FRAME_CONTROL_DELETE ||
@@ -1086,10 +1079,6 @@ handle_button_press_event (MetaUIFrame *frame,
      meta_window_focus (frame->meta_window, event->time);
    }

-  /* don't do the rest of this if on client area */
-  if (control == META_FRAME_CONTROL_CLIENT_AREA)
-    return FALSE; /* not on the frame, just passed through from client */
-
  /* We want to shade even if we have a GrabOp, since we'll have a move grab
   * if we double click the titlebar.
   */
@@ -1154,24 +1143,6 @@ handle_button_release_event (MetaUIFrame *frame,
        case META_FRAME_CONTROL_DELETE:
          meta_window_delete (frame->meta_window, event->time);
          break;
-        case META_FRAME_CONTROL_SHADE:
-          meta_window_shade (frame->meta_window, event->time);
-          break;
-        case META_FRAME_CONTROL_UNSHADE:
-          meta_window_unshade (frame->meta_window, event->time);
-          break;
-        case META_FRAME_CONTROL_ABOVE:
-          meta_window_make_above (frame->meta_window);
-          break;
-        case META_FRAME_CONTROL_UNABOVE:
-          meta_window_unmake_above (frame->meta_window);
-          break;
-        case META_FRAME_CONTROL_STICK:
-          meta_window_stick (frame->meta_window);
-          break;
-        case META_FRAME_CONTROL_UNSTICK:
-          meta_window_unstick (frame->meta_window);
-          break;
        default:
          break;
        }
@@ -1220,18 +1191,6 @@ meta_ui_frame_update_prelit_control (MetaUIFrame     *frame,
      break;
    case META_FRAME_CONTROL_UNMAXIMIZE:
      break;
-    case META_FRAME_CONTROL_SHADE:
-      break;
-    case META_FRAME_CONTROL_UNSHADE:
-      break;
-    case META_FRAME_CONTROL_ABOVE:
-      break;
-    case META_FRAME_CONTROL_UNABOVE:
-      break;
-    case META_FRAME_CONTROL_STICK:
-      break;
-    case META_FRAME_CONTROL_UNSTICK:
-      break;
    case META_FRAME_CONTROL_RESIZE_SE:
      cursor = META_CURSOR_SE_RESIZE;
      break;
@@ -1270,12 +1229,6 @@ meta_ui_frame_update_prelit_control (MetaUIFrame     *frame,
    case META_FRAME_CONTROL_MINIMIZE:
    case META_FRAME_CONTROL_MAXIMIZE:
    case META_FRAME_CONTROL_DELETE:
-    case META_FRAME_CONTROL_SHADE:
-    case META_FRAME_CONTROL_UNSHADE:
-    case META_FRAME_CONTROL_ABOVE:
-    case META_FRAME_CONTROL_UNABOVE:
-    case META_FRAME_CONTROL_STICK:
-    case META_FRAME_CONTROL_UNSTICK:
    case META_FRAME_CONTROL_UNMAXIMIZE:
      /* leave control set */
      break;
@@ -1409,6 +1362,10 @@ meta_ui_frame_get_mask (MetaUIFrame *frame,
                         borders.invisible.left / scale,
                         borders.invisible.top / scale,
                         frame_rect.width / scale, frame_rect.height / scale);
+  gtk_render_background (frame->style_info->styles[META_STYLE_ELEMENT_TITLEBAR], cr,
+                         borders.invisible.left / scale,
+                         borders.invisible.top / scale,
+                         frame_rect.width / scale, borders.total.top / scale);
 }

 /* XXX -- this is disgusting. Find a better approach here.
@@ -1487,24 +1444,6 @@ meta_ui_frame_paint (MetaUIFrame  *frame,
    case META_FRAME_CONTROL_UNMAXIMIZE:
      button_type = META_BUTTON_TYPE_MAXIMIZE;
      break;
-    case META_FRAME_CONTROL_SHADE:
-      button_type = META_BUTTON_TYPE_SHADE;
-      break;
-    case META_FRAME_CONTROL_UNSHADE:
-      button_type = META_BUTTON_TYPE_UNSHADE;
-      break;
-    case META_FRAME_CONTROL_ABOVE:
-      button_type = META_BUTTON_TYPE_ABOVE;
-      break;
-    case META_FRAME_CONTROL_UNABOVE:
-      button_type = META_BUTTON_TYPE_UNABOVE;
-      break;
-    case META_FRAME_CONTROL_STICK:
-      button_type = META_BUTTON_TYPE_STICK;
-      break;
-    case META_FRAME_CONTROL_UNSTICK:
-      button_type = META_BUTTON_TYPE_UNSTICK;
-      break;
    case META_FRAME_CONTROL_DELETE:
      button_type = META_BUTTON_TYPE_CLOSE;
      break;
@@ -1624,24 +1563,6 @@ control_rect (MetaFrameControl control,
    case META_FRAME_CONTROL_UNMAXIMIZE:
      rect = &fgeom->max_rect.visible;
      break;
-    case META_FRAME_CONTROL_SHADE:
-      rect = &fgeom->shade_rect.visible;
-      break;
-    case META_FRAME_CONTROL_UNSHADE:
-      rect = &fgeom->unshade_rect.visible;
-      break;
-    case META_FRAME_CONTROL_ABOVE:
-      rect = &fgeom->above_rect.visible;
-      break;
-    case META_FRAME_CONTROL_UNABOVE:
-      rect = &fgeom->unabove_rect.visible;
-      break;
-    case META_FRAME_CONTROL_STICK:
-      rect = &fgeom->stick_rect.visible;
-      break;
-    case META_FRAME_CONTROL_UNSTICK:
-      rect = &fgeom->unstick_rect.visible;
-      break;
    case META_FRAME_CONTROL_RESIZE_SE:
      break;
    case META_FRAME_CONTROL_RESIZE_S:
@@ -1726,36 +1647,6 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
        return META_FRAME_CONTROL_MAXIMIZE;
    }

-  if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable))
-    {
-      return META_FRAME_CONTROL_SHADE;
-    }
-
-  if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable))
-    {
-      return META_FRAME_CONTROL_UNSHADE;
-    }
-
-  if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable))
-    {
-      return META_FRAME_CONTROL_ABOVE;
-    }
-
-  if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable))
-    {
-      return META_FRAME_CONTROL_UNABOVE;
-    }
-
-  if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable))
-    {
-      return META_FRAME_CONTROL_STICK;
-    }
-
-  if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable))
-    {
-      return META_FRAME_CONTROL_UNSTICK;
-    }
-
  /* South resize always has priority over north resize,
   * in case of overlap.
   */
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -39,12 +39,6 @@ typedef enum
  META_FRAME_CONTROL_MINIMIZE,
  META_FRAME_CONTROL_MAXIMIZE,
  META_FRAME_CONTROL_UNMAXIMIZE,
-  META_FRAME_CONTROL_SHADE,
-  META_FRAME_CONTROL_UNSHADE,
-  META_FRAME_CONTROL_ABOVE,
-  META_FRAME_CONTROL_UNABOVE,
-  META_FRAME_CONTROL_STICK,
-  META_FRAME_CONTROL_UNSTICK,
  META_FRAME_CONTROL_RESIZE_SE,
  META_FRAME_CONTROL_RESIZE_S,
  META_FRAME_CONTROL_RESIZE_SW,
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -53,6 +53,8 @@ typedef struct _MetaFrameGeometry MetaFrameGeometry;
 **/
 struct _MetaFrameLayout
 {
+  /** Invisible border required by the theme */
+  GtkBorder invisible_border;
  /** Border/padding of the entire frame */
  GtkBorder frame_border;
  /** Border/padding of the titlebar region */
@@ -60,6 +62,16 @@ struct _MetaFrameLayout
  /** Border/padding of titlebar buttons */
  GtkBorder button_border;

+  /** Margin of title */
+  GtkBorder title_margin;
+  /** Margin of titlebar buttons */
+  GtkBorder button_margin;
+
+  /** Min size of titlebar region */
+  GtkRequisition titlebar_min_size;
+  /** Min size of titlebar buttons */
+  GtkRequisition button_min_size;
+
  /** Size of images in buttons */
  guint icon_size;

@@ -115,7 +127,7 @@ struct _MetaFrameGeometry

  /* used for a memset hack */
 #define ADDRESS_OF_BUTTON_RECTS(fgeom) (((char*)(fgeom)) + G_STRUCT_OFFSET (MetaFrameGeometry, close_rect))
-#define LENGTH_OF_BUTTON_RECTS (G_STRUCT_OFFSET (MetaFrameGeometry, unstick_rect) + sizeof (MetaButtonSpace) - G_STRUCT_OFFSET (MetaFrameGeometry, close_rect))
+#define LENGTH_OF_BUTTON_RECTS (G_STRUCT_OFFSET (MetaFrameGeometry, appmenu_rect) + sizeof (MetaButtonSpace) - G_STRUCT_OFFSET (MetaFrameGeometry, close_rect))

  /* The button rects (if changed adjust memset hack) */
  MetaButtonSpace close_rect;
@@ -123,12 +135,6 @@ struct _MetaFrameGeometry
  MetaButtonSpace min_rect;
  MetaButtonSpace menu_rect;
  MetaButtonSpace appmenu_rect;
-  MetaButtonSpace shade_rect;
-  MetaButtonSpace above_rect;
-  MetaButtonSpace stick_rect;
-  MetaButtonSpace unshade_rect;
-  MetaButtonSpace unabove_rect;
-  MetaButtonSpace unstick_rect;
  /* End of button rects (if changed adjust memset hack) */

  /* Saved button layout */
@@ -158,17 +164,12 @@ typedef enum
  META_BUTTON_TYPE_MINIMIZE,
  META_BUTTON_TYPE_MENU,
  META_BUTTON_TYPE_APPMENU,
-  META_BUTTON_TYPE_SHADE,
-  META_BUTTON_TYPE_ABOVE,
-  META_BUTTON_TYPE_STICK,
-  META_BUTTON_TYPE_UNSHADE,
-  META_BUTTON_TYPE_UNABOVE,
-  META_BUTTON_TYPE_UNSTICK,
  META_BUTTON_TYPE_LAST
 } MetaButtonType;

 typedef enum
 {
+  META_STYLE_ELEMENT_WINDOW,
  META_STYLE_ELEMENT_FRAME,
  META_STYLE_ELEMENT_TITLEBAR,
  META_STYLE_ELEMENT_TITLE,
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -79,10 +79,14 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,

  if (!layout->has_title)
    text_height = 0;
+  else
+    text_height = layout->title_margin.top + text_height + layout->title_margin.bottom;

-  buttons_height = layout->icon_size +
-    layout->button_border.top + layout->button_border.bottom;
-  content_height = MAX (buttons_height, text_height) +
+  buttons_height = MAX ((int)layout->icon_size, layout->button_min_size.height) +
+    layout->button_margin.top + layout->button_border.top +
+    layout->button_margin.bottom + layout->button_border.bottom;
+  content_height = MAX (buttons_height, text_height);
+  content_height = MAX (content_height, layout->titlebar_min_size.height) +
                   layout->titlebar_border.top + layout->titlebar_border.bottom;

  borders->visible.top    = layout->frame_border.top + content_height;
@@ -90,23 +94,28 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout,
  borders->visible.right  = layout->frame_border.right;
  borders->visible.bottom = layout->frame_border.bottom;

+  borders->invisible = layout->invisible_border;
+
  draggable_borders = meta_prefs_get_draggable_border_width ();

  if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
    {
-      borders->invisible.left   = MAX (0, draggable_borders - borders->visible.left);
-      borders->invisible.right  = MAX (0, draggable_borders - borders->visible.right);
+      borders->invisible.left   = MAX (borders->invisible.left,
+                                       draggable_borders - borders->visible.left);
+      borders->invisible.right  = MAX (borders->invisible.right,
+                                       draggable_borders - borders->visible.right);
    }

  if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
    {
-      borders->invisible.bottom = MAX (0, draggable_borders - borders->visible.bottom);
+      borders->invisible.bottom = MAX (borders->invisible.bottom,
+                                       draggable_borders - borders->visible.bottom);

      /* borders.visible.top is the height of the *title bar*. We can't do the same
       * algorithm here, titlebars are expectedly much bigger. Just subtract a couple
       * pixels to get a proper feel. */
      if (type != META_FRAME_TYPE_ATTACHED)
-        borders->invisible.top    = MAX (0, draggable_borders - 2);
+        borders->invisible.top    = MAX (borders->invisible.top, draggable_borders - 2);
    }

  borders->total.left   = borders->invisible.left   + borders->visible.left;
@@ -177,17 +186,6 @@ rect_for_function (MetaFrameGeometry *fgeom,
        return &fgeom->close_rect;
      else
        return NULL;
-    case META_BUTTON_FUNCTION_STICK:
-    case META_BUTTON_FUNCTION_SHADE:
-    case META_BUTTON_FUNCTION_ABOVE:
-    case META_BUTTON_FUNCTION_UNSTICK:
-    case META_BUTTON_FUNCTION_UNSHADE:
-    case META_BUTTON_FUNCTION_UNABOVE:
-      /* Fringe buttons that used to be supported by theme versions >v1;
-       * if we want to support them again, we need to return the
-       * correspondings rects here
-       */
-      return NULL;

    case META_BUTTON_FUNCTION_LAST:
      return NULL;
@@ -245,6 +243,16 @@ get_padding_and_border (GtkStyleContext *style,
  border->bottom += tmp.bottom;
 }

+static void
+get_min_size (GtkStyleContext *style,
+              GtkRequisition  *requisition)
+{
+  gtk_style_context_get (style, gtk_style_context_get_state (style),
+                         "min-width", &requisition->width,
+                         "min-height", &requisition->height,
+                         NULL);
+}
+
 static void
 scale_border (GtkBorder *border,
              double     factor)
@@ -262,6 +270,8 @@ meta_frame_layout_sync_with_style (MetaFrameLayout *layout,
 {
  GtkStyleContext *style;
  GtkBorder border;
+  GtkRequisition requisition;
+  GdkRectangle clip_rect;
  int border_radius, max_radius;

  meta_style_info_set_flags (style_info, flags);
@@ -270,6 +280,12 @@ meta_frame_layout_sync_with_style (MetaFrameLayout *layout,
  get_padding_and_border (style, &layout->frame_border);
  scale_border (&layout->frame_border, layout->title_scale);

+  gtk_render_background_get_clip (style, 0, 0, 0, 0, &clip_rect);
+  layout->invisible_border.left = -clip_rect.x;
+  layout->invisible_border.right = clip_rect.width + clip_rect.x;
+  layout->invisible_border.top = -clip_rect.y;
+  layout->invisible_border.bottom = clip_rect.height + clip_rect.y;
+
  if (layout->hide_buttons)
    layout->icon_size = 0;

@@ -292,14 +308,25 @@ meta_frame_layout_sync_with_style (MetaFrameLayout *layout,
  max_radius = MIN (layout->frame_border.bottom, layout->frame_border.right);
  layout->bottom_right_corner_rounded_radius = MAX (border_radius, max_radius);

+  get_min_size (style, &layout->titlebar_min_size);
  get_padding_and_border (style, &layout->titlebar_border);
  scale_border (&layout->titlebar_border, layout->title_scale);

+  style = style_info->styles[META_STYLE_ELEMENT_TITLE];
+  gtk_style_context_get_margin (style, gtk_style_context_get_state (style),
+                                &layout->title_margin);
+  scale_border (&layout->title_margin, layout->title_scale);
+
  style = style_info->styles[META_STYLE_ELEMENT_BUTTON];
+  get_min_size (style, &layout->button_min_size);
  get_padding_and_border (style, &layout->button_border);
  scale_border (&layout->button_border, layout->title_scale);
+  gtk_style_context_get_margin (style, gtk_style_context_get_state (style),
+                                &layout->button_margin);
+  scale_border (&layout->button_margin, layout->title_scale);

  style = style_info->styles[META_STYLE_ELEMENT_IMAGE];
+  get_min_size (style, &requisition);
  get_padding_and_border (style, &border);
  scale_border (&border, layout->title_scale);

@@ -307,6 +334,18 @@ meta_frame_layout_sync_with_style (MetaFrameLayout *layout,
  layout->button_border.right += border.right;
  layout->button_border.top += border.top;
  layout->button_border.bottom += border.bottom;
+
+  gtk_style_context_get_margin (style, gtk_style_context_get_state (style),
+                                &border);
+  layout->button_border.left += border.left;
+  layout->button_border.right += border.right;
+  layout->button_border.top += border.top;
+  layout->button_border.bottom += border.bottom;
+
+  layout->button_min_size.width = MAX(layout->button_min_size.width,
+                                      requisition.width);
+  layout->button_min_size.height = MAX(layout->button_min_size.height,
+                                       requisition.height);
 }

 static void
@@ -370,9 +409,9 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
                  (fgeom->content_border.right + borders.invisible.right);
  content_height = borders.visible.top - fgeom->content_border.top - fgeom->content_border.bottom;

-  button_width = layout->icon_size +
+  button_width = MAX ((int)layout->icon_size, layout->button_min_size.width) +
                 layout->button_border.left + layout->button_border.right;
-  button_height = layout->icon_size +
+  button_height = MAX ((int)layout->icon_size, layout->button_min_size.height) +
                  layout->button_border.top + layout->button_border.bottom;
  button_width *= scale;
  button_height *= scale;
@@ -433,11 +472,15 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,

      space_used_by_buttons = 0;

+      space_used_by_buttons += layout->button_margin.left * scale * n_left;
      space_used_by_buttons += button_width * n_left;
+      space_used_by_buttons += layout->button_margin.right * scale * n_left;
      space_used_by_buttons += (button_width * 0.75) * n_left_spacers;
      space_used_by_buttons += layout->titlebar_spacing * scale * MAX (n_left - 1, 0);

+      space_used_by_buttons += layout->button_margin.left * scale * n_right;
      space_used_by_buttons += button_width * n_right;
+      space_used_by_buttons += layout->button_margin.right * scale * n_right;
      space_used_by_buttons += (button_width * 0.75) * n_right_spacers;
      space_used_by_buttons += layout->titlebar_spacing * scale * MAX (n_right - 1, 0);

@@ -457,22 +500,10 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
        }

      /* Otherwise we need to shave out a button. Shave
-       * above, stick, shade, min, max, close, then menu (menu is most useful);
+       * min, max, close, then menu (menu is most useful);
       * prefer the default button locations.
       */
-      if (strip_button (left_func_rects, &n_left, &fgeom->above_rect))
-        continue;
-      else if (strip_button (right_func_rects, &n_right, &fgeom->above_rect))
-        continue;
-      else if (strip_button (left_func_rects, &n_left, &fgeom->stick_rect))
-        continue;
-      else if (strip_button (right_func_rects, &n_right, &fgeom->stick_rect))
-        continue;
-      else if (strip_button (left_func_rects, &n_left, &fgeom->shade_rect))
-        continue;
-      else if (strip_button (right_func_rects, &n_right, &fgeom->shade_rect))
-        continue;
-      else if (strip_button (left_func_rects, &n_left, &fgeom->min_rect))
+      if (strip_button (left_func_rects, &n_left, &fgeom->min_rect))
        continue;
      else if (strip_button (right_func_rects, &n_right, &fgeom->min_rect))
        continue;
@@ -519,6 +550,8 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
      if (x < 0) /* if we go negative, leave the buttons we don't get to as 0-width */
        break;

+      x -= layout->button_margin.right * scale;
+
      rect = right_func_rects[i];
      rect->visible.x = x - button_width;
      if (right_buttons_has_spacer[i])
@@ -544,7 +577,7 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
      else
        g_memmove (&(rect->clickable), &(rect->visible), sizeof(rect->clickable));

-      x = rect->visible.x;
+      x = rect->visible.x - layout->button_margin.left * scale;

      if (i > 0)
        x -= layout->titlebar_spacing;
@@ -563,6 +596,8 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
    {
      MetaButtonSpace *rect;

+      x += layout->button_margin.left * scale;
+
      rect = left_func_rects[i];

      rect->visible.x = x;
@@ -589,7 +624,7 @@ meta_frame_layout_calc_geometry (MetaFrameLayout        *layout,
      else
        g_memmove (&(rect->clickable), &(rect->visible), sizeof(rect->clickable));

-      x = rect->visible.x + rect->visible.width;
+      x = rect->visible.x + rect->visible.width + layout->button_margin.right * scale;
      if (i < n_left - 1)
        x += layout->titlebar_spacing * scale;
      if (left_buttons_has_spacer[i])
@@ -643,30 +678,6 @@ get_button_rect (MetaButtonType           type,
      *rect = fgeom->close_rect.visible;
      break;

-    case META_BUTTON_TYPE_SHADE:
-      *rect = fgeom->shade_rect.visible;
-      break;
-
-    case META_BUTTON_TYPE_UNSHADE:
-      *rect = fgeom->unshade_rect.visible;
-      break;
-
-    case META_BUTTON_TYPE_ABOVE:
-      *rect = fgeom->above_rect.visible;
-      break;
-
-    case META_BUTTON_TYPE_UNABOVE:
-      *rect = fgeom->unabove_rect.visible;
-      break;
-
-    case META_BUTTON_TYPE_STICK:
-      *rect = fgeom->stick_rect.visible;
-      break;
-
-    case META_BUTTON_TYPE_UNSTICK:
-      *rect = fgeom->unstick_rect.visible;
-      break;
-
    case META_BUTTON_TYPE_MAXIMIZE:
      *rect = fgeom->max_rect.visible;
      break;
@@ -890,6 +901,7 @@ meta_frame_layout_draw_with_style (MetaFrameLayout         *layout,
      cairo_restore (cr);
      if (button_class)
        gtk_style_context_remove_class (style, button_class);
+      gtk_style_context_set_state (style, state);
    }
 }

@@ -915,11 +927,9 @@ meta_theme_get_default (void)
      switch (frame_type)
        {
        case META_FRAME_TYPE_NORMAL:
-          break;
        case META_FRAME_TYPE_DIALOG:
        case META_FRAME_TYPE_MODAL_DIALOG:
        case META_FRAME_TYPE_ATTACHED:
-          layout->hide_buttons = TRUE;
          break;
        case META_FRAME_TYPE_MENU:
        case META_FRAME_TYPE_UTILITY:
@@ -977,6 +987,7 @@ static GtkStyleContext *
 create_style_context (GType            widget_type,
                      GtkStyleContext *parent_style,
                      GtkCssProvider  *provider,
+                      const char      *object_name,
                      const char      *first_class,
                      ...)
 {
@@ -996,6 +1007,9 @@ create_style_context (GType            widget_type,

  gtk_widget_path_append_type (path, widget_type);

+  if (object_name)
+    gtk_widget_path_iter_set_object_name (path, -1, object_name);
+
  va_start (ap, first_class);
  for (name = first_class; name; name = va_arg (ap, const char *))
    gtk_widget_path_iter_add_class (path, -1, name);
@@ -1031,40 +1045,48 @@ meta_theme_create_style_info (GdkScreen   *screen,
  style_info = g_new0 (MetaStyleInfo, 1);
  style_info->refcount = 1;

-  style_info->styles[META_STYLE_ELEMENT_FRAME] =
+  style_info->styles[META_STYLE_ELEMENT_WINDOW] =
    create_style_context (META_TYPE_FRAMES,
                          NULL,
                          provider,
+                          "window",
                          GTK_STYLE_CLASS_BACKGROUND,
-                          "window-frame",
                          "ssd",
                          NULL);
+  style_info->styles[META_STYLE_ELEMENT_FRAME] =
+    create_style_context (META_TYPE_FRAMES,
+                          style_info->styles[META_STYLE_ELEMENT_WINDOW],
+                          provider,
+                          "decoration",
+                          NULL);
  style_info->styles[META_STYLE_ELEMENT_TITLEBAR] =
    create_style_context (GTK_TYPE_HEADER_BAR,
                          style_info->styles[META_STYLE_ELEMENT_FRAME],
                          provider,
+                          "headerbar",
                          GTK_STYLE_CLASS_TITLEBAR,
                          GTK_STYLE_CLASS_HORIZONTAL,
                          "default-decoration",
-                          "header-bar",
                          NULL);
  style_info->styles[META_STYLE_ELEMENT_TITLE] =
    create_style_context (GTK_TYPE_LABEL,
                          style_info->styles[META_STYLE_ELEMENT_TITLEBAR],
                          provider,
+                          "label",
                          GTK_STYLE_CLASS_TITLE,
                          NULL);
  style_info->styles[META_STYLE_ELEMENT_BUTTON] =
    create_style_context (GTK_TYPE_BUTTON,
                          style_info->styles[META_STYLE_ELEMENT_TITLEBAR],
                          provider,
-                          GTK_STYLE_CLASS_BUTTON,
+                          "button",
                          "titlebutton",
                          NULL);
  style_info->styles[META_STYLE_ELEMENT_IMAGE] =
    create_style_context (GTK_TYPE_IMAGE,
                          style_info->styles[META_STYLE_ELEMENT_BUTTON],
                          provider,
+                          "image",
                          NULL);
  return style_info;
 }
@@ -1171,9 +1193,10 @@ meta_style_info_create_font_desc (MetaStyleInfo *style_info)
 {
  PangoFontDescription *font_desc;
  const PangoFontDescription *override = meta_prefs_get_titlebar_font ();
+  GtkStyleContext *context = style_info->styles[META_STYLE_ELEMENT_TITLE];

-  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_TITLE],
-                         GTK_STATE_FLAG_NORMAL,
+  gtk_style_context_get (context,
+                         gtk_style_context_get_state (context),
                         "font", &font_desc, NULL);

  if (override)
--- a/src/wayland/meta-pointer-confinement-wayland.c
+++ b/src/wayland/meta-pointer-confinement-wayland.c
@@ -0,0 +1,707 @@
+/* -*- 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 "wayland/meta-pointer-confinement-wayland.h"
+
+#include <glib-object.h>
+#include <cairo.h>
+
+#include "backends/meta-backend-private.h"
+#include "core/meta-border.h"
+#include "wayland/meta-wayland-seat.h"
+#include "wayland/meta-wayland-pointer.h"
+#include "wayland/meta-wayland-pointer-constraints.h"
+#include "wayland/meta-wayland-surface.h"
+#include "backends/meta-pointer-constraint.h"
+#include "compositor/meta-surface-actor-wayland.h"
+
+struct _MetaPointerConfinementWayland
+{
+  MetaPointerConstraint parent;
+
+  MetaWaylandPointerConstraint *constraint;
+};
+
+typedef struct _MetaBox
+{
+  int x1;
+  int y1;
+  int x2;
+  int y2;
+} MetaBox;
+
+G_DEFINE_TYPE (MetaPointerConfinementWayland, meta_pointer_confinement_wayland,
+               META_TYPE_POINTER_CONSTRAINT);
+
+static MetaBorder *
+add_border (GArray *borders,
+            float x1, float y1,
+            float x2, float y2,
+            MetaBorderMotionDirection blocking_directions)
+{
+  MetaBorder border;
+
+  border = (MetaBorder) {
+    .line = (MetaLine2) {
+      .a = (MetaVector2) {
+        .x = x1,
+        .y = y1,
+      },
+      .b = (MetaVector2) {
+        .x = x2,
+        .y = y2,
+      },
+    },
+    .blocking_directions = blocking_directions,
+  };
+
+  g_array_append_val (borders, border);
+
+  return &g_array_index (borders, MetaBorder, borders->len - 1);
+}
+
+static gint
+compare_lines_x (gconstpointer a, gconstpointer b)
+{
+  const MetaBorder *border_a = a;
+  const MetaBorder *border_b = b;
+
+  if (border_a->line.a.x == border_b->line.a.x)
+    return border_a->line.b.x < border_b->line.b.x;
+  else
+    return border_a->line.a.x > border_b->line.a.x;
+}
+
+static void
+add_non_overlapping_edges (MetaBox     *boxes,
+                           unsigned int band_above_start,
+                           unsigned int band_below_start,
+                           unsigned int band_below_end,
+                           GArray      *borders)
+{
+  unsigned int i;
+  GArray *band_merge;
+  MetaBorder *border;
+  MetaBorder *prev_border;
+  MetaBorder *new_border;
+
+  band_merge = g_array_new (FALSE, FALSE, sizeof *border);
+
+  /* Add bottom band of previous row, and top band of current row, and
+   * sort them so lower left x coordinate comes first. If there are two
+   * borders with the same left x coordinate, the wider one comes first.
+   */
+  for (i = band_above_start; i < band_below_start; i++)
+    {
+      MetaBox *box = &boxes[i];
+      add_border (band_merge, box->x1, box->y2, box->x2, box->y2,
+                  META_BORDER_MOTION_DIRECTION_POSITIVE_Y);
+    }
+  for (i = band_below_start; i < band_below_end; i++)
+    {
+      MetaBox *box= &boxes[i];
+      add_border (band_merge, box->x1, box->y1, box->x2, box->y1,
+                  META_BORDER_MOTION_DIRECTION_NEGATIVE_Y);
+    }
+  g_array_sort (band_merge, compare_lines_x);
+
+  /* Combine the two combined bands so that any overlapping border is
+   * eliminated. */
+  prev_border = NULL;
+  for (i = 0; i < band_merge->len; i++)
+    {
+      border = &g_array_index (band_merge, MetaBorder, i);
+
+      g_assert (border->line.a.y == border->line.b.y);
+      g_assert (!prev_border ||
+                prev_border->line.a.y == border->line.a.y);
+      g_assert (!prev_border ||
+                (prev_border->line.a.x != border->line.a.x ||
+                 prev_border->line.b.x != border->line.b.x));
+      g_assert (!prev_border ||
+                prev_border->line.a.x <= border->line.a.x);
+
+      if (prev_border &&
+          prev_border->line.a.x == border->line.a.x)
+        {
+          /*
+           * ------------ +
+           * -------      =
+           * [     ]-----
+           */
+          prev_border->line.a.x = border->line.b.x;
+        }
+      else if (prev_border &&
+               prev_border->line.b.x == border->line.b.x)
+        {
+          /*
+           * ------------ +
+           *       ------ =
+           * ------[    ]
+           */
+          prev_border->line.b.x = border->line.a.x;
+        }
+      else if (prev_border &&
+               prev_border->line.b.x == border->line.a.x)
+        {
+          /*
+           * --------        +
+           *         ------  =
+           * --------------
+           */
+          prev_border->line.b.x = border->line.b.x;
+        }
+      else if (prev_border &&
+               prev_border->line.b.x >= border->line.a.x)
+        {
+          /*
+           * --------------- +
+           *      ------     =
+           * -----[    ]----
+           */
+          new_border = add_border (borders,
+                                   border->line.b.x,
+                                   border->line.b.y,
+                                   prev_border->line.b.x,
+                                   prev_border->line.b.y,
+                                   prev_border->blocking_directions);
+          prev_border->line.b.x = border->line.a.x;
+          prev_border = new_border;
+        }
+      else
+        {
+          g_assert (!prev_border ||
+                    prev_border->line.b.x < border->line.a.x);
+          /*
+           * First border or non-overlapping.
+           *
+           * -----           +
+           *        -----    =
+           * -----  -----
+           */
+          g_array_append_val (borders, *border);
+          prev_border = &g_array_index (borders, MetaBorder, borders->len - 1);
+        }
+    }
+
+  g_array_free (band_merge, FALSE);
+}
+
+static void
+add_band_bottom_edges (MetaBox *boxes,
+                       int      band_start,
+                       int      band_end,
+                       GArray  *borders)
+{
+  int i;
+
+  for (i = band_start; i < band_end; i++)
+    {
+      add_border (borders,
+                  boxes[i].x1, boxes[i].y2,
+                  boxes[i].x2, boxes[i].y2,
+                  META_BORDER_MOTION_DIRECTION_POSITIVE_Y);
+    }
+}
+
+static void
+region_to_outline (cairo_region_t *region,
+                   GArray         *borders)
+{
+  MetaBox *boxes;
+  int num_boxes;
+  int i;
+  int top_most, bottom_most;
+  int current_roof;
+  int prev_top;
+  int band_start, prev_band_start;
+
+  /*
+   * Remove any overlapping lines from the set of rectangles. Note that
+   * pixman regions are grouped as rows of rectangles, where rectangles
+   * in one row never touch or overlap and are all of the same height.
+   *
+   *             -------- ---                   -------- ---
+   *             |      | | |                   |      | | |
+   *   ----------====---- ---         -----------  ----- ---
+   *   |            |            =>   |            |
+   *   ----==========---------        -----        ----------
+   *       |                 |            |                 |
+   *       -------------------            -------------------
+   *
+   */
+
+  num_boxes  = cairo_region_num_rectangles (region);
+  boxes = g_new (MetaBox, num_boxes);
+  for (i = 0; i < num_boxes; i++)
+    {
+      cairo_rectangle_int_t rect;
+      cairo_region_get_rectangle (region, i, &rect);
+      boxes[i] = (MetaBox) {
+        .x1 = rect.x,
+        .y1 = rect.y,
+        .x2 = rect.x + rect.width,
+        .y2 = rect.y + rect.height,
+      };
+    }
+  prev_top = 0;
+  top_most = boxes[0].y1;
+  current_roof = top_most;
+  bottom_most = boxes[num_boxes - 1].y2;
+  band_start = 0;
+  prev_band_start = 0;
+  for (i = 0; i < num_boxes; i++)
+    {
+      /* Detect if there is a vertical empty space, and add the lower
+       * level of the previous band if so was the case. */
+      if (i > 0 &&
+          boxes[i].y1 != prev_top &&
+          boxes[i].y1 != boxes[i - 1].y2)
+        {
+          current_roof = boxes[i].y1;
+          add_band_bottom_edges (boxes,
+                                 band_start,
+                                 i,
+                                 borders);
+        }
+
+      /* Special case adding the last band, since it won't be handled
+       * by the band change detection below. */
+      if (boxes[i].y1 != current_roof && i == num_boxes - 1)
+        {
+          if (boxes[i].y1 != prev_top)
+            {
+              /* The last band is a single box, so we don't
+               * have a prev_band_start to tell us when the
+               * previous band started. */
+              add_non_overlapping_edges (boxes,
+                                         band_start,
+                                         i,
+                                         i + 1,
+                                         borders);
+            }
+          else
+            {
+              add_non_overlapping_edges (boxes,
+                                         prev_band_start,
+                                         band_start,
+                                         i + 1,
+                                         borders);
+            }
+        }
+
+      /* Detect when passing a band and combine the top border of the
+       * just passed band with the bottom band of the previous band.
+       */
+      if (boxes[i].y1 != top_most && boxes[i].y1 != prev_top)
+        {
+          /* Combine the two passed bands. */
+          if (prev_top != current_roof)
+            {
+              add_non_overlapping_edges (boxes,
+                                         prev_band_start,
+                                         band_start,
+                                         i,
+                                         borders);
+            }
+
+          prev_band_start = band_start;
+          band_start = i;
+        }
+
+      /* Add the top border if the box is part of the current roof. */
+      if (boxes[i].y1 == current_roof)
+        {
+          add_border (borders,
+                      boxes[i].x1, boxes[i].y1,
+                      boxes[i].x2, boxes[i].y1,
+                      META_BORDER_MOTION_DIRECTION_NEGATIVE_Y);
+        }
+
+      /* Add the bottom border of the last band. */
+      if (boxes[i].y2 == bottom_most)
+        {
+          add_border (borders,
+                      boxes[i].x1, boxes[i].y2,
+                      boxes[i].x2, boxes[i].y2,
+                      META_BORDER_MOTION_DIRECTION_POSITIVE_Y);
+        }
+
+      /* Always add the left border. */
+      add_border (borders,
+                  boxes[i].x1, boxes[i].y1,
+                  boxes[i].x1, boxes[i].y2,
+                  META_BORDER_MOTION_DIRECTION_NEGATIVE_X);
+
+      /* Always add the right border. */
+      add_border (borders,
+                  boxes[i].x2, boxes[i].y1,
+                  boxes[i].x2, boxes[i].y2,
+                  META_BORDER_MOTION_DIRECTION_POSITIVE_X);
+
+      prev_top = boxes[i].y1;
+    }
+
+  g_free (boxes);
+}
+
+static MetaBorder *
+get_closest_border (GArray    *borders,
+                    MetaLine2 *motion,
+                    uint32_t   directions)
+{
+  MetaBorder *border;
+  MetaVector2 intersection;
+  MetaVector2 delta;
+  float distance_2;
+  MetaBorder *closest_border = NULL;
+  float closest_distance_2 = DBL_MAX;
+  unsigned int i;
+
+  for (i = 0; i < borders->len; i++)
+    {
+      border = &g_array_index (borders, MetaBorder, i);
+
+      if (!meta_border_is_blocking_directions (border, directions))
+        continue;
+
+      if (!meta_line2_intersects_with (&border->line, motion, &intersection))
+        continue;
+
+      delta = meta_vector2_subtract (intersection, motion->a);
+      distance_2 = delta.x*delta.x + delta.y*delta.y;
+      if (distance_2 < closest_distance_2)
+        {
+          closest_border = border;
+          closest_distance_2 = distance_2;
+        }
+    }
+
+  return closest_border;
+}
+
+static void
+clamp_to_border (MetaBorder *border,
+                 MetaLine2  *motion,
+                 uint32_t   *motion_dir)
+{
+  /*
+   * When clamping either rightward or downward motions, the motion needs to be
+   * clamped so that the destination coordinate does not end up on the border
+   * (see weston_pointer_clamp_event_to_region). Do this by clamping such
+   * motions to the border minus the smallest possible wl_fixed_t value.
+   *
+   * When clamping in either leftward or upward motion, the resulting coordinate
+   * needs to be clamped so that it is enough on the inside to avoid the
+   * inaccuracies of clutter's stage to actor transformation algorithm (the one
+   * used in clutter_actor_transform_stage_point) to make it end up outside the
+   * next motion. It also needs to be clamped so that to the wl_fixed_t
+   * coordinate may still be right on the border (i.e. at .0). Testing shows
+   * that the smallest wl_fixed_t value divided by 10 is small enough to make
+   * the wl_fixed_t coordinate .0 and large enough to avoid the inaccuracies of
+   * clutters transform algorithm.
+   */
+  if (meta_border_is_horizontal (border))
+    {
+      if (*motion_dir & META_BORDER_MOTION_DIRECTION_POSITIVE_Y)
+        motion->b.y = border->line.a.y - wl_fixed_to_double (1);
+      else
+        motion->b.y = border->line.a.y + wl_fixed_to_double (1) / 10;
+      *motion_dir &= ~(META_BORDER_MOTION_DIRECTION_POSITIVE_Y |
+                       META_BORDER_MOTION_DIRECTION_NEGATIVE_Y);
+    }
+  else
+    {
+      if (*motion_dir & META_BORDER_MOTION_DIRECTION_POSITIVE_X)
+        motion->b.x = border->line.a.x - wl_fixed_to_double (1);
+      else
+        motion->b.x = border->line.a.x + wl_fixed_to_double (1) / 10;
+      *motion_dir &= ~(META_BORDER_MOTION_DIRECTION_POSITIVE_X |
+                       META_BORDER_MOTION_DIRECTION_NEGATIVE_X);
+    }
+}
+
+static uint32_t
+get_motion_directions (MetaLine2 *motion)
+{
+  uint32_t directions = 0;
+
+  if (motion->a.x < motion->b.x)
+    directions |= META_BORDER_MOTION_DIRECTION_POSITIVE_X;
+  else if (motion->a.x > motion->b.x)
+    directions |= META_BORDER_MOTION_DIRECTION_NEGATIVE_X;
+  if (motion->a.y < motion->b.y)
+    directions |= META_BORDER_MOTION_DIRECTION_POSITIVE_Y;
+  else if (motion->a.y > motion->b.y)
+    directions |= META_BORDER_MOTION_DIRECTION_NEGATIVE_Y;
+
+  return directions;
+}
+
+static void
+meta_pointer_confinement_wayland_constrain (MetaPointerConstraint *constraint,
+                                            ClutterInputDevice    *device,
+                                            guint32                time,
+                                            float                  prev_x,
+                                            float                  prev_y,
+                                            float                  *x,
+                                            float                  *y)
+{
+  MetaPointerConfinementWayland *self =
+    META_POINTER_CONFINEMENT_WAYLAND (constraint);
+  MetaWaylandSurface *surface;
+  cairo_region_t *region;
+  float sx, sy;
+  float prev_sx, prev_sy;
+  GArray *borders;
+  MetaLine2 motion;
+  MetaBorder *closest_border;
+  uint32_t directions;
+
+  surface = meta_wayland_pointer_constraint_get_surface (self->constraint);
+
+  meta_wayland_surface_get_relative_coordinates (surface, *x, *y, &sx, &sy);
+  meta_wayland_surface_get_relative_coordinates (surface, prev_x, prev_y,
+                                                 &prev_sx, &prev_sy);
+
+  /* For motions in a positive direction on any axis, append the smallest
+   * possible value representable in a Wayland absolute coordinate.  This is
+   * in order to avoid not clamping motion that as a floating point number
+   * won't be clamped, but will be rounded up to be outside of the range
+   * of wl_fixed_t. */
+  if (sx > prev_sx)
+    sx += (float)wl_fixed_to_double(1);
+  if (sy > prev_sy)
+    sy += (float)wl_fixed_to_double(1);
+
+  borders = g_array_new (FALSE, FALSE, sizeof (MetaBorder));
+
+  /*
+   * Generate borders given the confine region we are to use. The borders
+   * are defined to be the outer region of the allowed area. This means
+   * top/left borders are "within" the allowed area, while bottom/right
+   * borders are outside. This needs to be considered when clamping
+   * confined motion vectors.
+   */
+  region =
+    meta_wayland_pointer_constraint_calculate_effective_region (self->constraint);
+  region_to_outline (region, borders);
+  cairo_region_destroy (region);
+
+  motion = (MetaLine2) {
+    .a = (MetaVector2) {
+      .x = prev_sx,
+      .y = prev_sy,
+    },
+    .b = (MetaVector2) {
+      .x = sx,
+      .y = sy,
+    },
+  };
+  directions = get_motion_directions (&motion);
+
+  while (directions)
+    {
+      closest_border = get_closest_border (borders,
+                                           &motion,
+                                           directions);
+      if (closest_border)
+        clamp_to_border (closest_border, &motion, &directions);
+      else
+        break;
+    }
+
+  meta_wayland_surface_get_absolute_coordinates (surface,
+                                                 motion.b.x, motion.b.y,
+                                                 x, y);
+
+  g_array_free (borders, FALSE);
+}
+
+static float
+point_to_border_distance_2 (MetaBorder *border,
+                            float       x,
+                            float       y)
+{
+  float orig_x, orig_y;
+  float dx, dy;
+
+  if (meta_border_is_horizontal (border))
+    {
+      if (x < border->line.a.x)
+        orig_x = border->line.a.x;
+      else if (x > border->line.b.x)
+        orig_x = border->line.b.x;
+      else
+        orig_x = x;
+      orig_y = border->line.a.y;
+    }
+  else
+    {
+      if (y < border->line.a.y)
+        orig_y = border->line.a.y;
+      else if (y > border->line.b.y)
+        orig_y = border->line.b.y;
+      else
+        orig_y = y;
+      orig_x = border->line.a.x;
+    }
+
+  dx = fabsf (orig_x - x);
+  dy = fabsf (orig_y - y);
+  return dx*dx + dy*dy;
+}
+
+static void
+warp_to_behind_border (MetaBorder *border,
+                       float      *sx,
+                       float      *sy)
+{
+  switch (border->blocking_directions)
+    {
+    case META_BORDER_MOTION_DIRECTION_POSITIVE_X:
+    case META_BORDER_MOTION_DIRECTION_NEGATIVE_X:
+      if (border->blocking_directions == META_BORDER_MOTION_DIRECTION_POSITIVE_X)
+        *sx = border->line.a.x - wl_fixed_to_double (1);
+      else
+        *sx = border->line.a.x + wl_fixed_to_double (1);
+      if (*sy < border->line.a.y)
+        *sy = border->line.a.y + wl_fixed_to_double (1);
+      else if (*sy > border->line.b.y)
+        *sy = border->line.b.y - wl_fixed_to_double (1);
+      break;
+    case META_BORDER_MOTION_DIRECTION_POSITIVE_Y:
+    case META_BORDER_MOTION_DIRECTION_NEGATIVE_Y:
+      if (border->blocking_directions == META_BORDER_MOTION_DIRECTION_POSITIVE_Y)
+        *sy = border->line.a.y - wl_fixed_to_double (1);
+      else
+        *sy = border->line.a.y + wl_fixed_to_double (1);
+      if (*sx < border->line.a.x)
+        *sx = border->line.a.x + wl_fixed_to_double (1);
+      else if (*sx > (border->line.b.x))
+        *sx = border->line.b.x - wl_fixed_to_double (1);
+      break;
+    }
+}
+
+static void
+meta_pointer_confinement_wayland_maybe_warp (MetaPointerConfinementWayland *self)
+{
+  MetaWaylandSeat *seat;
+  MetaWaylandSurface *surface;
+  ClutterPoint point;
+  float sx;
+  float sy;
+  cairo_region_t *region;
+
+  seat = meta_wayland_pointer_constraint_get_seat (self->constraint);
+  surface = meta_wayland_pointer_constraint_get_surface (self->constraint);
+
+  clutter_input_device_get_coords (seat->pointer.device, NULL, &point);
+  meta_wayland_surface_get_relative_coordinates (surface,
+                                                 point.x, point.y,
+                                                 &sx, &sy);
+
+  region =
+    meta_wayland_pointer_constraint_calculate_effective_region (self->constraint);
+
+  if (!cairo_region_contains_point (region, (int)sx, (int)sy))
+    {
+      GArray *borders;
+      float closest_distance_2 = FLT_MAX;
+      MetaBorder *closest_border = NULL;
+      unsigned int i;
+      float x;
+      float y;
+
+      borders = g_array_new (FALSE, FALSE, sizeof (MetaBorder));
+
+      region_to_outline (region, borders);
+
+      for (i = 0; i < borders->len; i++)
+        {
+          MetaBorder *border = &g_array_index (borders, MetaBorder, i);
+          float distance_2;
+
+          distance_2 = point_to_border_distance_2 (border, sx, sy);
+          if (distance_2 < closest_distance_2)
+            {
+              closest_border = border;
+              closest_distance_2 = distance_2;
+            }
+        }
+
+      warp_to_behind_border (closest_border, &sx, &sy);
+
+      meta_wayland_surface_get_absolute_coordinates (surface, sx, sy, &x, &y);
+      meta_backend_warp_pointer (meta_get_backend (), (int)x, (int)y);
+    }
+
+  cairo_region_destroy (region);
+}
+
+static void
+surface_actor_painting (MetaSurfaceActorWayland       *surface_actor,
+                        MetaPointerConfinementWayland *self)
+{
+  meta_pointer_confinement_wayland_maybe_warp (self);
+}
+
+MetaPointerConstraint *
+meta_pointer_confinement_wayland_new (MetaWaylandPointerConstraint *constraint)
+{
+  GObject *object;
+  MetaPointerConfinementWayland *confinement;
+  MetaWaylandSurface *surface;
+
+  object = g_object_new (META_TYPE_POINTER_CONFINEMENT_WAYLAND, NULL);
+  confinement = META_POINTER_CONFINEMENT_WAYLAND (object);
+
+  confinement->constraint = constraint;
+
+  surface = meta_wayland_pointer_constraint_get_surface (constraint);
+  g_signal_connect_object (surface->surface_actor,
+                           "painting",
+                           G_CALLBACK (surface_actor_painting),
+                           confinement,
+                           0);
+
+  return META_POINTER_CONSTRAINT (confinement);
+}
+
+static void
+meta_pointer_confinement_wayland_init (MetaPointerConfinementWayland *confinement_wayland)
+{
+}
+
+static void
+meta_pointer_confinement_wayland_class_init (MetaPointerConfinementWaylandClass *klass)
+{
+  MetaPointerConstraintClass *pointer_constraint_class =
+    META_POINTER_CONSTRAINT_CLASS (klass);
+
+  pointer_constraint_class->constrain = meta_pointer_confinement_wayland_constrain;
+}
--- a/src/wayland/meta-pointer-confinement-wayland.h
+++ b/src/wayland/meta-pointer-confinement-wayland.h
@@ -0,0 +1,45 @@
+/* -*- 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_CONFINEMENT_WAYLAND_H
+#define META_POINTER_CONFINEMENT_WAYLAND_H
+
+#include <glib-object.h>
+
+#include "backends/meta-pointer-constraint.h"
+#include "wayland/meta-wayland-pointer-constraints.h"
+
+G_BEGIN_DECLS
+
+#define META_TYPE_POINTER_CONFINEMENT_WAYLAND (meta_pointer_confinement_wayland_get_type ())
+G_DECLARE_FINAL_TYPE (MetaPointerConfinementWayland,
+                      meta_pointer_confinement_wayland,
+                      META, POINTER_CONFINEMENT_WAYLAND,
+                      MetaPointerConstraint);
+
+MetaPointerConstraint *meta_pointer_confinement_wayland_new (MetaWaylandPointerConstraint *constraint);
+
+G_END_DECLS
+
+#endif /* META_CONFINEMENT_WAYLAND_H */
--- a/src/wayland/meta-pointer-lock-wayland.c
+++ b/src/wayland/meta-pointer-lock-wayland.c
@@ -0,0 +1,72 @@
+/* -*- 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 "wayland/meta-pointer-lock-wayland.h"
+
+#include <glib-object.h>
+
+#include "backends/meta-pointer-constraint.h"
+
+struct _MetaPointerLockWayland
+{
+  MetaPointerConstraint parent;
+};
+
+G_DEFINE_TYPE (MetaPointerLockWayland, meta_pointer_lock_wayland,
+               META_TYPE_POINTER_CONSTRAINT);
+
+static void
+meta_pointer_lock_wayland_constrain (MetaPointerConstraint *constraint,
+                                     ClutterInputDevice    *device,
+                                     guint32                time,
+                                     float                  prev_x,
+                                     float                  prev_y,
+                                     float                 *x,
+                                     float                 *y)
+{
+  *x = prev_x;
+  *y = prev_y;
+}
+
+MetaPointerConstraint *
+meta_pointer_lock_wayland_new (void)
+{
+  return g_object_new (META_TYPE_POINTER_LOCK_WAYLAND, NULL);
+}
+
+static void
+meta_pointer_lock_wayland_init (MetaPointerLockWayland *lock_wayland)
+{
+}
+
+static void
+meta_pointer_lock_wayland_class_init (MetaPointerLockWaylandClass *klass)
+{
+  MetaPointerConstraintClass *pointer_constraint_class =
+    META_POINTER_CONSTRAINT_CLASS (klass);
+
+  pointer_constraint_class->constrain = meta_pointer_lock_wayland_constrain;
+}
--- a/src/wayland/meta-pointer-lock-wayland.h
+++ b/src/wayland/meta-pointer-lock-wayland.h
@@ -0,0 +1,42 @@
+/* -*- 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_LOCK_WAYLAND_H
+#define META_POINTER_LOCK_WAYLAND_H
+
+#include <glib-object.h>
+
+#include "backends/meta-pointer-constraint.h"
+
+G_BEGIN_DECLS
+
+#define META_TYPE_POINTER_LOCK_WAYLAND (meta_pointer_lock_wayland_get_type ())
+G_DECLARE_FINAL_TYPE (MetaPointerLockWayland, meta_pointer_lock_wayland,
+                      META, POINTER_LOCK_WAYLAND, MetaPointerConstraint);
+
+MetaPointerConstraint *meta_pointer_lock_wayland_new (void);
+
+G_END_DECLS
+
+#endif /* META_LOCK_WAYLAND_H */
--- a/src/wayland/meta-wayland-buffer.c
+++ b/src/wayland/meta-wayland-buffer.c
@@ -51,13 +51,32 @@ void
 meta_wayland_buffer_unref (MetaWaylandBuffer *buffer)
 {
  buffer->ref_count--;
+
  if (buffer->ref_count == 0)
    {
+      g_warn_if_fail (buffer->use_count == 0);
+
      g_clear_pointer (&buffer->texture, cogl_object_unref);
-      wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
    }
 }

+void
+meta_wayland_buffer_ref_use_count (MetaWaylandBuffer *buffer)
+{
+  buffer->use_count++;
+}
+
+void
+meta_wayland_buffer_unref_use_count (MetaWaylandBuffer *buffer)
+{
+  g_return_if_fail (buffer->use_count != 0);
+
+  buffer->use_count--;
+
+  if (buffer->use_count == 0)
+    wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
+}
+
 MetaWaylandBuffer *
 meta_wayland_buffer_from_resource (struct wl_resource *resource)
 {
@@ -93,6 +112,8 @@ meta_wayland_buffer_ensure_texture (MetaWaylandBuffer *buffer)
  CoglTexture *texture;
  struct wl_shm_buffer *shm_buffer;

+  g_return_val_if_fail (buffer->use_count != 0, NULL);
+
  if (buffer->texture)
    goto out;

@@ -126,6 +147,8 @@ meta_wayland_buffer_process_damage (MetaWaylandBuffer *buffer,
 {
  struct wl_shm_buffer *shm_buffer;

+  g_return_if_fail (buffer->use_count != 0);
+
  shm_buffer = wl_shm_buffer_get (buffer->resource);

  if (shm_buffer)
--- a/src/wayland/meta-wayland-buffer.h
+++ b/src/wayland/meta-wayland-buffer.h
@@ -39,11 +39,14 @@ struct _MetaWaylandBuffer

  CoglTexture *texture;
  uint32_t ref_count;
+  uint32_t use_count;
 };

 MetaWaylandBuffer *     meta_wayland_buffer_from_resource       (struct wl_resource    *resource);
 void                    meta_wayland_buffer_ref                 (MetaWaylandBuffer     *buffer);
 void                    meta_wayland_buffer_unref               (MetaWaylandBuffer     *buffer);
+void                    meta_wayland_buffer_ref_use_count       (MetaWaylandBuffer     *buffer);
+void                    meta_wayland_buffer_unref_use_count     (MetaWaylandBuffer     *buffer);
 CoglTexture *           meta_wayland_buffer_ensure_texture      (MetaWaylandBuffer     *buffer);
 void                    meta_wayland_buffer_process_damage      (MetaWaylandBuffer     *buffer,
                                                                 cairo_region_t        *region);
--- a/src/wayland/meta-wayland-data-device-private.h
+++ b/src/wayland/meta-wayland-data-device-private.h
@@ -31,4 +31,10 @@ G_DECLARE_FINAL_TYPE (MetaWaylandDataSourceWayland,
                      META, WAYLAND_DATA_SOURCE_WAYLAND,
                      MetaWaylandDataSource);

+#define META_TYPE_WAYLAND_DATA_SOURCE_PRIMARY (meta_wayland_data_source_primary_get_type ())
+G_DECLARE_FINAL_TYPE (MetaWaylandDataSourcePrimary,
+                      meta_wayland_data_source_primary,
+                      META, WAYLAND_DATA_SOURCE_PRIMARY,
+                      MetaWaylandDataSourceWayland);
+
 #endif /* META_WAYLAND_DATA_DEVICE_PRIVATE_H */
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
--- a/src/wayland/meta-wayland-data-device.h
+++ b/src/wayland/meta-wayland-data-device.h
@@ -45,6 +45,11 @@ struct _MetaWaylandDataSourceClass
  void (* target)  (MetaWaylandDataSource *source,
                    const gchar           *mime_type);
  void (* cancel)  (MetaWaylandDataSource *source);
+
+  void (* action)         (MetaWaylandDataSource *source,
+                           uint32_t               action);
+  void (* drop_performed) (MetaWaylandDataSource *source);
+  void (* drag_finished)  (MetaWaylandDataSource *source);
 };

 struct _MetaWaylandDataDevice
@@ -52,16 +57,18 @@ struct _MetaWaylandDataDevice
  uint32_t selection_serial;
  MetaWaylandDataSource *selection_data_source;
  MetaWaylandDataSource *dnd_data_source;
+  MetaWaylandDataSource *primary_data_source;
  struct wl_listener selection_data_source_listener;
  struct wl_list resource_list;
+  struct wl_list primary_resource_list;
  MetaWaylandDragGrab *current_grab;
+  struct wl_client *focus_client;

  struct wl_signal selection_ownership_signal;
  struct wl_signal dnd_ownership_signal;
+  struct wl_signal primary_ownership_signal;
 };

-GType meta_wayland_data_source_get_type (void) G_GNUC_CONST;
-
 void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);

 void meta_wayland_data_device_init (MetaWaylandDataDevice *data_device);
@@ -70,13 +77,14 @@ void meta_wayland_data_device_set_keyboard_focus (MetaWaylandDataDevice *data_de

 gboolean meta_wayland_data_device_is_dnd_surface (MetaWaylandDataDevice *data_device,
                                                  MetaWaylandSurface    *surface);
-void meta_wayland_data_device_update_dnd_surface (MetaWaylandDataDevice *data_device);

 void meta_wayland_data_device_set_dnd_source     (MetaWaylandDataDevice *data_device,
                                                  MetaWaylandDataSource *source);
 void meta_wayland_data_device_set_selection      (MetaWaylandDataDevice *data_device,
                                                  MetaWaylandDataSource *source,
                                                  guint32 serial);
+void meta_wayland_data_device_set_primary        (MetaWaylandDataDevice *data_device,
+                                                  MetaWaylandDataSource *source);

 gboolean meta_wayland_data_source_add_mime_type  (MetaWaylandDataSource *source,
                                                  const gchar           *mime_type);
@@ -96,6 +104,17 @@ void     meta_wayland_data_source_send           (MetaWaylandDataSource *source,
                                                  const gchar           *mime_type,
                                                  gint                   fd);

+void     meta_wayland_data_source_notify_finish  (MetaWaylandDataSource *source);
+
+uint32_t meta_wayland_data_source_get_actions        (MetaWaylandDataSource *source);
+uint32_t meta_wayland_data_source_get_user_action    (MetaWaylandDataSource *source);
+uint32_t meta_wayland_data_source_get_current_action (MetaWaylandDataSource *source);
+
+void     meta_wayland_data_source_set_actions        (MetaWaylandDataSource *source,
+                                                      uint32_t               dnd_actions);
+void     meta_wayland_data_source_set_current_action (MetaWaylandDataSource *source,
+                                                      uint32_t               action);
+
 const MetaWaylandDragDestFuncs *
         meta_wayland_data_device_get_drag_dest_funcs (void);

--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -56,13 +56,19 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <clutter/evdev/clutter-evdev.h>

 #include "backends/meta-backend-private.h"

 #include "meta-wayland-private.h"

+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-backend-native.h"
+#endif
+
 static void meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard);
 static void notify_modifiers (MetaWaylandKeyboard *keyboard);
+static guint evdev_code (const ClutterKeyEvent *event);

 static void
 unbind_resource (struct wl_resource *resource)
@@ -240,8 +246,10 @@ keyboard_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
 }

 static gboolean
-notify_key (MetaWaylandKeyboard *keyboard,
-            uint32_t time, uint32_t key, uint32_t state)
+meta_wayland_keyboard_broadcast_key (MetaWaylandKeyboard *keyboard,
+                                     uint32_t             time,
+                                     uint32_t             key,
+                                     uint32_t             state)
 {
  struct wl_resource *resource;
  struct wl_list *l;
@@ -251,11 +259,12 @@ notify_key (MetaWaylandKeyboard *keyboard,
    {
      struct wl_client *client = wl_resource_get_client (keyboard->focus_surface->resource);
      struct wl_display *display = wl_client_get_display (client);
-      uint32_t serial = wl_display_next_serial (display);
+
+      keyboard->key_serial = wl_display_next_serial (display);

      wl_resource_for_each (resource, l)
        {
-          wl_keyboard_send_key (resource, serial, time, key, state);
+          wl_keyboard_send_key (resource, keyboard->key_serial, time, key, state);
        }
    }

@@ -263,8 +272,15 @@ notify_key (MetaWaylandKeyboard *keyboard,
  return (keyboard->focus_surface != NULL);
 }

+static gboolean
+notify_key (MetaWaylandKeyboard *keyboard,
+            const ClutterEvent  *event)
+{
+  return keyboard->grab->interface->key (keyboard->grab, event);
+}
+
 static void
-notify_modifiers (MetaWaylandKeyboard *keyboard)
+meta_wayland_keyboard_broadcast_modifiers (MetaWaylandKeyboard *keyboard)
 {
  struct xkb_state *state;
  struct wl_resource *resource;
@@ -289,6 +305,16 @@ notify_modifiers (MetaWaylandKeyboard *keyboard)
    }
 }

+static void
+notify_modifiers (MetaWaylandKeyboard *keyboard)
+{
+  struct xkb_state *state;
+
+  state = keyboard->xkb_info.state;
+  keyboard->grab->interface->modifiers (keyboard->grab,
+                                        xkb_state_serialize_mods (state, XKB_STATE_MODS_EFFECTIVE));
+}
+
 static void
 meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard)
 {
@@ -368,6 +394,45 @@ settings_changed (GSettings           *settings,
  notify_key_repeat (keyboard);
 }

+static gboolean
+default_grab_key (MetaWaylandKeyboardGrab *grab,
+                  const ClutterEvent      *event)
+{
+  MetaWaylandKeyboard *keyboard = grab->keyboard;
+  gboolean is_press = event->type == CLUTTER_KEY_PRESS;
+  guint32 code;
+#ifdef HAVE_NATIVE_BACKEND
+  MetaBackend *backend = meta_get_backend ();
+#endif
+
+  /* Synthetic key events are for autorepeat. Ignore those, as
+   * autorepeat in Wayland is done on the client side. */
+  if (event->key.flags & CLUTTER_EVENT_FLAG_SYNTHETIC)
+    return FALSE;
+
+#ifdef HAVE_NATIVE_BACKEND
+  if (META_IS_BACKEND_NATIVE (backend))
+    code = clutter_evdev_event_get_event_code (event);
+  else
+#endif
+    code = evdev_code (&event->key);
+
+  return meta_wayland_keyboard_broadcast_key (keyboard, event->key.time,
+                                              code, is_press);
+}
+
+static void
+default_grab_modifiers (MetaWaylandKeyboardGrab *grab,
+                        ClutterModifierType      modifiers)
+{
+  meta_wayland_keyboard_broadcast_modifiers (grab->keyboard);
+}
+
+static const MetaWaylandKeyboardGrabInterface default_keyboard_grab_interface = {
+  default_grab_key,
+  default_grab_modifiers
+};
+
 void
 meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
                            struct wl_display   *display)
@@ -385,6 +450,10 @@ meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,

  keyboard->xkb_info.keymap_fd = -1;

+  keyboard->default_grab.interface = &default_keyboard_grab_interface;
+  keyboard->default_grab.keyboard = keyboard;
+  keyboard->grab = &keyboard->default_grab;
+
  keyboard->settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
  g_signal_connect (keyboard->settings, "changed",
                    G_CALLBACK (settings_changed), keyboard);
@@ -461,7 +530,7 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
 		is_press ? "press" : "release",
 		event->hardware_keycode);

-  handled = notify_key (keyboard, event->time, evdev_code (event), is_press);
+  handled = notify_key (keyboard, (const ClutterEvent *) event);

  if (handled)
    meta_verbose ("Sent event to wayland client\n");
@@ -672,3 +741,25 @@ meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
      wl_list_insert (&keyboard->resource_list, wl_resource_get_link (cr));
    }
 }
+
+gboolean
+meta_wayland_keyboard_can_popup (MetaWaylandKeyboard *keyboard,
+                                 uint32_t             serial)
+{
+  return keyboard->key_serial == serial;
+}
+
+void
+meta_wayland_keyboard_start_grab (MetaWaylandKeyboard     *keyboard,
+                                  MetaWaylandKeyboardGrab *grab)
+{
+  meta_wayland_keyboard_set_focus (keyboard, NULL);
+  keyboard->grab = grab;
+  grab->keyboard = keyboard;
+}
+
+void
+meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard)
+{
+  keyboard->grab = &keyboard->default_grab;
+}
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -49,6 +49,20 @@
 #include <wayland-server.h>
 #include <xkbcommon/xkbcommon.h>

+struct _MetaWaylandKeyboardGrabInterface
+{
+  gboolean (*key)       (MetaWaylandKeyboardGrab *grab,
+                         const ClutterEvent      *event);
+  void     (*modifiers) (MetaWaylandKeyboardGrab *grab,
+                         ClutterModifierType      modifiers);
+};
+
+struct _MetaWaylandKeyboardGrab
+{
+  const MetaWaylandKeyboardGrabInterface *interface;
+  MetaWaylandKeyboard *keyboard;
+};
+
 typedef struct
 {
  struct xkb_keymap *keymap;
@@ -68,10 +82,14 @@ struct _MetaWaylandKeyboard
  MetaWaylandSurface *focus_surface;
  struct wl_listener focus_surface_listener;
  uint32_t focus_serial;
+  uint32_t key_serial;

  MetaWaylandXkbInfo xkb_info;
  enum xkb_state_component mods_changed;

+  MetaWaylandKeyboardGrab *grab;
+  MetaWaylandKeyboardGrab default_grab;
+
  GSettings *settings;
 };

@@ -100,4 +118,11 @@ void meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
                                                struct wl_resource  *seat_resource,
                                                uint32_t id);

+gboolean meta_wayland_keyboard_can_popup (MetaWaylandKeyboard *keyboard,
+                                          uint32_t             serial);
+
+void meta_wayland_keyboard_start_grab (MetaWaylandKeyboard     *keyboard,
+                                       MetaWaylandKeyboardGrab *grab);
+void meta_wayland_keyboard_end_grab   (MetaWaylandKeyboard     *keyboard);
+
 #endif /* META_WAYLAND_KEYBOARD_H */
--- a/src/wayland/meta-wayland-outputs.c
+++ b/src/wayland/meta-wayland-outputs.c
@@ -99,7 +99,7 @@ bind_output (struct wl_client *client,
                       mode_flags,
                       (int)monitor_info->rect.width,
                       (int)monitor_info->rect.height,
-                       (int)monitor_info->refresh_rate);
+                       (int)(monitor_info->refresh_rate * 1000));

  if (version >= WL_OUTPUT_SCALE_SINCE_VERSION)
    wl_output_send_scale (resource, output->scale);
@@ -160,7 +160,7 @@ wayland_output_update_for_output (MetaWaylandOutput *wayland_output,
                           mode_flags,
                           (int)monitor_info->rect.width,
                           (int)monitor_info->rect.height,
-                           (int)monitor_info->refresh_rate);
+                           (int)(monitor_info->refresh_rate * 1000));
    }

  /* It's very important that we change the output pointer here, as
--- a/src/wayland/meta-wayland-pointer-constraints.c
+++ b/src/wayland/meta-wayland-pointer-constraints.c
@@ -0,0 +1,818 @@
+/* -*- 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 "meta-wayland-pointer-constraints.h"
+
+#include <glib.h>
+
+#include "meta/meta-backend.h"
+#include "meta-wayland-private.h"
+#include "meta-wayland-seat.h"
+#include "meta-wayland-pointer.h"
+#include "meta-wayland-surface.h"
+#include "meta-wayland-region.h"
+#include "meta-pointer-lock-wayland.h"
+#include "meta-pointer-confinement-wayland.h"
+#include "window-private.h"
+#include "backends/meta-backend-private.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/meta-pointer-constraint.h"
+
+#include "pointer-constraints-unstable-v1-server-protocol.h"
+
+static GQuark quark_pending_constraint_state = 0;
+
+struct _MetaWaylandPointerConstraint
+{
+  GObject parent;
+
+  MetaWaylandSurface *surface;
+  gboolean is_enabled;
+  cairo_region_t *region;
+  struct wl_resource *resource;
+  MetaWaylandPointerGrab grab;
+  MetaWaylandSeat *seat;
+  enum zwp_pointer_constraints_v1_lifetime lifetime;
+
+  gboolean hint_set;
+  wl_fixed_t x_hint;
+  wl_fixed_t y_hint;
+
+  MetaPointerConstraint *constraint;
+};
+
+typedef struct
+{
+  MetaWaylandPointerConstraint *constraint;
+  cairo_region_t *region;
+  gulong applied_handler_id;
+} MetaWaylandPendingConstraintState;
+
+typedef struct
+{
+  GList *pending_constraint_states;
+} MetaWaylandPendingConstraintStateContainer;
+
+G_DEFINE_TYPE (MetaWaylandPointerConstraint, meta_wayland_pointer_constraint,
+               G_TYPE_OBJECT);
+
+static const struct zwp_locked_pointer_v1_interface locked_pointer_interface;
+static const struct zwp_confined_pointer_v1_interface confined_pointer_interface;
+static const MetaWaylandPointerGrabInterface locked_pointer_grab_interface;
+static const MetaWaylandPointerGrabInterface confined_pointer_grab_interface;
+
+static cairo_region_t *
+create_infinite_constraint_region (void)
+{
+  return cairo_region_create_rectangle (&(cairo_rectangle_int_t) {
+                                          .x = INT_MIN / 2,
+                                          .y = INT_MIN / 2,
+                                          .width = INT_MAX,
+                                          .height = INT_MAX,
+                                        });
+}
+
+static MetaWaylandPointerConstraint *
+meta_wayland_pointer_constraint_new (MetaWaylandSurface                      *surface,
+                                     MetaWaylandSeat                         *seat,
+                                     MetaWaylandRegion                       *region,
+                                     enum zwp_pointer_constraints_v1_lifetime lifetime,
+                                     struct wl_resource                      *resource,
+                                     const MetaWaylandPointerGrabInterface   *grab_interface)
+{
+  MetaWaylandPointerConstraint *constraint;
+
+  constraint = g_object_new (META_TYPE_WAYLAND_POINTER_CONSTRAINT, NULL);
+  if (!constraint)
+    return NULL;
+
+  constraint->surface = surface;
+  constraint->seat = seat;
+  constraint->lifetime = lifetime;
+  constraint->resource = resource;
+  constraint->grab.interface = grab_interface;
+
+  if (region)
+    {
+      constraint->region =
+        cairo_region_copy (meta_wayland_region_peek_cairo_region (region));
+    }
+  else
+    {
+      constraint->region = create_infinite_constraint_region ();
+    }
+
+  return constraint;
+}
+
+static gboolean
+meta_wayland_pointer_constraint_is_enabled (MetaWaylandPointerConstraint *constraint)
+{
+  return constraint->is_enabled;
+}
+
+static void
+meta_wayland_pointer_constraint_notify_activated (MetaWaylandPointerConstraint *constraint)
+{
+  struct wl_resource *resource = constraint->resource;
+
+  if (wl_resource_instance_of (resource,
+                               &zwp_locked_pointer_v1_interface,
+                               &locked_pointer_interface))
+    {
+      zwp_locked_pointer_v1_send_locked (resource);
+    }
+  else if (wl_resource_instance_of (resource,
+                                    &zwp_confined_pointer_v1_interface,
+                                    &confined_pointer_interface))
+    {
+      zwp_confined_pointer_v1_send_confined (resource);
+    }
+}
+
+static void
+meta_wayland_pointer_constraint_notify_deactivated (MetaWaylandPointerConstraint *constraint)
+{
+  struct wl_resource *resource = constraint->resource;
+
+  if (wl_resource_instance_of (resource,
+                               &zwp_locked_pointer_v1_interface,
+                               &locked_pointer_interface))
+    zwp_locked_pointer_v1_send_unlocked (resource);
+  else if (wl_resource_instance_of (resource,
+                                    &zwp_confined_pointer_v1_interface,
+                                    &confined_pointer_interface))
+    zwp_confined_pointer_v1_send_unconfined (resource);
+}
+
+static MetaPointerConstraint *
+meta_wayland_pointer_constraint_create_pointer_constraint (MetaWaylandPointerConstraint *constraint)
+{
+  struct wl_resource *resource = constraint->resource;
+
+  if (wl_resource_instance_of (resource,
+                               &zwp_locked_pointer_v1_interface,
+                               &locked_pointer_interface))
+    {
+      return meta_pointer_lock_wayland_new ();
+    }
+  else if (wl_resource_instance_of (resource,
+                                    &zwp_confined_pointer_v1_interface,
+                                    &confined_pointer_interface))
+    {
+      return meta_pointer_confinement_wayland_new (constraint);
+    }
+  g_assert_not_reached ();
+  return NULL;
+}
+
+static void
+meta_wayland_pointer_constraint_enable (MetaWaylandPointerConstraint *constraint)
+{
+  MetaBackend *backend = meta_get_backend ();
+
+  g_assert (!constraint->is_enabled);
+
+  constraint->is_enabled = TRUE;
+  meta_wayland_pointer_constraint_notify_activated (constraint);
+  meta_wayland_pointer_start_grab (&constraint->seat->pointer,
+                                   &constraint->grab);
+
+  constraint->constraint =
+    meta_wayland_pointer_constraint_create_pointer_constraint (constraint);
+  meta_backend_set_client_pointer_constraint (backend, constraint->constraint);
+  g_object_add_weak_pointer (G_OBJECT (constraint->constraint),
+                             (gpointer *) &constraint->constraint);
+  g_object_unref (constraint->constraint);
+}
+
+static void
+meta_wayland_pointer_constraint_disable (MetaWaylandPointerConstraint *constraint)
+{
+  meta_wayland_pointer_constraint_notify_deactivated (constraint);
+  meta_wayland_pointer_end_grab (constraint->grab.pointer);
+  meta_backend_set_client_pointer_constraint (meta_get_backend (), NULL);
+}
+
+void
+meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constraint)
+{
+  if (meta_wayland_pointer_constraint_is_enabled (constraint))
+    meta_wayland_pointer_constraint_disable (constraint);
+
+  wl_resource_set_user_data (constraint->resource, NULL);
+  cairo_region_destroy (constraint->region);
+  g_object_unref (constraint);
+}
+
+static gboolean
+is_within_constraint_region (MetaWaylandPointerConstraint *constraint,
+                             wl_fixed_t                    sx,
+                             wl_fixed_t                    sy)
+{
+  cairo_region_t *region;
+  gboolean is_within;
+
+  region = meta_wayland_pointer_constraint_calculate_effective_region (constraint);
+  is_within = cairo_region_contains_point (constraint->region,
+                                           wl_fixed_to_int (sx),
+                                           wl_fixed_to_int (sy));
+  cairo_region_destroy (region);
+
+  return is_within;
+}
+
+void
+meta_wayland_pointer_constraint_maybe_enable (MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandSeat *seat = constraint->seat;
+  wl_fixed_t sx, sy;
+
+  if (constraint->is_enabled)
+    return;
+
+  if (seat->keyboard.focus_surface != constraint->surface)
+    return;
+
+  meta_wayland_pointer_get_relative_coordinates (&constraint->seat->pointer,
+                                                 constraint->surface,
+                                                 &sx, &sy);
+  if (!is_within_constraint_region (constraint, sx, sy))
+    return;
+
+  meta_wayland_pointer_constraint_enable (constraint);
+}
+
+static void
+meta_wayland_pointer_constraint_remove (MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandSurface *surface = constraint->surface;
+
+  meta_wayland_surface_remove_pointer_constraint (surface, constraint);
+  meta_wayland_pointer_constraint_destroy (constraint);
+}
+
+void
+meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
+                                                       MetaWindow      *focus_window)
+{
+  MetaWaylandPointer *pointer = &seat->pointer;
+
+  if ((pointer->grab->interface == &confined_pointer_grab_interface ||
+       pointer->grab->interface == &locked_pointer_grab_interface) &&
+      pointer->focus_surface &&
+      pointer->focus_surface->window != focus_window)
+    {
+      MetaWaylandPointerConstraint *constraint =
+        wl_container_of (pointer->grab, constraint, grab);
+
+      switch (constraint->lifetime)
+        {
+        case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT:
+          meta_wayland_pointer_constraint_remove (constraint);
+          break;
+
+        case ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT:
+          meta_wayland_pointer_constraint_disable (constraint);
+          break;
+
+        default:
+          g_assert_not_reached ();
+        }
+    }
+}
+
+void
+meta_wayland_pointer_constraint_maybe_enable_for_window (MetaWindow *window)
+{
+  MetaWaylandSurface *surface = window->surface;
+  GList *it;
+
+  for (it = surface->pointer_constraints; it; it = it->next)
+    {
+      MetaWaylandPointerConstraint *constraint = it->data;
+
+      meta_wayland_pointer_constraint_maybe_enable (constraint);
+    }
+}
+
+MetaWaylandSeat *
+meta_wayland_pointer_constraint_get_seat (MetaWaylandPointerConstraint *constraint)
+{
+  return constraint->seat;
+}
+
+cairo_region_t *
+meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerConstraint *constraint)
+{
+  cairo_region_t *region;
+
+  region = cairo_region_copy (constraint->surface->input_region);
+  cairo_region_intersect (region, constraint->region);
+
+  return region;
+}
+
+cairo_region_t *
+meta_wayland_pointer_constraint_get_region (MetaWaylandPointerConstraint *constraint)
+{
+  return constraint->region;
+}
+
+MetaWaylandSurface *
+meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint)
+{
+  return constraint->surface;
+}
+
+static void
+pointer_constraint_resource_destroyed (struct wl_resource *resource)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_resource_get_user_data (resource);
+
+  if (!constraint)
+    return;
+
+  meta_wayland_pointer_constraint_remove (constraint);
+}
+
+static void
+pending_constraint_state_free (MetaWaylandPendingConstraintState *constraint_pending)
+{
+  g_clear_pointer (&constraint_pending->region, cairo_region_destroy);
+  if (constraint_pending->constraint)
+    g_object_remove_weak_pointer (G_OBJECT (constraint_pending->constraint),
+                                  (gpointer *) &constraint_pending->constraint);
+}
+
+static MetaWaylandPendingConstraintStateContainer *
+get_pending_constraint_state_container (MetaWaylandPendingState *pending)
+{
+  return g_object_get_qdata (G_OBJECT (pending),
+                             quark_pending_constraint_state);
+}
+
+static MetaWaylandPendingConstraintState *
+get_pending_constraint_state (MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandPendingState *pending = constraint->surface->pending;
+  MetaWaylandPendingConstraintStateContainer *container;
+  GList *l;
+
+  container = get_pending_constraint_state_container (pending);
+  for (l = container->pending_constraint_states; l; l = l->next)
+    {
+      MetaWaylandPendingConstraintState *constraint_pending = l->data;
+
+      if (constraint_pending->constraint == constraint)
+        return constraint_pending;
+    }
+
+  return NULL;
+}
+
+static void
+pending_constraint_state_container_free (MetaWaylandPendingConstraintStateContainer *container)
+{
+  g_list_free_full (container->pending_constraint_states,
+                    (GDestroyNotify) pending_constraint_state_free);
+  g_free (container);
+}
+
+static MetaWaylandPendingConstraintStateContainer *
+ensure_pending_constraint_state_container (MetaWaylandPendingState *pending)
+{
+  MetaWaylandPendingConstraintStateContainer *container;
+
+  container = get_pending_constraint_state_container (pending);
+  if (!container)
+    {
+      container = g_new0 (MetaWaylandPendingConstraintStateContainer, 1);
+      g_object_set_qdata_full (G_OBJECT (pending),
+                               quark_pending_constraint_state,
+                               container,
+                               (GDestroyNotify) pending_constraint_state_container_free);
+
+    }
+
+  return container;
+}
+
+static void
+remove_pending_constraint_state (MetaWaylandPointerConstraint *constraint,
+                                 MetaWaylandPendingState      *pending)
+{
+  MetaWaylandPendingConstraintStateContainer *container;
+  GList *l;
+
+  container = get_pending_constraint_state_container (pending);
+  for (l = container->pending_constraint_states; l; l = l->next)
+    {
+      MetaWaylandPendingConstraintState *constraint_pending = l->data;
+      if (constraint_pending->constraint != constraint)
+        continue;
+
+      pending_constraint_state_free (l->data);
+      container->pending_constraint_states =
+        g_list_remove_link (container->pending_constraint_states, l);
+      break;
+    }
+}
+
+static void
+pending_constraint_state_applied (MetaWaylandPendingState           *pending,
+                                  MetaWaylandPendingConstraintState *constraint_pending)
+{
+  MetaWaylandPointerConstraint *constraint = constraint_pending->constraint;
+
+  if (!constraint)
+    return;
+
+  g_clear_pointer (&constraint->region, cairo_region_destroy);
+  if (constraint_pending->region)
+    {
+      constraint->region = constraint_pending->region;
+      constraint_pending->region = NULL;
+    }
+  else
+    {
+      constraint->region = create_infinite_constraint_region ();
+    }
+
+  g_signal_handler_disconnect (pending,
+                               constraint_pending->applied_handler_id);
+  remove_pending_constraint_state (constraint, pending);
+
+  /* The pointer is potentially warped by the actor paint signal callback if
+   * the new region proved it necessary.
+   */
+}
+
+static MetaWaylandPendingConstraintState *
+ensure_pending_constraint_state (MetaWaylandPointerConstraint *constraint)
+{
+  MetaWaylandPendingState *pending = constraint->surface->pending;
+  MetaWaylandPendingConstraintStateContainer *container;
+  MetaWaylandPendingConstraintState *constraint_pending;
+
+  container = ensure_pending_constraint_state_container (pending);
+  constraint_pending = get_pending_constraint_state (constraint);
+  if (!constraint_pending)
+    {
+      constraint_pending = g_new0 (MetaWaylandPendingConstraintState, 1);
+      constraint_pending->constraint = constraint;
+      constraint_pending->applied_handler_id =
+        g_signal_connect (pending, "applied",
+                          G_CALLBACK (pending_constraint_state_applied),
+                          constraint_pending);
+      g_object_add_weak_pointer (G_OBJECT (constraint),
+                                 (gpointer *) &constraint_pending->constraint);
+
+      container->pending_constraint_states =
+        g_list_append (container->pending_constraint_states,
+                       constraint_pending);
+    }
+
+  return constraint_pending;
+}
+
+static void
+meta_wayland_pointer_constraint_set_pending_region (MetaWaylandPointerConstraint *constraint,
+                                                    MetaWaylandRegion            *region)
+{
+  MetaWaylandPendingConstraintState *constraint_pending;
+
+  constraint_pending = ensure_pending_constraint_state (constraint);
+
+  g_clear_pointer (&constraint_pending->region, cairo_region_destroy);
+  if (region)
+    {
+      constraint_pending->region =
+        cairo_region_copy (meta_wayland_region_peek_cairo_region (region));
+    }
+}
+
+static void
+init_pointer_constraint (struct wl_resource                      *resource,
+                         uint32_t                                 id,
+                         MetaWaylandSurface                      *surface,
+                         MetaWaylandSeat                         *seat,
+                         MetaWaylandRegion                       *region,
+                         enum zwp_pointer_constraints_v1_lifetime lifetime,
+                         const struct wl_interface               *interface,
+                         const void                              *implementation,
+                         const MetaWaylandPointerGrabInterface   *grab_interface)
+{
+  struct wl_client *client = wl_resource_get_client (resource);
+  struct wl_resource *cr;
+  MetaWaylandPointerConstraint *constraint;
+
+  if (meta_wayland_surface_get_pointer_constraint_for_seat (surface, seat))
+    {
+      wl_resource_post_error (resource,
+                              WL_DISPLAY_ERROR_INVALID_OBJECT,
+                              "the pointer as already requested to be "
+                              "locked or confined on that surface");
+      return;
+    }
+
+  cr = wl_resource_create (client, interface,
+                           wl_resource_get_version (resource),
+                           id);
+  if (cr == NULL)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  constraint = meta_wayland_pointer_constraint_new (surface, seat,
+                                                    region,
+                                                    lifetime,
+                                                    cr, grab_interface);
+  if (constraint == NULL)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  meta_wayland_surface_add_pointer_constraint (surface, constraint);
+
+  wl_resource_set_implementation (cr, implementation, constraint,
+                                  pointer_constraint_resource_destroyed);
+
+  meta_wayland_pointer_constraint_maybe_enable (constraint);
+}
+
+static void
+locked_pointer_destroy (struct wl_client   *client,
+                        struct wl_resource *resource)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_resource_get_user_data (resource);
+  gboolean warp_pointer = FALSE;
+  int warp_x, warp_y;
+
+  if (constraint && constraint->is_enabled && constraint->hint_set &&
+      is_within_constraint_region (constraint,
+                                   constraint->x_hint,
+                                   constraint->y_hint))
+    {
+      float sx, sy;
+      float x, y;
+
+      sx = (float)wl_fixed_to_double (constraint->x_hint);
+      sy = (float)wl_fixed_to_double (constraint->y_hint);
+      meta_wayland_surface_get_absolute_coordinates (constraint->surface,
+                                                     sx, sy,
+                                                     &x, &y);
+      warp_pointer = TRUE;
+      warp_x = (int) x;
+      warp_y = (int) y;
+    }
+  wl_resource_destroy (resource);
+
+  if (warp_pointer)
+    meta_backend_warp_pointer (meta_get_backend (), warp_x, warp_y);
+}
+
+static void
+locked_pointer_set_cursor_position_hint (struct wl_client   *client,
+                                         struct wl_resource *resource,
+                                         wl_fixed_t          surface_x,
+                                         wl_fixed_t          surface_y)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_resource_get_user_data (resource);
+
+  /* Ignore a set cursor hint that was already sent after the constraint
+   * was cancelled. */
+  if (!constraint->resource || constraint->resource != resource)
+    return;
+
+  constraint->hint_set = TRUE;
+  constraint->x_hint = surface_x;
+  constraint->y_hint = surface_y;
+}
+
+static void
+locked_pointer_set_region (struct wl_client   *client,
+                           struct wl_resource *resource,
+                           struct wl_resource *region_resource)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_resource_get_user_data (resource);
+  MetaWaylandRegion *region =
+    region_resource ? wl_resource_get_user_data (region_resource) : NULL;
+
+  meta_wayland_pointer_constraint_set_pending_region (constraint, region);
+}
+
+static const struct zwp_locked_pointer_v1_interface locked_pointer_interface = {
+  locked_pointer_destroy,
+  locked_pointer_set_cursor_position_hint,
+  locked_pointer_set_region,
+};
+
+static void
+locked_pointer_grab_pointer_focus (MetaWaylandPointerGrab *grab,
+                                   MetaWaylandSurface     *surface)
+{
+}
+
+static void
+locked_pointer_grab_pointer_motion (MetaWaylandPointerGrab *grab,
+                                    const ClutterEvent     *event)
+{
+  meta_wayland_pointer_send_relative_motion (grab->pointer, event);
+}
+
+static void
+locked_pointer_grab_pointer_button (MetaWaylandPointerGrab *grab,
+                                    const ClutterEvent     *event)
+{
+  meta_wayland_pointer_send_button (grab->pointer, event);
+}
+
+static const MetaWaylandPointerGrabInterface locked_pointer_grab_interface = {
+  locked_pointer_grab_pointer_focus,
+  locked_pointer_grab_pointer_motion,
+  locked_pointer_grab_pointer_button,
+};
+
+static void
+pointer_constraints_destroy (struct wl_client   *client,
+                             struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static void
+pointer_constraints_lock_pointer (struct wl_client   *client,
+                                  struct wl_resource *resource,
+                                  uint32_t            id,
+                                  struct wl_resource *surface_resource,
+                                  struct wl_resource *pointer_resource,
+                                  struct wl_resource *region_resource,
+                                  uint32_t            lifetime)
+{
+  MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
+  MetaWaylandPointer *pointer = wl_resource_get_user_data (pointer_resource);
+  MetaWaylandSeat *seat = meta_wayland_pointer_get_seat (pointer);
+  MetaWaylandRegion *region =
+    region_resource ? wl_resource_get_user_data (region_resource) : NULL;
+
+  init_pointer_constraint (resource, id, surface, seat, region, lifetime,
+                           &zwp_locked_pointer_v1_interface,
+                           &locked_pointer_interface,
+                           &locked_pointer_grab_interface);
+}
+
+static void
+confined_pointer_grab_pointer_focus (MetaWaylandPointerGrab *grab,
+                                     MetaWaylandSurface *surface)
+{
+}
+
+static void
+confined_pointer_grab_pointer_motion (MetaWaylandPointerGrab *grab,
+                                      const ClutterEvent     *event)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_container_of (grab, constraint, grab);
+  MetaWaylandPointer *pointer = grab->pointer;
+
+  g_assert (pointer->focus_surface);
+  g_assert (pointer->focus_surface == constraint->surface);
+
+  meta_wayland_pointer_send_motion (pointer, event);
+}
+
+static void
+confined_pointer_grab_pointer_button (MetaWaylandPointerGrab *grab,
+                                      const ClutterEvent     *event)
+{
+  meta_wayland_pointer_send_button (grab->pointer, event);
+}
+
+static const MetaWaylandPointerGrabInterface confined_pointer_grab_interface = {
+  confined_pointer_grab_pointer_focus,
+  confined_pointer_grab_pointer_motion,
+  confined_pointer_grab_pointer_button,
+};
+
+static void
+confined_pointer_destroy (struct wl_client   *client,
+                          struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static void
+confined_pointer_set_region (struct wl_client   *client,
+                             struct wl_resource *resource,
+                             struct wl_resource *region_resource)
+{
+  MetaWaylandPointerConstraint *constraint =
+    wl_resource_get_user_data (resource);
+  MetaWaylandRegion *region =
+    region_resource ? wl_resource_get_user_data (region_resource) : NULL;
+
+  meta_wayland_pointer_constraint_set_pending_region (constraint, region);
+}
+
+static const struct zwp_confined_pointer_v1_interface confined_pointer_interface = {
+  confined_pointer_destroy,
+  confined_pointer_set_region,
+};
+
+static void
+pointer_constraints_confine_pointer (struct wl_client   *client,
+                                     struct wl_resource *resource,
+                                     uint32_t            id,
+                                     struct wl_resource *surface_resource,
+                                     struct wl_resource *pointer_resource,
+                                     struct wl_resource *region_resource,
+                                     uint32_t            lifetime)
+{
+  MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
+  MetaWaylandPointer *pointer = wl_resource_get_user_data (pointer_resource);
+  MetaWaylandSeat *seat = meta_wayland_pointer_get_seat (pointer);
+  MetaWaylandRegion *region =
+    region_resource ? wl_resource_get_user_data (region_resource) : NULL;
+
+  init_pointer_constraint (resource, id, surface, seat, region, lifetime,
+                           &zwp_confined_pointer_v1_interface,
+                           &confined_pointer_interface,
+                           &confined_pointer_grab_interface);
+
+}
+
+static const struct zwp_pointer_constraints_v1_interface pointer_constraints = {
+  pointer_constraints_destroy,
+  pointer_constraints_lock_pointer,
+  pointer_constraints_confine_pointer,
+};
+
+static void
+bind_pointer_constraints (struct wl_client *client,
+                          void             *data,
+                          uint32_t          version,
+                          uint32_t          id)
+{
+  MetaWaylandCompositor *compositor = data;
+  struct wl_resource *resource;
+
+  resource = wl_resource_create (client,
+                                 &zwp_pointer_constraints_v1_interface,
+                                 1, id);
+
+  wl_resource_set_implementation (resource,
+                                  &pointer_constraints,
+                                  compositor,
+                                  NULL);
+}
+
+void
+meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor)
+{
+  if (!wl_global_create (compositor->wayland_display,
+                         &zwp_pointer_constraints_v1_interface, 1,
+                         compositor, bind_pointer_constraints))
+    g_error ("Could not create wp_pointer_constraints global");
+}
+
+static void
+meta_wayland_pointer_constraint_init (MetaWaylandPointerConstraint *constraint)
+{
+}
+
+static void
+meta_wayland_pointer_constraint_class_init (MetaWaylandPointerConstraintClass *klass)
+{
+  quark_pending_constraint_state =
+    g_quark_from_static_string ("-meta-wayland-pointer-constraint-pending_state");
+}
--- a/src/wayland/meta-wayland-pointer-constraints.h
+++ b/src/wayland/meta-wayland-pointer-constraints.h
@@ -0,0 +1,60 @@
+/* -*- 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_WAYLAND_POINTER_CONSTRAINTS_H
+#define META_WAYLAND_POINTER_CONSTRAINTS_H
+
+#include "meta-wayland-types.h"
+#include "meta/window.h"
+
+#include <wayland-server.h>
+
+#define META_TYPE_WAYLAND_POINTER_CONSTRAINT (meta_wayland_pointer_constraint_get_type ())
+G_DECLARE_FINAL_TYPE (MetaWaylandPointerConstraint,
+                      meta_wayland_pointer_constraint,
+                      META, WAYLAND_POINTER_CONSTRAINT,
+                      GObject);
+
+typedef struct _MetaWaylandPointerConstraint MetaWaylandPointerConstraint;
+
+void meta_wayland_pointer_constraints_init (MetaWaylandCompositor *compositor);
+
+void meta_wayland_pointer_constraint_maybe_enable (MetaWaylandPointerConstraint *constraint);
+
+void meta_wayland_pointer_constraint_destroy (MetaWaylandPointerConstraint *constraint);
+
+MetaWaylandSeat * meta_wayland_pointer_constraint_get_seat (MetaWaylandPointerConstraint *constraint);
+
+cairo_region_t * meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerConstraint *constraint);
+
+cairo_region_t * meta_wayland_pointer_constraint_get_region (MetaWaylandPointerConstraint *constraint);
+
+MetaWaylandSurface * meta_wayland_pointer_constraint_get_surface (MetaWaylandPointerConstraint *constraint);
+
+void meta_wayland_pointer_constraint_maybe_remove_for_seat (MetaWaylandSeat *seat,
+                                                            MetaWindow      *focus_window);
+
+void meta_wayland_pointer_constraint_maybe_enable_for_window (MetaWindow *window);
+
+#endif /* META_WAYLAND_POINTER_CONSTRAINTS_H */
--- a/src/wayland/meta-wayland-pointer-gesture-pinch.c
+++ b/src/wayland/meta-wayland-pointer-gesture-pinch.c
@@ -30,7 +30,7 @@
 #include "meta-wayland-pointer-gesture-pinch.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-surface.h"
-#include "pointer-gestures-server-protocol.h"
+#include "pointer-gestures-unstable-v1-server-protocol.h"

 static void
 handle_pinch_begin (MetaWaylandPointer *pointer,
@@ -45,10 +45,10 @@ handle_pinch_begin (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
    {
-      _wl_pointer_gesture_pinch_send_begin (resource, serial,
-                                            clutter_event_get_time (event),
-                                            pointer->focus_surface->resource,
-                                            2);
+      zwp_pointer_gesture_pinch_v1_send_begin (resource, serial,
+                                               clutter_event_get_time (event),
+                                               pointer->focus_surface->resource,
+                                               2);
    }
 }

@@ -67,12 +67,12 @@ handle_pinch_update (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
    {
-      _wl_pointer_gesture_pinch_send_update (resource,
-                                             clutter_event_get_time (event),
-                                             wl_fixed_from_double (dx),
-                                             wl_fixed_from_double (dy),
-                                             wl_fixed_from_double (scale),
-                                             wl_fixed_from_double (rotation));
+      zwp_pointer_gesture_pinch_v1_send_update (resource,
+                                                clutter_event_get_time (event),
+                                                wl_fixed_from_double (dx),
+                                                wl_fixed_from_double (dy),
+                                                wl_fixed_from_double (scale),
+                                                wl_fixed_from_double (rotation));
    }
 }

@@ -93,9 +93,9 @@ handle_pinch_end (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
    {
-      _wl_pointer_gesture_pinch_send_end (resource, serial,
-                                          clutter_event_get_time (event),
-                                          cancelled);
+      zwp_pointer_gesture_pinch_v1_send_end (resource, serial,
+                                             clutter_event_get_time (event),
+                                             cancelled);
    }
 }

@@ -135,7 +135,7 @@ pointer_gesture_pinch_destroy (struct wl_client   *client,
  wl_resource_destroy (resource);
 }

-static const struct _wl_pointer_gesture_pinch_interface pointer_gesture_pinch_interface = {
+static const struct zwp_pointer_gesture_pinch_v1_interface pointer_gesture_pinch_interface = {
  pointer_gesture_pinch_destroy
 };

@@ -151,7 +151,7 @@ meta_wayland_pointer_gesture_pinch_create_new_resource (MetaWaylandPointer *poin
  pointer_client = meta_wayland_pointer_get_pointer_client (pointer, client);
  g_return_if_fail (pointer_client != NULL);

-  res = wl_resource_create (client, &_wl_pointer_gesture_pinch_interface,
+  res = wl_resource_create (client, &zwp_pointer_gesture_pinch_v1_interface,
                            wl_resource_get_version (gestures_resource), id);
  wl_resource_set_implementation (res, &pointer_gesture_pinch_interface, pointer,
                                  meta_wayland_pointer_unbind_pointer_client_resource);
--- a/src/wayland/meta-wayland-pointer-gesture-swipe.c
+++ b/src/wayland/meta-wayland-pointer-gesture-swipe.c
@@ -30,7 +30,7 @@
 #include "meta-wayland-pointer-gesture-swipe.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-surface.h"
-#include "pointer-gestures-server-protocol.h"
+#include "pointer-gestures-unstable-v1-server-protocol.h"

 static void
 handle_swipe_begin (MetaWaylandPointer *pointer,
@@ -46,10 +46,10 @@ handle_swipe_begin (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
    {
-      _wl_pointer_gesture_swipe_send_begin (resource, serial,
-                                            clutter_event_get_time (event),
-                                            pointer->focus_surface->resource,
-                                            fingers);
+      zwp_pointer_gesture_swipe_v1_send_begin (resource, serial,
+                                               clutter_event_get_time (event),
+                                               pointer->focus_surface->resource,
+                                               fingers);
    }
 }

@@ -66,10 +66,10 @@ handle_swipe_update (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
    {
-      _wl_pointer_gesture_swipe_send_update (resource,
-                                             clutter_event_get_time (event),
-                                             wl_fixed_from_double (dx),
-                                             wl_fixed_from_double (dy));
+      zwp_pointer_gesture_swipe_v1_send_update (resource,
+                                                clutter_event_get_time (event),
+                                                wl_fixed_from_double (dx),
+                                                wl_fixed_from_double (dy));
    }
 }

@@ -90,9 +90,9 @@ handle_swipe_end (MetaWaylandPointer *pointer,

  wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
    {
-      _wl_pointer_gesture_swipe_send_end (resource, serial,
-                                          clutter_event_get_time (event),
-                                          cancelled);
+      zwp_pointer_gesture_swipe_v1_send_end (resource, serial,
+                                             clutter_event_get_time (event),
+                                             cancelled);
    }
 }

@@ -131,7 +131,7 @@ pointer_gesture_swipe_release (struct wl_client   *client,
  wl_resource_destroy (resource);
 }

-static const struct _wl_pointer_gesture_swipe_interface pointer_gesture_swipe_interface = {
+static const struct zwp_pointer_gesture_swipe_v1_interface pointer_gesture_swipe_interface = {
  pointer_gesture_swipe_release
 };

@@ -147,7 +147,7 @@ meta_wayland_pointer_gesture_swipe_create_new_resource (MetaWaylandPointer *poin
  pointer_client = meta_wayland_pointer_get_pointer_client (pointer, client);
  g_return_if_fail (pointer_client != NULL);

-  res = wl_resource_create (client, &_wl_pointer_gesture_swipe_interface,
+  res = wl_resource_create (client, &zwp_pointer_gesture_swipe_v1_interface,
                            wl_resource_get_version (pointer_resource), id);
  wl_resource_set_implementation (res, &pointer_gesture_swipe_interface, pointer,
                                  meta_wayland_pointer_unbind_pointer_client_resource);
--- a/src/wayland/meta-wayland-pointer-gestures.c
+++ b/src/wayland/meta-wayland-pointer-gestures.c
@@ -27,7 +27,7 @@

 #include <glib.h>
 #include "meta-wayland-pointer-gestures.h"
-#include "pointer-gestures-server-protocol.h"
+#include "pointer-gestures-unstable-v1-server-protocol.h"
 #include "meta-wayland-versions.h"
 #include "meta-wayland-private.h"

@@ -53,7 +53,7 @@ gestures_get_pinch (struct wl_client   *client,
  meta_wayland_pointer_gesture_pinch_create_new_resource (pointer, client, resource, id);
 }

-static const struct _wl_pointer_gestures_interface pointer_gestures_interface = {
+static const struct zwp_pointer_gestures_v1_interface pointer_gestures_interface = {
  gestures_get_swipe,
  gestures_get_pinch
 };
@@ -66,16 +66,8 @@ bind_pointer_gestures (struct wl_client *client,
 {
  struct wl_resource *resource;

-  resource = wl_resource_create (client, &_wl_pointer_gestures_interface, version, id);
-
-  if (version != META__WL_POINTER_GESTURES_VERSION)
-    {
-      wl_resource_post_error (resource,
-                              _WL_POINTER_GESTURES_ERROR_VERSION_MISMATCH,
-                              "The client bound a non-supported version");
-      return;
-    }
-
+  resource = wl_resource_create (client, &zwp_pointer_gestures_v1_interface,
+                                 version, id);
  wl_resource_set_implementation (resource, &pointer_gestures_interface,
                                  NULL, NULL);
 }
@@ -84,7 +76,7 @@ void
 meta_wayland_pointer_gestures_init (MetaWaylandCompositor *compositor)
 {
  wl_global_create (compositor->wayland_display,
-                    &_wl_pointer_gestures_interface,
-                    META__WL_POINTER_GESTURES_VERSION,
+                    &zwp_pointer_gestures_v1_interface,
+                    META_ZWP_POINTER_GESTURES_V1_VERSION,
                    NULL, bind_pointer_gestures);
 }
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -44,6 +44,7 @@
 #include "config.h"

 #include <clutter/clutter.h>
+#include <clutter/evdev/clutter-evdev.h>
 #include <cogl/cogl.h>
 #include <cogl/cogl-wayland-server.h>
 #include <linux/input.h>
@@ -53,6 +54,7 @@
 #include "meta-wayland-private.h"
 #include "meta-wayland-surface.h"
 #include "meta-wayland-buffer.h"
+#include "meta-xwayland.h"
 #include "meta-cursor.h"
 #include "meta-cursor-tracker-private.h"
 #include "meta-surface-actor-wayland.h"
@@ -61,6 +63,12 @@
 #include "backends/meta-cursor-tracker-private.h"
 #include "backends/meta-cursor-renderer.h"

+#include "relative-pointer-unstable-v1-server-protocol.h"
+
+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-backend-native.h"
+#endif
+
 #include <string.h>

 #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int (10)
@@ -74,7 +82,6 @@ struct _MetaWaylandSurfaceRoleCursor
  MetaCursorSprite *cursor_sprite;
 };

-GType meta_wayland_surface_role_cursor_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleCursor,
               meta_wayland_surface_role_cursor,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -91,6 +98,7 @@ meta_wayland_pointer_client_new (void)
  wl_list_init (&pointer_client->pointer_resources);
  wl_list_init (&pointer_client->swipe_gesture_resources);
  wl_list_init (&pointer_client->pinch_gesture_resources);
+  wl_list_init (&pointer_client->relative_pointer_resources);

  return pointer_client;
 }
@@ -119,6 +127,11 @@ meta_wayland_pointer_client_free (MetaWaylandPointerClient *pointer_client)
      wl_list_remove (wl_resource_get_link (resource));
      wl_list_init (wl_resource_get_link (resource));
    }
+  wl_resource_for_each_safe (resource, next, &pointer_client->relative_pointer_resources)
+    {
+      wl_list_remove (wl_resource_get_link (resource));
+      wl_list_init (wl_resource_get_link (resource));
+    }

  g_slice_free (MetaWaylandPointerClient, pointer_client);
 }
@@ -128,7 +141,8 @@ meta_wayland_pointer_client_is_empty (MetaWaylandPointerClient *pointer_client)
 {
  return (wl_list_empty (&pointer_client->pointer_resources) &&
          wl_list_empty (&pointer_client->swipe_gesture_resources) &&
-          wl_list_empty (&pointer_client->pinch_gesture_resources));
+          wl_list_empty (&pointer_client->pinch_gesture_resources) &&
+          wl_list_empty (&pointer_client->relative_pointer_resources));
 }

 MetaWaylandPointerClient *
@@ -237,26 +251,102 @@ pointer_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
  meta_wayland_pointer_set_focus (pointer, NULL);
 }

+static void
+meta_wayland_pointer_send_frame (MetaWaylandPointer *pointer,
+				 struct wl_resource *resource)
+{
+  if (wl_resource_get_version (resource) >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION)
+    wl_pointer_send_frame (resource);
+}
+
+static void
+meta_wayland_pointer_broadcast_frame (MetaWaylandPointer *pointer)
+{
+  struct wl_resource *resource;
+
+  if (!pointer->focus_client)
+    return;
+
+  wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
+    {
+      meta_wayland_pointer_send_frame (pointer, resource);
+    }
+}
+
+void
+meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer,
+                                           const ClutterEvent *event)
+{
+  struct wl_resource *resource;
+  double dx, dy;
+  double dx_unaccel, dy_unaccel;
+  uint64_t time_us;
+  uint32_t time_us_hi;
+  uint32_t time_us_lo;
+  wl_fixed_t dxf, dyf;
+  wl_fixed_t dx_unaccelf, dy_unaccelf;
+
+  if (!pointer->focus_client)
+    return;
+
+  if (!meta_backend_get_relative_motion_deltas (meta_get_backend (),
+                                                event,
+                                                &dx, &dy,
+                                                &dx_unaccel, &dy_unaccel))
+    return;
+
+#ifdef HAVE_NATIVE_BACKEND
+  time_us = clutter_evdev_event_get_time_usec (event);
+  if (time_us == 0)
+#endif
+    time_us = clutter_event_get_time (event) * 1000ULL;
+  time_us_hi = (uint32_t) (time_us >> 32);
+  time_us_lo = (uint32_t) time_us;
+  dxf = wl_fixed_from_double (dx);
+  dyf = wl_fixed_from_double (dy);
+  dx_unaccelf = wl_fixed_from_double (dx_unaccel);
+  dy_unaccelf = wl_fixed_from_double (dy_unaccel);
+
+  wl_resource_for_each (resource,
+                        &pointer->focus_client->relative_pointer_resources)
+    {
+      zwp_relative_pointer_v1_send_relative_motion (resource,
+                                                    time_us_hi,
+                                                    time_us_lo,
+                                                    dxf,
+                                                    dyf,
+                                                    dx_unaccelf,
+                                                    dy_unaccelf);
+    }
+}
+
 void
 meta_wayland_pointer_send_motion (MetaWaylandPointer *pointer,
                                  const ClutterEvent *event)
 {
  struct wl_resource *resource;
  uint32_t time;
-  wl_fixed_t sx, sy;
+  float sx, sy;

  if (!pointer->focus_client)
    return;

  time = clutter_event_get_time (event);
-  meta_wayland_pointer_get_relative_coordinates (pointer,
-                                                 pointer->focus_surface,
+  meta_wayland_surface_get_relative_coordinates (pointer->focus_surface,
+                                                 event->motion.x,
+                                                 event->motion.y,
                                                 &sx, &sy);

  wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
    {
-      wl_pointer_send_motion (resource, time, sx, sy);
+      wl_pointer_send_motion (resource, time,
+                              wl_fixed_from_double (sx),
+                              wl_fixed_from_double (sy));
    }
+
+  meta_wayland_pointer_send_relative_motion (pointer, event);
+
+  meta_wayland_pointer_broadcast_frame (pointer);
 }

 void
@@ -277,34 +367,50 @@ meta_wayland_pointer_send_button (MetaWaylandPointer *pointer,
      uint32_t button;
      uint32_t serial;

+#ifdef HAVE_NATIVE_BACKEND
+      MetaBackend *backend = meta_get_backend ();
+      if (META_IS_BACKEND_NATIVE (backend))
+        button = clutter_evdev_event_get_event_code (event);
+      else
+#endif
+        {
+          button = clutter_event_get_button (event);
+          switch (button)
+            {
+            case 1:
+              button = BTN_LEFT;
+              break;
+
+              /* The evdev input right and middle button numbers are swapped
+                 relative to how Clutter numbers them */
+            case 2:
+              button = BTN_MIDDLE;
+              break;
+
+            case 3:
+              button = BTN_RIGHT;
+              break;
+
+            default:
+              button = button + (BTN_LEFT - 1) + 4;
+              break;
+            }
+        }
+
      time = clutter_event_get_time (event);
-
-      button = clutter_event_get_button (event);
-      switch (button)
-	{
-	  /* The evdev input right and middle button numbers are swapped
-	     relative to how Clutter numbers them */
-	case 2:
-	  button = BTN_MIDDLE;
-	  break;
-
-	case 3:
-	  button = BTN_RIGHT;
-	  break;
-
-	default:
-	  button = button + BTN_LEFT - 1;
-	  break;
-	}
-
      serial = wl_display_next_serial (display);

+      if (event->type == CLUTTER_BUTTON_PRESS)
+        pointer->click_serial = serial;
+
      wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
        {
          wl_pointer_send_button (resource, serial,
                                  time, button,
                                  event_type == CLUTTER_BUTTON_PRESS ? 1 : 0);
        }
+
+      meta_wayland_pointer_broadcast_frame (pointer);
    }

  if (pointer->button_count == 0 && event_type == CLUTTER_BUTTON_RELEASE)
@@ -494,26 +600,48 @@ handle_scroll_event (MetaWaylandPointer *pointer,
 {
  struct wl_resource *resource;
  wl_fixed_t x_value = 0, y_value = 0;
+  int x_discrete = 0, y_discrete = 0;
+  enum wl_pointer_axis_source source = -1;

  if (clutter_event_is_pointer_emulated (event))
    return;

+  switch (event->scroll.scroll_source)
+    {
+    case CLUTTER_SCROLL_SOURCE_WHEEL:
+      source = WL_POINTER_AXIS_SOURCE_WHEEL;
+      break;
+    case CLUTTER_SCROLL_SOURCE_FINGER:
+      source = WL_POINTER_AXIS_SOURCE_FINGER;
+      break;
+    case CLUTTER_SCROLL_SOURCE_CONTINUOUS:
+      source = WL_POINTER_AXIS_SOURCE_CONTINUOUS;
+      break;
+    default:
+      source = WL_POINTER_AXIS_SOURCE_WHEEL;
+      break;
+    }
+
  switch (clutter_event_get_scroll_direction (event))
    {
    case CLUTTER_SCROLL_UP:
      y_value = -DEFAULT_AXIS_STEP_DISTANCE;
+      y_discrete = -1;
      break;

    case CLUTTER_SCROLL_DOWN:
      y_value = DEFAULT_AXIS_STEP_DISTANCE;
+      y_discrete = 1;
      break;

    case CLUTTER_SCROLL_LEFT:
      x_value = -DEFAULT_AXIS_STEP_DISTANCE;
+      x_discrete = -1;
      break;

    case CLUTTER_SCROLL_RIGHT:
      x_value = DEFAULT_AXIS_STEP_DISTANCE;
+      x_discrete = 1;
      break;

    case CLUTTER_SCROLL_SMOOTH:
@@ -537,13 +665,44 @@ handle_scroll_event (MetaWaylandPointer *pointer,
    {
      wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
        {
+          if (wl_resource_get_version (resource) >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION)
+            wl_pointer_send_axis_source (resource, source);
+
+          /* X axis */
+          if (x_discrete != 0 &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
+            wl_pointer_send_axis_discrete (resource,
+                                           WL_POINTER_AXIS_HORIZONTAL_SCROLL,
+                                           x_discrete);
+
          if (x_value)
            wl_pointer_send_axis (resource, clutter_event_get_time (event),
                                  WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value);
+
+          if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL) &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
+            wl_pointer_send_axis_stop (resource,
+                                       clutter_event_get_time (event),
+                                       WL_POINTER_AXIS_HORIZONTAL_SCROLL);
+          /* Y axis */
+          if (y_discrete != 0 &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
+            wl_pointer_send_axis_discrete (resource,
+                                           WL_POINTER_AXIS_VERTICAL_SCROLL,
+                                           y_discrete);
+
          if (y_value)
            wl_pointer_send_axis (resource, clutter_event_get_time (event),
                                  WL_POINTER_AXIS_VERTICAL_SCROLL, y_value);
+
+          if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL) &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
+            wl_pointer_send_axis_stop (resource,
+                                       clutter_event_get_time (event),
+                                       WL_POINTER_AXIS_VERTICAL_SCROLL);
        }
+
+      meta_wayland_pointer_broadcast_frame (pointer);
    }
 }

@@ -582,13 +741,57 @@ meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
 }

 static void
-broadcast_focus (MetaWaylandPointer *pointer,
-                 struct wl_resource *resource)
+meta_wayland_pointer_send_enter (MetaWaylandPointer *pointer,
+                                 struct wl_resource *pointer_resource,
+                                 uint32_t            serial,
+                                 MetaWaylandSurface *surface)
 {
  wl_fixed_t sx, sy;

-  meta_wayland_pointer_get_relative_coordinates (pointer, pointer->focus_surface, &sx, &sy);
-  wl_pointer_send_enter (resource, pointer->focus_serial, pointer->focus_surface->resource, sx, sy);
+  meta_wayland_pointer_get_relative_coordinates (pointer, surface, &sx, &sy);
+  wl_pointer_send_enter (pointer_resource,
+                         serial,
+                         surface->resource,
+                         sx, sy);
+}
+
+static void
+meta_wayland_pointer_send_leave (MetaWaylandPointer *pointer,
+                                 struct wl_resource *pointer_resource,
+                                 uint32_t            serial,
+                                 MetaWaylandSurface *surface)
+{
+  wl_pointer_send_leave (pointer_resource, serial, surface->resource);
+}
+
+static void
+meta_wayland_pointer_broadcast_enter (MetaWaylandPointer *pointer,
+                                      uint32_t            serial,
+                                      MetaWaylandSurface *surface)
+{
+  struct wl_resource *pointer_resource;
+
+  wl_resource_for_each (pointer_resource,
+                        &pointer->focus_client->pointer_resources)
+    meta_wayland_pointer_send_enter (pointer, pointer_resource,
+                                     serial, surface);
+
+  meta_wayland_pointer_broadcast_frame (pointer);
+}
+
+static void
+meta_wayland_pointer_broadcast_leave (MetaWaylandPointer *pointer,
+                                      uint32_t            serial,
+                                      MetaWaylandSurface *surface)
+{
+  struct wl_resource *pointer_resource;
+
+  wl_resource_for_each (pointer_resource,
+                        &pointer->focus_client->pointer_resources)
+    meta_wayland_pointer_send_leave (pointer, pointer_resource,
+                                     serial, surface);
+
+  meta_wayland_pointer_broadcast_frame (pointer);
 }

 void
@@ -607,18 +810,14 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
        wl_resource_get_client (pointer->focus_surface->resource);
      struct wl_display *display = wl_client_get_display (client);
      uint32_t serial;
-      struct wl_resource *resource;

      serial = wl_display_next_serial (display);

      if (pointer->focus_client)
        {
-          wl_resource_for_each (resource,
-                                &pointer->focus_client->pointer_resources)
-            {
-              wl_pointer_send_leave (resource, serial, pointer->focus_surface->resource);
-            }
-
+          meta_wayland_pointer_broadcast_leave (pointer,
+                                                serial,
+                                                pointer->focus_surface);
          pointer->focus_client = NULL;
        }

@@ -630,7 +829,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
    {
      struct wl_client *client = wl_resource_get_client (surface->resource);
      struct wl_display *display = wl_client_get_display (client);
-      struct wl_resource *resource;
      ClutterPoint pos;

      pointer->focus_surface = surface;
@@ -649,12 +847,9 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
      if (pointer->focus_client)
        {
          pointer->focus_serial = wl_display_next_serial (display);
-
-          wl_resource_for_each (resource,
-                                &pointer->focus_client->pointer_resources)
-            {
-              broadcast_focus (pointer, resource);
-            }
+          meta_wayland_pointer_broadcast_enter (pointer,
+                                                pointer->focus_serial,
+                                                pointer->focus_surface);
        }
    }

@@ -735,11 +930,10 @@ meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
  ClutterPoint pos;

  clutter_input_device_get_coords (pointer->device, NULL, &pos);
-  clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
-                                       pos.x, pos.y, &xf, &yf);
+  meta_wayland_surface_get_relative_coordinates (surface, pos.x, pos.y, &xf, &yf);

-  *sx = wl_fixed_from_double (xf) / surface->scale;
-  *sy = wl_fixed_from_double (yf) / surface->scale;
+  *sx = wl_fixed_from_double (xf);
+  *sy = wl_fixed_from_double (yf);
 }

 static void
@@ -820,9 +1014,12 @@ cursor_sprite_prepare_at (MetaCursorSprite *cursor_sprite,
  MetaScreen *screen = display->screen;
  const MetaMonitorInfo *monitor;

-  monitor = meta_screen_get_monitor_for_point (screen, x, y);
-  meta_cursor_sprite_set_texture_scale (cursor_sprite,
-                                        (float)monitor->scale / surface->scale);
+  if (!meta_xwayland_is_xwayland_surface (surface))
+    {
+      monitor = meta_screen_get_monitor_for_point (screen, x, y);
+      meta_cursor_sprite_set_texture_scale (cursor_sprite,
+                                            (float)monitor->scale / surface->scale);
+    }
  meta_wayland_surface_update_outputs (surface);
 }

@@ -927,7 +1124,12 @@ meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
                  wl_resource_get_link (cr));

  if (pointer->focus_client == pointer_client)
-    broadcast_focus (pointer, cr);
+    {
+      meta_wayland_pointer_send_enter (pointer, cr,
+                                       pointer->focus_serial,
+                                       pointer->focus_surface);
+      meta_wayland_pointer_send_frame (pointer, cr);
+    }
 }

 gboolean
@@ -958,6 +1160,108 @@ meta_wayland_pointer_get_top_popup (MetaWaylandPointer *pointer)
  return meta_wayland_popup_grab_get_top_popup(grab);
 }

+static void
+relative_pointer_destroy (struct wl_client *client,
+                          struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static const struct zwp_relative_pointer_v1_interface relative_pointer_interface = {
+  relative_pointer_destroy
+};
+
+static void
+relative_pointer_manager_destroy (struct wl_client *client,
+                                  struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static void
+relative_pointer_manager_get_relative_pointer (struct wl_client   *client,
+                                               struct wl_resource *resource,
+                                               uint32_t            id,
+                                               struct wl_resource *pointer_resource)
+{
+  MetaWaylandPointer *pointer = wl_resource_get_user_data (pointer_resource);
+  struct wl_resource *cr;
+  MetaWaylandPointerClient *pointer_client;
+
+  cr = wl_resource_create (client, &zwp_relative_pointer_v1_interface,
+                           wl_resource_get_version (resource), id);
+  if (cr == NULL)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  wl_resource_set_implementation (cr, &relative_pointer_interface,
+                                  pointer,
+                                  meta_wayland_pointer_unbind_pointer_client_resource);
+
+  pointer_client = meta_wayland_pointer_ensure_pointer_client (pointer, client);
+
+  wl_list_insert (&pointer_client->relative_pointer_resources,
+                  wl_resource_get_link (cr));
+}
+
+static const struct zwp_relative_pointer_manager_v1_interface relative_pointer_manager = {
+  relative_pointer_manager_destroy,
+  relative_pointer_manager_get_relative_pointer,
+};
+
+static void
+bind_relative_pointer_manager (struct wl_client *client,
+                               void             *data,
+                               uint32_t          version,
+                               uint32_t          id)
+{
+  MetaWaylandCompositor *compositor = data;
+  struct wl_resource *resource;
+
+  resource = wl_resource_create (client,
+                                 &zwp_relative_pointer_manager_v1_interface,
+                                 1, id);
+
+  if (version != 1)
+    wl_resource_post_error (resource,
+                            WL_DISPLAY_ERROR_INVALID_OBJECT,
+                            "bound invalid version %u of "
+                            "wp_relative_pointer_manager",
+                            version);
+
+  wl_resource_set_implementation (resource, &relative_pointer_manager,
+                                  compositor,
+                                  NULL);
+}
+
+void
+meta_wayland_relative_pointer_init (MetaWaylandCompositor *compositor)
+{
+  /* Relative pointer events are currently only supported by the native backend
+   * so lets just advertise the extension when the native backend is used.
+   */
+#ifdef HAVE_NATIVE_BACKEND
+  if (!META_IS_BACKEND_NATIVE (meta_get_backend ()))
+    return;
+#else
+  return;
+#endif
+
+  if (!wl_global_create (compositor->wayland_display,
+                         &zwp_relative_pointer_manager_v1_interface, 1,
+                         compositor, bind_relative_pointer_manager))
+    g_error ("Could not create relative pointer manager global");
+}
+
+MetaWaylandSeat *
+meta_wayland_pointer_get_seat (MetaWaylandPointer *pointer)
+{
+  MetaWaylandSeat *seat = wl_container_of (pointer, seat, pointer);
+  return seat;
+}
+
 static void
 cursor_surface_role_assigned (MetaWaylandSurfaceRole *surface_role)
 {
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -28,6 +28,7 @@
 #include "meta-wayland-pointer-gesture-swipe.h"
 #include "meta-wayland-pointer-gesture-pinch.h"
 #include "meta-wayland-surface.h"
+#include "meta-wayland-pointer-constraints.h"

 #include <meta/meta-cursor-tracker.h>

@@ -58,6 +59,7 @@ struct _MetaWaylandPointerClient
  struct wl_list pointer_resources;
  struct wl_list swipe_gesture_resources;
  struct wl_list pinch_gesture_resources;
+  struct wl_list relative_pointer_resources;
 };

 struct _MetaWaylandPointer
@@ -101,6 +103,9 @@ gboolean meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
 void meta_wayland_pointer_send_motion (MetaWaylandPointer *pointer,
                                       const ClutterEvent *event);

+void meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer,
+                                                const ClutterEvent *event);
+
 void meta_wayland_pointer_send_button (MetaWaylandPointer *pointer,
                                       const ClutterEvent *event);

@@ -142,4 +147,8 @@ MetaWaylandPointerClient * meta_wayland_pointer_get_pointer_client (MetaWaylandP
                                                                    struct wl_client   *client);
 void meta_wayland_pointer_unbind_pointer_client_resource (struct wl_resource *resource);

+void meta_wayland_relative_pointer_init (MetaWaylandCompositor *compositor);
+
+MetaWaylandSeat *meta_wayland_pointer_get_seat (MetaWaylandPointer *pointer);
+
 #endif /* META_WAYLAND_POINTER_H */
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -405,3 +405,12 @@ meta_wayland_seat_get_grab_info (MetaWaylandSeat    *seat,

  return sequence || can_grab_surface;
 }
+
+gboolean
+meta_wayland_seat_can_popup (MetaWaylandSeat *seat,
+                             uint32_t         serial)
+{
+  return (meta_wayland_pointer_can_popup (&seat->pointer, serial) ||
+          meta_wayland_keyboard_can_popup (&seat->keyboard, serial) ||
+          meta_wayland_touch_can_popup (&seat->touch, serial));
+}
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -64,5 +64,7 @@ gboolean meta_wayland_seat_get_grab_info (MetaWaylandSeat    *seat,
 					  uint32_t            serial,
 					  gfloat             *x,
 					  gfloat             *y);
+gboolean meta_wayland_seat_can_popup     (MetaWaylandSeat *seat,
+                                          uint32_t         serial);

 #endif /* META_WAYLAND_SEAT_H */
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -31,7 +31,7 @@

 #include <wayland-server.h>
 #include "gtk-shell-server-protocol.h"
-#include "xdg-shell-server-protocol.h"
+#include "xdg-shell-unstable-v5-server-protocol.h"

 #include "meta-wayland-private.h"
 #include "meta-xwayland-private.h"
@@ -55,6 +55,14 @@
 #include "meta-surface-actor-wayland.h"
 #include "meta-xwayland-private.h"

+enum {
+  PENDING_STATE_SIGNAL_APPLIED,
+
+  PENDING_STATE_SIGNAL_LAST_SIGNAL
+};
+
+static guint pending_state_signals[PENDING_STATE_SIGNAL_LAST_SIGNAL];
+
 typedef struct _MetaWaylandSurfaceRolePrivate
 {
  MetaWaylandSurface *surface;
@@ -73,21 +81,21 @@ typedef struct
  struct wl_listener sibling_destroy_listener;
 } MetaWaylandSubsurfacePlacementOp;

-GType meta_wayland_surface_get_type (void) G_GNUC_CONST;
-
 G_DEFINE_TYPE (MetaWaylandSurface, meta_wayland_surface, G_TYPE_OBJECT);

-GType meta_wayland_surface_role_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandSurfaceRole,
                            meta_wayland_surface_role,
                            G_TYPE_OBJECT);

+G_DEFINE_TYPE (MetaWaylandPendingState,
+               meta_wayland_pending_state,
+               G_TYPE_OBJECT);
+
 struct _MetaWaylandSurfaceRoleSubsurface
 {
  MetaWaylandSurfaceRole parent;
 };

-GType meta_wayland_surface_role_subsurface_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleSubsurface,
               meta_wayland_surface_role_subsurface,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -97,7 +105,6 @@ struct _MetaWaylandSurfaceRoleXdgSurface
  MetaWaylandSurfaceRole parent;
 };

-GType meta_wayland_surface_role_xdg_surface_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgSurface,
               meta_wayland_surface_role_xdg_surface,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -107,7 +114,6 @@ struct _MetaWaylandSurfaceRoleXdgPopup
  MetaWaylandSurfaceRole parent;
 };

-GType meta_wayland_surface_role_xdg_popup_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleXdgPopup,
               meta_wayland_surface_role_xdg_popup,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -117,7 +123,6 @@ struct _MetaWaylandSurfaceRoleWlShellSurface
  MetaWaylandSurfaceRole parent;
 };

-GType meta_wayland_surface_role_wl_shell_surface_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleWlShellSurface,
               meta_wayland_surface_role_wl_shell_surface,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -127,7 +132,6 @@ struct _MetaWaylandSurfaceRoleDND
  MetaWaylandSurfaceRole parent;
 };

-GType meta_wayland_surface_role_dnd_get_type (void) G_GNUC_CONST;
 G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND,
               meta_wayland_surface_role_dnd,
               META_TYPE_WAYLAND_SURFACE_ROLE);
@@ -170,6 +174,25 @@ meta_wayland_surface_assign_role (MetaWaylandSurface *surface,
    }
 }

+static void
+surface_use_buffer (MetaWaylandSurface *surface)
+{
+  g_return_if_fail (!surface->using_buffer);
+
+  meta_wayland_buffer_ref_use_count (surface->buffer);
+  surface->using_buffer = TRUE;
+}
+
+static void
+surface_stop_using_buffer (MetaWaylandSurface *surface)
+{
+  if (!surface->using_buffer)
+    return;
+
+  meta_wayland_buffer_unref_use_count (surface->buffer);
+  surface->using_buffer = FALSE;
+}
+
 static void
 surface_set_buffer (MetaWaylandSurface *surface,
                    MetaWaylandBuffer  *buffer)
@@ -180,6 +203,8 @@ surface_set_buffer (MetaWaylandSurface *surface,
  if (surface->buffer)
    {
      wl_list_remove (&surface->buffer_destroy_listener.link);
+
+      surface_stop_using_buffer (surface);
      meta_wayland_buffer_unref (surface->buffer);
    }

@@ -265,8 +290,6 @@ dnd_surface_commit (MetaWaylandSurfaceRole  *surface_role,
    meta_wayland_surface_role_get_surface (surface_role);

  meta_wayland_surface_queue_pending_state_frame_callbacks (surface, pending);
-
-  meta_wayland_data_device_update_dnd_surface (&surface->compositor->seat->data_device);
 }

 static void
@@ -343,6 +366,12 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,

  queue_surface_actor_frame_callbacks (surface, pending);

+  /* If there's no new buffer pending, then there's nothing else to
+   * do
+   */
+  if (!pending->newly_attached)
+    return;
+
  if (META_IS_WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE (surface->role))
    {
      /* For wl_shell, it's equivalent to an unmap. Semantics
@@ -359,12 +388,6 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
          return;
        }
    }
-  else if (META_IS_WAYLAND_SURFACE_ROLE_XDG_POPUP (surface->role))
-    {
-      /* Ignore commits if we couldn't grab the pointer */
-      if (!window)
-        return;
-    }
  else
    {
      if (surface->buffer == NULL)
@@ -377,10 +400,11 @@ toplevel_surface_commit (MetaWaylandSurfaceRole  *surface_role,
        }
    }

-  g_assert (window != NULL);
-
-  /* We resize X based surfaces according to X events */
-  if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
+  /* Update the state of the MetaWindow if we still have one. We might not if
+   * the window was unmanaged (for example popup destroyed, NULL buffer attached to
+   * wl_shell_surface wl_surface, xdg_surface object was destroyed, etc).
+   */
+  if (window && window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
    {
      MetaRectangle geom = { 0 };

@@ -483,7 +507,18 @@ move_pending_state (MetaWaylandPendingState *from,
  if (from->buffer)
    wl_list_remove (&from->buffer_destroy_listener.link);

-  *to = *from;
+  to->newly_attached = from->newly_attached;
+  to->buffer = from->buffer;
+  to->dx = from->dx;
+  to->dy = from->dy;
+  to->scale = from->scale;
+  to->damage = from->damage;
+  to->input_region = from->input_region;
+  to->input_region_set = from->input_region_set;
+  to->opaque_region = from->opaque_region;
+  to->opaque_region_set = from->opaque_region_set;
+  to->new_geometry = from->new_geometry;
+  to->has_new_geometry = from->has_new_geometry;

  wl_list_init (&to->frame_callback_list);
  wl_list_insert_list (&to->frame_callback_list, &from->frame_callback_list);
@@ -494,6 +529,38 @@ move_pending_state (MetaWaylandPendingState *from,
  pending_state_init (from);
 }

+static void
+meta_wayland_pending_state_finalize (GObject *object)
+{
+  MetaWaylandPendingState *state = META_WAYLAND_PENDING_STATE (object);
+
+  pending_state_destroy (state);
+
+  G_OBJECT_CLASS (meta_wayland_pending_state_parent_class)->finalize (object);
+}
+
+static void
+meta_wayland_pending_state_init (MetaWaylandPendingState *state)
+{
+  pending_state_init (state);
+}
+
+static void
+meta_wayland_pending_state_class_init (MetaWaylandPendingStateClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_wayland_pending_state_finalize;
+
+  pending_state_signals[PENDING_STATE_SIGNAL_APPLIED] =
+    g_signal_new ("applied",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+}
+
 static void
 subsurface_surface_commit (MetaWaylandSurfaceRole  *surface_role,
                           MetaWaylandPendingState *pending)
@@ -592,7 +659,7 @@ parent_surface_state_applied (gpointer data, gpointer user_data)
    }

  if (is_surface_effectively_synchronized (surface))
-    apply_pending_state (surface, &surface->sub.pending);
+    apply_pending_state (surface, surface->sub.pending);

  meta_surface_actor_wayland_sync_subsurface_state (
    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
@@ -602,6 +669,8 @@ static void
 apply_pending_state (MetaWaylandSurface      *surface,
                     MetaWaylandPendingState *pending)
 {
+  gboolean release_new_buffer = FALSE;
+
  if (pending->newly_attached)
    {
      if (!surface->buffer && surface->window)
@@ -609,10 +678,18 @@ apply_pending_state (MetaWaylandSurface      *surface,

      surface_set_buffer (surface, pending->buffer);

-      if (pending->buffer)
+      if (pending->buffer && !surface->using_buffer)
        {
+          struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (pending->buffer->resource);
+
+          surface_use_buffer (surface);
          CoglTexture *texture = meta_wayland_buffer_ensure_texture (pending->buffer);
          meta_surface_actor_wayland_set_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor), texture);
+
+          /* Release the buffer as soon as possible, so the client can reuse it
+          */
+          if (shm_buffer)
+            release_new_buffer = TRUE;
        }
    }

@@ -622,6 +699,9 @@ apply_pending_state (MetaWaylandSurface      *surface,
  if (!cairo_region_is_empty (pending->damage))
    surface_process_damage (surface, pending->damage);

+  if (release_new_buffer)
+    surface_stop_using_buffer (surface);
+
  surface->offset_x += pending->dx;
  surface->offset_y += pending->dy;

@@ -661,6 +741,10 @@ apply_pending_state (MetaWaylandSurface      *surface,
      wl_list_init (&pending->frame_callback_list);
    }

+  g_signal_emit (pending,
+                 pending_state_signals[PENDING_STATE_SIGNAL_APPLIED],
+                 0);
+
  meta_surface_actor_wayland_sync_state (
    META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));

@@ -681,9 +765,9 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
   *     surface is in effective desynchronized mode.
   */
  if (is_surface_effectively_synchronized (surface))
-    move_pending_state (&surface->pending, &surface->sub.pending);
+    move_pending_state (surface->pending, surface->sub.pending);
  else
-    apply_pending_state (surface, &surface->pending);
+    apply_pending_state (surface, surface->pending);
 }

 static void
@@ -712,17 +796,17 @@ wl_surface_attach (struct wl_client *client,
  else
    buffer = NULL;

-  if (surface->pending.buffer)
-    wl_list_remove (&surface->pending.buffer_destroy_listener.link);
+  if (surface->pending->buffer)
+    wl_list_remove (&surface->pending->buffer_destroy_listener.link);

-  surface->pending.newly_attached = TRUE;
-  surface->pending.buffer = buffer;
-  surface->pending.dx = dx;
-  surface->pending.dy = dy;
+  surface->pending->newly_attached = TRUE;
+  surface->pending->buffer = buffer;
+  surface->pending->dx = dx;
+  surface->pending->dy = dy;

  if (buffer)
    wl_signal_add (&buffer->destroy_signal,
-                   &surface->pending.buffer_destroy_listener);
+                   &surface->pending->buffer_destroy_listener);
 }

 static void
@@ -740,7 +824,7 @@ wl_surface_damage (struct wl_client *client,
  if (!surface)
    return;

-  cairo_region_union_rectangle (surface->pending.damage, &rectangle);
+  cairo_region_union_rectangle (surface->pending->damage, &rectangle);
 }

 static void
@@ -770,7 +854,7 @@ wl_surface_frame (struct wl_client *client,
  callback->resource = wl_resource_create (client, &wl_callback_interface, META_WL_CALLBACK_VERSION, callback_id);
  wl_resource_set_implementation (callback->resource, NULL, callback, destroy_frame_callback);

-  wl_list_insert (surface->pending.frame_callback_list.prev, &callback->link);
+  wl_list_insert (surface->pending->frame_callback_list.prev, &callback->link);
 }

 static void
@@ -784,14 +868,14 @@ wl_surface_set_opaque_region (struct wl_client *client,
  if (!surface)
    return;

-  g_clear_pointer (&surface->pending.opaque_region, cairo_region_destroy);
+  g_clear_pointer (&surface->pending->opaque_region, cairo_region_destroy);
  if (region_resource)
    {
      MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
      cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
-      surface->pending.opaque_region = cairo_region_copy (cr_region);
+      surface->pending->opaque_region = cairo_region_copy (cr_region);
    }
-  surface->pending.opaque_region_set = TRUE;
+  surface->pending->opaque_region_set = TRUE;
 }

 static void
@@ -805,14 +889,14 @@ wl_surface_set_input_region (struct wl_client *client,
  if (!surface)
    return;

-  g_clear_pointer (&surface->pending.input_region, cairo_region_destroy);
+  g_clear_pointer (&surface->pending->input_region, cairo_region_destroy);
  if (region_resource)
    {
      MetaWaylandRegion *region = wl_resource_get_user_data (region_resource);
      cairo_region_t *cr_region = meta_wayland_region_peek_cairo_region (region);
-      surface->pending.input_region = cairo_region_copy (cr_region);
+      surface->pending->input_region = cairo_region_copy (cr_region);
    }
-  surface->pending.input_region_set = TRUE;
+  surface->pending->input_region_set = TRUE;
 }

 static void
@@ -843,7 +927,7 @@ wl_surface_set_buffer_scale (struct wl_client *client,
 {
  MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
  if (scale > 0)
-    surface->pending.scale = scale;
+    surface->pending->scale = scale;
  else
    g_warning ("Trying to set invalid buffer_scale of %d\n", scale);
 }
@@ -936,7 +1020,6 @@ set_surface_is_on_output (MetaWaylandSurface *surface,

 static void
 surface_handle_output_destroy (MetaWaylandOutput *wayland_output,
-                               GParamSpec *pspec,
                               MetaWaylandSurface *surface)
 {
  set_surface_is_on_output (surface, wayland_output, FALSE);
@@ -947,22 +1030,26 @@ set_surface_is_on_output (MetaWaylandSurface *surface,
                          MetaWaylandOutput *wayland_output,
                          gboolean is_on_output)
 {
-  gboolean was_on_output = g_hash_table_contains (surface->outputs,
-                                                  wayland_output);
+  gpointer orig_id;
+  gboolean was_on_output = g_hash_table_lookup_extended (surface->outputs_to_destroy_notify_id,
+                                                         wayland_output,
+                                                         NULL, &orig_id);

  if (!was_on_output && is_on_output)
    {
-      g_signal_connect (wayland_output, "output-destroyed",
-                        G_CALLBACK (surface_handle_output_destroy),
-                        surface);
-      g_hash_table_add (surface->outputs, wayland_output);
+      gulong id;
+
+      id = g_signal_connect (wayland_output, "output-destroyed",
+                             G_CALLBACK (surface_handle_output_destroy),
+                             surface);
+      g_hash_table_insert (surface->outputs_to_destroy_notify_id, wayland_output,
+                           GSIZE_TO_POINTER ((gsize)id));
      surface_entered_output (surface, wayland_output);
    }
  else if (was_on_output && !is_on_output)
    {
-      g_hash_table_remove (surface->outputs, wayland_output);
-      g_signal_handlers_disconnect_by_func  (
-        wayland_output, (gpointer)surface_handle_output_destroy, surface);
+      g_hash_table_remove (surface->outputs_to_destroy_notify_id, wayland_output);
+      g_signal_handler_disconnect (wayland_output, (gulong) GPOINTER_TO_SIZE (orig_id));
      surface_left_output (surface, wayland_output);
    }
 }
@@ -1000,6 +1087,12 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data)
  set_surface_is_on_output (surface, wayland_output, is_on_output);
 }

+static void
+surface_output_disconnect_signal (gpointer key, gpointer value, gpointer user_data)
+{
+  g_signal_handler_disconnect (key, (gulong) GPOINTER_TO_SIZE (value));
+}
+
 void
 meta_wayland_surface_update_outputs (MetaWaylandSurface *surface)
 {
@@ -1035,8 +1128,11 @@ wl_surface_destructor (struct wl_resource *resource)
  if (surface->window)
    destroy_window (surface);

+  g_list_free_full (surface->pointer_constraints,
+                    (GDestroyNotify) meta_wayland_pointer_constraint_destroy);
+
  surface_set_buffer (surface, NULL);
-  pending_state_destroy (&surface->pending);
+  g_clear_object (&surface->pending);

  if (surface->opaque_region)
    cairo_region_destroy (surface->opaque_region);
@@ -1050,7 +1146,8 @@ wl_surface_destructor (struct wl_resource *resource)

  meta_wayland_compositor_destroy_frame_callbacks (compositor, surface);

-  g_hash_table_unref (surface->outputs);
+  g_hash_table_foreach (surface->outputs_to_destroy_notify_id, surface_output_disconnect_signal, surface);
+  g_hash_table_unref (surface->outputs_to_destroy_notify_id);

  wl_list_for_each_safe (cb, next, &surface->pending_frame_callback_list, link)
    wl_resource_destroy (cb->resource);
@@ -1074,6 +1171,13 @@ wl_surface_destructor (struct wl_resource *resource)
  meta_wayland_compositor_repick (compositor);
 }

+static void
+surface_actor_painting (MetaSurfaceActorWayland *surface_actor,
+                        MetaWaylandSurface      *surface)
+{
+  meta_wayland_surface_update_outputs (surface);
+}
+
 MetaWaylandSurface *
 meta_wayland_surface_create (MetaWaylandCompositor *compositor,
                             struct wl_client      *client,
@@ -1093,11 +1197,16 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,

  wl_list_init (&surface->pending_frame_callback_list);

+  g_signal_connect_object (surface->surface_actor,
+                           "painting",
+                           G_CALLBACK (surface_actor_painting),
+                           surface,
+                           0);
+
  sync_drag_dest_funcs (surface);

-  surface->outputs = g_hash_table_new (NULL, NULL);
+  surface->outputs_to_destroy_notify_id = g_hash_table_new (NULL, NULL);

-  pending_state_init (&surface->pending);
  return surface;
 }

@@ -1300,11 +1409,11 @@ xdg_surface_set_window_geometry (struct wl_client *client,
 {
  MetaWaylandSurface *surface = wl_resource_get_user_data (resource);

-  surface->pending.has_new_geometry = TRUE;
-  surface->pending.new_geometry.x = x;
-  surface->pending.new_geometry.y = y;
-  surface->pending.new_geometry.width = width;
-  surface->pending.new_geometry.height = height;
+  surface->pending->has_new_geometry = TRUE;
+  surface->pending->new_geometry.x = x;
+  surface->pending->new_geometry.y = y;
+  surface->pending->new_geometry.width = width;
+  surface->pending->new_geometry.height = height;
 }

 static void
@@ -1436,8 +1545,8 @@ handle_popup_parent_destroyed (struct wl_listener *listener, void *data)
  MetaWaylandSurface *surface =
    wl_container_of (listener, surface, popup.parent_destroy_listener);

-  wl_resource_post_error (surface->xdg_popup,
-                          XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
+  wl_resource_post_error (surface->xdg_shell_resource,
+                          XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
                          "destroyed popup not top most popup");
  surface->popup.parent = NULL;

@@ -1455,8 +1564,8 @@ handle_popup_destroyed (struct wl_listener *listener, void *data)
  top_popup = meta_wayland_popup_get_top_popup (popup);
  if (surface != top_popup)
    {
-      wl_resource_post_error (surface->xdg_popup,
-                              XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
+      wl_resource_post_error (surface->xdg_shell_resource,
+                              XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
                              "destroyed popup not top most popup");
    }

@@ -1507,7 +1616,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
      (parent_surf->xdg_popup == NULL && parent_surf->xdg_surface == NULL))
    {
      wl_resource_post_error (resource,
-                              XDG_POPUP_ERROR_INVALID_PARENT,
+                              XDG_SHELL_ERROR_INVALID_POPUP_PARENT,
                              "invalid parent surface");
      return;
    }
@@ -1517,7 +1626,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
      (top_popup != NULL && parent_surf != top_popup))
    {
      wl_resource_post_error (resource,
-                              XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
+                              XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
                              "parent not top most surface");
      return;
    }
@@ -1529,15 +1638,15 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
                                  surface,
                                  xdg_popup_destructor);

-  if (!meta_wayland_pointer_can_popup (&seat->pointer, serial))
+  surface->xdg_popup = popup_resource;
+  surface->xdg_shell_resource = resource;
+
+  if (!meta_wayland_seat_can_popup (seat, serial))
    {
      xdg_popup_send_popup_done (popup_resource);
      return;
    }

-  surface->xdg_popup = popup_resource;
-  surface->xdg_shell_resource = resource;
-
  surface->popup.parent = parent_surf;
  surface->popup.parent_destroy_listener.notify = handle_popup_parent_destroyed;
  wl_resource_add_destroy_listener (parent_surf->resource,
@@ -1753,7 +1862,7 @@ wl_shell_surface_set_popup (struct wl_client *client,

  wl_shell_surface_set_state (surface, SURFACE_STATE_TOPLEVEL);

-  if (!meta_wayland_pointer_can_popup (&seat->pointer, serial))
+  if (!meta_wayland_seat_can_popup (seat, serial))
    {
      wl_shell_surface_send_popup_done (resource);
      return;
@@ -1956,8 +2065,21 @@ get_gtk_surface (struct wl_client *client,
  wl_resource_set_implementation (surface->gtk_surface, &meta_wayland_gtk_surface_interface, surface, gtk_surface_destructor);
 }

+static void
+set_startup_id (struct wl_client   *client,
+                struct wl_resource *resource,
+                const char         *startup_id)
+{
+  MetaDisplay *display;
+
+  display = meta_get_display ();
+  meta_startup_notification_remove_sequence (display->startup_notification,
+                                             startup_id);
+}
+
 static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = {
-  get_gtk_surface
+  get_gtk_surface,
+  set_startup_id
 };

 static void
@@ -1971,7 +2093,7 @@ bind_gtk_shell (struct wl_client *client,

  resource = wl_resource_create (client, &gtk_shell_interface, version, id);

-  if (version != META_GTK_SHELL_VERSION)
+  if (version < 2)
    {
      wl_resource_post_error (resource,
                              WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -2013,7 +2135,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
      surface->sub.parent = NULL;
    }

-  pending_state_destroy (&surface->sub.pending);
+  g_clear_object (&surface->sub.pending);
  surface->wl_subsurface = NULL;
 }

@@ -2139,7 +2261,7 @@ wl_subsurface_set_desync (struct wl_client *client,
  surface->sub.synchronous = FALSE;
  if (was_effectively_synchronized &&
      !is_surface_effectively_synchronized (surface))
-    apply_pending_state (surface, &surface->sub.pending);
+    apply_pending_state (surface, surface->sub.pending);
 }

 static const struct wl_subsurface_interface meta_wayland_wl_subsurface_interface = {
@@ -2203,7 +2325,7 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
  surface->wl_subsurface = wl_resource_create (client, &wl_subsurface_interface, wl_resource_get_version (resource), id);
  wl_resource_set_implementation (surface->wl_subsurface, &meta_wayland_wl_subsurface_interface, surface, wl_subsurface_destructor);

-  pending_state_init (&surface->sub.pending);
+  surface->sub.pending = g_object_new (META_TYPE_WAYLAND_PENDING_STATE, NULL);
  surface->sub.synchronous = TRUE;
  surface->sub.parent = parent;
  surface->sub.parent_destroy_listener.notify = surface_handle_parent_surface_destroyed;
@@ -2390,6 +2512,15 @@ meta_wayland_surface_drag_dest_drop (MetaWaylandSurface *surface)
  surface->dnd.funcs->drop (data_device, surface);
 }

+void
+meta_wayland_surface_drag_dest_update (MetaWaylandSurface *surface)
+{
+  MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
+  MetaWaylandDataDevice *data_device = &compositor->seat->data_device;
+
+  surface->dnd.funcs->update (data_device, surface);
+}
+
 MetaWindow *
 meta_wayland_surface_get_toplevel_window (MetaWaylandSurface *surface)
 {
@@ -2409,9 +2540,79 @@ meta_wayland_surface_get_toplevel_window (MetaWaylandSurface *surface)
  return NULL;
 }

+void
+meta_wayland_surface_add_pointer_constraint (MetaWaylandSurface           *surface,
+                                             MetaWaylandPointerConstraint *constraint)
+{
+  surface->pointer_constraints = g_list_append (surface->pointer_constraints,
+                                                constraint);
+}
+
+void
+meta_wayland_surface_remove_pointer_constraint (MetaWaylandSurface           *surface,
+                                                MetaWaylandPointerConstraint *constraint)
+{
+  surface->pointer_constraints = g_list_remove (surface->pointer_constraints,
+                                                constraint);
+}
+
+MetaWaylandPointerConstraint *
+meta_wayland_surface_get_pointer_constraint_for_seat (MetaWaylandSurface *surface,
+                                                      MetaWaylandSeat    *seat)
+{
+  GList *iter;
+
+  for (iter = surface->pointer_constraints; iter; iter = iter->next)
+    {
+      MetaWaylandPointerConstraint *constraint = iter->data;
+
+      if (seat == meta_wayland_pointer_constraint_get_seat (constraint))
+        return constraint;
+    }
+
+  return NULL;
+}
+
+void
+meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
+                                               float               abs_x,
+                                               float               abs_y,
+                                               float               *sx,
+                                               float               *sy)
+{
+  ClutterActor *actor =
+    CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor));
+
+  clutter_actor_transform_stage_point (actor, abs_x, abs_y, sx, sy);
+  *sx /= surface->scale;
+  *sy /= surface->scale;
+}
+
+void
+meta_wayland_surface_get_absolute_coordinates (MetaWaylandSurface *surface,
+                                               float               sx,
+                                               float               sy,
+                                               float               *x,
+                                               float               *y)
+{
+  ClutterActor *actor =
+    CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor));
+  ClutterVertex sv = {
+    .x = sx * surface->scale,
+    .y = sy * surface->scale,
+  };
+  ClutterVertex v = { 0 };
+
+  clutter_actor_apply_relative_transform_to_point (actor, NULL, &sv, &v);
+
+  *x = v.x;
+  *y = v.y;
+}
+
 static void
 meta_wayland_surface_init (MetaWaylandSurface *surface)
 {
+  surface->pending = g_object_new (META_TYPE_WAYLAND_PENDING_STATE, NULL);
 }

 static void
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -31,6 +31,7 @@
 #include "meta-wayland-types.h"
 #include "meta-surface-actor.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "meta-wayland-pointer-constraints.h"

 typedef struct _MetaWaylandPendingState MetaWaylandPendingState;

@@ -44,6 +45,12 @@ G_DECLARE_FINAL_TYPE (MetaWaylandSurface,
 G_DECLARE_DERIVABLE_TYPE (MetaWaylandSurfaceRole, meta_wayland_surface_role,
                          META, WAYLAND_SURFACE_ROLE, GObject);

+#define META_TYPE_WAYLAND_PENDING_STATE (meta_wayland_pending_state_get_type ())
+G_DECLARE_FINAL_TYPE (MetaWaylandPendingState,
+                      meta_wayland_pending_state,
+                      META, WAYLAND_PENDING_STATE,
+                      GObject);
+
 struct _MetaWaylandSurfaceRoleClass
 {
  GObjectClass parent_class;
@@ -92,6 +99,8 @@ G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleDND,

 struct _MetaWaylandPendingState
 {
+  GObject parent;
+
  /* wl_surface.attach */
  gboolean newly_attached;
  MetaWaylandBuffer *buffer;
@@ -128,6 +137,8 @@ struct _MetaWaylandDragDestFuncs
                      const ClutterEvent    *event);
  void (* drop)      (MetaWaylandDataDevice *data_device,
                      MetaWaylandSurface    *surface);
+  void (* update)    (MetaWaylandDataDevice *data_device,
+                      MetaWaylandSurface    *surface);
 };

 struct _MetaWaylandSurface
@@ -141,13 +152,14 @@ struct _MetaWaylandSurface
  MetaWaylandSurfaceRole *role;
  MetaWindow *window;
  MetaWaylandBuffer *buffer;
+  gboolean using_buffer;
  struct wl_listener buffer_destroy_listener;
  cairo_region_t *input_region;
  cairo_region_t *opaque_region;
  int scale;
  int32_t offset_x, offset_y;
  GList *subsurfaces;
-  GHashTable *outputs;
+  GHashTable *outputs_to_destroy_notify_id;

  /* List of pending frame callbacks that needs to stay queued longer than one
   * commit sequence, such as when it has not yet been assigned a role.
@@ -159,7 +171,7 @@ struct _MetaWaylandSurface
  } dnd;

  /* All the pending state that wl_surface.commit will apply. */
-  MetaWaylandPendingState pending;
+  MetaWaylandPendingState *pending;

  /* Extension resources. */
  struct wl_resource *xdg_surface;
@@ -200,13 +212,15 @@ struct _MetaWaylandSurface
     * state here.
     */
    gboolean synchronous;
-    MetaWaylandPendingState pending;
+    MetaWaylandPendingState *pending;

    int32_t pending_x;
    int32_t pending_y;
    gboolean pending_pos;
    GSList *pending_placement_ops;
  } sub;
+
+  GList *pointer_constraints;
 };

 void                meta_wayland_shell_init     (MetaWaylandCompositor *compositor);
@@ -240,6 +254,7 @@ void                meta_wayland_surface_drag_dest_motion    (MetaWaylandSurface
                                                              const ClutterEvent   *event);
 void                meta_wayland_surface_drag_dest_focus_out (MetaWaylandSurface   *surface);
 void                meta_wayland_surface_drag_dest_drop      (MetaWaylandSurface   *surface);
+void                meta_wayland_surface_drag_dest_update    (MetaWaylandSurface   *surface);

 void                meta_wayland_surface_update_outputs (MetaWaylandSurface *surface);

@@ -250,6 +265,27 @@ void                meta_wayland_surface_queue_pending_frame_callbacks (MetaWayl
 void                meta_wayland_surface_queue_pending_state_frame_callbacks (MetaWaylandSurface      *surface,
                                                                              MetaWaylandPendingState *pending);

+void                meta_wayland_surface_add_pointer_constraint (MetaWaylandSurface           *surface,
+                                                                 MetaWaylandPointerConstraint *constraint);
+
+void                meta_wayland_surface_remove_pointer_constraint (MetaWaylandSurface           *surface,
+                                                                    MetaWaylandPointerConstraint *constraint);
+MetaWaylandPointerConstraint *
+                    meta_wayland_surface_get_pointer_constraint_for_seat (MetaWaylandSurface *surface,
+                                                                          MetaWaylandSeat    *seat);
+
+void                meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
+                                                                   float               abs_x,
+                                                                   float               abs_y,
+                                                                   float              *sx,
+                                                                   float              *sy);
+
+void                meta_wayland_surface_get_absolute_coordinates (MetaWaylandSurface *surface,
+                                                                   float               sx,
+                                                                   float               sy,
+                                                                   float              *x,
+                                                                   float              *y);
+
 MetaWaylandSurface * meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role);

 #endif
--- a/src/wayland/meta-wayland-touch.c
+++ b/src/wayland/meta-wayland-touch.c
@@ -208,8 +208,8 @@ touch_get_relative_coordinates (MetaWaylandTouch   *touch,
                                           &event_x, &event_y);
    }

-  *x = event_x;
-  *y = event_y;
+  *x = event_x / surface->scale;
+  *y = event_y / surface->scale;
 }


@@ -575,6 +575,26 @@ meta_wayland_touch_create_new_resource (MetaWaylandTouch   *touch,
  wl_list_insert (&touch->resource_list, wl_resource_get_link (cr));
 }

+gboolean
+meta_wayland_touch_can_popup (MetaWaylandTouch *touch,
+                              uint32_t          serial)
+{
+  MetaWaylandTouchInfo *touch_info;
+  GHashTableIter iter;
+
+  if (!touch->touches)
+    return FALSE;
+
+  g_hash_table_iter_init (&iter, touch->touches);
+
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &touch_info))
+    {
+      if (touch_info->slot_serial == serial)
+        return TRUE;
+    }
+  return FALSE;
+}
+
 ClutterEventSequence *
 meta_wayland_touch_find_grab_sequence (MetaWaylandTouch   *touch,
                                       MetaWaylandSurface *surface,
--- a/src/wayland/meta-wayland-touch.h
+++ b/src/wayland/meta-wayland-touch.h
@@ -70,4 +70,7 @@ gboolean meta_wayland_touch_get_press_coords (MetaWaylandTouch     *touch,
                                              gfloat               *x,
                                              gfloat               *y);

+gboolean meta_wayland_touch_can_popup        (MetaWaylandTouch *touch,
+                                              uint32_t          serial);
+
 #endif /* META_WAYLAND_TOUCH_H */
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -29,6 +29,8 @@ typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
 typedef struct _MetaWaylandPopupGrab MetaWaylandPopupGrab;
 typedef struct _MetaWaylandPopup MetaWaylandPopup;
 typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
+typedef struct _MetaWaylandKeyboardGrab MetaWaylandKeyboardGrab;
+typedef struct _MetaWaylandKeyboardGrabInterface MetaWaylandKeyboardGrabInterface;
 typedef struct _MetaWaylandTouch MetaWaylandTouch;
 typedef struct _MetaWaylandDragDestFuncs MetaWaylandDragDestFuncs;
 typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
--- a/Show More
+++ b/Show More