MetaWaylandSeat: reset pointer focus always when it might be different

It can happen because of a grab that the current surface changes but the focus doesn't. Later on, when the grab ends, we would keep the previous focus until the user goes out of the window and back in again.
MetaIdleMonitor: add a DBus interface for the idle monitor
2013-08-14 18:42:07 +02:00 · 2013-08-14 18:42:07 +02:00 · 2013-08-14 18:42:07 +02:00 · 2013-08-14 18:31:00 +02:00 · 2013-08-14 10:03:50 +02:00 · 2013-08-14 10:03:50 +02:00
79 changed files with 4370 additions and 5138 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@ src/50-mutter-navigation.xml
 src/50-mutter-system.xml
 src/50-mutter-windows.xml
 src/mutter-wm.desktop
-src/mutter-wayland.desktop
+src/mutter.desktop
 *.o
 *.a
 *.lo
@@ -46,13 +46,12 @@ POTFILES
 po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
-libmutter-wayland.pc
-mutter-wayland
-mutter-launch
+libmutter.pc
+mutter
+mutter-theme-viewer
+mutter.desktop
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
-org.gnome.mutter.wayland.gschema.valid
-org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
@@ -75,15 +74,7 @@ src/mutter-enum-types.[ch]
 src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
-src/meta-dbus-xrandr.[ch]
-src/meta-dbus-idle-monitor.[ch]
 src/mutter-plugins.pc
-src/wayland/gtk-shell-protocol.c
-src/wayland/gtk-shell-client-protocol.h
-src/wayland/gtk-shell-server-protocol.h
-src/wayland/xserver-protocol.c
-src/wayland/xserver-client-protocol.h
-src/wayland/xserver-server-protocol.h
 doc/reference/*.args
 doc/reference/*.bak
 doc/reference/*.hierarchy
--- a/59
+++ b/59
@@ -1,62 +1,3 @@
-3.9.91
-======
-* Drop man pages for removed utilities [Kalev; #706579]
-* Add support for idle tracking [Giovanni, Cosimo; #706005, #707250]
-* Skip CRTC reconfigurations that have no effect [Giovanni; #706672]
-* Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399]
-* Don't save pixbuf data in user data [Tim; #706777]
-* Don't queue redraws for obscured regions [Adel; #703332]
-* Suppor the opaque region hints for wayland clients [Jasper; #707019]
-* Turn blending off when drawing entirely opaque regions [Jasper; #707019]
-* Check event timestamps before reconfiguring [Giovanni; #706735]
-* Merge the DBus API for display configuration in the wayland branch [Giovanni]
-* Install an X IO error handler for XWayland [Giovanni; #706962]
-* Use the clutter xkbcommon integration for the wayland keyboard [Giovanni; #705862]
-* Add a setuid helper for running on KMS+evdev [Giovanni, Colin; #705861]
-* Add keybindings for switching VT [Giovanni; #705861]
-* Implement plugin modality when running as a wayland compositor [Giovanni; #705917]
-* Add support for the application menu for wayland clients [Giovanni; #707128]
-* Several Coverity spotted fixes [Jasper]
-* Don't create a dummy texture for the texture template [Neil; #707458]
-* Use a more conservative paint volume for obscured windows [Adel]
-* Misc bug fixes [Giovanni, Colin, Seán, Jasper, Cosimo; #706582, #706598,
-  #706787, #706729, #706825, #707081, #707090, #707267, #706982, #706289]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Colin Guthrie, Kalev Lember,
-  Tim Lunn, Jasper St. Pierre, Neil Roberts, Rico Tzschichholz, Seán de Búrca
-
-Translations:
-  Piotr Drąg [pl], Alexandre Franke [fr], Kjartan Maraas [nb],
-  Milo Casagrande [it], Balázs Úr [hu], Seán de Búrca [ga], Fran Diéguez [gl],
-  Daniel Mustieles [es], Aurimas Černius [lt], Gil Forcada [ca]
-
-3.9.90
-======
-* First release from the wayland branch, includes basic support for running
-  as a wayland compositor [Robert, Neil, Giovanni]
-* Add support for _GTK_FRAME_EXTENTS [Jasper; #705766]
-* Fix quick consecutive <super> presses breaking keyboard input [Alban; #666101]
-* Work towards running as wayland compositor [Giovanni]
- - Add DBus API for display configuration
-   [#705670, #706231, #706233, #706322, #706382]
- - Add abstraction layer for cursor tracking [#705911]
- - Add support for plugin modality under wayland [#705917]
-* Disable GTK+ scaling [Alexander; #706388]
-* Disable blending while updating tower [Robert]
-* Misc bug fixes and cleanups [Adel, Jasper, Giovanni, Colin, Rico, Florian;
-  #703332, #704437, #706207]
-
-Contributors:
-  Robert Bragg, Giovanni Campagna, Alban Crequy, Adel Gadllah,
-  Alexander Larsson, Florian Müllner, Jasper St. Pierre, Neil Roberts,
-  Rico Tzschichholz, Colin Walters
-
-Translations:
-  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Matej Urbančič [sl],
-  Marek Černocký [cs], Daniel Mustieles [es], Rafael Ferreira [pt_BR],
-  Yaron Shahrabani [he], Ján Kyselica [sk]
-
 3.9.5
 =====
 * Don't select for touch events on the stage [Jasper; #697192]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [9])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_micro_version], [5])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -19,10 +19,6 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 AM_MAINTAINER_MODE([enable])

-# Change pkglibdir and pkgdatadir to mutter-wayland instead of mutter
-PACKAGE="mutter-wayland"
-AC_SUBST([PACKAGE], [$PACKAGE])
-
 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
 MUTTER_MICRO_VERSION=mutter_micro_version
@@ -38,7 +34,7 @@ AC_SUBST(MUTTER_PLUGIN_DIR)
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")

-GETTEXT_PACKAGE=mutter-wayland
+GETTEXT_PACKAGE=mutter
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])

@@ -80,7 +76,6 @@ MUTTER_PC_MODULES="
   $CLUTTER_PACKAGE >= 1.14.3
   cogl-1.0 >= 1.13.3
   upower-glib > 0.9.11
-   gnome-desktop-3.0
 "

 GLIB_GSETTINGS
@@ -119,6 +114,11 @@ AC_ARG_ENABLE(shape,
                 [disable mutter's use of the shaped window extension]),,
  enable_shape=auto)

+AC_ARG_ENABLE(wayland,
+  AC_HELP_STRING([--enable-wayland],
+                 [Enable support for running as a hybrid X and Wayland compositor]),,
+  enable_wayland=no)
+
 ## Wayland support requires the xserver.xml protocol extension found in the weston
 ## repository but since there aren't currently established conventions for
 ## installing and discovering these we simply require a location to be given
@@ -141,11 +141,6 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
 PKG_CHECK_MODULES(MUTTER_LAUNCH, libdrm libsystemd-login)

-saved_LIBS="$LIBS"
-LIBS="$LIBS $MUTTER_LAUNCH"
-AC_CHECK_FUNCS([sd_session_get_vt])
-LIBS="$saved_LIBS"
-
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
 AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
@@ -223,16 +218,29 @@ if test x$have_xcursor = xyes; then
  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
 fi

-# We always build with wayland enabled
-AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
+have_wayland=no
+if test x$enable_wayland = "xyes"; then
+  WAYLAND_VERSION=0.1
+  AC_MSG_CHECKING([Wayland >= $WAYLAND_VERSION])
+  if ! $PKG_CONFIG --atleast-version $WAYLAND_VERSION wayland-server; then
+    AC_MSG_ERROR([wayland support enabled but no suitable wayland-server package found])
+  fi
+  AC_MSG_RESULT(yes)

-AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-  AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
-AC_SUBST([WAYLAND_SCANNER])
-AC_SUBST(XWAYLAND_PATH)
+  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
+  AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
+        AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
+  AC_SUBST([WAYLAND_SCANNER])
+
+  AC_SUBST(XWAYLAND_PATH)
+
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server libdrm"
+  AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
+  have_wayland=yes
+fi
+
+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = "xyes")

-MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server libdrm"
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

 PKG_CHECK_EXISTS([xi >= 1.6.99.1],
@@ -470,7 +478,8 @@ doc/man/Makefile
 doc/reference/Makefile
 doc/reference/meta-docs.sgml
 src/Makefile
-src/libmutter-wayland.pc
+src/libmutter.pc
+src/mutter-plugins.pc
 src/compositor/plugins/Makefile
 protocol/Makefile
 data/Makefile
@@ -489,12 +498,14 @@ fi

 dnl ==========================================================================
 echo "
-mutter-wayland-$VERSION
+mutter-$VERSION

 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}

+	Wayland:		  ${have_wayland}
+
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,7 @@
-defaultcursordir = $(pkgdatadir)/cursors
+defaultcursordir = $(datadir)/mutter/cursors

-dist_defaultcursor_DATA = left_ptr.png
+dist_defaultcursor_DATA =
+
+if HAVE_WAYLAND
+dist_defaultcursor_DATA += left_ptr.png
+endif
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -140,7 +140,7 @@ expand_content_files= \
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(MUTTER_CFLAGS)
-GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter-wayland.la
+GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter.la

 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
-src/core/monitor.c
 src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
@@ -21,12 +20,15 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/mutter-wayland.desktop.in
+src/mutter.desktop.in
+src/mutter-wm.desktop.in
 src/org.gnome.mutter.gschema.xml.in
-src/org.gnome.mutter.wayland.gschema.xml.in
+src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
+src/ui/theme-viewer.c
+
--- a/protocol/gtk-shell.xml
+++ b/protocol/gtk-shell.xml
@@ -1,30 +0,0 @@
-<protocol name="gtk">
-
-  <interface name="gtk_shell" version="1">
-    <enum name="capability">
-      <entry name="global_app_menu" value="1"/>
-      <entry name="global_menu_bar" value="2"/>
-    </enum>
-
-    <event name="capabilities">
-      <arg name="capabilities" type="uint"/>
-    </event>
-
-    <request name="get_gtk_surface">
-      <arg name="gtk_surface" type="new_id" interface="gtk_surface"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-  </interface>
-
-  <interface name="gtk_surface" version="1">
-    <request name="set_dbus_properties">
-      <arg name="application_id" type="string" allow-null="true"/>
-      <arg name="app_menu_path" type="string" allow-null="true"/>
-      <arg name="menubar_path" type="string" allow-null="true"/>
-      <arg name="window_object_path" type="string" allow-null="true"/>
-      <arg name="application_object_path" type="string" allow-null="true"/>
-      <arg name="unique_bus_name" type="string" allow-null="true"/>
-    </request>
-  </interface>
-
-</protocol>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:

-lib_LTLIBRARIES = libmutter-wayland.la
+lib_LTLIBRARIES = libmutter.la

 SUBDIRS=compositor/plugins

@@ -10,7 +10,6 @@ INCLUDES=								\
 	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \
 	$(MUTTER_CFLAGS)						\
-	-I$(top_builddir)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
 	-I$(srcdir)/ui							\
@@ -30,24 +29,26 @@ INCLUDES=								\
 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"

+if HAVE_WAYLAND
 INCLUDES += \
 	-I$(srcdir)/wayland						\
-	-I$(builddir)/wayland						\
 	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
+endif

 mutter_built_sources = \
-	$(dbus_idle_built_sources)		\
-	$(dbus_xrandr_built_sources)		\
-	mutter-enum-types.h 			\
-	mutter-enum-types.c			\
-	wayland/gtk-shell-protocol.c		\
-	wayland/gtk-shell-server-protocol.h	\
-	wayland/gtk-shell-client-protocol.h	\
+	$(dbus_xrandr_built_sources)	\
+	$(dbus_idle_built_sources) \
+	mutter-enum-types.h \
+	mutter-enum-types.c
+
+if HAVE_WAYLAND
+mutter_built_sources += \
 	wayland/xserver-protocol.c		\
 	wayland/xserver-server-protocol.h	\
 	wayland/xserver-client-protocol.h
+endif

-libmutter_wayland_la_SOURCES =			\
+libmutter_la_SOURCES =				\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
 	core/barrier.c				\
@@ -76,7 +77,6 @@ libmutter_wayland_la_SOURCES =			\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
-	compositor/meta-shaped-texture-private.h 	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@@ -109,8 +109,6 @@ libmutter_wayland_la_SOURCES =			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
-	core/edid-parse.c			\
-	core/edid.h				\
 	core/errors.c				\
 	meta/errors.h				\
 	core/frame.c				\
@@ -134,6 +132,7 @@ libmutter_wayland_la_SOURCES =			\
 	core/meta-xrandr-shared.h		\
 	core/monitor.c				\
 	core/monitor-config.c			\
+	core/monitor-kms.c			\
 	core/monitor-private.h			\
 	core/monitor-xrandr.c			\
 	core/mutter-Xatomtype.h			\
@@ -184,7 +183,10 @@ libmutter_wayland_la_SOURCES =			\
 	ui/ui.c					\
 	$(mutter_built_sources)

-libmutter_wayland_la_SOURCES +=			\
+if HAVE_WAYLAND
+libmutter_la_SOURCES +=				\
+	wayland/meta-tty.c			\
+	wayland/meta-tty.h			\
 	wayland/meta-wayland.c			\
 	wayland/meta-wayland-private.h		\
 	wayland/meta-xwayland-private.h		\
@@ -199,14 +201,12 @@ libmutter_wayland_la_SOURCES +=			\
 	wayland/meta-wayland-seat.h		\
 	wayland/meta-wayland-stage.h		\
 	wayland/meta-wayland-stage.c		\
-	wayland/meta-wayland-surface.c		\
-	wayland/meta-wayland-surface.h		\
-	wayland/meta-wayland-types.h		\
 	wayland/meta-weston-launch.c		\
 	wayland/meta-weston-launch.h
+endif

-libmutter_wayland_la_LDFLAGS = -no-undefined
-libmutter_wayland_la_LIBADD  = $(MUTTER_LIBS)
+libmutter_la_LDFLAGS = -no-undefined
+libmutter_la_LIBADD  = $(MUTTER_LIBS)

 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
@@ -244,27 +244,29 @@ libmutterinclude_base_headers =		\
 libmutterinclude_extra_headers =		\
 	meta/atomnames.h

-libmutterincludedir = $(includedir)/mutter-wayland/meta
+libmutterincludedir = $(includedir)/mutter/meta

 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)

-bin_PROGRAMS=mutter-wayland
+bin_PROGRAMS=mutter

-mutter_wayland_SOURCES = core/mutter.c
-mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
+mutter_SOURCES = core/mutter.c
+mutter_LDADD = $(MUTTER_LIBS) libmutter.la

+if HAVE_WAYLAND
 bin_PROGRAMS+=mutter-launch

 mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h

-mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\"
+mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS)
 mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam

 install-exec-hook:
 	-chown root $(DESTDIR)$(bindir)/mutter-launch
 	-chmod u+s $(DESTDIR)$(bindir)/mutter-launch
+endif

 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
@@ -286,15 +288,15 @@ typelib_DATA = Meta-$(api_version).typelib

 INTROSPECTION_GIRS = Meta-$(api_version).gir

-Meta-$(api_version).gir: libmutter-wayland.la
+Meta-$(api_version).gir: libmutter.la
@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
-@META_GIR@_EXPORT_PACKAGES = libmutter-wayland
+@META_GIR@_EXPORT_PACKAGES = libmutter
@META_GIR@_CFLAGS = $(INCLUDES)
-@META_GIR@_LIBS = libmutter-wayland.la
+@META_GIR@_LIBS = libmutter.la
@META_GIR@_FILES =				\
 	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_wayland_la_SOURCES))
+	$(filter %.c,$(libmutter_la_SOURCES))
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error

 endif
@@ -305,17 +307,22 @@ testasyncgetprop_SOURCES = core/testasyncgetprop.c

 noinst_PROGRAMS=testboxes testgradient testasyncgetprop

-testboxes_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testgradient_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
+testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
+testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la

@INTLTOOL_DESKTOP_RULE@

 desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=mutter-wayland.desktop.in
+desktopfiles_in_files=mutter.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)

+wmpropertiesdir=$(datadir)/gnome/wm-properties
+wmproperties_in_files=mutter-wm.desktop.in
+wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+wmproperties_DATA = $(wmproperties_files)
+
 xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
        50-mutter-navigation.xml.in	\
@@ -323,9 +330,7 @@ xml_in_files = \
        50-mutter-windows.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)

-dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
-
-gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
+gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@

@@ -333,10 +338,9 @@ convertdir = $(datadir)/GConf/gsettings
 convert_DATA = mutter-schemas.convert

 CLEANFILES =					\
-	mutter-wayland.desktop			\
+	mutter.desktop				\
 	mutter-wm.desktop			\
 	org.gnome.mutter.gschema.xml		\
-	org.gnome.mutter.wayland.gschema.xml	\
 	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
@@ -344,7 +348,7 @@ CLEANFILES =					\

 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = libmutter-wayland.pc
+pkgconfig_DATA = libmutter.pc mutter-plugins.pc

 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_files)		\
@@ -353,12 +357,11 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_in_files)	\
 	$(xml_in_files)			\
 	org.gnome.mutter.gschema.xml.in \
-	org.gnome.mutter.wayland.gschema.xml.in \
 	mutter-schemas.convert \
-	libmutter-wayland.pc.in \
+	libmutter.pc.in \
+	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
-	mutter-enum-types.c.in \
-	xrandr.xml idle-monitor.xml
+	mutter-enum-types.c.in

 BUILT_SOURCES = $(mutter_built_sources)
 MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
@@ -390,7 +393,7 @@ $(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
 		--interface-prefix org.gnome.Mutter					\
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-xrandr					\
-		$(srcdir)/xrandr.xml
+		xrandr.xml

 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h

@@ -400,14 +403,13 @@ $(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-idle-monitor				\
 		--c-generate-object-manager						\
-		$(srcdir)/idle-monitor.xml
+		idle-monitor.xml

+if HAVE_WAYLAND
 wayland/%-protocol.c : $(top_builddir)/protocol/%.xml
-	mkdir -p wayland
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
 wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml
-	mkdir -p wayland
 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
 wayland/%-client-protocol.h : $(top_builddir)/protocol/%.xml
-	mkdir -p wayland
 	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+endif
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@@ -50,7 +50,7 @@ meta_create_color_texture_4ub (guint8           red,
  CoglColor color;
  guint8 pixel[4];

-  cogl_color_init_from_4ub (&color, red, green, blue, alpha);
+  cogl_color_set_from_4ub (&color, red, green, blue, alpha);
  cogl_color_premultiply (&color);

  pixel[0] = cogl_color_get_red_byte (&color);
@@ -73,8 +73,10 @@ meta_create_color_texture_4ub (guint8           red,
 * @src_texture: (allow-none): texture to use initially for the layer
 *
 * Creates a pipeline with a single layer. Using a common template
- * makes it easier for Cogl to share a shader for different uses in
- * Mutter.
+ * allows sharing a shader for different uses in Mutter. To share the same
+ * shader with all other pipelines that are just texture plus opacity
+ * would require Cogl fixes.
+ * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
 *
 * Return value: (transfer full): a newly created #CoglPipeline
 */
@@ -84,21 +86,22 @@ meta_create_texture_pipeline (CoglTexture *src_texture)
  static CoglPipeline *texture_pipeline_template = NULL;
  CoglPipeline *pipeline;

-  /* The only state used in the pipeline that would affect the shader
-     generation is the texture type on the layer. Therefore we create
-     a template pipeline which sets this state and all texture
-     pipelines are created as a copy of this. That way Cogl can find
-     the shader state for the pipeline more quickly by looking at the
-     pipeline ancestry instead of resorting to the shader cache. */
+  /* We use a pipeline that has a dummy texture as a base for all
+     texture pipelines. The idea is that only the Cogl texture object
+     would be different in the children so it is likely that Cogl will
+     be able to share GL programs between all the textures. */
  if (G_UNLIKELY (texture_pipeline_template == NULL))
    {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      CoglTexture *dummy_texture;
+      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+
+      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
+                                                     COGL_TEXTURE_NONE);
+

      texture_pipeline_template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
-                                            0, /* layer */
-                                            COGL_TEXTURE_TYPE_2D);
+      cogl_pipeline_set_layer_texture (texture_pipeline_template, 0, dummy_texture);
+      cogl_object_unref (dummy_texture);
    }

  pipeline = cogl_pipeline_copy (texture_pipeline_template);
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -84,9 +84,11 @@
 #include "meta-window-group.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-keyboard.h"
+#endif
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>

@@ -521,8 +523,7 @@ begin_modal_wayland (MetaScreen       *screen,
    }
  if ((options & META_MODAL_KEYBOARD_ALREADY_GRABBED) == 0)
    {
-      if (!meta_wayland_keyboard_begin_modal (&compositor->seat->keyboard,
-                                              timestamp))
+      if (!meta_wayland_keyboard_begin_modal (&compositor->seat->keyboard))
        goto fail;

      keyboard_grabbed = TRUE;
@@ -534,7 +535,7 @@ begin_modal_wayland (MetaScreen       *screen,
  if (pointer_grabbed)
    meta_wayland_pointer_end_modal (&compositor->seat->pointer);
  if (keyboard_grabbed)
-    meta_wayland_keyboard_end_modal (&compositor->seat->keyboard, timestamp);
+    meta_wayland_keyboard_end_modal (&compositor->seat->keyboard);

  return FALSE;
 }
@@ -590,8 +591,7 @@ meta_end_modal_for_plugin (MetaScreen     *screen,
      MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();

      meta_wayland_pointer_end_modal (&compositor->seat->pointer);
-      meta_wayland_keyboard_end_modal (&compositor->seat->keyboard,
-                                       timestamp);
+      meta_wayland_keyboard_end_modal (&compositor->seat->keyboard);
    }
  else
    {
@@ -694,9 +694,11 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  MetaCompScreen *info;
  MetaDisplay    *display       = meta_screen_get_display (screen);
  Display        *xdisplay      = meta_display_get_xdisplay (display);
-  Window          xwin = None;
+  Window          xwin          = None;
  gint            width, height;
+#ifdef HAVE_WAYLAND
  MetaWaylandCompositor *wayland_compositor;
+#endif

  /* Check if the screen is already managed */
  if (meta_screen_get_compositor_data (screen))
@@ -729,6 +731,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  /* We will have already created a stage if running as a wayland
   * compositor... */
+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    {
      wayland_compositor = meta_wayland_compositor_get_default ();
@@ -738,6 +741,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
      clutter_actor_set_size (info->stage, width, height);
    }
  else
+#endif /* HAVE_WAYLAND */
    {
      info->stage = clutter_stage_new ();

@@ -836,6 +840,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

      redirect_windows (compositor, screen);
    }
+
+  clutter_actor_show (info->stage);
 }

 void
@@ -995,8 +1001,8 @@ is_grabbed_event (MetaDisplay *display,
 }

 void
-meta_compositor_window_shape_changed (MetaCompositor *compositor,
-                                      MetaWindow     *window)
+meta_compositor_window_x11_shape_changed (MetaCompositor *compositor,
+                                          MetaWindow     *window)
 {
  MetaWindowActor *window_actor;
  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
@@ -1275,7 +1281,6 @@ sync_actor_stacking (MetaCompScreen *info)
   * we go ahead and do it */

  children = clutter_actor_get_children (info->window_group);
-  has_windows = FALSE;
  reordered = FALSE;

  /* We allow for actors in the window group other than the actors we
@@ -1485,7 +1490,6 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
 				  guint		   width,
 				  guint		   height)
 {
-  MetaDisplay    *display = meta_screen_get_display (screen);
  MetaCompScreen *info    = meta_screen_get_compositor_data (screen);

  if (meta_is_wayland_compositor ())
@@ -1504,6 +1508,7 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
    }
  else
    {
+      MetaDisplay    *display = meta_screen_get_display (screen);
      Display        *xdisplay;
      Window          xwin;

--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@@ -6,9 +6,9 @@
 #include <meta/screen.h>
 #include <meta/meta-background-actor.h>

-void meta_background_actor_set_clip_region  (MetaBackgroundActor *self,
-                                             cairo_region_t      *clip_region);
+void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
+                                                cairo_region_t      *visible_region);

-cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);
+cairo_region_t *meta_background_actor_get_visible_region (MetaBackgroundActor *self);

 #endif /* META_BACKGROUND_ACTOR_PRIVATE_H */
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -44,7 +44,7 @@

 struct _MetaBackgroundActorPrivate
 {
-  cairo_region_t *clip_region;
+  cairo_region_t *visible_region;
 };

 G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);
@@ -54,7 +54,7 @@ meta_background_actor_dispose (GObject *object)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);

-  meta_background_actor_set_clip_region (self, NULL);
+  meta_background_actor_set_visible_region (self, NULL);

  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
@@ -167,17 +167,17 @@ meta_background_actor_new (void)
 }

 /**
- * meta_background_actor_set_clip_region:
+ * meta_background_actor_set_visible_region:
 * @self: a #MetaBackgroundActor
- * @clip_region: (allow-none): the area of the actor (in allocate-relative
+ * @visible_region: (allow-none): the area of the actor (in allocate-relative
 *   coordinates) that is visible.
 *
 * Sets the area of the background that is unobscured by overlapping windows.
 * This is used to optimize and only paint the visible portions.
 */
 void
-meta_background_actor_set_clip_region (MetaBackgroundActor *self,
-                                       cairo_region_t      *clip_region)
+meta_background_actor_set_visible_region (MetaBackgroundActor *self,
+                                          cairo_region_t      *visible_region)
 {
  MetaBackgroundActorPrivate *priv;

@@ -185,16 +185,16 @@ meta_background_actor_set_clip_region (MetaBackgroundActor *self,

  priv = self->priv;

-  g_clear_pointer (&priv->clip_region,
+  g_clear_pointer (&priv->visible_region,
                   (GDestroyNotify)
                   cairo_region_destroy);

-  if (clip_region)
-    priv->clip_region = cairo_region_copy (clip_region);
+  if (visible_region)
+    priv->visible_region = cairo_region_copy (visible_region);
 }

 /**
- * meta_background_actor_get_clip_region:
+ * meta_background_actor_get_visible_region:
 * @self: a #MetaBackgroundActor
 *
 * Return value (transfer full): a #cairo_region_t that represents the part of
@@ -202,16 +202,16 @@ meta_background_actor_set_clip_region (MetaBackgroundActor *self,
 * #MetaWindowActor objects.
 */
 cairo_region_t *
-meta_background_actor_get_clip_region (MetaBackgroundActor *self)
+meta_background_actor_get_visible_region (MetaBackgroundActor *self)
 {
  MetaBackgroundActorPrivate *priv = self->priv;
  ClutterActorBox content_box;
  cairo_rectangle_int_t content_area = { 0 };
-  cairo_region_t *clip_region;
+  cairo_region_t *visible_region;

  g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);

-  if (!priv->clip_region)
+  if (!priv->visible_region)
      return NULL;

  clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
@@ -221,8 +221,8 @@ meta_background_actor_get_clip_region (MetaBackgroundActor *self)
  content_area.width = content_box.x2 - content_box.x1;
  content_area.height = content_box.y2 - content_box.y1;

-  clip_region = cairo_region_create_rectangle (&content_area);
-  cairo_region_intersect (clip_region, priv->clip_region);
+  visible_region = cairo_region_create_rectangle (&content_area);
+  cairo_region_intersect (visible_region, priv->visible_region);

-  return clip_region;
+  return visible_region;
 }
--- a/src/compositor/meta-background-group-private.h
+++ b/src/compositor/meta-background-group-private.h
@@ -6,6 +6,6 @@
 #include <meta/screen.h>
 #include <meta/meta-background-group.h>

-void meta_background_group_set_clip_region  (MetaBackgroundGroup *self,
-                                             cairo_region_t      *visible_region);
+void meta_background_group_set_visible_region  (MetaBackgroundGroup *self,
+                                                cairo_region_t      *visible_region);
 #endif /* META_BACKGROUND_GROUP_PRIVATE_H */
--- a/src/compositor/meta-background-group.c
+++ b/src/compositor/meta-background-group.c
@@ -62,16 +62,16 @@ meta_background_group_init (MetaBackgroundGroup *self)
 }

 /**
- * meta_background_group_set_clip_region:
+ * meta_background_group_set_visible_region:
 * @self: a #MetaBackgroundGroup
- * @region: (allow-none): the parts of the background to paint
+ * @visible_region: (allow-none): the parts of the background to paint
 *
 * Sets the area of the backgrounds that is unobscured by overlapping windows.
 * This is used to optimize and only paint the visible portions.
 */
 void
-meta_background_group_set_clip_region (MetaBackgroundGroup *self,
-                                       cairo_region_t      *region)
+meta_background_group_set_visible_region (MetaBackgroundGroup *self,
+                                          cairo_region_t      *region)
 {
  GList *children, *l;

@@ -82,7 +82,7 @@ meta_background_group_set_clip_region (MetaBackgroundGroup *self,

      if (META_IS_BACKGROUND_ACTOR (actor))
        {
-          meta_background_actor_set_clip_region (META_BACKGROUND_ACTOR (actor), region);
+          meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (actor), region);
        }
      else if (META_IS_BACKGROUND_GROUP (actor))
        {
@@ -92,7 +92,7 @@ meta_background_group_set_clip_region (MetaBackgroundGroup *self,
            continue;

          cairo_region_translate (region, -x, -y);
-          meta_background_group_set_clip_region (META_BACKGROUND_GROUP (actor), region);
+          meta_background_group_set_visible_region (META_BACKGROUND_GROUP (actor), region);
          cairo_region_translate (region, x, y);
        }
    }
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
@@ -412,13 +412,13 @@ meta_background_paint_content (ClutterContent   *content,
   */
  if (META_IS_BACKGROUND_ACTOR (actor))
    {
-      cairo_region_t *clip_region;
-      clip_region = meta_background_actor_get_clip_region (META_BACKGROUND_ACTOR (actor));
+      cairo_region_t *visible_region;
+      visible_region = meta_background_actor_get_visible_region (META_BACKGROUND_ACTOR (actor));

-      if (clip_region != NULL)
+      if (visible_region != NULL)
        {
-          cairo_region_intersect (paintable_region, clip_region);
-          cairo_region_destroy (clip_region);
+          cairo_region_intersect (paintable_region, visible_region);
+          cairo_region_destroy (visible_region);
        }
    }

@@ -1031,6 +1031,7 @@ meta_background_load_file_finish (MetaBackground  *self,
                                  GAsyncResult    *result,
                                  GError         **error)
 {
+  static CoglUserDataKey key;
  GTask *task;
  LoadFileTaskData *task_data;
  CoglTexture *texture;
@@ -1076,6 +1077,12 @@ meta_background_load_file_finish (MetaBackground  *self,
      goto out;
    }

+  cogl_object_set_user_data (COGL_OBJECT (texture),
+                             &key,
+                             g_object_ref (pixbuf),
+                             (CoglUserDataDestroyCallback)
+                             g_object_unref);
+
  ensure_pipeline (self);
  unset_texture (self);
  set_style (self, task_data->style);
--- a/src/compositor/meta-module.c
+++ b/src/compositor/meta-module.c
@@ -192,7 +192,10 @@ meta_module_class_init (MetaModuleClass *klass)
 static void
 meta_module_init (MetaModule *self)
 {
-  self->priv = META_MODULE_GET_PRIVATE (self);
+  MetaModulePrivate *priv;
+
+  self->priv = priv = META_MODULE_GET_PRIVATE (self);
+
 }

 GType
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -138,7 +138,9 @@ meta_plugin_class_init (MetaPluginClass *klass)
 static void
 meta_plugin_init (MetaPlugin *self)
 {
-  self->priv = META_PLUGIN_GET_PRIVATE (self);
+  MetaPluginPrivate *priv;
+
+  self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
 }

 gboolean
--- a/src/compositor/meta-shaped-texture-private.h
+++ b/src/compositor/meta-shaped-texture-private.h
@@ -1,44 +0,0 @@
-/*
- * shaped texture
- *
- * An actor to draw a texture clipped to a list of rectangles
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * Copyright (C) 2008 Intel Corporation
- *               2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __META_SHAPED_TEXTURE_PRIVATE_H__
-#define __META_SHAPED_TEXTURE_PRIVATE_H__
-
-#include <meta/meta-shaped-texture.h>
-#include "meta-wayland-private.h"
-
-ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow);
-ClutterActor *meta_shaped_texture_new_with_wayland_surface  (MetaWaylandSurface *surface);
-void meta_shaped_texture_set_wayland_surface                (MetaShapedTexture  *stex,
-                                                             MetaWaylandSurface *surface);
-MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex);
-
-void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
-                                     Pixmap             pixmap);
-void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
-                                                MetaWaylandBuffer  *buffer);
-
-#endif
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -33,9 +33,10 @@
 #include <meta/util.h>
 #include "meta-texture-tower.h"

-#include "meta-shaped-texture-private.h"
+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
 #include <cogl/cogl-wayland-server.h>
+#endif

 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
@@ -63,7 +64,9 @@ static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, Clutte
 typedef enum _MetaShapedTextureType
 {
  META_SHAPED_TEXTURE_TYPE_X11_PIXMAP,
+#ifdef HAVE_WAYLAND
  META_SHAPED_TEXTURE_TYPE_WAYLAND_SURFACE,
+#endif
 } MetaShapedTextureType;


@@ -83,18 +86,21 @@ struct _MetaShapedTexturePrivate
    struct {
      Pixmap pixmap;
    } x11;
+#ifdef HAVE_WAYLAND
    struct {
      MetaWaylandSurface *surface;
    } wayland;
+#endif
  };

  CoglTexture *texture;

  CoglTexture *mask_texture;
+  CoglPipeline *pipeline;
+  CoglPipeline *pipeline_unshaped;

  cairo_region_t *clip_region;
  cairo_region_t *input_shape_region;
-  cairo_region_t *opaque_region;

  guint tex_width, tex_height;

@@ -144,6 +150,8 @@ meta_shaped_texture_dispose (GObject *object)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;

+  g_clear_pointer (&priv->pipeline, cogl_object_unref);
+  g_clear_pointer (&priv->pipeline_unshaped, cogl_object_unref);
  g_clear_pointer (&priv->texture, cogl_object_unref);

  meta_shaped_texture_set_mask_texture (self, NULL);
@@ -152,76 +160,6 @@ meta_shaped_texture_dispose (GObject *object)
  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }

-static CoglPipeline *
-get_unmasked_pipeline (CoglContext *ctx)
-{
-  return cogl_pipeline_new (ctx);
-}
-
-static CoglPipeline *
-get_masked_pipeline (CoglContext *ctx)
-{
-  static CoglPipeline *template = NULL;
-  if (G_UNLIKELY (template == NULL))
-    {
-      template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_combine (template, 1,
-                                       "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
-                                       NULL);
-    }
-
-  return cogl_pipeline_copy (template);
-}
-
-static CoglPipeline *
-get_unblended_pipeline (CoglContext *ctx)
-{
-  static CoglPipeline *template = NULL;
-  if (G_UNLIKELY (template == NULL))
-    {
-      CoglColor color;
-      template = cogl_pipeline_new (ctx);
-      cogl_color_init_from_4ub (&color, 255, 255, 255, 255);
-      cogl_pipeline_set_blend (template,
-                               "RGBA = ADD (SRC_COLOR, 0)",
-                               NULL);
-      cogl_pipeline_set_color (template, &color);
-    }
-
-  return cogl_pipeline_copy (template);
-}
-
-static void
-paint_clipped_rectangle (CoglFramebuffer       *fb,
-                         CoglPipeline          *pipeline,
-                         cairo_rectangle_int_t *rect,
-                         ClutterActorBox       *alloc)
-{
-  float coords[8];
-  float x1, y1, x2, y2;
-
-  x1 = rect->x;
-  y1 = rect->y;
-  x2 = rect->x + rect->width;
-  y2 = rect->y + rect->height;
-
-  coords[0] = rect->x / (alloc->x2 - alloc->x1);
-  coords[1] = rect->y / (alloc->y2 - alloc->y1);
-  coords[2] = (rect->x + rect->width) / (alloc->x2 - alloc->x1);
-  coords[3] = (rect->y + rect->height) / (alloc->y2 - alloc->y1);
-
-  coords[4] = coords[0];
-  coords[5] = coords[1];
-  coords[6] = coords[2];
-  coords[7] = coords[3];
-
-  cogl_framebuffer_draw_multitextured_rectangle (fb, pipeline,
-                                                 x1, y1, x2, y2,
-                                                 &coords[0], 8);
-
-}
-
-
 static void
 set_cogl_texture (MetaShapedTexture *stex,
                  CoglTexture       *cogl_tex)
@@ -238,6 +176,12 @@ set_cogl_texture (MetaShapedTexture *stex,

  priv->texture = cogl_tex;

+  if (priv->pipeline != NULL)
+    cogl_pipeline_set_layer_texture (priv->pipeline, 0, COGL_TEXTURE (cogl_tex));
+
+  if (priv->pipeline_unshaped != NULL)
+    cogl_pipeline_set_layer_texture (priv->pipeline_unshaped, 0, COGL_TEXTURE (cogl_tex));
+
  if (cogl_tex != NULL)
    {
      width = cogl_texture_get_width (COGL_TEXTURE (cogl_tex));
@@ -271,14 +215,14 @@ meta_shaped_texture_paint (ClutterActor *actor)
 {
  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
  MetaShapedTexturePrivate *priv = stex->priv;
-  guint tex_width, tex_height;
-  guchar opacity;
-  CoglContext *ctx;
-  CoglFramebuffer *fb;
-  CoglPipeline *pipeline = NULL;
  CoglTexture *paint_tex;
+  guint tex_width, tex_height;
  ClutterActorBox alloc;
-  cairo_region_t *blended_region = NULL;
+
+  static CoglPipeline *pipeline_template = NULL;
+  static CoglPipeline *pipeline_unshaped_template = NULL;
+
+  CoglPipeline *pipeline;

  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
    return;
@@ -315,74 +259,38 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;

-  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  fb = cogl_get_draw_framebuffer ();
-
-  opacity = clutter_actor_get_paint_opacity (actor);
-  clutter_actor_get_allocation_box (actor, &alloc);
-
-  if (priv->opaque_region != NULL && opacity == 255)
-    {
-      CoglPipeline *opaque_pipeline;
-      cairo_region_t *region;
-      int n_rects;
-      int i;
-
-      if (priv->clip_region != NULL)
-        {
-          region = cairo_region_copy (priv->clip_region);
-          cairo_region_intersect (region, priv->opaque_region);
-        }
-      else
-        {
-          region = cairo_region_reference (priv->opaque_region);
-        }
-
-      if (cairo_region_is_empty (region))
-        goto paint_blended;
-
-      opaque_pipeline = get_unblended_pipeline (ctx);
-      cogl_pipeline_set_layer_texture (opaque_pipeline, 0, paint_tex);
-
-      n_rects = cairo_region_num_rectangles (region);
-      for (i = 0; i < n_rects; i++)
-        {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (region, i, &rect);
-          paint_clipped_rectangle (fb, opaque_pipeline, &rect, &alloc);
-        }
-
-      cogl_object_unref (opaque_pipeline);
-
-      if (priv->clip_region != NULL)
-        {
-          blended_region = cairo_region_copy (priv->clip_region);
-        }
-      else
-        {
-          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-          blended_region = cairo_region_create_rectangle (&rect);
-        }
-
-      cairo_region_subtract (blended_region, priv->opaque_region);
-
-    paint_blended:
-      cairo_region_destroy (region);
-    }
-
-  if (blended_region == NULL && priv->clip_region != NULL)
-    blended_region = cairo_region_reference (priv->clip_region);
-
-  if (blended_region != NULL && cairo_region_is_empty (blended_region))
-    goto out;
-
  if (priv->mask_texture == NULL)
    {
-      pipeline = get_unmasked_pipeline (ctx);
+      /* Use a single-layer texture if we don't have a mask. */
+
+      if (priv->pipeline_unshaped == NULL)
+        {
+          if (G_UNLIKELY (pipeline_unshaped_template == NULL))
+            {
+              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+              pipeline_unshaped_template = cogl_pipeline_new (ctx);
+            }
+
+          priv->pipeline_unshaped = cogl_pipeline_copy (pipeline_unshaped_template);
+        }
+        pipeline = priv->pipeline_unshaped;
    }
  else
    {
-      pipeline = get_masked_pipeline (ctx);
+      if (priv->pipeline == NULL)
+	{
+	   if (G_UNLIKELY (pipeline_template == NULL))
+	    {
+              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+	      pipeline_template =  cogl_pipeline_new (ctx);
+	      cogl_pipeline_set_layer_combine (pipeline_template, 1,
+					   "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
+					   NULL);
+	    }
+	  priv->pipeline = cogl_pipeline_copy (pipeline_template);
+	}
+      pipeline = priv->pipeline;
+
      cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture);
    }

@@ -390,50 +298,66 @@ meta_shaped_texture_paint (ClutterActor *actor)

  {
    CoglColor color;
-    cogl_color_init_from_4ub (&color, opacity, opacity, opacity, opacity);
+    guchar opacity = clutter_actor_get_paint_opacity (actor);
+    cogl_color_set_from_4ub (&color, opacity, opacity, opacity, opacity);
    cogl_pipeline_set_color (pipeline, &color);
  }

-  if (blended_region != NULL)
+  cogl_set_source (pipeline);
+
+  clutter_actor_get_allocation_box (actor, &alloc);
+
+  if (priv->clip_region)
    {
      int n_rects;
+      int i;
+      cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };

      /* Limit to how many separate rectangles we'll draw; beyond this just
       * fall back and draw the whole thing */
 #     define MAX_RECTS 16

-      n_rects = cairo_region_num_rectangles (blended_region);
+      n_rects = cairo_region_num_rectangles (priv->clip_region);
      if (n_rects <= MAX_RECTS)
 	{
-          int i;
-          cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };
+	  float coords[8];
+          float x1, y1, x2, y2;

 	  for (i = 0; i < n_rects; i++)
 	    {
 	      cairo_rectangle_int_t rect;

-	      cairo_region_get_rectangle (blended_region, i, &rect);
+	      cairo_region_get_rectangle (priv->clip_region, i, &rect);

 	      if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
 		continue;

-              paint_clipped_rectangle (fb, pipeline, &rect, &alloc);
+	      x1 = rect.x;
+	      y1 = rect.y;
+	      x2 = rect.x + rect.width;
+	      y2 = rect.y + rect.height;
+
+	      coords[0] = rect.x / (alloc.x2 - alloc.x1);
+	      coords[1] = rect.y / (alloc.y2 - alloc.y1);
+	      coords[2] = (rect.x + rect.width) / (alloc.x2 - alloc.x1);
+	      coords[3] = (rect.y + rect.height) / (alloc.y2 - alloc.y1);
+
+              coords[4] = coords[0];
+              coords[5] = coords[1];
+              coords[6] = coords[2];
+              coords[7] = coords[3];
+
+              cogl_rectangle_with_multitexture_coords (x1, y1, x2, y2,
+                                                       &coords[0], 8);
            }

-          goto out;
+	  return;
 	}
    }

-  cogl_framebuffer_draw_rectangle (fb, pipeline,
-                                   0, 0,
-                                   alloc.x2 - alloc.x1,
-                                   alloc.y2 - alloc.y1);
-
- out:
-  if (pipeline != NULL)
-    cogl_object_unref (pipeline);
-  if (blended_region != NULL)
-    cairo_region_destroy (blended_region);
+  cogl_rectangle (0, 0,
+		  alloc.x2 - alloc.x1,
+		  alloc.y2 - alloc.y1);
 }

 static void
@@ -449,16 +373,13 @@ meta_shaped_texture_pick (ClutterActor       *actor,

  /* If there is no region then use the regular pick */
  if (priv->input_shape_region == NULL)
-    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)->pick (actor, color);
+    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
+      ->pick (actor, color);
  else
    {
      int n_rects;
      float *rectangles;
      int i;
-      CoglPipeline *pipeline;
-      CoglContext *ctx;
-      CoglFramebuffer *fb;
-      CoglColor cogl_color;

      /* Note: We don't bother trying to intersect the pick and clip regions
       * since needing to copy the region, do the intersection, and probably
@@ -487,17 +408,12 @@ meta_shaped_texture_pick (ClutterActor       *actor,
          rectangles[pos + 3] = rect.y + rect.height;
        }

-      ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      fb = cogl_get_draw_framebuffer ();
+      cogl_set_source_color4ub (color->red,
+                                color->green,
+                                color->blue,
+                                color->alpha);

-      cogl_color_init_from_4ub (&cogl_color, color->red, color->green, color->blue, color->alpha);
-
-      pipeline = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_color (pipeline, &cogl_color);
-
-      cogl_framebuffer_draw_rectangles (fb, pipeline,
-                                        rectangles, n_rects);
-      cogl_object_unref (pipeline);
+      cogl_rectangles (rectangles, n_rects);
    }
 }

@@ -546,6 +462,7 @@ meta_shaped_texture_get_paint_volume (ClutterActor *self,
  return clutter_paint_volume_set_from_allocation (volume, self);
 }

+#ifdef HAVE_WAYLAND
 ClutterActor *
 meta_shaped_texture_new_with_wayland_surface (MetaWaylandSurface *surface)
 {
@@ -581,6 +498,7 @@ meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex)
  MetaShapedTexturePrivate *priv = stex->priv;
  return priv->wayland.surface;
 }
+#endif /* HAVE_WAYLAND */

 ClutterActor *
 meta_shaped_texture_new_with_xwindow (Window xwindow)
@@ -630,6 +548,7 @@ meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

+#ifdef HAVE_WAYLAND
 static void
 wayland_surface_update_area (MetaShapedTexture *stex,
                             int                x,
@@ -689,20 +608,21 @@ wayland_surface_update_area (MetaShapedTexture *stex,
        }
    }
 }
+#endif /* HAVE_WAYLAND */

 static void
-get_clip (MetaShapedTexture *stex,
-          int x,
-          int y,
-          int width,
-          int height,
-          cairo_rectangle_int_t *clip)
+queue_damage_redraw_with_clip (MetaShapedTexture *stex,
+                               int x,
+                               int y,
+                               int width,
+                               int height)
 {
  ClutterActor *self = CLUTTER_ACTOR (stex);
  MetaShapedTexturePrivate *priv;
  ClutterActorBox allocation;
  float scale_x;
  float scale_y;
+  cairo_rectangle_int_t clip;

  /* NB: clutter_actor_queue_redraw_with_clip expects a box in the actor's
   * coordinate space so we need to convert from surface coordinates to
@@ -731,45 +651,26 @@ get_clip (MetaShapedTexture *stex,
  scale_x = (allocation.x2 - allocation.x1) / priv->tex_width;
  scale_y = (allocation.y2 - allocation.y1) / priv->tex_height;

-  clip->x = x * scale_x;
-  clip->y = y * scale_y;
-  clip->width = width * scale_x;
-  clip->height = height * scale_y;
+  clip.x = x * scale_x;
+  clip.y = y * scale_y;
+  clip.width = width * scale_x;
+  clip.height = height * scale_y;
+  clutter_actor_queue_redraw_with_clip (self, &clip);
 }

-/**
- * meta_shaped_texture_update_area:
- * @stex: #MetaShapedTexture
- * @x: the x coordinate of the damaged area
- * @y: the y coordinate of the damaged area
- * @width: the width of the damaged area
- * @height: the height of the damaged area
- * @unobscured_region: The unobscured region of the window or %NULL if
- * there is no valid one (like when the actor is transformed or
- * has a mapped clone)
- *
- * Repairs the damaged area indicated by @x, @y, @width and @height
- * and queues a redraw for the intersection @visibible_region and
- * the damage area. If @visibible_region is %NULL a redraw will always
- * get queued.
- *
- * Return value: Whether a redraw have been queued or not
- */
-gboolean
+void
 meta_shaped_texture_update_area (MetaShapedTexture *stex,
-				 int                x,
-				 int                y,
-				 int                width,
-				 int                height,
-				 cairo_region_t    *unobscured_region)
+                                 int                x,
+                                 int                y,
+                                 int                width,
+                                 int                height)
 {
  MetaShapedTexturePrivate *priv;
-  cairo_rectangle_int_t clip;

  priv = stex->priv;

  if (priv->texture == NULL)
-    return FALSE;
+    return;

  switch (priv->type)
    {
@@ -777,43 +678,16 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
      cogl_texture_pixmap_x11_update_area (COGL_TEXTURE_PIXMAP_X11 (priv->texture),
                                           x, y, width, height);
      break;
+#ifdef HAVE_WAYLAND
    case META_SHAPED_TEXTURE_TYPE_WAYLAND_SURFACE:
      wayland_surface_update_area (stex, x, y, width, height);
      break;
+#endif
    }

  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);

-  get_clip (stex, x, y, width, height, &clip);
-
-  if (unobscured_region)
-    {
-      cairo_region_t *intersection;
-
-      if (cairo_region_is_empty (unobscured_region))
-        return FALSE;
-
-      intersection = cairo_region_copy (unobscured_region);
-      cairo_region_intersect_rectangle (intersection, &clip);
-
-      if (!cairo_region_is_empty (intersection))
-        {
-          cairo_rectangle_int_t damage_rect;
-          cairo_region_get_extents (intersection, &damage_rect);
-          clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &damage_rect);
-          cairo_region_destroy (intersection);
-
-          return TRUE;
-        }
-
-      cairo_region_destroy (intersection);
-
-      return FALSE;
-    }
-
-  clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip);
-
-  return TRUE;
+  queue_damage_redraw_with_clip (stex, x, y, width, height);
 }

 /**
@@ -852,6 +726,7 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
                                         COGL_TEXTURE (priv->texture));
 }

+#ifdef HAVE_WAYLAND
 void
 meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
                                           MetaWaylandBuffer  *buffer)
@@ -897,6 +772,7 @@ meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
    meta_texture_tower_set_base_texture (priv->paint_tower,
                                         COGL_TEXTURE (priv->texture));
 }
+#endif /* HAVE_WAYLAND */

 /**
 * meta_shaped_texture_get_texture:
@@ -949,8 +825,8 @@ meta_shaped_texture_set_input_shape_region (MetaShapedTexture *stex,
 /**
 * meta_shaped_texture_set_clip_region:
 * @stex: a #MetaShapedTexture
- * @clip_region: the region of the texture that is visible and
- *   should be painted.
+ * @clip_region: (transfer full): the region of the texture that
+ *   is visible and should be painted.
 *
 * Provides a hint to the texture about what areas of the texture
 * are not completely obscured and thus need to be painted. This
@@ -971,7 +847,10 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
  priv = stex->priv;

  if (priv->clip_region)
-    cairo_region_destroy (priv->clip_region);
+    {
+      cairo_region_destroy (priv->clip_region);
+      priv->clip_region = NULL;
+    }

  if (clip_region)
    priv->clip_region = cairo_region_copy (clip_region);
@@ -979,36 +858,6 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
    priv->clip_region = NULL;
 }

-/**
- * meta_shaped_texture_set_opaque_region:
- * @stex: a #MetaShapedTexture
- * @opaque_region: (transfer full): the region of the texture that
- *   can have blending turned off.
- *
- * As most windows have a large portion that does not require blending,
- * we can easily turn off blending if we know the areas that do not
- * require blending. This sets the region where we will not blend for
- * optimization purposes.
- */
-void
-meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
-                                       cairo_region_t    *opaque_region)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  if (priv->opaque_region)
-    cairo_region_destroy (priv->opaque_region);
-
-  if (opaque_region)
-    priv->opaque_region = cairo_region_reference (opaque_region);
-  else
-    priv->opaque_region = NULL;
-}
-
 /**
 * meta_shaped_texture_get_image:
 * @stex: A #MetaShapedTexture
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -5,8 +5,10 @@

 #include <config.h>

+#ifdef HAVE_WAYLAND
 #include <wayland-server.h>
 #include <meta-wayland-private.h>
+#endif

 #include <X11/extensions/Xdamage.h>
 #include <meta/compositor-mutter.h>
@@ -30,6 +32,7 @@ void meta_window_actor_unmaximize (MetaWindowActor *self,
 void meta_window_actor_process_x11_damage (MetaWindowActor    *self,
                                           XDamageNotifyEvent *event);

+#ifdef HAVE_WAYLAND
 void meta_window_actor_process_wayland_damage (MetaWindowActor *self,
                                               int              x,
                                               int              y,
@@ -39,6 +42,7 @@ void meta_window_actor_set_wayland_surface    (MetaWindowActor    *self,
                                               MetaWaylandSurface *surface);
 void meta_window_actor_attach_wayland_buffer  (MetaWindowActor   *self,
                                               MetaWaylandBuffer *buffer);
+#endif

 void meta_window_actor_pre_paint      (MetaWindowActor    *self);
 void meta_window_actor_post_paint     (MetaWindowActor    *self);
@@ -70,14 +74,11 @@ void     meta_window_actor_queue_frame_drawn   (MetaWindowActor *self,

 cairo_region_t *meta_window_actor_get_obscured_region (MetaWindowActor *self);

-void meta_window_actor_set_clip_region         (MetaWindowActor *self,
-                                                cairo_region_t  *clip_region);
-void meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
-                                                cairo_region_t  *beneath_region);
-void meta_window_actor_reset_clip_regions      (MetaWindowActor *self);
-
-void meta_window_actor_set_unobscured_region      (MetaWindowActor *self,
-                                                   cairo_region_t  *unobscured_region);
+void meta_window_actor_set_visible_region         (MetaWindowActor *self,
+                                                   cairo_region_t  *visible_region);
+void meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
+                                                   cairo_region_t  *beneath_region);
+void meta_window_actor_reset_visible_regions      (MetaWindowActor *self);

 void meta_window_actor_effect_completed (MetaWindowActor *actor,
                                         gulong           event);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -10,6 +10,7 @@

 #include <math.h>

+#include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xrender.h>
@@ -27,13 +28,13 @@
 #include "xprops.h"

 #include "compositor-private.h"
-#include "meta-shaped-texture-private.h"
 #include "meta-shadow-factory-private.h"
 #include "meta-window-actor-private.h"
 #include "meta-texture-rectangle.h"
 #include "region-utils.h"
+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
-#include "monitor-private.h"
+#endif

 enum {
  POSITION_CHANGED,
@@ -71,19 +72,13 @@ struct _MetaWindowActorPrivate
  /* A region that matches the shape of the window, including frame bounds */
  cairo_region_t   *shape_region;
  /* If the window has an input shape, a region that matches the shape */
-  cairo_region_t   *input_region;
+  cairo_region_t   *input_shape_region;
  /* The opaque region, from _NET_WM_OPAQUE_REGION, intersected with
   * the shape region. */
  cairo_region_t   *opaque_region;
  /* The region we should clip to when painting the shadow */
  cairo_region_t   *shadow_clip;

-  /* The region that is visible, used to optimize out redraws */
-  cairo_region_t   *unobscured_region;
-
-  guint              send_frame_messages_timer;
-  gint64             frame_drawn_time;
-
  /* Extracted size-invariant shape used for shadows */
  MetaWindowShape  *shadow_shape;

@@ -193,12 +188,6 @@ static void meta_window_actor_handle_updates (MetaWindowActor *self);

 static void check_needs_reshape (MetaWindowActor *self);

-static void do_send_frame_drawn (MetaWindowActor *self, FrameData *frame);
-static void do_send_frame_timings (MetaWindowActor  *self,
-                                   FrameData        *frame,
-                                   gint             refresh_interval,
-                                   gint64           presentation_time);
-
 G_DEFINE_TYPE (MetaWindowActor, meta_window_actor, CLUTTER_TYPE_ACTOR);

 static void
@@ -369,31 +358,24 @@ meta_window_actor_constructed (GObject *object)
  Window                  xwindow  = priv->xwindow;
  MetaWindow             *window   = priv->window;
  Display                *xdisplay = meta_display_get_xdisplay (display);
+  XRenderPictFormat      *format;

  if (!meta_is_wayland_compositor ())
    priv->damage = XDamageCreate (xdisplay, xwindow,
                                  XDamageReportBoundingBox);

-  if (window->client_type == META_WINDOW_CLIENT_TYPE_X11)
-    {
-      XRenderPictFormat      *format;
+  format = XRenderFindVisualFormat (xdisplay, window->xvisual);

-      format = XRenderFindVisualFormat (xdisplay, window->xvisual);
-
-      if (format && format->type == PictTypeDirect && format->direct.alphaMask)
-        priv->argb32 = TRUE;
-    }
-  else
-    {
-      /* XXX: parse shm formats to determine argb32 */
-      priv->argb32 = TRUE;
-    }
+  if (format && format->type == PictTypeDirect && format->direct.alphaMask)
+    priv->argb32 = TRUE;

  if (!priv->actor)
    {
+#ifdef HAVE_WAYLAND
      if (meta_is_wayland_compositor ())
        priv->actor = meta_shaped_texture_new_with_wayland_surface (window->surface);
      else
+#endif
        priv->actor = meta_shaped_texture_new_with_xwindow (xwindow);

      clutter_actor_add_child (CLUTTER_ACTOR (self), priv->actor);
@@ -410,10 +392,10 @@ meta_window_actor_constructed (GObject *object)
       */
      g_object_ref (priv->actor);

-      g_signal_connect_object (window, "notify::decorated",
-                               G_CALLBACK (window_decorated_notify), self, 0);
-      g_signal_connect_object (window, "notify::appears-focused",
-                               G_CALLBACK (window_appears_focused_notify), self, 0);
+      g_signal_connect (window, "notify::decorated",
+                        G_CALLBACK (window_decorated_notify), self);
+      g_signal_connect (window, "notify::appears-focused",
+                        G_CALLBACK (window_appears_focused_notify), self);
    }
  else
    {
@@ -428,8 +410,8 @@ meta_window_actor_constructed (GObject *object)

  /* Start off with empty regions to maintain the invariant that
     these regions are always set */
-  priv->shape_region = cairo_region_create ();
-  priv->input_region = cairo_region_create ();
+  priv->shape_region = cairo_region_create();
+  priv->input_shape_region = cairo_region_create();
 }

 static void
@@ -451,17 +433,15 @@ meta_window_actor_dispose (GObject *object)
  info     = meta_screen_get_compositor_data (screen);

  if (!meta_is_wayland_compositor ())
-    meta_window_actor_detach_x11_pixmap (self);
-
-  if (priv->send_frame_messages_timer != 0)
    {
-      g_source_remove (priv->send_frame_messages_timer);
-      priv->send_frame_messages_timer = 0;
+      display  = meta_screen_get_display (screen);
+      xdisplay = meta_display_get_xdisplay (display);
+
+      meta_window_actor_detach_x11_pixmap (self);
    }

-  g_clear_pointer (&priv->unobscured_region, cairo_region_destroy);
  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
-  g_clear_pointer (&priv->input_region, cairo_region_destroy);
+  g_clear_pointer (&priv->input_shape_region, cairo_region_destroy);
  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
  g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);

@@ -472,9 +452,6 @@ meta_window_actor_dispose (GObject *object)

  if (!meta_is_wayland_compositor () && priv->damage != None)
    {
-      display  = meta_screen_get_display (screen);
-      xdisplay = meta_display_get_xdisplay (display);
-
      meta_error_trap_push (display);
      XDamageDestroy (xdisplay, priv->damage);
      meta_error_trap_pop (display);
@@ -687,16 +664,6 @@ meta_window_actor_paint (ClutterActor *actor)
  gboolean appears_focused = meta_window_appears_focused (priv->window);
  MetaShadow *shadow = appears_focused ? priv->focused_shadow : priv->unfocused_shadow;

- /* This window got damage when obscured; we set up a timer
-  * to send frame completion events, but since we're drawing
-  * the window now (for some other reason) cancel the timer
-  * and send the completion events normally */
-  if (priv->send_frame_messages_timer != 0)
-    {
-      g_source_remove (priv->send_frame_messages_timer);
-      priv->send_frame_messages_timer = 0;
-    }
-
  if (shadow != NULL)
    {
      MetaShadowParams params;
@@ -767,9 +734,6 @@ meta_window_actor_get_paint_volume (ClutterActor       *actor,
      gdk_rectangle_union (&bounds, &shadow_bounds, &bounds);
    }

-  if (priv->unobscured_region)
-    cairo_region_intersect_rectangle (priv->unobscured_region, &bounds);
-
  origin.x = bounds.x;
  origin.y = bounds.y;
  origin.z = 0.0f;
@@ -962,66 +926,11 @@ meta_window_actor_freeze (MetaWindowActor *self)
    self->priv->freeze_count++;
 }

-static
-gboolean send_frame_messages_timeout (gpointer data)
-{
-  MetaWindowActor *self = (MetaWindowActor *) data;
-  MetaWindowActorPrivate *priv = self->priv;
-  FrameData *frame = g_slice_new0 (FrameData);
-
-  frame->sync_request_serial = priv->window->sync_request_serial;
-
-  do_send_frame_drawn (self, frame);
-  do_send_frame_timings (self, frame, 0, 0);
-
-  priv->needs_frame_drawn = FALSE;
-  priv->send_frame_messages_timer = 0;
-  frame_data_free (frame);
-
-  return FALSE;
-}
-
-static void
-queue_send_frame_messages_timeout (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaScreen  *screen  = priv->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  gint64 current_time = meta_compositor_monotonic_time_to_server_time (display, g_get_monotonic_time ());
-  MetaMonitorManager *monitor_manager = meta_monitor_manager_get ();
-  MetaWindow *window = priv->window;
-
-  MetaOutput *outputs;
-  guint n_outputs, i;
-  float refresh_rate = 60.0f;
-  gint interval, offset;
-
-  outputs = meta_monitor_manager_get_outputs (monitor_manager, &n_outputs);
-  for (i = 0; i < n_outputs; i++)
-    {
-      if (outputs[i].output_id == window->monitor->output_id && outputs[i].crtc)
-        {
-          refresh_rate = outputs[i].crtc->current_mode->refresh_rate;
-          break;
-        }
-    }
-
-  interval = (int)(1000000 / refresh_rate) * 6;
-  offset = MAX (0, current_time - priv->frame_drawn_time + interval) / 1000;
-
- /* The clutter master clock source has already been added with META_PRIORITY_REDRAW,
-  * so the timer will run *after* the clutter frame handling, if a frame is ready
-  * to be drawn when the timer expires.
-  */
-  priv->send_frame_messages_timer = g_timeout_add_full (META_PRIORITY_REDRAW, offset, send_frame_messages_timeout, self, NULL);
-}
-
 static void
 meta_window_actor_damage_all (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
  CoglTexture *texture;
-  gboolean redraw_queued;

  if (!priv->needs_damage_all)
    return;
@@ -1031,16 +940,13 @@ meta_window_actor_damage_all (MetaWindowActor *self)
  if (!priv->mapped || priv->needs_pixmap)
    return;

-  redraw_queued = meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                                   0, 0,
-                                                   cogl_texture_get_width (texture),
-                                                   cogl_texture_get_height (texture),
-                                                   clutter_actor_has_mapped_clones (priv->actor) ?
-                                                   NULL : priv->unobscured_region);
-
-  priv->repaint_scheduled = priv->repaint_scheduled  || redraw_queued;
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   0, 0,
+                                   cogl_texture_get_width (texture),
+                                   cogl_texture_get_height (texture));

  priv->needs_damage_all = FALSE;
+  priv->repaint_scheduled = TRUE;
 }

 static void
@@ -1096,31 +1002,14 @@ meta_window_actor_queue_frame_drawn (MetaWindowActor *self,

  if (!priv->repaint_scheduled)
    {
-      gboolean is_obscured = FALSE;
-
-      /* Find out whether the window is completly obscured */
-      if (priv->unobscured_region)
-        {
-          cairo_region_t *unobscured_window_region;
-          unobscured_window_region = cairo_region_copy (priv->shape_region);
-          cairo_region_intersect (unobscured_window_region, priv->unobscured_region);
-          is_obscured = cairo_region_is_empty (unobscured_window_region);
-          cairo_region_destroy (unobscured_window_region);
-        }
-
      /* A frame was marked by the client without actually doing any
-       * damage or any unobscured, or while we had the window frozen
-       * (e.g. during an interactive resize.) We need to make sure that the
+       * damage, or while we had the window frozen (e.g. during an
+       * interactive resize.) We need to make sure that the
       * pre_paint/post_paint functions get called, enabling us to
       * send a _NET_WM_FRAME_DRAWN. We do a 1-pixel redraw to get
-       * consistent timing with non-empty frames. If the window
-       * is completely obscured we fire off the send_frame_messages timeout.
+       * consistent timing with non-empty frames.
       */
-      if (is_obscured)
-        {
-          queue_send_frame_messages_timeout (self);
-        }
-      else if (priv->mapped && (!meta_is_wayland_compositor () || !priv->needs_pixmap))
+      if (priv->mapped && (!meta_is_wayland_compositor () || !priv->needs_pixmap))
        {
          const cairo_rectangle_int_t clip = { 0, 0, 1, 1 };
          clutter_actor_queue_redraw_with_clip (priv->actor, &clip);
@@ -1374,7 +1263,7 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
  if (priv->opacity != 0xff)
    return FALSE;

-  if (metaWindow->shape_region != NULL)
+  if (metaWindow->has_shape)
    return FALSE;

  if (priv->argb32 && !meta_window_requested_bypass_compositor (metaWindow))
@@ -1431,8 +1320,10 @@ meta_window_actor_destroy (MetaWindowActor *self)

  priv = self->priv;

+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    meta_shaped_texture_set_wayland_surface (META_SHAPED_TEXTURE (priv->actor), NULL);
+#endif

  window = priv->window;
  window_type = meta_window_get_window_type (window);
@@ -1676,12 +1567,14 @@ meta_window_actor_new (MetaWindow *window)

      meta_verbose ("add window: Meta %p, xwin 0x%x\n", window, (guint)top_window);
    }
+#ifdef HAVE_WAYLAND
  else
    {
      meta_verbose ("add window: Meta %p, wayland surface %p\n",
                    window, window->surface);
      top_window = None;
    }
+#endif

  self = g_object_new (META_TYPE_WINDOW_ACTOR,
                       "meta-window",         window,
@@ -1690,13 +1583,13 @@ meta_window_actor_new (MetaWindow *window)
                       NULL);

  priv = self->priv;
-  priv->mapped = meta_window_toplevel_is_mapped (priv->window);

  if (!meta_is_wayland_compositor ())
    {
      priv->last_width = -1;
      priv->last_height = -1;

+      priv->mapped = meta_window_toplevel_is_mapped (priv->window);
      if (priv->mapped)
        meta_window_actor_queue_create_x11_pixmap (self);

@@ -1840,67 +1733,40 @@ see_region (cairo_region_t *region,
 #endif

 /**
- * meta_window_actor_set_unobscured_region:
+ * meta_window_actor_set_visible_region:
 * @self: a #MetaWindowActor
- * @unobscured_region: the region of the screen that isn't completely
- *  obscured.
- *
- * Provides a hint as to what areas of the window need to queue
- * redraws when damaged. Regions not in @unobscured_region are completely obscured.
- * Unlike meta_window_actor_set_clip_region(), the region here
- * doesn't take into account any clipping that is in effect while drawing.
- */
-void
-meta_window_actor_set_unobscured_region (MetaWindowActor *self,
-                                         cairo_region_t  *unobscured_region)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-
-  if (priv->unobscured_region)
-    cairo_region_destroy (priv->unobscured_region);
-
-  if (unobscured_region)
-    priv->unobscured_region = cairo_region_copy (unobscured_region);
-  else
-    priv->unobscured_region = NULL;
-}
-
-/**
- * meta_window_actor_set_clip_region:
- * @self: a #MetaWindowActor
- * @clip_region: the region of the screen that isn't completely
+ * @visible_region: the region of the screen that isn't completely
 *  obscured.
 *
 * Provides a hint as to what areas of the window need to be
- * drawn. Regions not in @clip_region are completely obscured or
- * not drawn in this frame.
+ * drawn. Regions not in @visible_region are completely obscured.
 * This will be set before painting then unset afterwards.
 */
 void
-meta_window_actor_set_clip_region (MetaWindowActor *self,
-                                   cairo_region_t  *clip_region)
+meta_window_actor_set_visible_region (MetaWindowActor *self,
+                                      cairo_region_t  *visible_region)
 {
  MetaWindowActorPrivate *priv = self->priv;

  meta_shaped_texture_set_clip_region (META_SHAPED_TEXTURE (priv->actor),
-                                       clip_region);
+                                       visible_region);
 }

 /**
- * meta_window_actor_set_clip_region_beneath:
+ * meta_window_actor_set_visible_region_beneath:
 * @self: a #MetaWindowActor
- * @clip_region: the region of the screen that isn't completely
+ * @visible_region: the region of the screen that isn't completely
 *  obscured beneath the main window texture.
 *
 * Provides a hint as to what areas need to be drawn *beneath*
- * the main window texture.  This is the relevant clip region
+ * the main window texture.  This is the relevant visible region
 * when drawing the shadow, properly accounting for areas of the
 * shadow hid by the window itself. This will be set before painting
 * then unset afterwards.
 */
 void
-meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
-                                           cairo_region_t  *beneath_region)
+meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
+                                              cairo_region_t  *beneath_region)
 {
  MetaWindowActorPrivate *priv = self->priv;
  gboolean appears_focused = meta_window_appears_focused (priv->window);
@@ -1919,14 +1785,14 @@ meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
 }

 /**
- * meta_window_actor_reset_clip_regions:
+ * meta_window_actor_reset_visible_regions:
 * @self: a #MetaWindowActor
 *
- * Unsets the regions set by meta_window_actor_set_clip_region() and
- * meta_window_actor_set_clip_region_beneath()
+ * Unsets the regions set by meta_window_actor_set_visible_region() and
+ * meta_window_actor_set_visible_region_beneath()
 */
 void
-meta_window_actor_reset_clip_regions (MetaWindowActor *self)
+meta_window_actor_reset_visible_regions (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

@@ -2101,7 +1967,6 @@ meta_window_actor_process_x11_damage (MetaWindowActor    *self,
 {
  MetaWindowActorPrivate *priv = self->priv;
  MetaCompScreen *info = meta_screen_get_compositor_data (priv->screen);
-  gboolean redraw_queued;

  priv->received_x11_damage = TRUE;

@@ -2149,18 +2014,15 @@ meta_window_actor_process_x11_damage (MetaWindowActor    *self,
  if (!priv->mapped || priv->needs_pixmap)
    return;

-  redraw_queued = meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                                   event->area.x,
-                                                   event->area.y,
-                                                   event->area.width,
-                                                   event->area.height,
-                                                   clutter_actor_has_mapped_clones (priv->actor) ?
-                                                   NULL : priv->unobscured_region);
-
-  priv->repaint_scheduled = priv->repaint_scheduled  || redraw_queued;
-
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   event->area.x,
+                                   event->area.y,
+                                   event->area.width,
+                                   event->area.height);
+  priv->repaint_scheduled = TRUE;
 }

+#ifdef HAVE_WAYLAND
 void
 meta_window_actor_process_wayland_damage (MetaWindowActor *self,
                                          int x,
@@ -2169,18 +2031,15 @@ meta_window_actor_process_wayland_damage (MetaWindowActor *self,
                                          int height)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  gboolean redraw_queued;

  if (!priv->mapped)
    return;

-  redraw_queued = meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                                   x, y, width, height,
-                                                   clutter_actor_has_mapped_clones (priv->actor) ?
-                                                   NULL : priv->unobscured_region);
-
-  priv->repaint_scheduled = priv->repaint_scheduled  || redraw_queued;
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   x, y, width, height);
+  priv->repaint_scheduled = TRUE;
 }
+#endif

 void
 meta_window_actor_sync_visibility (MetaWindowActor *self)
@@ -2321,65 +2180,85 @@ build_and_scan_frame_mask (MetaWindowActor       *self,
  g_free (mask_data);
 }

+static cairo_region_t *
+region_create_from_x_rectangles (const XRectangle *rects,
+                                 int n_rects,
+                                 int dx,
+                                 int dy)
+{
+  int i;
+  cairo_rectangle_int_t *cairo_rects = g_newa (cairo_rectangle_int_t, n_rects);
+
+  for (i = 0; i < n_rects; i ++)
+    {
+      cairo_rects[i].x = rects[i].x + dx;
+      cairo_rects[i].y = rects[i].y + dy;
+      cairo_rects[i].width = rects[i].width;
+      cairo_rects[i].height = rects[i].height;
+    }
+
+  return cairo_region_create_rectangles (cairo_rects, n_rects);
+}
+
 static void
-meta_window_actor_update_shape_region (MetaWindowActor       *self,
-                                       cairo_rectangle_int_t *client_area)
+meta_window_actor_update_x11_shape_region (MetaWindowActor *self,
+                                           cairo_rectangle_int_t *client_area)
 {
  MetaWindowActorPrivate *priv = self->priv;
  cairo_region_t *region = NULL;
+  gboolean needs_mask;

-  if (priv->window->frame != NULL && priv->window->shape_region != NULL)
+  if (priv->shadow_shape != NULL)
    {
-      region = cairo_region_copy (priv->window->shape_region);
-      cairo_region_translate (region, client_area->x, client_area->y);
-    }
-  else if (priv->window->shape_region != NULL)
-    {
-      region = cairo_region_reference (priv->window->shape_region);
-    }
-  else
-    {
-      /* If we don't have a shape on the server, that means that
-       * we have an implicit shape of one rectangle covering the
-       * entire window. */
-      region = cairo_region_create_rectangle (client_area);
+      meta_window_shape_unref (priv->shadow_shape);
+      priv->shadow_shape = NULL;
    }

  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), NULL);
-  if ((priv->window->shape_region != NULL) || (priv->window->frame != NULL))
-    build_and_scan_frame_mask (self, client_area, region);
-
  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
-  priv->shape_region = region;
+  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);

-  g_clear_pointer (&priv->shadow_shape, meta_window_shape_unref);
-
-  meta_window_actor_invalidate_shadow (self);
-}
-
-static void
-meta_window_actor_update_input_region (MetaWindowActor       *self,
-                                       cairo_rectangle_int_t *client_area)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaShapedTexture *stex = META_SHAPED_TEXTURE (priv->actor);
-  cairo_region_t *region = NULL;
-
-  if (priv->window->frame != NULL && priv->window->input_region != NULL)
+#ifdef HAVE_SHAPE
+  if (priv->window->has_shape)
    {
-      region = meta_frame_get_frame_bounds (priv->window->frame);
+      /* Translate the set of XShape rectangles that we
+       * get from the X server to a cairo_region. */
+      MetaScreen *screen = priv->screen;
+      MetaDisplay *display = meta_screen_get_display (screen);
+      Display *xdisplay = meta_display_get_xdisplay (display);
+      XRectangle *rects;
+      int n_rects, ordering;

-      cairo_region_subtract_rectangle (region, client_area);
+      meta_error_trap_push (display);
+      rects = XShapeGetRectangles (xdisplay,
+                                   priv->window->xwindow,
+                                   ShapeBounding,
+                                   &n_rects,
+                                   &ordering);
+      meta_error_trap_pop (display);

-      /* input_region is in client window coordinates, so translate the
-       * input region into that coordinate system and back */
-      cairo_region_translate (region, -client_area->x, -client_area->y);
-      cairo_region_union (region, priv->window->input_region);
-      cairo_region_translate (region, client_area->x, client_area->y);
+      if (rects)
+        {
+          region = region_create_from_x_rectangles (rects, n_rects,
+                                                    client_area->x,
+                                                    client_area->y);
+          XFree (rects);
+        }
    }
-  else if (priv->window->shape_region != NULL)
+#endif
+
+  needs_mask = (region != NULL) || (priv->window->frame != NULL);
+
+  if (region != NULL)
    {
-      region = cairo_region_reference (priv->window->input_region);
+      /* The shape we get back from the client may have coordinates
+       * outside of the frame. The X SHAPE Extension requires that
+       * the overall shape the client provides never exceeds the
+       * "bounding rectangle" of the window -- the shape that the
+       * window would have gotten if it was unshaped. In our case,
+       * this is simply the client area.
+       */
+      cairo_region_intersect_rectangle (region, client_area);
    }
  else
    {
@@ -2389,23 +2268,11 @@ meta_window_actor_update_input_region (MetaWindowActor       *self,
      region = cairo_region_create_rectangle (client_area);
    }

-  meta_shaped_texture_set_input_shape_region (stex, region);
-  cairo_region_destroy (region);
-}
-
-static void
-meta_window_actor_update_opaque_region (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-
-  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
+  /* The region at this point should be constrained to the
+   * bounds of the client rectangle. */

  if (priv->argb32 && priv->window->opaque_region != NULL)
    {
-      MetaFrameBorders borders;
-
-      meta_frame_calc_borders (priv->window->frame, &borders);
-
      /* The opaque region is defined to be a part of the
       * window which ARGB32 will always paint with opaque
       * pixels. For these regions, we want to avoid painting
@@ -2417,16 +2284,91 @@ meta_window_actor_update_opaque_region (MetaWindowActor *self)
       * case, graphical glitches will occur.
       */
      priv->opaque_region = cairo_region_copy (priv->window->opaque_region);
-      cairo_region_translate (priv->opaque_region, borders.total.left, borders.total.top);
-      cairo_region_intersect (priv->opaque_region, priv->shape_region);
+      cairo_region_translate (priv->opaque_region, client_area->x, client_area->y);
+      cairo_region_intersect (priv->opaque_region, region);
    }
  else if (priv->argb32)
    priv->opaque_region = NULL;
  else
-    priv->opaque_region = cairo_region_reference (priv->shape_region);
+    priv->opaque_region = cairo_region_reference (region);

-  meta_shaped_texture_set_opaque_region (META_SHAPED_TEXTURE (priv->actor),
-                                         priv->opaque_region);
+  if (needs_mask)
+    {
+      /* This takes the region, generates a mask using GTK+
+       * and scans the mask looking for all opaque pixels,
+       * adding it to region.
+       */
+      build_and_scan_frame_mask (self, client_area, region);
+    }
+
+  priv->shape_region = region;
+
+  meta_window_actor_invalidate_shadow (self);
+}
+
+static void
+meta_window_actor_update_x11_input_shape_region (MetaWindowActor *self,
+                                                 cairo_rectangle_int_t *client_area)
+{
+  MetaWindowActorPrivate *priv = self->priv;
+  cairo_region_t *region = NULL;
+
+  g_clear_pointer (&priv->input_shape_region, cairo_region_destroy);
+
+#ifdef HAVE_SHAPE
+  /* Note: we currently assume that mutter never sets an input region
+   * when there is a frame. */
+  if (priv->window->frame == NULL && priv->window->has_input_shape)
+    {
+      MetaScreen *screen = priv->screen;
+      MetaDisplay *display = meta_screen_get_display (screen);
+      Display *xdisplay = meta_display_get_xdisplay (display);
+      XRectangle *rects;
+      int n_rects, ordering;
+
+      /* Note we only actually query the ShapeInput shape of a window
+       * when we don't have a frame because we assume currently that
+       * mutter never sets an ShapeInput shape on a frame. */
+      meta_error_trap_push (display);
+      rects = XShapeGetRectangles (xdisplay,
+                                   priv->window->xwindow,
+                                   ShapeInput,
+                                   &n_rects,
+                                   &ordering);
+      meta_error_trap_pop (display);
+      if (rects)
+        {
+          region = region_create_from_x_rectangles (rects, n_rects,
+                                                    client_area->x,
+                                                    client_area->y);
+          XFree (rects);
+        }
+    }
+#endif /* HAVE_SHAPE */
+
+  if (region != NULL)
+    {
+      /* The X shape extension requires us to intersect the input
+       * region with the effective bounding shape to determine the
+       * effective input region.
+       */
+      if (priv->shape_region)
+        cairo_region_intersect (region, priv->shape_region);
+      else
+        cairo_region_intersect_rectangle (region, client_area);
+    }
+  else
+    {
+      /* If we don't have a shape on the server, that means that we
+       * have an implicit shape of one rectangle covering the entire
+       * window. */
+      region = cairo_region_create_rectangle (client_area);
+    }
+
+  priv->input_shape_region = region;
+
+  meta_shaped_texture_set_input_shape_region (META_SHAPED_TEXTURE (priv->actor),
+                                              priv->input_shape_region);
 }

 static void
@@ -2452,9 +2394,24 @@ check_needs_reshape (MetaWindowActor *self)
  else
    client_area.height = priv->window->rect.height;

-  meta_window_actor_update_shape_region (self, &client_area);
-  meta_window_actor_update_input_region (self, &client_area);
-  meta_window_actor_update_opaque_region (self);
+  if (priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11)
+    {
+      meta_window_actor_update_x11_shape_region (self, &client_area);
+      meta_window_actor_update_x11_input_shape_region (self, &client_area);
+    }
+  else
+    {
+      /* TODO: properly support setting an input region as specified
+       * via the wayland protocol */
+
+      g_clear_pointer (&priv->shape_region, cairo_region_destroy);
+      g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
+      g_clear_pointer (&priv->input_shape_region, cairo_region_destroy);
+
+      priv->shape_region = cairo_region_create_rectangle (&client_area);
+      priv->opaque_region = cairo_region_reference (priv->shape_region);
+      priv->input_shape_region = cairo_region_reference (priv->shape_region);
+    }

  priv->needs_reshape = FALSE;
 }
@@ -2472,6 +2429,7 @@ meta_window_actor_update_shape (MetaWindowActor *self)
  clutter_actor_queue_redraw (priv->actor);
 }

+#ifdef HAVE_WAYLAND
 static void
 maybe_emit_size_changed (MetaWindowActor *self,
                         MetaWaylandBuffer *new_buffer)
@@ -2532,6 +2490,7 @@ meta_window_actor_attach_wayland_buffer (MetaWindowActor *self,

  maybe_emit_size_changed (self, buffer);
 }
+#endif /* HAVE_WAYLAND */

 static void
 meta_window_actor_handle_updates (MetaWindowActor *self)
@@ -2612,35 +2571,6 @@ meta_window_actor_pre_paint (MetaWindowActor *self)
    }
 }

-static void
-do_send_frame_drawn (MetaWindowActor *self, FrameData *frame)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaScreen  *screen  = priv->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  Display *xdisplay = meta_display_get_xdisplay (display);
-
-  XClientMessageEvent ev = { 0, };
-
-  frame->frame_drawn_time = meta_compositor_monotonic_time_to_server_time (display,
-                                                                           g_get_monotonic_time ());
-  priv->frame_drawn_time = frame->frame_drawn_time;
-
-  ev.type = ClientMessage;
-  ev.window = meta_window_get_xwindow (priv->window);
-  ev.message_type = display->atom__NET_WM_FRAME_DRAWN;
-  ev.format = 32;
-  ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
-  ev.data.l[1] = frame->sync_request_serial >> 32;
-  ev.data.l[2] = frame->frame_drawn_time & G_GUINT64_CONSTANT(0xffffffff);
-  ev.data.l[3] = frame->frame_drawn_time >> 32;
-
-  meta_error_trap_push (display);
-  XSendEvent (xdisplay, ev.window, False, 0, (XEvent*) &ev);
-  XFlush (xdisplay);
-  meta_error_trap_pop (display);
-}
-
 void
 meta_window_actor_post_paint (MetaWindowActor *self)
 {
@@ -2648,29 +2578,47 @@ meta_window_actor_post_paint (MetaWindowActor *self)

  priv->repaint_scheduled = FALSE;

- /* This window had damage, but wasn't actually redrawn because
-  * it is obscured. So we should wait until timer expiration
-  * before sending _NET_WM_FRAME_* messages.
-  */
-  if (priv->send_frame_messages_timer != 0)
-    return;
-
  if (priv->needs_frame_drawn)
    {
-      do_send_frame_drawn (self, priv->frames->data);
+      MetaScreen  *screen  = priv->screen;
+      MetaDisplay *display = meta_screen_get_display (screen);
+      Display *xdisplay = meta_display_get_xdisplay (display);
+
+      XClientMessageEvent ev = { 0, };
+
+      FrameData *frame = priv->frames->data;
+
+      frame->frame_drawn_time = meta_compositor_monotonic_time_to_server_time (display,
+                                                                               g_get_monotonic_time ());
+      ev.type = ClientMessage;
+      ev.window = meta_window_get_xwindow (priv->window);
+      ev.message_type = display->atom__NET_WM_FRAME_DRAWN;
+      ev.format = 32;
+      ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
+      ev.data.l[1] = frame->sync_request_serial >> 32;
+      ev.data.l[2] = frame->frame_drawn_time & G_GUINT64_CONSTANT(0xffffffff);
+      ev.data.l[3] = frame->frame_drawn_time >> 32;
+
+      meta_error_trap_push (display);
+      XSendEvent (xdisplay, ev.window, False, 0, (XEvent*) &ev);
+      XFlush (xdisplay);
+      meta_error_trap_pop (display);
+
      priv->needs_frame_drawn = FALSE;
    }
 }

 static void
-do_send_frame_timings (MetaWindowActor  *self,
-                       FrameData        *frame,
-                       gint             refresh_interval,
-                       gint64           presentation_time)
+send_frame_timings (MetaWindowActor  *self,
+                    FrameData        *frame,
+                    CoglFrameInfo    *frame_info,
+                    gint64            presentation_time)
 {
  MetaWindowActorPrivate *priv = self->priv;
  MetaDisplay *display = meta_screen_get_display (priv->screen);
  Display *xdisplay = meta_display_get_xdisplay (display);
+  float refresh_rate;
+  int refresh_interval;

  XClientMessageEvent ev = { 0, };

@@ -2681,6 +2629,13 @@ do_send_frame_timings (MetaWindowActor  *self,
  ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
  ev.data.l[1] = frame->sync_request_serial >> 32;

+  refresh_rate = cogl_frame_info_get_refresh_rate (frame_info);
+  /* 0.0 is a flag for not known, but sanity-check against other odd numbers */
+  if (refresh_rate >= 1.0)
+    refresh_interval = (int) (0.5 + 1000000 / refresh_rate);
+  else
+    refresh_interval = 0;
+
  if (presentation_time != 0)
    {
      gint64 presentation_time_server = meta_compositor_monotonic_time_to_server_time (display,
@@ -2702,25 +2657,6 @@ do_send_frame_timings (MetaWindowActor  *self,
  meta_error_trap_pop (display);
 }

-static void
-send_frame_timings (MetaWindowActor  *self,
-                    FrameData        *frame,
-                    CoglFrameInfo    *frame_info,
-                    gint64            presentation_time)
-{
-  float refresh_rate;
-  int refresh_interval;
-
-  refresh_rate = cogl_frame_info_get_refresh_rate (frame_info);
-  /* 0.0 is a flag for not known, but sanity-check against other odd numbers */
-  if (refresh_rate >= 1.0)
-    refresh_interval = (int) (0.5 + 1000000 / refresh_rate);
-  else
-    refresh_interval = 0;
-
-  do_send_frame_timings (self, frame, refresh_interval, presentation_time);
-}
-
 void
 meta_window_actor_frame_complete (MetaWindowActor *self,
                                  CoglFrameInfo   *frame_info,
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -90,30 +90,17 @@ painting_untransformed (MetaWindowGroup *window_group,
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
-  cairo_region_t *clip_region;
-  cairo_region_t *unobscured_region;
+  cairo_region_t *visible_region;
+  ClutterActor *stage;
  ClutterActorIter iter;
  ClutterActor *child;
-  cairo_rectangle_int_t visible_rect, clip_rect;
+  cairo_rectangle_int_t visible_rect;
  int paint_x_origin, paint_y_origin;
  int actor_x_origin, actor_y_origin;
  int paint_x_offset, paint_y_offset;

  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
-  MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
-  ClutterActor *stage = clutter_actor_get_stage (actor);
-
-  /* Start off by treating all windows as completely unobscured, so damage anywhere
-   * in a window queues redraws, but confine it more below. */
-  clutter_actor_iter_init (&iter, actor);
-  while (clutter_actor_iter_next (&iter, &child))
-    {
-      if (META_IS_WINDOW_ACTOR (child))
-        {
-          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
-          meta_window_actor_set_unobscured_region (window_actor, NULL);
-        }
-    }
+  MetaCompScreen *info;

  /* Normally we expect an actor to be drawn at it's position on the screen.
   * However, if we're inside the paint of a ClutterClone, that won't be the
@@ -138,22 +125,17 @@ meta_window_group_paint (ClutterActor *actor)
  paint_x_offset = paint_x_origin - actor_x_origin;
  paint_y_offset = paint_y_origin - actor_y_origin;

-  visible_rect.x = visible_rect.y = 0;
-  visible_rect.width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
-  visible_rect.height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
-
-  unobscured_region = cairo_region_create_rectangle (&visible_rect);
-
  /* Get the clipped redraw bounds from Clutter so that we can avoid
   * painting shadows on windows that don't need to be painted in this
   * frame. In the case of a multihead setup with mismatched monitor
   * sizes, we could intersect this with an accurate union of the
   * monitors to avoid painting shadows that are visible only in the
   * holes. */
+  stage = clutter_actor_get_stage (actor);
  clutter_stage_get_redraw_clip_bounds (CLUTTER_STAGE (stage),
-                                        &clip_rect);
+                                        &visible_rect);

-  clip_region = cairo_region_create_rectangle (&clip_rect);
+  visible_region = cairo_region_create_rectangle (&visible_rect);

  if (!meta_is_wayland_compositor ())
    {
@@ -164,8 +146,7 @@ meta_window_group_paint (ClutterActor *actor)
          MetaWindow *window = meta_window_actor_get_meta_window (info->unredirected_window);

          meta_window_get_outer_rect (window, (MetaRectangle *)&unredirected_rect);
-          cairo_region_subtract_rectangle (unobscured_region, &unredirected_rect);
-          cairo_region_subtract_rectangle (clip_region, &unredirected_rect);
+          cairo_region_subtract_rectangle (visible_region, &unredirected_rect);
        }
    }

@@ -205,7 +186,8 @@ meta_window_group_paint (ClutterActor *actor)

      if (META_IS_WINDOW_ACTOR (child))
        {
-          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
+          MetaWindow *meta_window;
+          MetaWindowActor *window_actor = child;
          int x, y;

          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
@@ -214,28 +196,27 @@ meta_window_group_paint (ClutterActor *actor)
          x += paint_x_offset;
          y += paint_y_offset;

-
          /* Temporarily move to the coordinate system of the actor */
-          cairo_region_translate (unobscured_region, - x, - y);
-          cairo_region_translate (clip_region, - x, - y);
+          cairo_region_translate (visible_region, - x, - y);

-          meta_window_actor_set_unobscured_region (window_actor, unobscured_region);
-          meta_window_actor_set_clip_region (window_actor, clip_region);
+          meta_window_actor_set_visible_region (window_actor, visible_region);

-          if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
+          /* TODO: Track the opaque regions of wayland clients.
+           * Although wayland clients can report opaque window
+           * regions, for now we assume that all wayland clients are
+           * transparent... */
+          meta_window = meta_window_actor_get_meta_window (window_actor);
+
+          if (meta_window->client_type != META_WINDOW_CLIENT_TYPE_WAYLAND &&
+              clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
            {
              cairo_region_t *obscured_region = meta_window_actor_get_obscured_region (window_actor);
              if (obscured_region)
-                {
-                  cairo_region_subtract (unobscured_region, obscured_region);
-                  cairo_region_subtract (clip_region, obscured_region);
-                }
+                cairo_region_subtract (visible_region, obscured_region);
            }

-          meta_window_actor_set_clip_region_beneath (window_actor, clip_region);
-
-          cairo_region_translate (unobscured_region, x, y);
-          cairo_region_translate (clip_region, x, y);
+          meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
+          cairo_region_translate (visible_region, x, y);
        }
      else if (META_IS_BACKGROUND_ACTOR (child) ||
               META_IS_BACKGROUND_GROUP (child))
@@ -248,18 +229,17 @@ meta_window_group_paint (ClutterActor *actor)
          x += paint_x_offset;
          y += paint_y_offset;

-          cairo_region_translate (clip_region, - x, - y);
+          cairo_region_translate (visible_region, - x, - y);

          if (META_IS_BACKGROUND_GROUP (child))
-            meta_background_group_set_clip_region (META_BACKGROUND_GROUP (child), clip_region);
+            meta_background_group_set_visible_region (META_BACKGROUND_GROUP (child), visible_region);
          else
-            meta_background_actor_set_clip_region (META_BACKGROUND_ACTOR (child), clip_region);
-          cairo_region_translate (clip_region, x, y);
+            meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (child), visible_region);
+          cairo_region_translate (visible_region, x, y);
        }
    }

-  cairo_region_destroy (unobscured_region);
-  cairo_region_destroy (clip_region);
+  cairo_region_destroy (visible_region);

  CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);

@@ -272,12 +252,12 @@ meta_window_group_paint (ClutterActor *actor)
      if (META_IS_WINDOW_ACTOR (child))
        {
          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
-          meta_window_actor_reset_clip_regions (window_actor);
+          meta_window_actor_reset_visible_regions (window_actor);
        }
      else if (META_IS_BACKGROUND_ACTOR (child))
        {
          MetaBackgroundActor *background_actor = META_BACKGROUND_ACTOR (child);
-          meta_background_actor_set_clip_region (background_actor, NULL);
+          meta_background_actor_set_visible_region (background_actor, NULL);
        }
    }
 }
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -27,6 +27,7 @@
 #include <meta/meta-background-group.h>
 #include <meta/meta-background-actor.h>

+#include <stdlib.h>
 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
 #define N_(x) x
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -89,7 +89,7 @@ meta_core_get (Display *xdisplay,
  if (request != META_CORE_WINDOW_HAS_FRAME &&
      (window == NULL || window->frame == NULL)) {
    meta_bug ("No such frame window 0x%lx!\n", xwindow);
-    goto out;
+    return;
  }

  while (request != META_CORE_GET_END) {
@@ -99,7 +99,7 @@ meta_core_get (Display *xdisplay,
    switch (request) {
      case META_CORE_WINDOW_HAS_FRAME:
        *((gboolean*)answer) = window != NULL && window->frame != NULL;
-        if (!*((gboolean*)answer)) goto out; /* see above */
+        if (!*((gboolean*)answer)) return; /* see above */
        break; 
      case META_CORE_GET_CLIENT_WIDTH:
        *((gint*)answer) = window->rect.width;
@@ -160,7 +160,6 @@ meta_core_get (Display *xdisplay,
    request = va_arg (args, MetaCoreGetType);
  } 

- out:
  va_end (args);
 }

--- a/src/core/display.c
+++ b/src/core/display.c
@@ -75,8 +75,6 @@
 #include <string.h>
 #include <unistd.h>

-#include "meta-xwayland-private.h"
-
 #define GRAB_OP_IS_WINDOW_SWITCH(g)                     \
        (g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL  ||  \
         g == META_GRAB_OP_KEYBOARD_TABBING_DOCK    ||  \
@@ -518,12 +516,9 @@ meta_display_open (void)
      return FALSE;
    }

-  if (meta_is_wayland_compositor ())
-    meta_xwayland_complete_init ();
-
  if (meta_is_syncing ())
    XSynchronize (xdisplay, True);
-  
+
  g_assert (the_display == NULL);
  the_display = g_object_new (META_TYPE_DISPLAY, NULL);

@@ -996,10 +991,8 @@ meta_display_open (void)

    meta_error_trap_pop (the_display);
  }
-
-  meta_idle_monitor_init_dbus ();
-
-  meta_display_ungrab (the_display);
+  
+  meta_display_ungrab (the_display);  

  /* Done opening new display */
  the_display->display_opening = FALSE;
@@ -1876,17 +1869,14 @@ get_input_event (MetaDisplay *display,
        case XI_ButtonRelease:
          if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
            return input_event;
-          break;
        case XI_KeyPress:
        case XI_KeyRelease:
          if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
            return input_event;
-          break;
        case XI_FocusIn:
        case XI_FocusOut:
          if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
            return input_event;
-          break;
        case XI_Enter:
        case XI_Leave:
          if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
@@ -1914,7 +1904,9 @@ update_focus_window (MetaDisplay   *display,
                     Window         xwindow,
                     gulong         serial)
 {
+#ifdef HAVE_WAYLAND
  MetaWaylandCompositor *compositor;
+#endif

  display->focus_serial = serial;

@@ -1955,6 +1947,7 @@ update_focus_window (MetaDisplay   *display,
  else
    meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL with serial %lu\n", serial);

+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    {
      compositor = meta_wayland_compositor_get_default ();
@@ -1967,6 +1960,7 @@ update_focus_window (MetaDisplay   *display,
      else
        meta_topic (META_DEBUG_FOCUS, "Focus change has no effect, because there is no matching wayland surface");
     }
+#endif

  g_object_notify (G_OBJECT (display), "focus-window");
  meta_display_update_active_window_hint (display);
@@ -2323,8 +2317,8 @@ meta_display_handle_event (MetaDisplay *display,
          meta_window_update_sync_request_counter (alarm_window, new_counter_value);
          filter_out_event = TRUE; /* GTK doesn't want to see this really */
        }
-      else
-        meta_idle_monitor_handle_xevent_all (event);
+
+      meta_idle_monitor_handle_xevent_all (event);
    }
 #endif /* HAVE_XSYNC */

@@ -2339,9 +2333,59 @@ meta_display_handle_event (MetaDisplay *display,
          XShapeEvent *sev = (XShapeEvent*) event;

          if (sev->kind == ShapeBounding)
-            meta_window_update_shape_region_x11 (window);
+            {
+              if (sev->shaped && !window->has_shape)
+                {
+                  window->has_shape = TRUE;                  
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s now has a shape\n",
+                              window->desc);
+                }
+              else if (!sev->shaped && window->has_shape)
+                {
+                  window->has_shape = FALSE;
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s no longer has a shape\n",
+                              window->desc);
+                }
+              else
+                {
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s shape changed\n",
+                              window->desc);
+                }
+
+              if (display->compositor)
+                meta_compositor_window_x11_shape_changed (display->compositor,
+                                                          window);
+            }
          else if (sev->kind == ShapeInput)
-            meta_window_update_input_region_x11 (window);
+            {
+              if (sev->shaped && !window->has_input_shape)
+                {
+                  window->has_input_shape = TRUE;                  
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s now has an input shape\n",
+                              window->desc);
+                }
+              else if (!sev->shaped && window->has_input_shape)
+                {
+                  window->has_input_shape = FALSE;
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s no longer has an input shape\n",
+                              window->desc);
+                }
+              else
+                {
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s input shape changed\n",
+                              window->desc);
+                }
+
+              if (display->compositor)
+                meta_compositor_window_x11_shape_changed (display->compositor,
+                                                          window);
+            }
        }
      else
        {
@@ -3187,10 +3231,12 @@ event_callback (XEvent  *event,
     erratically because of the lag between updating the window
     position from the surface position. Instead we bypass the
     translation altogether by directly using the Clutter events */
+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor () &&
      event->type == GenericEvent &&
      event->xcookie.evtype == XI_Motion)
    return FALSE;
+#endif

  return meta_display_handle_event (display, event);
 }
--- a/src/core/edid-parse.c
+++ b/src/core/edid-parse.c
@@ -1,539 +0,0 @@
-/*
- * Copyright 2007 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Author: Soren Sandmann <sandmann@redhat.com> */
-
-#include "edid.h"
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <glib.h>
-
-static int
-get_bit (int in, int bit)
-{
-  return (in & (1 << bit)) >> bit;
-}
-
-static int
-get_bits (int in, int begin, int end)
-{
-  int mask = (1 << (end - begin + 1)) - 1;
-
-  return (in >> begin) & mask;
-}
-
-static int
-decode_header (const uchar *edid)
-{
-  if (memcmp (edid, "\x00\xff\xff\xff\xff\xff\xff\x00", 8) == 0)
-    return TRUE;
-  return FALSE;
-}
-
-static int
-decode_vendor_and_product_identification (const uchar *edid, MonitorInfo *info)
-{
-  int is_model_year;
-
-  /* Manufacturer Code */
-  info->manufacturer_code[0]  = get_bits (edid[0x08], 2, 6);
-  info->manufacturer_code[1]  = get_bits (edid[0x08], 0, 1) << 3;
-  info->manufacturer_code[1] |= get_bits (edid[0x09], 5, 7);
-  info->manufacturer_code[2]  = get_bits (edid[0x09], 0, 4);
-  info->manufacturer_code[3]  = '\0';
-
-  info->manufacturer_code[0] += 'A' - 1;
-  info->manufacturer_code[1] += 'A' - 1;
-  info->manufacturer_code[2] += 'A' - 1;
-
-  /* Product Code */
-  info->product_code = edid[0x0b] << 8 | edid[0x0a];
-
-  /* Serial Number */
-  info->serial_number =
-    edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | edid[0x0f] << 24;
-
-  /* Week and Year */
-  is_model_year = FALSE;
-  switch (edid[0x10])
-    {
-    case 0x00:
-      info->production_week = -1;
-      break;
-
-    case 0xff:
-      info->production_week = -1;
-      is_model_year = TRUE;
-      break;
-
-    default:
-      info->production_week = edid[0x10];
-      break;
-    }
-
-  if (is_model_year)
-    {
-      info->production_year = -1;
-      info->model_year = 1990 + edid[0x11];
-    }
-  else
-    {
-      info->production_year = 1990 + edid[0x11];
-      info->model_year = -1;
-    }
-
-  return TRUE;
-}
-
-static int
-decode_edid_version (const uchar *edid, MonitorInfo *info)
-{
-  info->major_version = edid[0x12];
-  info->minor_version = edid[0x13];
-
-  return TRUE;
-}
-
-static int
-decode_display_parameters (const uchar *edid, MonitorInfo *info)
-{
-  /* Digital vs Analog */
-  info->is_digital = get_bit (edid[0x14], 7);
-
-  if (info->is_digital)
-    {
-      int bits;
-
-      static const int bit_depth[8] =
-        {
-          -1, 6, 8, 10, 12, 14, 16, -1
-        };
-
-      static const Interface interfaces[6] =
-        {
-          UNDEFINED, DVI, HDMI_A, HDMI_B, MDDI, DISPLAY_PORT
-        };
-
-      bits = get_bits (edid[0x14], 4, 6);
-      info->connector.digital.bits_per_primary = bit_depth[bits];
-
-      bits = get_bits (edid[0x14], 0, 3);
-
-      if (bits <= 5)
-        info->connector.digital.interface = interfaces[bits];
-      else
-        info->connector.digital.interface = UNDEFINED;
-    }
-  else
-    {
-      int bits = get_bits (edid[0x14], 5, 6);
-
-      static const double levels[][3] =
-        {
-          { 0.7,   0.3,    1.0 },
-          { 0.714, 0.286,  1.0 },
-          { 1.0,   0.4,    1.4 },
-          { 0.7,   0.0,    0.7 },
-        };
-
-      info->connector.analog.video_signal_level = levels[bits][0];
-      info->connector.analog.sync_signal_level = levels[bits][1];
-      info->connector.analog.total_signal_level = levels[bits][2];
-
-      info->connector.analog.blank_to_black = get_bit (edid[0x14], 4);
-
-      info->connector.analog.separate_hv_sync = get_bit (edid[0x14], 3);
-      info->connector.analog.composite_sync_on_h = get_bit (edid[0x14], 2);
-      info->connector.analog.composite_sync_on_green = get_bit (edid[0x14], 1);
-
-      info->connector.analog.serration_on_vsync = get_bit (edid[0x14], 0);
-    }
-
-  /* Screen Size / Aspect Ratio */
-  if (edid[0x15] == 0 && edid[0x16] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1;
-      info->aspect_ratio = -1.0;
-    }
-  else if (edid[0x16] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1; 
-      info->aspect_ratio = 100.0 / (edid[0x15] + 99);
-    }
-  else if (edid[0x15] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1;
-      info->aspect_ratio = 100.0 / (edid[0x16] + 99);
-      info->aspect_ratio = 1/info->aspect_ratio; /* portrait */
-    }
-  else
-    {
-      info->width_mm = 10 * edid[0x15];
-      info->height_mm = 10 * edid[0x16];
-    }
-
-  /* Gamma */
-  if (edid[0x17] == 0xFF)
-    info->gamma = -1.0;
-  else
-    info->gamma = (edid[0x17] + 100.0) / 100.0;
-
-  /* Features */
-  info->standby = get_bit (edid[0x18], 7);
-  info->suspend = get_bit (edid[0x18], 6);
-  info->active_off = get_bit (edid[0x18], 5);
-
-  if (info->is_digital)
-    {
-      info->connector.digital.rgb444 = TRUE;
-      if (get_bit (edid[0x18], 3))
-        info->connector.digital.ycrcb444 = 1;
-      if (get_bit (edid[0x18], 4))
-        info->connector.digital.ycrcb422 = 1;
-    }
-  else
-    {
-      int bits = get_bits (edid[0x18], 3, 4);
-      ColorType color_type[4] =
-        {
-          MONOCHROME, RGB, OTHER_COLOR, UNDEFINED_COLOR
-        };
-
-      info->connector.analog.color_type = color_type[bits];
-    }
-
-  info->srgb_is_standard = get_bit (edid[0x18], 2);
-
-  /* In 1.3 this is called "has preferred timing" */
-  info->preferred_timing_includes_native = get_bit (edid[0x18], 1);
-
-  /* FIXME: In 1.3 this indicates whether the monitor accepts GTF */
-  info->continuous_frequency = get_bit (edid[0x18], 0);
-  return TRUE;
-}
-
-static double
-decode_fraction (int high, int low)
-{
-  double result = 0.0;
-  int i;
-
-  high = (high << 2) | low;
-
-  for (i = 0; i < 10; ++i)
-    result += get_bit (high, i) * pow (2, i - 10);
-
-  return result;
-}
-
-static int
-decode_color_characteristics (const uchar *edid, MonitorInfo *info)
-{
-  info->red_x = decode_fraction (edid[0x1b], get_bits (edid[0x19], 6, 7));
-  info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 5, 4));
-  info->green_x = decode_fraction (edid[0x1d], get_bits (edid[0x19], 2, 3));
-  info->green_y = decode_fraction (edid[0x1e], get_bits (edid[0x19], 0, 1));
-  info->blue_x = decode_fraction (edid[0x1f], get_bits (edid[0x1a], 6, 7));
-  info->blue_y = decode_fraction (edid[0x20], get_bits (edid[0x1a], 4, 5));
-  info->white_x = decode_fraction (edid[0x21], get_bits (edid[0x1a], 2, 3));
-  info->white_y = decode_fraction (edid[0x22], get_bits (edid[0x1a], 0, 1));
-
-  return TRUE;
-}
-
-static int
-decode_established_timings (const uchar *edid, MonitorInfo *info)
-{
-  static const Timing established[][8] = 
-    {
-      {
-        { 800, 600, 60 },
-        { 800, 600, 56 },
-        { 640, 480, 75 },
-        { 640, 480, 72 },
-        { 640, 480, 67 },
-        { 640, 480, 60 },
-        { 720, 400, 88 },
-        { 720, 400, 70 }
-      },
-      {
-        { 1280, 1024, 75 },
-        { 1024, 768, 75 },
-        { 1024, 768, 70 },
-        { 1024, 768, 60 },
-        { 1024, 768, 87 },
-        { 832, 624, 75 },
-        { 800, 600, 75 },
-        { 800, 600, 72 }
-	},
-      {
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 1152, 870, 75 }
-      },
-    };
-
-  int i, j, idx;
-
-  idx = 0;
-  for (i = 0; i < 3; ++i)
-    {
-      for (j = 0; j < 8; ++j)
-	{
-          int byte = edid[0x23 + i];
-
-          if (get_bit (byte, j) && established[i][j].frequency != 0)
-            info->established[idx++] = established[i][j];
-	}
-    }
-  return TRUE;
-}
-
-static int
-decode_standard_timings (const uchar *edid, MonitorInfo *info)
-{
-  int i;
-
-  for (i = 0; i < 8; i++)
-    {
-      int first = edid[0x26 + 2 * i];
-      int second = edid[0x27 + 2 * i];
-
-      if (first != 0x01 && second != 0x01)
-	{
-          int w = 8 * (first + 31);
-          int h = 0;
-
-          switch (get_bits (second, 6, 7))
-            {
-	    case 0x00: h = (w / 16) * 10; break;
-	    case 0x01: h = (w / 4) * 3; break;
-	    case 0x02: h = (w / 5) * 4; break;
-	    case 0x03: h = (w / 16) * 9; break;
-	    }
-
-          info->standard[i].width = w;
-          info->standard[i].height = h;
-          info->standard[i].frequency = get_bits (second, 0, 5) + 60;
-	}
-    }
-
-  return TRUE;
-}
-
-static void
-decode_lf_string (const uchar *s, int n_chars, char *result)
-{
-  int i;
-  for (i = 0; i < n_chars; ++i)
-    {
-      if (s[i] == 0x0a)
-	{
-          *result++ = '\0';
-          break;
-	}
-      else if (s[i] == 0x00)
-	{
-          /* Convert embedded 0's to spaces */
-          *result++ = ' ';
-	}
-      else
-	{
-          *result++ = s[i];
-	}
-    }
-}
-
-static void
-decode_display_descriptor (const uchar *desc,
-			   MonitorInfo *info)
-{
-  switch (desc[0x03])
-    {
-    case 0xFC:
-      decode_lf_string (desc + 5, 13, info->dsc_product_name);
-      break;
-    case 0xFF:
-      decode_lf_string (desc + 5, 13, info->dsc_serial_number);
-      break;
-    case 0xFE:
-      decode_lf_string (desc + 5, 13, info->dsc_string);
-      break;
-    case 0xFD:
-      /* Range Limits */
-      break;
-    case 0xFB:
-      /* Color Point */
-      break;
-    case 0xFA:
-      /* Timing Identifications */
-      break;
-    case 0xF9:
-      /* Color Management */
-      break;
-    case 0xF8:
-      /* Timing Codes */
-      break;
-    case 0xF7:
-      /* Established Timings */
-      break;
-    case 0x10:
-      break;
-    }
-}
-
-static void
-decode_detailed_timing (const uchar *timing,
-			DetailedTiming *detailed)
-{
-  int bits;
-  StereoType stereo[] =
-    {
-      NO_STEREO, NO_STEREO, FIELD_RIGHT, FIELD_LEFT,
-      TWO_WAY_RIGHT_ON_EVEN, TWO_WAY_LEFT_ON_EVEN,
-      FOUR_WAY_INTERLEAVED, SIDE_BY_SIDE
-    };
-
-  detailed->pixel_clock = (timing[0x00] | timing[0x01] << 8) * 10000;
-  detailed->h_addr = timing[0x02] | ((timing[0x04] & 0xf0) << 4);
-  detailed->h_blank = timing[0x03] | ((timing[0x04] & 0x0f) << 8);
-  detailed->v_addr = timing[0x05] | ((timing[0x07] & 0xf0) << 4);
-  detailed->v_blank = timing[0x06] | ((timing[0x07] & 0x0f) << 8);
-  detailed->h_front_porch = timing[0x08] | get_bits (timing[0x0b], 6, 7) << 8;
-  detailed->h_sync = timing[0x09] | get_bits (timing[0x0b], 4, 5) << 8;
-  detailed->v_front_porch =
-    get_bits (timing[0x0a], 4, 7) | get_bits (timing[0x0b], 2, 3) << 4;
-  detailed->v_sync =
-    get_bits (timing[0x0a], 0, 3) | get_bits (timing[0x0b], 0, 1) << 4;
-  detailed->width_mm =  timing[0x0c] | get_bits (timing[0x0e], 4, 7) << 8;
-  detailed->height_mm = timing[0x0d] | get_bits (timing[0x0e], 0, 3) << 8;
-  detailed->right_border = timing[0x0f];
-  detailed->top_border = timing[0x10];
-
-  detailed->interlaced = get_bit (timing[0x11], 7);
-
-  /* Stereo */
-  bits = get_bits (timing[0x11], 5, 6) << 1 | get_bit (timing[0x11], 0);
-  detailed->stereo = stereo[bits];
-
-  /* Sync */
-  bits = timing[0x11];
-
-  detailed->digital_sync = get_bit (bits, 4);
-  if (detailed->digital_sync)
-    {
-      detailed->connector.digital.composite = !get_bit (bits, 3);
-
-      if (detailed->connector.digital.composite)
-	{
-          detailed->connector.digital.serrations = get_bit (bits, 2);
-          detailed->connector.digital.negative_vsync = FALSE;
-	}
-      else
-	{
-          detailed->connector.digital.serrations = FALSE;
-          detailed->connector.digital.negative_vsync = !get_bit (bits, 2);
-	}
-
-      detailed->connector.digital.negative_hsync = !get_bit (bits, 0);
-    }
-  else
-    {
-      detailed->connector.analog.bipolar = get_bit (bits, 3);
-      detailed->connector.analog.serrations = get_bit (bits, 2);
-      detailed->connector.analog.sync_on_green = !get_bit (bits, 1);
-    }
-}
-
-static int
-decode_descriptors (const uchar *edid, MonitorInfo *info)
-{
-  int i;
-  int timing_idx;
-
-  timing_idx = 0;
-
-  for (i = 0; i < 4; ++i)
-    {
-      int index = 0x36 + i * 18;
-
-      if (edid[index + 0] == 0x00 && edid[index + 1] == 0x00)
-	{
-          decode_display_descriptor (edid + index, info);
-	}
-      else
-	{
-          decode_detailed_timing (edid + index, &(info->detailed_timings[timing_idx++]));
-	}
-    }
-
-  info->n_detailed_timings = timing_idx;
-
-  return TRUE;
-}
-
-static void
-decode_check_sum (const uchar *edid,
-		  MonitorInfo *info)
-{
-  int i;
-  uchar check = 0;
-
-  for (i = 0; i < 128; ++i)
-    check += edid[i];
-
-  info->checksum = check;
-}
-
-MonitorInfo *
-decode_edid (const uchar *edid)
-{
-  MonitorInfo *info = g_new0 (MonitorInfo, 1);
-
-  decode_check_sum (edid, info);
-
-  if (decode_header (edid)
-      && decode_vendor_and_product_identification (edid, info)
-      && decode_edid_version (edid, info)
-      && decode_display_parameters (edid, info)
-      && decode_color_characteristics (edid, info)
-      && decode_established_timings (edid, info)
-      && decode_standard_timings (edid, info)
-      && decode_descriptors (edid, info))
-    {
-      return info;
-    }
-  else
-    {
-      g_free (info);
-      return NULL;
-    }
-}
--- a/src/core/edid.h
+++ b/src/core/edid.h
@@ -1,195 +0,0 @@
-/* edid.h
- *
- * Copyright 2007, 2008, Red Hat, Inc.
- * 
- * This file is part of the Gnome Library.
- * 
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- * 
- * Author: Soren Sandmann <sandmann@redhat.com>
- */
-
-#ifndef EDID_H
-#define EDID_H
-
-typedef unsigned char uchar;
-typedef struct MonitorInfo MonitorInfo;
-typedef struct Timing Timing;
-typedef struct DetailedTiming DetailedTiming;
-
-typedef enum
-{
-  UNDEFINED,
-  DVI,
-  HDMI_A,
-  HDMI_B,
-  MDDI,
-  DISPLAY_PORT
-} Interface;
-
-typedef enum
-{
-  UNDEFINED_COLOR,
-  MONOCHROME,
-  RGB,
-  OTHER_COLOR
-} ColorType;
-
-typedef enum
-{
-  NO_STEREO,
-  FIELD_RIGHT,
-  FIELD_LEFT,
-  TWO_WAY_RIGHT_ON_EVEN,
-  TWO_WAY_LEFT_ON_EVEN,
-  FOUR_WAY_INTERLEAVED,
-  SIDE_BY_SIDE
-} StereoType;
-
-struct Timing
-{
-  int width;
-  int height;
-  int frequency;
-};
-
-struct DetailedTiming
-{
-  int		pixel_clock;
-  int		h_addr;
-  int		h_blank;
-  int		h_sync;
-  int		h_front_porch;
-  int		v_addr;
-  int		v_blank;
-  int		v_sync;
-  int		v_front_porch;
-  int		width_mm;
-  int		height_mm;
-  int		right_border;
-  int		top_border;
-  int		interlaced;
-  StereoType	stereo;
-
-  int		digital_sync;
-  union
-  {
-    struct
-    {
-      int bipolar;
-      int serrations;
-      int sync_on_green;
-    } analog;
-
-    struct
-    {
-      int composite;
-      int serrations;
-      int negative_vsync;
-      int negative_hsync;
-    } digital;
-  } connector;
-};
-
-struct MonitorInfo
-{
-  int		checksum;
-  char		manufacturer_code[4];
-  int		product_code;
-  unsigned int	serial_number;
-
-  int		production_week;	/* -1 if not specified */
-  int		production_year;	/* -1 if not specified */
-  int		model_year;		/* -1 if not specified */
-
-  int		major_version;
-  int		minor_version;
-
-  int		is_digital;
-
-  union
-  {
-    struct
-    {
-      int	bits_per_primary;
-      Interface	interface;
-      int	rgb444;
-      int	ycrcb444;
-      int	ycrcb422;
-    } digital;
-
-    struct
-    {
-      double	video_signal_level;
-      double	sync_signal_level;
-      double	total_signal_level;
-
-      int	blank_to_black;
-
-      int	separate_hv_sync;
-      int	composite_sync_on_h;
-      int	composite_sync_on_green;
-      int	serration_on_vsync;
-      ColorType	color_type;
-    } analog;
-  } connector;
-
-  int		width_mm;		/* -1 if not specified */
-  int		height_mm;		/* -1 if not specified */
-  double	aspect_ratio;		/* -1.0 if not specififed */
-
-  double	gamma;			/* -1.0 if not specified */
-
-  int		standby;
-  int		suspend;
-  int		active_off;
-
-  int		srgb_is_standard;
-  int		preferred_timing_includes_native;
-  int		continuous_frequency;
-
-  double	red_x;
-  double	red_y;
-  double	green_x;
-  double	green_y;
-  double	blue_x;
-  double	blue_y;
-  double	white_x;
-  double	white_y;
-
-  Timing	established[24];	/* Terminated by 0x0x0 */
-  Timing	standard[8];
-
-  int		n_detailed_timings;
-  DetailedTiming detailed_timings[4];	/* If monitor has a preferred
-                                         * mode, it is the first one
-                                         * (whether it has, is
-                                         * determined by the 
-                                         * preferred_timing_includes
-                                         * bit.
-                                         */
-
-  /* Optional product description */
-  char		dsc_serial_number[14];
-  char		dsc_product_name[14];
-  char		dsc_string[14];		/* Unspecified ASCII data */
-};
-
-MonitorInfo *decode_edid (const uchar *data);
-char *make_display_name (const MonitorInfo *info);
-char *make_display_size_string (int width_mm, int height_mm);
-
-#endif
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -59,7 +59,6 @@

 #define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
 #define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
-#define SCHEMA_MUTTER_WAYLAND_KEYBINDINGS "org.gnome.mutter.wayland.keybindings"

 static gboolean add_builtin_keybinding (MetaDisplay          *display,
                                        const char           *name,
@@ -1970,23 +1969,6 @@ process_overlay_key (MetaDisplay *display,
            return TRUE;
          meta_display_overlay_key_activate (display);
        }
-      else
-        {
-          /* In some rare race condition, mutter might not receive the Super_L
-           * KeyRelease event because:
-           * - the compositor might end the modal mode and call XIUngrabDevice
-           *   while the key is still down
-           * - passive grabs are only activated on KeyPress and not KeyRelease.
-           *
-           * In this case, display->overlay_key_only_pressed might be wrong.
-           * Mutter still ought to acknowledge events, otherwise the X server
-           * will not send the next events.
-           *
-           * https://bugzilla.gnome.org/show_bug.cgi?id=666101
-           */
-          XIAllowEvents (display->xdisplay, event->deviceid,
-                         XIAsyncDevice, event->time);
-        }

      return TRUE;
    }
@@ -4114,17 +4096,17 @@ handle_switch_vt (MetaDisplay    *display,
 {
    gint vt = binding->handler->data;
    MetaWaylandCompositor *compositor;
-    MetaLauncher *launcher;
+    MetaTTY *tty;

    compositor = meta_wayland_compositor_get_default ();
-    launcher = meta_wayland_compositor_get_launcher (compositor);
+    tty = meta_wayland_compositor_get_tty (compositor);

-    if (launcher)
+    if (tty)
      {
        GError *error;

        error = NULL;
-        if (!meta_launcher_activate_vt (launcher, vt, &error))
+        if (!meta_tty_activate_vt (tty, vt, &error))
          {
            g_warning ("Failed to switch VT: %s", error->message);
            g_error_free (error);
@@ -4200,7 +4182,6 @@ init_builtin_key_bindings (MetaDisplay *display)
                               META_KEY_BINDING_IS_REVERSED)
  GSettings *common_keybindings = g_settings_new (SCHEMA_COMMON_KEYBINDINGS);
  GSettings *mutter_keybindings = g_settings_new (SCHEMA_MUTTER_KEYBINDINGS);
-  GSettings *mutter_wayland_keybindings = g_settings_new (SCHEMA_MUTTER_WAYLAND_KEYBINDINGS);

  add_builtin_keybinding (display,
                          "switch-to-workspace-1",
@@ -4467,49 +4448,49 @@ init_builtin_key_bindings (MetaDisplay *display)
    {
      add_builtin_keybinding (display,
                              "switch-to-session-1",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 1);

      add_builtin_keybinding (display,
                              "switch-to-session-2",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 2);

      add_builtin_keybinding (display,
                              "switch-to-session-3",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 3);

      add_builtin_keybinding (display,
                              "switch-to-session-4",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 4);

      add_builtin_keybinding (display,
                              "switch-to-session-5",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 5);

      add_builtin_keybinding (display,
                              "switch-to-session-6",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 6);

      add_builtin_keybinding (display,
                              "switch-to-session-7",
-                              mutter_wayland_keybindings,
+                              mutter_keybindings,
                              META_KEY_BINDING_NONE,
                              META_KEYBINDING_ACTION_NONE,
                              handle_switch_vt, 7);
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -55,7 +55,9 @@
 #include "session.h"
 #include <meta/prefs.h>
 #include <meta/compositor.h>
+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
+#endif

 #include <glib-object.h>
 #include <glib-unix.h>
@@ -349,8 +351,10 @@ meta_finalize (void)
    meta_display_close (display,
                        CurrentTime); /* I doubt correct timestamps matter here */

+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    meta_wayland_finalize ();
+#endif
 }

 static gboolean
@@ -361,6 +365,28 @@ on_sigterm (gpointer user_data)
  return G_SOURCE_REMOVE;
 }

+static void
+crash_handler (int signum)
+{
+  char buffer[256];
+  MetaWaylandCompositor *compositor;
+  MetaTTY *tty;
+
+  snprintf (buffer, 256, "Fatal server error: %d\n", signum);
+  write (STDERR_FILENO, buffer, strlen (buffer));
+
+  compositor = meta_wayland_compositor_get_default ();
+  tty = meta_wayland_compositor_get_tty (compositor);
+
+  /* Passing FALSE ensures that we only do ioctls, which is
+     safe from a signal handler */
+  if (tty)
+    meta_tty_reset (tty, FALSE);
+
+  /* We can't continue with the default handling, so just exit here */
+  _exit(1);
+}
+
 /**
 * meta_init: (skip)
 *
@@ -386,6 +412,19 @@ meta_init (void)
                g_strerror (errno));
 #endif

+  if (meta_is_wayland_compositor ())
+    {
+      act.sa_handler = crash_handler;
+
+      /* Ignore if we can't register signal handlers, worse
+         that can happen one needs the sysrq to get out of the VT */
+      sigaction (SIGABRT, &act, NULL);
+      sigaction (SIGSEGV, &act, NULL);
+      sigaction (SIGBUS, &act, NULL);
+      sigaction (SIGFPE, &act, NULL);
+      sigaction (SIGTRAP, &act, NULL);
+    }
+
  g_unix_signal_add (SIGTERM, on_sigterm, NULL);

  if (g_getenv ("MUTTER_VERBOSE"))
@@ -404,6 +443,7 @@ meta_init (void)
  g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
 #endif

+#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    {
      /* NB: When running as a hybrid wayland compositor we run our own headless X
@@ -411,6 +451,7 @@ meta_init (void)
      meta_wayland_init ();
    }
  else
+#endif
    meta_select_display (opt_display_name);

  meta_set_syncing (opt_sync || (g_getenv ("MUTTER_SYNC") != NULL));
--- a/src/core/meta-cursor-tracker-private.h
+++ b/src/core/meta-cursor-tracker-private.h
@@ -25,7 +25,6 @@
 #define META_CURSOR_TRACKER_PRIVATE_H

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

 gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
 					    XEvent            *xevent);
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -39,10 +39,7 @@

 #include "meta-cursor-tracker-private.h"
 #include "screen-private.h"
-
-#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
-#endif

 #define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_X 7
 #define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_Y 4
@@ -126,7 +123,6 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
                                          G_TYPE_NONE, 0);
 }

-#ifdef HAVE_WAYLAND
 static MetaCursorTracker *
 make_wayland_cursor_tracker (MetaScreen *screen)
 {
@@ -143,7 +139,6 @@ make_wayland_cursor_tracker (MetaScreen *screen)

  return self;
 }
-#endif

 static MetaCursorTracker *
 make_x11_cursor_tracker (MetaScreen *screen)
@@ -174,11 +169,9 @@ meta_cursor_tracker_get_for_screen (MetaScreen *screen)
  if (screen->cursor_tracker)
    return screen->cursor_tracker;

-#ifdef HAVE_WAYLAND
  if (meta_is_wayland_compositor ())
    self = make_wayland_cursor_tracker (screen);
  else
-#endif
    self = make_x11_cursor_tracker (screen);

  screen->cursor_tracker = self;
@@ -319,8 +312,8 @@ ensure_wayland_cursor (MetaCursorTracker *tracker)
  if (tracker->default_cursor)
    return;

-  filename = g_build_filename (MUTTER_PKGDATADIR,
-                               "cursors/left_ptr.png",
+  filename = g_build_filename (MUTTER_DATADIR,
+                               "mutter/cursors/left_ptr.png",
                               NULL);

  bitmap = cogl_bitmap_new_from_file (filename, NULL);
--- a/src/core/meta-idle-monitor.c
+++ b/src/core/meta-idle-monitor.c
@@ -104,26 +104,25 @@ _xsyncvalue_to_int64 (XSyncValue value)
    | (guint64) XSyncValueLow32 (value);
 }

-#define GUINT64_TO_XSYNCVALUE(value, ret) XSyncIntsToValue (ret, (value) & 0xFFFFFFFF, ((guint64)(value)) >> 32)
+#define GINT64_TO_XSYNCVALUE(value, ret) XSyncIntsToValue (ret, value, ((guint64)value) >> 32)

 static void
 fire_watch (MetaIdleMonitorWatch *watch)
 {
  MetaIdleMonitor *monitor;
-  guint id;
-  gboolean is_user_active_watch;

  monitor = watch->monitor;
  g_object_ref (monitor);

-  id = watch->id;
-  is_user_active_watch = (watch->timeout_msec == 0);
-
  if (watch->callback)
-    watch->callback (monitor, id, watch->user_data);
+    {
+      watch->callback (watch->monitor,
+                       watch->id,
+                       watch->user_data);
+    }

-  if (is_user_active_watch)
-    meta_idle_monitor_remove_watch (monitor, id);
+  if (watch->timeout_msec == 0)
+    meta_idle_monitor_remove_watch (watch->monitor, watch->id);

  g_object_unref (monitor);
 }
@@ -147,7 +146,7 @@ _xsync_alarm_set (MetaIdleMonitor	*monitor,
  attr.delta = delta;
  attr.events = want_events;

-  GUINT64_TO_XSYNCVALUE (interval, &attr.trigger.wait_value);
+  GINT64_TO_XSYNCVALUE (interval, &attr.trigger.wait_value);
  attr.trigger.test_type = test_type;
  return XSyncCreateAlarm (monitor->display, flags, &attr);
 }
@@ -220,7 +219,7 @@ meta_idle_monitor_handle_xevent (MetaIdleMonitor       *monitor,
    {
      watches = g_hash_table_get_values (monitor->watches);

-      g_list_foreach (watches, check_x11_watch, (gpointer) alarm);
+      g_list_foreach (watches, check_x11_watch, monitor);
      g_list_free (watches);
    }
 }
@@ -230,7 +229,7 @@ meta_idle_monitor_handle_xevent_all (XEvent *xevent)
 {
  int i;

-  for (i = 0; i <= device_id_max; i++)
+  for (i = 0; i < device_id_max; i++)
    if (device_monitors[i])
      meta_idle_monitor_handle_xevent (device_monitors[i], (XSyncAlarmNotifyEvent*)xevent);
 }
@@ -309,10 +308,7 @@ init_xsync (MetaIdleMonitor *monitor)
  monitor->counter = find_idletime_counter (monitor);
  /* IDLETIME counter not found? */
  if (monitor->counter == None)
-    {
-      meta_warning ("IDLETIME counter not found\n");
-      return;
-    }
+    return;

  monitor->user_active_alarm = _xsync_alarm_set (monitor, XSyncNegativeTransition, 1, FALSE);
 }
@@ -636,7 +632,7 @@ meta_idle_monitor_remove_watch (MetaIdleMonitor *monitor,
 *
 * Returns: The current idle time, in milliseconds, or -1 for not supported
 */
-gint64
+guint64
 meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor)
 {
  XSyncValue value;
@@ -791,7 +787,7 @@ make_dbus_watch (MetaDBusIdleMonitor   *skeleton,
 static gboolean
 handle_add_idle_watch (MetaDBusIdleMonitor   *skeleton,
                       GDBusMethodInvocation *invocation,
-                       guint64                interval,
+                       guint64                interval,                  
                       MetaIdleMonitor       *monitor)
 {
  DBusWatch *watch;
@@ -835,12 +831,30 @@ handle_remove_watch (MetaDBusIdleMonitor   *skeleton,
 }

 static void
-create_monitor_skeleton (GDBusObjectManagerServer *manager,
-                         MetaIdleMonitor          *monitor,
-                         const char               *path)
+on_device_added (ClutterDeviceManager     *device_manager,
+                 ClutterInputDevice       *device,
+                 GDBusObjectManagerServer *manager)
 {
  MetaDBusIdleMonitor *skeleton;
+  MetaIdleMonitor *monitor;
  MetaDBusObjectSkeleton *object;
+  int device_id;
+  gboolean is_core;
+  char *path;
+
+  is_core = clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER;
+
+  if (is_core)
+    {
+      monitor = meta_idle_monitor_get_core ();
+      path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
+    }
+  else
+    {
+      device_id = clutter_input_device_get_device_id (device);
+      monitor = meta_idle_monitor_get_for_device (device_id);
+      path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
+    }

  skeleton = meta_dbus_idle_monitor_skeleton_new ();
  g_signal_connect_object (skeleton, "handle-add-idle-watch",
@@ -858,42 +872,6 @@ create_monitor_skeleton (GDBusObjectManagerServer *manager,
  g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
 }

-static void
-on_device_added (ClutterDeviceManager     *device_manager,
-                 ClutterInputDevice       *device,
-                 GDBusObjectManagerServer *manager)
-{
-
-  MetaIdleMonitor *monitor;
-  int device_id;
-  char *path;
-
-  device_id = clutter_input_device_get_device_id (device);
-  monitor = meta_idle_monitor_get_for_device (device_id);
-  path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
-
-  create_monitor_skeleton (manager, monitor, path);
-  g_free (path);
-}
-
-static void
-on_device_removed (ClutterDeviceManager     *device_manager,
-                   ClutterInputDevice       *device,
-                   GDBusObjectManagerServer *manager)
-{
-  int device_id;
-  char *path;
-
-  device_id = clutter_input_device_get_device_id (device);
-  path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
-  g_dbus_object_manager_server_unexport (manager, path);
-  g_free (path);
-
-  g_clear_object (&device_monitors[device_id]);
-  if (device_id == device_id_max)
-    device_id_max--;
-}
-
 static void
 on_bus_acquired (GDBusConnection *connection,
                 const char      *name,
@@ -901,19 +879,10 @@ on_bus_acquired (GDBusConnection *connection,
 {
  GDBusObjectManagerServer *manager;
  ClutterDeviceManager *device_manager;
-  MetaIdleMonitor *monitor;
  GSList *devices, *iter;
-  char *path;

  manager = g_dbus_object_manager_server_new ("/org/gnome/Mutter/IdleMonitor");

-  /* We never clear the core monitor, as that's supposed to cumulate idle times from
-     all devices */
-  monitor = meta_idle_monitor_get_core ();
-  path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
-  create_monitor_skeleton (manager, monitor, path);
-  g_free (path);
-
  device_manager = clutter_device_manager_get_default ();
  devices = clutter_device_manager_list_devices (device_manager);

@@ -922,10 +891,8 @@ on_bus_acquired (GDBusConnection *connection,

  g_signal_connect_object (device_manager, "device-added",
                           G_CALLBACK (on_device_added), manager, 0);
-  g_signal_connect_object (device_manager, "device-removed",
-                           G_CALLBACK (on_device_removed), manager, 0);

-  g_dbus_object_manager_server_set_connection (manager, connection);
+  g_dbus_object_manager_server_set_connection (manager, g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL));
 }

 static void
@@ -933,7 +900,7 @@ on_name_acquired (GDBusConnection *connection,
                  const char      *name,
                  gpointer         user_data)
 {
-  meta_verbose ("Acquired name %s\n", name);
+  meta_topic (META_DEBUG_DBUS, "Acquired name %s\n", name);
 }

 static void
@@ -941,7 +908,7 @@ on_name_lost (GDBusConnection *connection,
              const char      *name,
              gpointer         user_data)
 {
-  meta_verbose ("Lost or failed to acquire name %s\n", name);
+  meta_topic (META_DEBUG_DBUS, "Lost or failed to acquire name %s\n", name);
 }

 void
--- a/src/core/monitor-config.c
+++ b/src/core/monitor-config.c
@@ -55,8 +55,6 @@ typedef struct {
  char *serial;
 } MetaOutputKey;

-/* Keep this structure packed, so that we
-   can use memcmp */
 typedef struct {
  gboolean enabled;
  MetaRectangle rect;
@@ -149,13 +147,6 @@ output_key_equal (const MetaOutputKey *one,
    strcmp (one->serial, two->serial) == 0;
 }

-static gboolean
-output_config_equal (const MetaOutputConfig *one,
-                     const MetaOutputConfig *two)
-{
-  return memcmp (one, two, sizeof (MetaOutputConfig)) == 0;
-}
-
 static unsigned int
 config_hash (gconstpointer data)
 {
@@ -189,30 +180,6 @@ config_equal (gconstpointer one,
  return ok;
 }

-static gboolean
-config_equal_full (gconstpointer one,
-                   gconstpointer two)
-{
-  const MetaConfiguration *c_one = one;
-  const MetaConfiguration *c_two = two;
-  unsigned int i;
-  gboolean ok;
-
-  if (c_one->n_outputs != c_two->n_outputs)
-    return FALSE;
-
-  ok = TRUE;
-  for (i = 0; i < c_one->n_outputs && ok; i++)
-    {
-      ok = output_key_equal (&c_one->keys[i],
-                             &c_two->keys[i]);
-      ok = ok && output_config_equal (&c_one->outputs[i],
-                                      &c_two->outputs[i]);
-    }
-
-  return ok;
-}
-
 static void
 meta_monitor_config_init (MetaMonitorConfig *self)
 {
@@ -223,7 +190,7 @@ meta_monitor_config_init (MetaMonitorConfig *self)

  filename = g_getenv ("MUTTER_MONITOR_FILENAME");
  if (filename == NULL)
-    filename = "monitors.xml";
+    filename = "monitors-test.xml"; /* FIXME after testing */

  path = g_build_filename (g_get_user_config_dir (), filename, NULL);
  self->file = g_file_new_for_path (path);
@@ -985,6 +952,8 @@ meta_monitor_config_apply_stored (MetaMonitorConfig  *self,
 * or failing that, an output that is good to be a primary (LVDS or eDP,
 * which are internal monitors), or failing that, the one with the
 * best resolution
+ *
+ * Input assertions: there is at least one output
 */
 static MetaOutput *
 find_primary_output (MetaOutput *outputs,
@@ -994,8 +963,6 @@ find_primary_output (MetaOutput *outputs,
  MetaOutput *best;
  int best_width, best_height;

-  g_assert (n_outputs >= 1);
-
  for (i = 0; i < n_outputs; i++)
    {
      if (outputs[i].is_primary)
@@ -1062,9 +1029,6 @@ make_default_config (MetaMonitorConfig *self,
     In the latter case, search for a configuration that includes one
     less screen, then add the new one as a presentation screen
     in preferred mode.
-
-     XXX: but presentation mode is not implemented in the control-center
-     or in mutter core, so let's do extended for now.
  */
  x = 0;
  y = 0;
@@ -1090,7 +1054,7 @@ make_default_config (MetaMonitorConfig *self,
                }
              else if (j > i)
                {
-                  g_assert (output_key_equal (&ret->keys[j], &ref->keys[j - 1]));
+                  g_assert (output_key_equal (&ret->keys[i], &ref->keys[j - 1]));
                  ret->outputs[j] = ref->outputs[j - 1];
                  x = MAX (x, ref->outputs[j - 1].rect.x + ref->outputs[j - 1].rect.width);
                  y = MAX (y, ref->outputs[j - 1].rect.y + ref->outputs[j - 1].rect.height);
@@ -1105,7 +1069,7 @@ make_default_config (MetaMonitorConfig *self,
                  ret->outputs[j].refresh_rate = outputs[0].preferred_mode->refresh_rate;
                  ret->outputs[j].transform = WL_OUTPUT_TRANSFORM_NORMAL;
                  ret->outputs[j].is_primary = FALSE;
-                  ret->outputs[j].is_presentation = FALSE;
+                  ret->outputs[j].is_presentation = TRUE;
                }
            }

@@ -1276,12 +1240,6 @@ meta_monitor_config_update_current (MetaMonitorConfig  *self,
      init_config_from_output (&current->outputs[i], &outputs[i]);
    }

-  if (self->current && config_equal_full (current, self->current))
-    {
-      config_free (current);
-      return;
-    }
-
  if (self->current && !self->current_is_stored)
    config_free (self->current);

@@ -1294,7 +1252,9 @@ meta_monitor_config_restore_previous (MetaMonitorConfig  *self,
                                      MetaMonitorManager *manager)
 {
  if (self->previous)
-    apply_configuration (self, self->previous, manager, FALSE);
+    {
+      apply_configuration (self, self->previous, manager, FALSE);
+    }
  else
    {
      if (!meta_monitor_config_apply_stored (self, manager))
@@ -1583,7 +1543,7 @@ crtc_assignment_assign (CrtcAssignment            *assign,
      return TRUE;
    }
  else
-    {
+    {	
      MetaCRTCInfo *info = g_slice_new0 (MetaCRTCInfo);

      info->crtc = crtc;
@@ -1595,7 +1555,7 @@ crtc_assignment_assign (CrtcAssignment            *assign,

      g_ptr_array_add (info->outputs, output);
      g_hash_table_insert (assign->info, crtc, info);
-
+	    
      return TRUE;
    }
 }
@@ -1693,28 +1653,15 @@ real_assign_crtcs (CrtcAssignment     *assignment,
          for (j = 0; j < n_modes; j++)
 	    {
              MetaMonitorMode *mode = &modes[j];
-              int width, height;

-              if (meta_monitor_transform_is_rotated (output_config->transform))
-                {
-                  width = mode->height;
-                  height = mode->width;
-                }
-              else
-                {
-                  width = mode->width;
-                  height = mode->height;
-                }
-
-              if (width == output_config->rect.width &&
-                  height == output_config->rect.height &&
+              if (mode->width == output_config->rect.width &&
+                  mode->height == output_config->rect.height &&
                  (pass == 1 || mode->refresh_rate == output_config->refresh_rate))
 		{
-                  meta_verbose ("CRTC %ld: trying mode %dx%d@%fHz with output at %dx%d@%fHz (transform %d) (pass %d)\n",
+                  meta_verbose ("CRTC %ld: trying mode %dx%d@%fHz with output at %dx%d@%fHz (pass %d)\n",
                                crtc->crtc_id,
                                mode->width, mode->height, mode->refresh_rate,
                                output_config->rect.width, output_config->rect.height, output_config->refresh_rate,
-                                output_config->transform,
                                pass);


--- a/src/core/monitor-kms.c
+++ b/src/core/monitor-kms.c
@@ -0,0 +1,767 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* 
+ * Copyright (C) 2013 Red Hat Inc.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Giovanni Campagna <gcampagn@redhat.com>
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <clutter/clutter.h>
+
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#include <meta/main.h>
+#include <meta/errors.h>
+#include "monitor-private.h"
+
+#define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)
+
+typedef struct {
+  drmModeConnector *connector;
+
+  unsigned n_encoders;
+  drmModeEncoderPtr *encoders;
+  drmModeEncoderPtr  current_encoder;
+
+  /* bitmasks of encoder position in the resources array */
+  uint32_t encoder_mask;
+  uint32_t enc_clone_mask;
+
+  uint32_t dpms_prop_id;
+} MetaOutputKms;
+
+struct _MetaMonitorManagerKms
+{
+  MetaMonitorManager parent_instance;
+
+  int fd;
+
+  drmModeConnector **connectors;
+  unsigned int       n_connectors;
+
+  drmModeEncoder   **encoders;
+  unsigned int       n_encoders;
+
+  drmModeEncoder    *current_encoder;
+};
+
+struct _MetaMonitorManagerKmsClass
+{
+  MetaMonitorManagerClass parent_class;
+};
+
+G_DEFINE_TYPE (MetaMonitorManagerKms, meta_monitor_manager_kms, META_TYPE_MONITOR_MANAGER);
+
+static int
+compare_outputs (const void *one,
+                 const void *two)
+{
+  const MetaOutput *o_one = one, *o_two = two;
+
+  return strcmp (o_one->name, o_two->name);
+}
+
+static char *
+make_output_name (drmModeConnector *connector)
+{
+  static const char * const connector_type_names[] = {
+    "unknown", "VGA", "DVII", "DVID", "DVID", "Composite",
+    "SVIDEO", "LVDS", "Component", "9PinDIN", "DisplayPort",
+    "HDMIA", "HDMIB", "TV", "eDP"
+  };
+  const char *connector_type_name;
+
+  if (connector->connector_type >= 0 &&
+      connector->connector_type < G_N_ELEMENTS (connector_type_names))
+    connector_type_name = connector_type_names[connector->connector_type];
+  else
+    connector_type_name = "unknown";
+
+  return g_strdup_printf ("%s%d", connector_type_name, connector->connector_id);
+}
+
+static void
+meta_output_destroy_notify (MetaOutput *output)
+{
+  MetaOutputKms *output_kms;
+  unsigned i;
+
+  output_kms = output->driver_private;
+
+  for (i = 0; i < output_kms->n_encoders; i++)
+    drmModeFreeEncoder (output_kms->encoders[i]);
+
+  g_slice_free (MetaOutputKms, output_kms);
+}
+
+static void
+meta_monitor_mode_destroy_notify (MetaMonitorMode *output)
+{
+  g_slice_free (drmModeModeInfo, output->driver_private);
+}
+
+static gboolean
+drm_mode_equal (gconstpointer one,
+                gconstpointer two)
+{
+  return memcmp (one, two, sizeof (drmModeModeInfo)) == 0;
+}
+
+static guint
+drm_mode_hash (gconstpointer ptr)
+{
+  const drmModeModeInfo *mode = ptr;
+  guint hash = 0;
+
+  hash ^= mode->clock;
+  hash ^= mode->hdisplay ^ mode->hsync_start ^ mode->hsync_end;
+  hash ^= mode->vdisplay ^ mode->vsync_start ^ mode->vsync_end;
+  hash ^= mode->vrefresh;
+  hash ^= mode->flags ^ mode->type;
+
+  return hash;
+}
+
+static void
+meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+  drmModeRes *resources;
+  GHashTable *modes;
+  GHashTableIter iter;
+  drmModeModeInfo *mode;
+  unsigned int i, j, k;
+  unsigned int n_actual_outputs;
+  int width, height;
+
+  resources = drmModeGetResources(manager_kms->fd);
+  modes = g_hash_table_new (drm_mode_hash, drm_mode_equal);
+
+  manager->max_screen_width = resources->max_width;
+  manager->max_screen_height = resources->max_height;
+
+  manager->power_save_mode = META_POWER_SAVE_ON;
+
+  manager_kms->n_connectors = resources->count_connectors;
+  manager_kms->connectors = g_new (drmModeConnector *, manager_kms->n_connectors);
+  for (i = 0; i < manager_kms->n_connectors; i++)
+    {
+      drmModeConnector *connector;
+
+      connector = drmModeGetConnector (manager_kms->fd, resources->connectors[i]);
+      manager_kms->connectors[i] = connector;
+
+      if (connector->connection == DRM_MODE_CONNECTED)
+        {
+          /* Collect all modes for this connector */
+          for (j = 0; j < (unsigned)connector->count_modes; j++)
+            g_hash_table_add (modes, &connector->modes[j]);
+        }
+    }
+
+  manager_kms->n_encoders = resources->count_encoders;
+  manager_kms->encoders = g_new (drmModeEncoder *, manager_kms->n_encoders);
+  for (i = 0; i < manager_kms->n_encoders; i++)
+    {
+      manager_kms->encoders[i] = drmModeGetEncoder (manager_kms->fd,
+                                                    resources->encoders[i]);
+    }
+
+  manager->n_modes = g_hash_table_size (modes);
+  manager->modes = g_new0 (MetaMonitorMode, manager->n_modes);
+  g_hash_table_iter_init (&iter, modes);
+  i = 0;
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer)&mode))
+    {
+      MetaMonitorMode *meta_mode;
+
+      meta_mode = &manager->modes[i];
+
+      meta_mode->mode_id = i;
+      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));
+
+      meta_mode->driver_private = g_slice_dup (drmModeModeInfo, mode);
+      meta_mode->driver_notify = (GDestroyNotify)meta_monitor_mode_destroy_notify;
+
+      i++;
+    }
+  g_hash_table_destroy (modes);
+
+  manager->n_crtcs = resources->count_crtcs;
+  manager->crtcs = g_new0 (MetaCRTC, manager->n_crtcs);
+  width = 0; height = 0;
+  for (i = 0; i < (unsigned)resources->count_crtcs; i++)
+    {
+      drmModeCrtc *crtc;
+      MetaCRTC *meta_crtc;
+
+      crtc = drmModeGetCrtc (manager_kms->fd, resources->crtcs[i]);
+
+      meta_crtc = &manager->crtcs[i];
+
+      meta_crtc->crtc_id = crtc->crtc_id;
+      meta_crtc->rect.x = crtc->x;
+      meta_crtc->rect.y = crtc->y;
+      meta_crtc->rect.width = crtc->width;
+      meta_crtc->rect.height = crtc->height;
+      meta_crtc->dirty = FALSE;
+
+      /* FIXME: we can handle some transforms, with a combination of
+         scaling and fitting, but it is very driver dependent */
+      meta_crtc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
+      meta_crtc->all_transforms = 1 << WL_OUTPUT_TRANSFORM_NORMAL;
+
+      if (crtc->mode_valid)
+        {
+          for (j = 0; j < manager->n_modes; j++)
+            {
+              if (drm_mode_equal (&crtc->mode, manager->modes[j].driver_private))
+                {
+                  meta_crtc->current_mode = &manager->modes[j];
+                  break;
+                }
+            }
+
+          width = MAX (width, meta_crtc->rect.x + meta_crtc->rect.width);
+          height = MAX (height, meta_crtc->rect.y + meta_crtc->rect.height);
+        }
+
+      drmModeFreeCrtc (crtc);
+    }
+
+  manager->screen_width = width;
+  manager->screen_height = height;
+
+  manager->outputs = g_new0 (MetaOutput, manager_kms->n_connectors);
+  n_actual_outputs = 0;
+
+  for (i = 0; i < manager_kms->n_connectors; i++)
+    {
+      MetaOutput *meta_output;
+      MetaOutputKms *output_kms;
+      drmModeConnector *connector;
+      GArray *crtcs;
+      unsigned int crtc_mask;
+
+      connector = manager_kms->connectors[i];
+      meta_output = &manager->outputs[n_actual_outputs];
+
+      if (connector->connection == DRM_MODE_CONNECTED)
+	{
+	  meta_output->output_id = connector->connector_id;
+	  meta_output->name = make_output_name (connector);
+	  meta_output->vendor = g_strdup ("unknown");
+	  meta_output->product = g_strdup ("unknown");
+	  meta_output->serial = g_strdup ("");
+	  meta_output->width_mm = connector->mmWidth;
+	  meta_output->height_mm = connector->mmHeight;
+
+          if (connector->subpixel == DRM_MODE_SUBPIXEL_UNKNOWN)
+            meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+          else if (connector->subpixel == DRM_MODE_SUBPIXEL_NONE)
+            meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_NONE;
+          else
+            meta_output->subpixel_order = connector->subpixel;
+
+	  meta_output->n_modes = connector->count_modes;
+	  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 (drm_mode_equal (&connector->modes[j], manager->modes[k].driver_private))
+		    {
+		      meta_output->modes[j] = &manager->modes[k];
+		      break;
+		    }
+		}
+	    }
+	  meta_output->preferred_mode = meta_output->modes[0];
+
+          meta_output->driver_private = output_kms = g_slice_new0 (MetaOutputKms);
+          meta_output->driver_notify = (GDestroyNotify)meta_output_destroy_notify;
+
+          output_kms->connector = connector;
+          output_kms->n_encoders = connector->count_encoders;
+          output_kms->encoders = g_new0 (drmModeEncoderPtr, output_kms->n_encoders);
+
+          crtc_mask = 0x7F;
+	  for (j = 0; j < output_kms->n_encoders; j++)
+	    {
+              output_kms->encoders[j] = drmModeGetEncoder (manager_kms->fd, connector->encoders[j]);
+
+              crtc_mask &= output_kms->encoders[j]->possible_crtcs;
+
+              if (output_kms->encoders[j]->encoder_id == connector->encoder_id)
+                output_kms->current_encoder = output_kms->encoders[j];
+            }
+
+          crtcs = g_array_new (FALSE, FALSE, sizeof (MetaCRTC*));
+
+          for (j = 0; j < manager->n_crtcs; j++)
+            {
+              if (crtc_mask & (1 << j))
+                {
+                  MetaCRTC *crtc = &manager->crtcs[j];
+                  g_array_append_val (crtcs, crtc);
+		}
+	    }
+          
+	  meta_output->n_possible_crtcs = crtcs->len;
+	  meta_output->possible_crtcs = (void*)g_array_free (crtcs, FALSE);
+
+          if (output_kms->current_encoder && output_kms->current_encoder->crtc_id != 0)
+            {
+              for (j = 0; j < manager->n_crtcs; j++)
+                {
+                  if (manager->crtcs[j].crtc_id == output_kms->current_encoder->crtc_id)
+                    {
+                      meta_output->crtc = &manager->crtcs[j];
+                      break;
+                    }
+                }
+            }
+          else
+            meta_output->crtc = NULL;
+
+	  meta_output->is_primary = FALSE;
+	  meta_output->is_presentation = FALSE;
+
+          for (j = 0; j < (unsigned)connector->count_props; j++)
+            {
+              drmModePropertyPtr prop;
+
+              prop = drmModeGetProperty(manager_kms->fd, connector->props[j]);
+
+              if (prop)
+                {
+                  if ((prop->flags & DRM_MODE_PROP_ENUM) &&
+                      strcmp(prop->name, "DPMS") == 0)
+                    {
+                      output_kms->dpms_prop_id = prop->prop_id;
+                      drmModeFreeProperty(prop);
+                      break;
+                    }
+
+                  drmModeFreeProperty(prop);
+		}
+            }
+
+          /* FIXME: backlight is a very driver specific thing unfortunately,
+             every DDX does its own thing, and the dumb KMS API does not include it.
+
+             For example, xf86-video-intel has a list of paths to probe in /sys/class/backlight
+             (one for each major HW maker, and then some).
+             We can't do the same because we're not root.
+             It might be best to leave backlight out of the story and rely on the setuid
+             helper in gnome-settings-daemon.
+          */
+	  meta_output->backlight_min = 0;
+          meta_output->backlight_max = 0;
+          meta_output->backlight = -1;
+
+	  n_actual_outputs++;
+	}
+    }
+
+  manager->n_outputs = n_actual_outputs;
+  manager->outputs = g_renew (MetaOutput, manager->outputs, manager->n_outputs);
+
+  /* Sort the outputs for easier handling in MetaMonitorConfig */
+  qsort (manager->outputs, manager->n_outputs, sizeof (MetaOutput), compare_outputs);
+
+  /* Now fix the clones.
+     Code mostly inspired by xf86-video-modesetting. */
+
+  /* XXX: intel hardware doesn't usually have clones, but we only have intel
+     cards, so this code was never tested! */
+  for (i = 0; i < manager->n_outputs; i++)
+    {
+      MetaOutput *meta_output;
+      MetaOutputKms *output_kms;
+
+      meta_output = &manager->outputs[i];
+      output_kms = meta_output->driver_private;
+
+      output_kms->enc_clone_mask = 0xff;
+      output_kms->encoder_mask = 0;
+
+      for (j = 0; j < output_kms->n_encoders; j++)
+	{
+	  for (k = 0; k < manager_kms->n_encoders; k++)
+	    {
+	      if (output_kms->encoders[j]->encoder_id == manager_kms->encoders[k]->encoder_id)
+		{
+                  output_kms->encoder_mask |= (1 << k);
+		  break;
+		}
+	    }
+
+          output_kms->enc_clone_mask &= output_kms->encoders[j]->possible_clones;
+	}
+    }
+
+  for (i = 0; i < manager->n_outputs; i++)
+    {
+      MetaOutput *meta_output;
+      MetaOutputKms *output_kms;
+
+      meta_output = &manager->outputs[i];
+      output_kms = meta_output->driver_private;
+
+      if (output_kms->enc_clone_mask == 0)
+        continue;
+
+      for (j = 0; j < manager->n_outputs; j++)
+        {
+          MetaOutput *meta_clone;
+          MetaOutputKms *clone_kms;
+
+          meta_clone = &manager->outputs[i];
+          clone_kms = meta_clone->driver_private;
+
+          if (meta_clone == meta_output)
+            continue;
+
+          if (clone_kms->encoder_mask == 0)
+            continue;
+
+          if (clone_kms->encoder_mask == output_kms->enc_clone_mask)
+            {
+              meta_output->n_possible_clones++;
+              meta_output->possible_clones = g_renew (MetaOutput *,
+                                                      meta_output->possible_clones,
+                                                      meta_output->n_possible_clones);
+              meta_output->possible_clones[meta_output->n_possible_clones - 1] = meta_clone;
+            }
+        }
+    }
+
+  drmModeFreeResources (resources);
+}
+
+static void
+meta_monitor_manager_kms_set_power_save_mode (MetaMonitorManager *manager,
+                                              MetaPowerSave       mode)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+  uint64_t state;
+  unsigned i;
+
+  switch (mode) {
+  case META_POWER_SAVE_ON:
+    state = DRM_MODE_DPMS_ON;
+    break;
+  case META_POWER_SAVE_STANDBY:
+    state = DRM_MODE_DPMS_STANDBY;
+    break;
+  case META_POWER_SAVE_SUSPEND:
+    state = DRM_MODE_DPMS_SUSPEND;
+    break;
+  case META_POWER_SAVE_OFF:
+    state = DRM_MODE_DPMS_SUSPEND;
+    break;
+  default:
+    return;
+  }
+
+  for (i = 0; i < manager->n_outputs; i++)
+    {
+      MetaOutput *meta_output;
+      MetaOutputKms *output_kms;
+
+      meta_output = &manager->outputs[i];
+      output_kms = meta_output->driver_private;
+
+      if (output_kms->dpms_prop_id)
+        {
+          int ok = drmModeConnectorSetProperty(manager_kms->fd, meta_output->output_id,
+                                               output_kms->dpms_prop_id, state);
+
+          if (ok < 0)
+            meta_warning ("Failed to set power save mode for output %s: %s\n",
+                          meta_output->name, strerror (errno));
+        }
+    }
+}
+
+static void
+crtc_free (CoglKmsCrtc *crtc)
+{
+  g_free (crtc->connectors);
+  g_slice_free (CoglKmsCrtc, crtc);
+}
+
+static void
+meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
+                                              MetaCRTCInfo       **crtcs,
+                                              unsigned int         n_crtcs,
+                                              MetaOutputInfo     **outputs,
+                                              unsigned int         n_outputs)
+{
+  ClutterBackend *backend;
+  CoglContext *cogl_context;
+  CoglDisplay *cogl_display;
+  unsigned i;
+  GList *cogl_crtcs;
+  int width, height;
+  gboolean ok;
+  GError *error;
+
+  cogl_crtcs = NULL;
+  width = 0; height = 0;
+  for (i = 0; i < n_crtcs; i++)
+    {
+      MetaCRTCInfo *crtc_info = crtcs[i];
+      MetaCRTC *crtc = crtc_info->crtc;
+      CoglKmsCrtc *cogl_crtc;
+
+      crtc->dirty = TRUE;
+
+      cogl_crtc = g_slice_new0 (CoglKmsCrtc);
+      cogl_crtcs = g_list_prepend (cogl_crtcs, cogl_crtc);
+
+      if (crtc_info->mode == NULL)
+        {
+          cogl_crtc->id = crtc->crtc_id;
+          cogl_crtc->x = 0;
+          cogl_crtc->y = 0;
+          cogl_crtc->count = 0;
+          memset (&cogl_crtc->mode, 0, sizeof (drmModeModeInfo));
+          cogl_crtc->connectors = NULL;
+          cogl_crtc->count = 0;
+
+          crtc->rect.x = 0;
+          crtc->rect.y = 0;
+          crtc->rect.width = 0;
+          crtc->rect.height = 0;
+          crtc->current_mode = NULL;
+        }
+      else
+        {
+          MetaMonitorMode *mode;
+          uint32_t *outputs;
+          unsigned int j, n_outputs;
+
+          mode = crtc_info->mode;
+
+          cogl_crtc->id = crtc->crtc_id;
+          cogl_crtc->x = crtc_info->x;
+          cogl_crtc->y = crtc_info->y;
+          cogl_crtc->count = n_outputs = crtc_info->outputs->len;
+          cogl_crtc->connectors = outputs = g_new (uint32_t, n_outputs);
+
+          for (j = 0; j < n_outputs; j++)
+            {
+              MetaOutput *output = ((MetaOutput**)crtc_info->outputs->pdata)[j];
+
+              outputs[j] = output->output_id;
+
+              output->dirty = TRUE;
+              output->crtc = crtc;
+            }
+
+          memcpy (&cogl_crtc->mode, crtc_info->mode->driver_private,
+                  sizeof (drmModeModeInfo));
+
+          width = MAX (width, crtc_info->x + crtc_info->mode->width);
+          height = MAX (height, crtc_info->y + crtc_info->mode->height);
+
+          crtc->rect.x = crtc_info->x;
+          crtc->rect.y = crtc_info->y;
+          crtc->rect.width = mode->width;
+          crtc->rect.height = mode->height;
+          crtc->current_mode = mode;
+          crtc->transform = crtc_info->transform;
+        }
+    }
+
+  /* Disable CRTCs not mentioned in the list */
+  for (i = 0; i < manager->n_crtcs; i++)
+    {
+      MetaCRTC *crtc = &manager->crtcs[i];
+      CoglKmsCrtc *cogl_crtc;
+
+      crtc->logical_monitor = NULL;
+
+      if (crtc->dirty)
+        {
+          crtc->dirty = FALSE;
+          continue;
+        }
+
+      cogl_crtc = g_slice_new0 (CoglKmsCrtc);
+      cogl_crtcs = g_list_prepend (cogl_crtcs, cogl_crtc);
+
+      cogl_crtc->id = crtc->crtc_id;
+      cogl_crtc->x = 0;
+      cogl_crtc->y = 0;
+      cogl_crtc->count = 0;
+      memset (&cogl_crtc->mode, 0, sizeof (drmModeModeInfo));
+      cogl_crtc->connectors = NULL;
+      cogl_crtc->count = 0;
+
+      crtc->rect.x = 0;
+      crtc->rect.y = 0;
+      crtc->rect.width = 0;
+      crtc->rect.height = 0;
+      crtc->current_mode = NULL;
+    }
+
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
+  cogl_display = cogl_context_get_display (cogl_context);
+
+  error = NULL;
+  ok = cogl_kms_display_set_layout (cogl_display, width, height, cogl_crtcs, &error);
+  g_list_free_full (cogl_crtcs, (GDestroyNotify) crtc_free);
+
+  if (!ok)
+    {
+      meta_warning ("Applying display configuration failed: %s\n", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  for (i = 0; i < n_outputs; i++)
+    {
+      MetaOutputInfo *output_info = outputs[i];
+      MetaOutput *output = output_info->output;
+
+      output->is_primary = output_info->is_primary;
+      output->is_presentation = output_info->is_presentation;
+    }
+
+  /* Disable outputs not mentioned in the list */
+  for (i = 0; i < manager->n_outputs; i++)
+    {
+      MetaOutput *output = &manager->outputs[i];
+
+      if (output->dirty)
+        {
+          output->dirty = FALSE;
+          continue;
+        }
+
+      output->crtc = NULL;
+      output->is_primary = FALSE;
+    }
+
+  manager->screen_width = width;
+  manager->screen_height = height;
+
+  meta_monitor_manager_rebuild_derived (manager);
+}
+
+static void
+meta_monitor_manager_kms_get_crtc_gamma (MetaMonitorManager  *manager,
+                                         MetaCRTC            *crtc,
+                                         gsize               *size,
+                                         unsigned short     **red,
+                                         unsigned short     **green,
+                                         unsigned short     **blue)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+  drmModeCrtc *kms_crtc;
+
+  kms_crtc = drmModeGetCrtc (manager_kms->fd, crtc->crtc_id);
+
+  *size = kms_crtc->gamma_size;
+  *red = g_new (unsigned short, *size);
+  *green = g_new (unsigned short, *size);
+  *blue = g_new (unsigned short, *size);
+
+  drmModeCrtcGetGamma (manager_kms->fd, crtc->crtc_id, *size, *red, *green, *blue);
+
+  drmModeFreeCrtc (kms_crtc);
+}
+
+static void
+meta_monitor_manager_kms_set_crtc_gamma (MetaMonitorManager *manager,
+                                         MetaCRTC           *crtc,
+                                         gsize               size,
+                                         unsigned short     *red,
+                                         unsigned short     *green,
+                                         unsigned short     *blue)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (manager);
+
+  drmModeCrtcSetGamma (manager_kms->fd, crtc->crtc_id, size, red, green, blue);
+}
+
+static void
+meta_monitor_manager_kms_init (MetaMonitorManagerKms *manager_kms)
+{
+  ClutterBackend *backend;
+  CoglContext *cogl_context;
+  CoglDisplay *cogl_display;
+  CoglRenderer *cogl_renderer;
+
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
+  cogl_display = cogl_context_get_display (cogl_context);
+  cogl_renderer = cogl_display_get_renderer (cogl_display);
+
+  manager_kms->fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
+}
+
+static void
+meta_monitor_manager_kms_finalize (GObject *object)
+{
+  MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (object);
+  unsigned i;
+
+  for (i = 0; i < manager_kms->n_encoders; i++)
+    drmModeFreeEncoder (manager_kms->encoders[i]);
+  for (i = 0; i < manager_kms->n_connectors; i++)
+    drmModeFreeConnector (manager_kms->connectors[i]);
+
+  g_free (manager_kms->encoders);
+  g_free (manager_kms->connectors);
+
+  G_OBJECT_CLASS (meta_monitor_manager_kms_parent_class)->finalize (object);
+}
+
+static void
+meta_monitor_manager_kms_class_init (MetaMonitorManagerKmsClass *klass)
+{
+  MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_monitor_manager_kms_finalize;
+
+  manager_class->read_current = meta_monitor_manager_kms_read_current;
+  manager_class->apply_configuration = meta_monitor_manager_kms_apply_configuration;
+  manager_class->set_power_save_mode = meta_monitor_manager_kms_set_power_save_mode;
+  manager_class->get_crtc_gamma = meta_monitor_manager_kms_get_crtc_gamma;
+  manager_class->set_crtc_gamma = meta_monitor_manager_kms_set_crtc_gamma;
+}
+
--- a/src/core/monitor-private.h
+++ b/src/core/monitor-private.h
@@ -38,7 +38,6 @@
 #define META_MONITOR_PRIVATE_H

 #include <cogl/cogl.h>
-#include <libgnome-desktop/gnome-pnp-ids.h>

 #include "display-private.h"
 #include <meta/screen.h>
@@ -105,7 +104,7 @@ struct _MetaOutput
  int backlight_max;

  /* Used when changing configuration */
-  gboolean is_dirty;
+  gboolean dirty;

  /* The low-level bits used to build the high-level info
     in MetaMonitorInfo
@@ -116,6 +115,9 @@ struct _MetaOutput
  */
  gboolean is_primary;
  gboolean is_presentation;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
 };

 struct _MetaCRTC
@@ -132,17 +134,21 @@ struct _MetaCRTC
  MetaMonitorInfo *logical_monitor;

  /* Used when changing configuration */
-  gboolean is_dirty;
+  gboolean dirty;
 };

 struct _MetaMonitorMode
 {
  /* The low-level ID of this mode, used to apply back configuration */
  glong mode_id;
+  char *name;

  int width;
  int height;
  float refresh_rate;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
 };

 /**
@@ -165,7 +171,8 @@ struct _MetaMonitorInfo
  gboolean in_fullscreen;

  /* The primary or first output for this monitor, 0 if we can't figure out.
-     It can be matched to an output_id of a MetaOutput.
+     This is a XID when using XRandR, otherwise a KMS id (not implemented).
+     In any case, it can be matched to an output_id of a MetaOutput.

     This is used as an opaque token on reconfiguration when switching from
     clone to extened, to decide on what output the windows should go next
@@ -251,8 +258,6 @@ struct _MetaMonitorManager

  int persistent_timeout_id;
  MetaMonitorConfig *config;
-
-  GnomePnpIds *pnp_ids;
 };

 struct _MetaMonitorManagerClass
@@ -301,6 +306,13 @@ GType meta_monitor_manager_get_type (void);
 void                meta_monitor_manager_initialize (void);
 MetaMonitorManager *meta_monitor_manager_get  (void);

+void                meta_monitor_manager_init_dbus         (MetaMonitorManager *manager,
+                                                            GAsyncReadyCallback callback,
+                                                            gpointer            user_data);
+gboolean            meta_monitor_manager_init_dbus_finish  (MetaMonitorManager *manager,
+                                                            GAsyncResult       *result,
+                                                            GError            **error);
+
 void                meta_monitor_manager_rebuild_derived   (MetaMonitorManager *manager);

 MetaMonitorInfo    *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
@@ -351,6 +363,18 @@ typedef struct _MetaMonitorManagerXrandr         MetaMonitorManagerXrandr;

 GType meta_monitor_manager_xrandr_get_type (void);

+#define META_TYPE_MONITOR_MANAGER_KMS            (meta_monitor_manager_kms_get_type ())
+#define META_MONITOR_MANAGER_KMS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKms))
+#define META_MONITOR_MANAGER_KMS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKmsClass))
+#define META_IS_MONITOR_MANAGER_KMS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER_KMS))
+#define META_IS_MONITOR_MANAGER_KMS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER_KMS))
+#define META_MONITOR_MANAGER_KMS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER_KMS, MetaMonitorManagerKmsClass))
+
+typedef struct _MetaMonitorManagerKmsClass    MetaMonitorManagerKmsClass;
+typedef struct _MetaMonitorManagerKms         MetaMonitorManagerKms;
+
+GType meta_monitor_manager_kms_get_type (void);
+
 #define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
 #define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
 #define META_MONITOR_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_CONFIG, MetaMonitorConfigClass))
@@ -381,15 +405,4 @@ void               meta_monitor_config_restore_previous (MetaMonitorConfig  *con
 void               meta_crtc_info_free   (MetaCRTCInfo   *info);
 void               meta_output_info_free (MetaOutputInfo *info);

-void               meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
-                                                           int         n_old_outputs);
-
-/* Returns true if transform causes width and height to be inverted
-   This is true for the odd transforms in the enum */
-static inline gboolean
-meta_monitor_transform_is_rotated (enum wl_output_transform transform)
-{
-  return (transform % 2);
-}
-
 #endif
--- a/src/core/monitor-xrandr.c
+++ b/src/core/monitor-xrandr.c
@@ -29,7 +29,6 @@

 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
 #include <clutter/clutter.h>

 #include <X11/Xatom.h>
@@ -40,15 +39,8 @@
 #include <meta/errors.h>
 #include "monitor-private.h"

-#include "edid.h"
-
 #define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)

-/* Look for DPI_FALLBACK in:
- * http://git.gnome.org/browse/gnome-settings-daemon/tree/plugins/xsettings/gsd-xsettings-manager.c
- * for the reasoning */
-#define DPI_FALLBACK 96.0
-
 struct _MetaMonitorManagerXrandr
 {
  MetaMonitorManager parent_instance;
@@ -170,8 +162,8 @@ static int
 normalize_backlight (MetaOutput *output,
                     int         hw_value)
 {
-  return round ((double)(hw_value - output->backlight_min) /
-                (output->backlight_max - output->backlight_min) * 100.0);
+  return round((double)(hw_value - output->backlight_min) /
+               (output->backlight_max - output->backlight_min) * 100.0);
 }

 static int
@@ -243,74 +235,6 @@ compare_outputs (const void *one,
  return strcmp (o_one->name, o_two->name);
 }

-static guint8 *
-get_edid_property (Display  *dpy,
-                   RROutput  output,
-                   Atom      atom,
-                   gsize    *len)
-{
-  unsigned char *prop;
-  int actual_format;
-  unsigned long nitems, bytes_after;
-  Atom actual_type;
-  guint8 *result;
-
-  XRRGetOutputProperty (dpy, output, atom,
-                        0, 100, False, False,
-                        AnyPropertyType,
-                        &actual_type, &actual_format,
-                        &nitems, &bytes_after, &prop);
-
-  if (actual_type == XA_INTEGER && actual_format == 8)
-    {
-      result = g_memdup (prop, nitems);
-      if (len)
-        *len = nitems;
-    }
-  else
-    {
-      result = NULL;
-    }
-
-  XFree (prop);
-    
-  return result;
-}
-
-static GBytes *
-read_output_edid (MetaMonitorManagerXrandr *manager_xrandr,
-                  XID                       output_id)
-{
-  Atom edid_atom;
-  guint8 *result;
-  gsize len;
-
-  edid_atom = XInternAtom (manager_xrandr->xdisplay, "EDID", FALSE);
-  result = get_edid_property (manager_xrandr->xdisplay, output_id, edid_atom, &len);
-
-  if (!result)
-    {
-      edid_atom = XInternAtom (manager_xrandr->xdisplay, "EDID_DATA", FALSE);
-      result = get_edid_property (manager_xrandr->xdisplay, output_id, edid_atom, &len);
-    }
-
-  if (!result)
-    {
-      edid_atom = XInternAtom (manager_xrandr->xdisplay, "XFree86_DDC_EDID1_RAWDATA", FALSE);
-      result = get_edid_property (manager_xrandr->xdisplay, output_id, edid_atom, &len);
-    }
-
-  if (result)
-    {
-      if (len > 0 && len % 128 == 0)
-        return g_bytes_new_take (result, len);
-      else
-        g_free (result);
-    }
-
-  return NULL;
-}
-
 static void
 meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 {
@@ -337,23 +261,18 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
      dpms_enabled)
    {
      switch (dpms_state)
-        {
-        case DPMSModeOn:
-          manager->power_save_mode = META_POWER_SAVE_ON;
-          break;
-        case DPMSModeStandby:
-          manager->power_save_mode = META_POWER_SAVE_STANDBY;
-          break;
-        case DPMSModeSuspend:
-          manager->power_save_mode = META_POWER_SAVE_SUSPEND;
-          break;
-        case DPMSModeOff:
-          manager->power_save_mode = META_POWER_SAVE_OFF;
-          break;
-        default:
-          manager->power_save_mode = META_POWER_SAVE_UNKNOWN;
-          break;
-        }
+	{
+	case DPMSModeOn:
+	  manager->power_save_mode = META_POWER_SAVE_ON;
+	case DPMSModeStandby:
+	  manager->power_save_mode = META_POWER_SAVE_STANDBY;
+	case DPMSModeSuspend:
+	  manager->power_save_mode = META_POWER_SAVE_SUSPEND;
+	case DPMSModeOff:
+	  manager->power_save_mode = META_POWER_SAVE_OFF;
+	default:
+	  manager->power_save_mode = META_POWER_SAVE_UNKNOWN;
+	}
    }
  else
    {
@@ -414,7 +333,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
      meta_crtc->rect.y = crtc->y;
      meta_crtc->rect.width = crtc->width;
      meta_crtc->rect.height = crtc->height;
-      meta_crtc->is_dirty = FALSE;
+      meta_crtc->dirty = FALSE;
      meta_crtc->transform = wl_transform_from_xrandr (crtc->rotation);
      meta_crtc->all_transforms = wl_transform_from_xrandr_all (crtc->rotations);

@@ -445,42 +364,11 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)

      if (output->connection != RR_Disconnected)
 	{
-          GBytes *edid;
-          MonitorInfo *parsed_edid;
-
 	  meta_output->output_id = resources->outputs[i];
 	  meta_output->name = g_strdup (output->name);
-
-          edid = read_output_edid (manager_xrandr, meta_output->output_id);
-          if (edid)
-            {
-              gsize len;
-
-              parsed_edid = decode_edid (g_bytes_get_data (edid, &len));
-              if (parsed_edid)
-                {
-                  meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
-                  if (parsed_edid->dsc_product_name[0])
-                    meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14);
-                  else
-                    meta_output->product = g_strdup_printf ("0x%04x", (unsigned)parsed_edid->product_code);
-                  if (parsed_edid->dsc_serial_number[0])
-                    meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
-                  else
-                    meta_output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number);
-
-                  g_free (parsed_edid);
-                }
-
-              g_bytes_unref (edid);
-            }
-
-          if (!meta_output->vendor)
-            {
-              meta_output->vendor = g_strdup ("unknown");
-              meta_output->product = g_strdup ("unknown");
-              meta_output->serial = g_strdup ("unknown");
-            }
+	  meta_output->vendor = g_strdup ("unknown");
+	  meta_output->product = g_strdup ("unknown");
+	  meta_output->serial = g_strdup ("");
 	  meta_output->width_mm = output->mm_width;
 	  meta_output->height_mm = output->mm_height;
 	  meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
@@ -532,7 +420,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 	  */
 	  for (j = 0; j < (unsigned)output->nclone; j++)
 	    {
-	      meta_output->possible_clones[j] = GINT_TO_POINTER (output->clones[j]);
+	      meta_output->possible_clones = GINT_TO_POINTER (output->clones[j]);
 	    }

 	  meta_output->is_primary = ((XID)meta_output->output_id == primary_output);
@@ -578,13 +466,73 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
    }
 }

+static guint8 *
+get_edid_property (Display  *dpy,
+                   RROutput  output,
+                   Atom      atom,
+                   gsize    *len)
+{
+  unsigned char *prop;
+  int actual_format;
+  unsigned long nitems, bytes_after;
+  Atom actual_type;
+  guint8 *result;
+
+  XRRGetOutputProperty (dpy, output, atom,
+                        0, 100, False, False,
+                        AnyPropertyType,
+                        &actual_type, &actual_format,
+                        &nitems, &bytes_after, &prop);
+
+  if (actual_type == XA_INTEGER && actual_format == 8)
+    {
+      result = g_memdup (prop, nitems);
+      if (len)
+        *len = nitems;
+    }
+  else
+    {
+      result = NULL;
+    }
+
+  XFree (prop);
+    
+  return result;
+}
+
 static GBytes *
 meta_monitor_manager_xrandr_read_edid (MetaMonitorManager *manager,
                                       MetaOutput         *output)
 {
  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
+  Atom edid_atom;
+  guint8 *result;
+  gsize len;

-  return read_output_edid (manager_xrandr, output->output_id);
+  edid_atom = XInternAtom (manager_xrandr->xdisplay, "EDID", FALSE);
+  result = get_edid_property (manager_xrandr->xdisplay, output->output_id, edid_atom, &len);
+
+  if (!result)
+    {
+      edid_atom = XInternAtom (manager_xrandr->xdisplay, "EDID_DATA", FALSE);
+      result = get_edid_property (manager_xrandr->xdisplay, output->output_id, edid_atom, &len);
+    }
+
+  if (!result)
+    {
+      edid_atom = XInternAtom (manager_xrandr->xdisplay, "XFree86_DDC_EDID1_RAWDATA", FALSE);
+      result = get_edid_property (manager_xrandr->xdisplay, output->output_id, edid_atom, &len);
+    }
+
+  if (result)
+    {
+      if (len > 0 && len % 128 == 0)
+        return g_bytes_new_take (result, len);
+      else
+        g_free (result);
+    }
+
+  return NULL;
 }

 static void
@@ -667,46 +615,16 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
 {
  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
  unsigned i;
-  int width, height, width_mm, height_mm;

  meta_display_grab (meta_get_display ());

-  /* First compute the new size of the screen (framebuffer) */
-  width = 0; height = 0;
  for (i = 0; i < n_crtcs; i++)
    {
      MetaCRTCInfo *crtc_info = crtcs[i];
      MetaCRTC *crtc = crtc_info->crtc;
-      crtc->is_dirty = TRUE;
+      crtc->dirty = TRUE;

      if (crtc_info->mode == NULL)
-        continue;
-
-      if (meta_monitor_transform_is_rotated (crtc_info->transform))
-        {
-          width = MAX (width, crtc_info->x + crtc_info->mode->height);
-          height = MAX (height, crtc_info->y + crtc_info->mode->width);
-        }
-      else
-        {
-          width = MAX (width, crtc_info->x + crtc_info->mode->width);
-          height = MAX (height, crtc_info->y + crtc_info->mode->height);
-        }
-    }
-
-  /* Second disable all newly disabled CRTCs, or CRTCs that in the previous
-     configuration would be outside the new framebuffer (otherwise X complains
-     loudly when resizing)
-     CRTC will be enabled again after resizing the FB
-  */
-  for (i = 0; i < n_crtcs; i++)
-    {
-      MetaCRTCInfo *crtc_info = crtcs[i];
-      MetaCRTC *crtc = crtc_info->crtc;
-
-      if (crtc_info->mode == NULL ||
-          crtc->rect.x + crtc->rect.width > width ||
-          crtc->rect.y + crtc->rect.height > height)
        {
          XRRSetCrtcConfig (manager_xrandr->xdisplay,
                            manager_xrandr->resources,
@@ -716,112 +634,21 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
                            None,
                            RR_Rotate_0,
                            NULL, 0);
-
-          crtc->rect.x = 0;
-          crtc->rect.y = 0;
-          crtc->rect.width = 0;
-          crtc->rect.height = 0;
-          crtc->current_mode = NULL;
        }
-    }
-
-  /* Disable CRTCs not mentioned in the list */
-  for (i = 0; i < manager->n_crtcs; i++)
-    {
-      MetaCRTC *crtc = &manager->crtcs[i];
-
-      if (crtc->is_dirty)
-        {
-          crtc->is_dirty = FALSE;
-          continue;
-        }
-      if (crtc->current_mode == NULL)
-        continue;
-
-      XRRSetCrtcConfig (manager_xrandr->xdisplay,
-                        manager_xrandr->resources,
-                        (XID)crtc->crtc_id,
-                        manager_xrandr->time,
-                        0, 0,
-                        None,
-                        RR_Rotate_0,
-                        NULL, 0);
-
-      crtc->rect.x = 0;
-      crtc->rect.y = 0;
-      crtc->rect.width = 0;
-      crtc->rect.height = 0;
-      crtc->current_mode = NULL;
-    }
-
-  g_assert (width > 0 && height > 0);
-  /* The 'physical size' of an X screen is meaningless if that screen
-   * can consist of many monitors. So just pick a size that make the
-   * dpi 96.
-   *
-   * Firefox and Evince apparently believe what X tells them.
-   */
-  width_mm = (width / DPI_FALLBACK) * 25.4 + 0.5;
-  height_mm = (height / DPI_FALLBACK) * 25.4 + 0.5;
-  meta_error_trap_push (meta_get_display ());
-  XRRSetScreenSize (manager_xrandr->xdisplay, DefaultRootWindow (manager_xrandr->xdisplay),
-                    width, height, width_mm, height_mm);
-  meta_error_trap_pop (meta_get_display ());
-
-  for (i = 0; i < n_crtcs; i++)
-    {
-      MetaCRTCInfo *crtc_info = crtcs[i];
-      MetaCRTC *crtc = crtc_info->crtc;
-
-      if (crtc_info->mode != NULL)
+      else
        {
          MetaMonitorMode *mode;
          XID *outputs;
-          unsigned int j, n_outputs;
-          int width, height;
+          int j, n_outputs;
          Status ok;
-          unsigned long old_controlled_mask;
-          unsigned long new_controlled_mask;

          mode = crtc_info->mode;

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

-          old_controlled_mask = 0;
-          for (j = 0; j < manager->n_outputs; j++)
-            {
-              MetaOutput *output;
-
-              output = &manager->outputs[j];
-
-              if (output->crtc == crtc)
-                old_controlled_mask |= 1UL << j;
-            }
-
-          new_controlled_mask = 0;
          for (j = 0; j < n_outputs; j++)
-            {
-              MetaOutput *output;
-
-              output = ((MetaOutput**)crtc_info->outputs->pdata)[j];
-
-              output->is_dirty = TRUE;
-              output->crtc = crtc;
-              new_controlled_mask |= 1UL << j;
-
-              outputs[j] = output->output_id;
-            }
-
-          if (crtc->current_mode == mode &&
-              crtc->rect.x == crtc_info->x &&
-              crtc->rect.y == crtc_info->y &&
-              crtc->transform == crtc_info->transform &&
-              old_controlled_mask == new_controlled_mask)
-            {
-              /* No change */
-              goto next;
-            }
+            outputs[j] = ((MetaOutput**)crtc_info->outputs->pdata)[j]->output_id;

          meta_error_trap_push (meta_get_display ());
          ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
@@ -835,33 +662,11 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
          meta_error_trap_pop (meta_get_display ());

          if (ok != Success)
-            {
-              meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transfrom %u failed\n",
-                            (unsigned)(crtc->crtc_id), (unsigned)(mode->mode_id),
-                            mode->width, mode->height, (float)mode->refresh_rate,
-                            crtc_info->x, crtc_info->y, crtc_info->transform);
-              goto next;
-            }
+            meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transfrom %u failed\n",
+                          (unsigned)(crtc - manager->crtcs), (unsigned)(mode - manager->modes),
+                          mode->width, mode->height, (float)mode->refresh_rate,
+                          crtc_info->x, crtc_info->y, crtc_info->transform);

-          if (meta_monitor_transform_is_rotated (crtc_info->transform))
-            {
-              width = mode->height;
-              height = mode->width;
-            }
-          else
-            {
-              width = mode->width;
-              height = mode->height;
-            }
-
-          crtc->rect.x = crtc_info->x;
-          crtc->rect.y = crtc_info->y;
-          crtc->rect.width = width;
-          crtc->rect.height = height;
-          crtc->current_mode = mode;
-          crtc->transform = crtc_info->transform;
-
-        next:
          g_free (outputs);
        }
    }
@@ -869,7 +674,6 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
  for (i = 0; i < n_outputs; i++)
    {
      MetaOutputInfo *output_info = outputs[i];
-      MetaOutput *output = output_info->output;

      if (output_info->is_primary)
        {
@@ -881,24 +685,29 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
      output_set_presentation_xrandr (manager_xrandr,
                                      output_info->output,
                                      output_info->is_presentation);
-
-      output->is_primary = output_info->is_primary;
-      output->is_presentation = output_info->is_presentation;
    }

-  /* Disable outputs not mentioned in the list */
-  for (i = 0; i < manager->n_outputs; i++)
+  /* Disable CRTCs not mentioned in the list */
+  for (i = 0; i < manager->n_crtcs; i++)
    {
-      MetaOutput *output = &manager->outputs[i];
+      MetaCRTC *crtc = &manager->crtcs[i];

-      if (output->is_dirty)
+      if (crtc->dirty)
        {
-          output->is_dirty = FALSE;
+          crtc->dirty = FALSE;
          continue;
        }
+      if (crtc->current_mode == NULL)
+        continue;

-      output->crtc = NULL;
-      output->is_primary = FALSE;
+      XRRSetCrtcConfig (manager_xrandr->xdisplay,
+                        manager_xrandr->resources,
+                        (XID)crtc->crtc_id,
+                        manager_xrandr->time,
+                        0, 0,
+                        None,
+                        RR_Rotate_0,
+                        NULL, 0);
    }

  meta_display_ungrab (meta_get_display ());
@@ -913,7 +722,7 @@ meta_monitor_manager_xrandr_change_backlight (MetaMonitorManager *manager,
  MetaDisplay *display = meta_get_display ();
  int hw_value;

-  hw_value = round ((double)value / 100.0 * output->backlight_max + output->backlight_min);
+  hw_value = round((double)value / 100.0 * output->backlight_max + output->backlight_min);

  meta_error_trap_push (display);
  XRRChangeOutputProperty (manager_xrandr->xdisplay,
@@ -957,16 +766,14 @@ meta_monitor_manager_xrandr_set_crtc_gamma (MetaMonitorManager *manager,
 					    unsigned short     *blue)
 {
  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
-  XRRCrtcGamma *gamma;
+  XRRCrtcGamma gamma;

-  gamma = XRRAllocGamma (size);
-  memcpy (gamma->red, red, sizeof (unsigned short) * size);
-  memcpy (gamma->green, green, sizeof (unsigned short) * size);
-  memcpy (gamma->blue, blue, sizeof (unsigned short) * size);
+  gamma.size = size;
+  gamma.red = red;
+  gamma.green = green;
+  gamma.blue = blue;

-  XRRSetCrtcGamma (manager_xrandr->xdisplay, (XID)crtc->crtc_id, gamma);
-
-  XRRFreeGamma (gamma);
+  XRRSetCrtcGamma (manager_xrandr->xdisplay, (XID)crtc->crtc_id, &gamma);
 }

 static gboolean
@@ -974,57 +781,11 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManager *manager,
 					   XEvent             *event)
 {
  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
-  MetaOutput *old_outputs;
-  MetaCRTC *old_crtcs;
-  MetaMonitorMode *old_modes;
-  int n_old_outputs;

  if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)
    return FALSE;

  XRRUpdateConfiguration (event);
-
-  /* Save the old structures, so they stay valid during the update */
-  old_outputs = manager->outputs;
-  n_old_outputs = manager->n_outputs;
-  old_modes = manager->modes;
-  old_crtcs = manager->crtcs;
-
-  manager->serial++;
-  meta_monitor_manager_xrandr_read_current (manager);
-
-  /* Check if the current intended configuration has the same outputs
-     as the new real one, or if the event is a result of an XRandR call.
-     If so, we can go straight to rebuild the logical config and tell
-     the outside world.
-     Otherwise, this event was caused by hotplug, so give a chance to
-     MetaMonitorConfig.
-
-     Note that we need to check both the timestamps and the list of
-     outputs, because the X server might emit spurious events with
-     new configTimestamps (bug 702804), and the driver may have
-     changed the EDID for some other reason (old broken qxl and vbox
-     drivers...).
-  */
-  if (manager_xrandr->resources->timestamp >= manager_xrandr->resources->configTimestamp ||
-      meta_monitor_config_match_current (manager->config, manager))
-    {
-      /* This will be a no-op if the change was from our side, as
-         we already called it in the DBus method handler */
-      meta_monitor_config_update_current (manager->config, manager);
-
-      meta_monitor_manager_rebuild_derived (manager);
-    }
-  else
-    {
-      if (!meta_monitor_config_apply_stored (manager->config, manager))
-        meta_monitor_config_make_default (manager->config, manager);
-    }
-
-  meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
-  g_free (old_modes);
-  g_free (old_crtcs);
-
  return TRUE;
 }

--- a/src/core/monitor.c
+++ b/src/core/monitor.c
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+	/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /* 
 * Copyright (C) 2001, 2002 Havoc Pennington
@@ -28,20 +28,20 @@
 #include "config.h"

 #include <string.h>
-#include <math.h>
 #include <stdlib.h>
 #include <clutter/clutter.h>

 #include <meta/main.h>
-#include <meta/util.h>
 #include <meta/errors.h>
 #include "monitor-private.h"
+#include "meta-wayland-private.h"

 #include "meta-dbus-xrandr.h"

 #define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)

 enum {
+  MONITORS_CHANGED,
  CONFIRM_DISPLAY_CHANGE,
  SIGNALS_LAST
 };
@@ -59,28 +59,67 @@ static void meta_monitor_manager_display_config_init (MetaDBusDisplayConfigIface
 G_DEFINE_TYPE_WITH_CODE (MetaMonitorManager, meta_monitor_manager, META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON,
                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_DISPLAY_CONFIG, meta_monitor_manager_display_config_init));

-static void initialize_dbus_interface (MetaMonitorManager *manager);
+static void free_output_array (MetaOutput *old_outputs,
+                               int         n_old_outputs);
+static void free_mode_array (MetaMonitorMode *old_modes,
+                             int              n_old_modes);

 static void
 read_current_dummy (MetaMonitorManager *manager)
 {
+  /* The dummy monitor config has:
+     - one enabled output, LVDS, primary, at 0x0 and 1024x768
+     - one free CRTC
+     - two disabled outputs
+     - three modes, 1024x768, 800x600 and 640x480
+     - no clones are possible (use different CRTCs)
+
+     Low-level IDs should be assigned sequentially, to
+     mimick what XRandR and KMS do
+  */
+
  manager->max_screen_width = 65535;
  manager->max_screen_height = 65535;
  manager->screen_width = 1024;
  manager->screen_height = 768;

-  manager->modes = g_new0 (MetaMonitorMode, 1);
-  manager->n_modes = 1;
+  manager->modes = g_new0 (MetaMonitorMode, 6);
+  manager->n_modes = 6;

-  manager->modes[0].mode_id = 0;
+  manager->modes[0].mode_id = 1;
  manager->modes[0].width = 1024;
  manager->modes[0].height = 768;
  manager->modes[0].refresh_rate = 60.0;

-  manager->crtcs = g_new0 (MetaCRTC, 1);
-  manager->n_crtcs = 1;
+  manager->modes[1].mode_id = 2;
+  manager->modes[1].width = 800;
+  manager->modes[1].height = 600;
+  manager->modes[1].refresh_rate = 60.0;

-  manager->crtcs[0].crtc_id = 1;
+  manager->modes[2].mode_id = 3;
+  manager->modes[2].width = 640;
+  manager->modes[2].height = 480;
+  manager->modes[2].refresh_rate = 60.0;
+
+  manager->modes[3].mode_id = 4;
+  manager->modes[3].width = 1920;
+  manager->modes[3].height = 1080;
+  manager->modes[3].refresh_rate = 60.0;
+
+  manager->modes[4].mode_id = 5;
+  manager->modes[4].width = 1920;
+  manager->modes[4].height = 1080;
+  manager->modes[4].refresh_rate = 55.0;
+
+  manager->modes[5].mode_id = 6;
+  manager->modes[5].width = 1600;
+  manager->modes[5].height = 900;
+  manager->modes[5].refresh_rate = 60.0;
+
+  manager->crtcs = g_new0 (MetaCRTC, 3);
+  manager->n_crtcs = 3;
+
+  manager->crtcs[0].crtc_id = 4;
  manager->crtcs[0].rect.x = 0;
  manager->crtcs[0].rect.y = 0;
  manager->crtcs[0].rect.width = manager->modes[0].width;
@@ -88,33 +127,114 @@ read_current_dummy (MetaMonitorManager *manager)
  manager->crtcs[0].current_mode = &manager->modes[0];
  manager->crtcs[0].transform = WL_OUTPUT_TRANSFORM_NORMAL;
  manager->crtcs[0].all_transforms = ALL_WL_TRANSFORMS;
-  manager->crtcs[0].is_dirty = FALSE;
+  manager->crtcs[0].dirty = FALSE;
  manager->crtcs[0].logical_monitor = NULL;

-  manager->outputs = g_new0 (MetaOutput, 1);
-  manager->n_outputs = 1;
+  manager->crtcs[1].crtc_id = 5;
+  manager->crtcs[1].rect.x = 0;
+  manager->crtcs[1].rect.y = 0;
+  manager->crtcs[1].rect.width = 0;
+  manager->crtcs[1].rect.height = 0;
+  manager->crtcs[1].current_mode = NULL;
+  manager->crtcs[1].transform = WL_OUTPUT_TRANSFORM_NORMAL;
+  manager->crtcs[1].all_transforms = ALL_WL_TRANSFORMS;
+  manager->crtcs[1].dirty = FALSE;
+  manager->crtcs[1].logical_monitor = NULL;

-  manager->outputs[0].crtc = &manager->crtcs[0];
-  manager->outputs[0].output_id = 1;
-  manager->outputs[0].name = g_strdup ("LVDS");
+  manager->crtcs[2].crtc_id = 5;
+  manager->crtcs[2].rect.x = 0;
+  manager->crtcs[2].rect.y = 0;
+  manager->crtcs[2].rect.width = 0;
+  manager->crtcs[2].rect.height = 0;
+  manager->crtcs[2].current_mode = NULL;
+  manager->crtcs[2].transform = WL_OUTPUT_TRANSFORM_NORMAL;
+  manager->crtcs[2].all_transforms = ALL_WL_TRANSFORMS;
+  manager->crtcs[2].dirty = FALSE;
+  manager->crtcs[2].logical_monitor = NULL;
+
+  manager->outputs = g_new0 (MetaOutput, 3);
+  manager->n_outputs = 3;
+
+  manager->outputs[0].crtc = NULL;
+  manager->outputs[0].output_id = 6;
+  manager->outputs[0].name = g_strdup ("HDMI");
  manager->outputs[0].vendor = g_strdup ("MetaProducts Inc.");
  manager->outputs[0].product = g_strdup ("unknown");
-  manager->outputs[0].serial = g_strdup ("0xC0FFEE");
-  manager->outputs[0].width_mm = 222;
-  manager->outputs[0].height_mm = 125;
+  manager->outputs[0].serial = g_strdup ("0xC0F01A");
+  manager->outputs[0].width_mm = 510;
+  manager->outputs[0].height_mm = 287;
  manager->outputs[0].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
-  manager->outputs[0].preferred_mode = &manager->modes[0];
-  manager->outputs[0].n_modes = 1;
-  manager->outputs[0].modes = g_new0 (MetaMonitorMode *, 1);
+  manager->outputs[0].preferred_mode = &manager->modes[3];
+  manager->outputs[0].n_modes = 5;
+  manager->outputs[0].modes = g_new0 (MetaMonitorMode *, 5);
  manager->outputs[0].modes[0] = &manager->modes[0];
-  manager->outputs[0].n_possible_crtcs = 1;
-  manager->outputs[0].possible_crtcs = g_new0 (MetaCRTC *, 1);
+  manager->outputs[0].modes[1] = &manager->modes[1];
+  manager->outputs[0].modes[2] = &manager->modes[2];
+  manager->outputs[0].modes[3] = &manager->modes[3];
+  manager->outputs[0].modes[4] = &manager->modes[4];
+  manager->outputs[0].n_possible_crtcs = 3;
+  manager->outputs[0].possible_crtcs = g_new0 (MetaCRTC *, 3);
  manager->outputs[0].possible_crtcs[0] = &manager->crtcs[0];
+  manager->outputs[0].possible_crtcs[1] = &manager->crtcs[1];
+  manager->outputs[0].possible_crtcs[2] = &manager->crtcs[2];
  manager->outputs[0].n_possible_clones = 0;
  manager->outputs[0].possible_clones = g_new0 (MetaOutput *, 0);
  manager->outputs[0].backlight = -1;
  manager->outputs[0].backlight_min = 0;
  manager->outputs[0].backlight_max = 0;
+
+  manager->outputs[1].crtc = &manager->crtcs[0];
+  manager->outputs[1].output_id = 7;
+  manager->outputs[1].name = g_strdup ("LVDS");
+  manager->outputs[1].vendor = g_strdup ("MetaProducts Inc.");
+  manager->outputs[1].product = g_strdup ("unknown");
+  manager->outputs[1].serial = g_strdup ("0xC0FFEE");
+  manager->outputs[1].width_mm = 222;
+  manager->outputs[1].height_mm = 125;
+  manager->outputs[1].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+  manager->outputs[1].preferred_mode = &manager->modes[5];
+  manager->outputs[1].n_modes = 4;
+  manager->outputs[1].modes = g_new0 (MetaMonitorMode *, 4);
+  manager->outputs[1].modes[0] = &manager->modes[0];
+  manager->outputs[1].modes[1] = &manager->modes[1];
+  manager->outputs[1].modes[2] = &manager->modes[2];
+  manager->outputs[1].modes[3] = &manager->modes[5];
+  manager->outputs[1].n_possible_crtcs = 3;
+  manager->outputs[1].possible_crtcs = g_new0 (MetaCRTC *, 3);
+  manager->outputs[1].possible_crtcs[0] = &manager->crtcs[0];
+  manager->outputs[1].possible_crtcs[1] = &manager->crtcs[1];
+  manager->outputs[1].possible_crtcs[2] = &manager->crtcs[2];
+  manager->outputs[1].n_possible_clones = 0;
+  manager->outputs[1].possible_clones = g_new0 (MetaOutput *, 0);
+  manager->outputs[1].backlight = -1;
+  manager->outputs[1].backlight_min = 0;
+  manager->outputs[1].backlight_max = 0;
+
+  manager->outputs[2].crtc = NULL;
+  manager->outputs[2].output_id = 8;
+  manager->outputs[2].name = g_strdup ("VGA");
+  manager->outputs[2].vendor = g_strdup ("MetaProducts Inc.");
+  manager->outputs[2].product = g_strdup ("unknown");
+  manager->outputs[2].serial = g_strdup ("0xC4FE");
+  manager->outputs[2].width_mm = 309;
+  manager->outputs[2].height_mm = 174;
+  manager->outputs[2].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+  manager->outputs[2].preferred_mode = &manager->modes[0];
+  manager->outputs[2].n_modes = 3;
+  manager->outputs[2].modes = g_new0 (MetaMonitorMode *, 3);
+  manager->outputs[2].modes[0] = &manager->modes[0];
+  manager->outputs[2].modes[1] = &manager->modes[1];
+  manager->outputs[2].modes[2] = &manager->modes[2];
+  manager->outputs[2].n_possible_crtcs = 3;
+  manager->outputs[2].possible_crtcs = g_new0 (MetaCRTC *, 3);
+  manager->outputs[2].possible_crtcs[0] = &manager->crtcs[0];
+  manager->outputs[2].possible_crtcs[1] = &manager->crtcs[1];
+  manager->outputs[2].possible_crtcs[2] = &manager->crtcs[2];
+  manager->outputs[2].n_possible_clones = 0;
+  manager->outputs[2].possible_clones = g_new0 (MetaOutput *, 0);
+  manager->outputs[2].backlight = -1;
+  manager->outputs[2].backlight_min = 0;
+  manager->outputs[2].backlight_max = 0;
 }

 static void
@@ -131,7 +251,7 @@ apply_config_dummy (MetaMonitorManager *manager,
    {
      MetaCRTCInfo *crtc_info = crtcs[i];
      MetaCRTC *crtc = crtc_info->crtc;
-      crtc->is_dirty = TRUE;
+      crtc->dirty = TRUE;

      if (crtc_info->mode == NULL)
        {
@@ -146,37 +266,25 @@ apply_config_dummy (MetaMonitorManager *manager,
          MetaMonitorMode *mode;
          MetaOutput *output;
          int i, n_outputs;
-          int width, height;

          mode = crtc_info->mode;

-          if (meta_monitor_transform_is_rotated (crtc_info->transform))
-            {
-              width = mode->height;
-              height = mode->width;
-            }
-          else
-            {
-              width = mode->width;
-              height = mode->height;
-            }
-
          crtc->rect.x = crtc_info->x;
          crtc->rect.y = crtc_info->y;
-          crtc->rect.width = width;
-          crtc->rect.height = height;
+          crtc->rect.width = mode->width;
+          crtc->rect.height = mode->height;
          crtc->current_mode = mode;
          crtc->transform = crtc_info->transform;

-          screen_width = MAX (screen_width, crtc_info->x + width);
-          screen_height = MAX (screen_height, crtc_info->y + height);
+          screen_width = MAX (screen_width, crtc_info->x + mode->width);
+          screen_height = MAX (screen_height, crtc_info->y + mode->height);

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

-              output->is_dirty = TRUE;
+              output->dirty = TRUE;
              output->crtc = crtc;
            }
        }
@@ -198,9 +306,9 @@ apply_config_dummy (MetaMonitorManager *manager,

      crtc->logical_monitor = NULL;

-      if (crtc->is_dirty)
+      if (crtc->dirty)
        {
-          crtc->is_dirty = FALSE;
+          crtc->dirty = FALSE;
          continue;
        }

@@ -216,9 +324,9 @@ apply_config_dummy (MetaMonitorManager *manager,
    {
      MetaOutput *output = &manager->outputs[i];

-      if (output->is_dirty)
+      if (output->dirty)
        {
-          output->is_dirty = FALSE;
+          output->dirty = FALSE;
          continue;
        }

@@ -354,15 +462,6 @@ make_logical_config (MetaMonitorManager *manager)
  manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
 }

-static GType
-get_default_backend (void)
-{
-  if (meta_is_wayland_compositor ())
-    return META_TYPE_MONITOR_MANAGER; /* FIXME: KMS */
-  else
-    return META_TYPE_MONITOR_MANAGER_XRANDR;
-}
-
 static MetaMonitorManager *
 meta_monitor_manager_new (void)
 {
@@ -372,7 +471,21 @@ meta_monitor_manager_new (void)
  env = g_getenv ("META_DEBUG_MULTIMONITOR");

  if (env == NULL)
-    type = get_default_backend ();
+    {
+      if (meta_is_wayland_compositor ())
+        {
+          MetaWaylandCompositor *compositor;
+
+          compositor = meta_wayland_compositor_get_default ();
+
+          if (meta_wayland_compositor_is_native (compositor))
+            type = META_TYPE_MONITOR_MANAGER_KMS;
+          else
+            type = META_TYPE_MONITOR_MANAGER;
+        }
+      else
+        type = META_TYPE_MONITOR_MANAGER_XRANDR;
+    }
  else if (strcmp (env, "xrandr") == 0)
    type = META_TYPE_MONITOR_MANAGER_XRANDR;
  else
@@ -407,22 +520,22 @@ meta_monitor_manager_constructed (GObject *object)
      MetaOutput *old_outputs;
      MetaCRTC *old_crtcs;
      MetaMonitorMode *old_modes;
-      int n_old_outputs;
+      unsigned int n_old_outputs, n_old_modes;

      old_outputs = manager->outputs;
      n_old_outputs = manager->n_outputs;
      old_modes = manager->modes;
+      n_old_modes = manager->n_modes;
      old_crtcs = manager->crtcs;

      read_current_config (manager);

-      meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
-      g_free (old_modes);
+      free_output_array (old_outputs, n_old_outputs);
+      free_mode_array (old_modes, n_old_modes);
      g_free (old_crtcs);
    }

  make_logical_config (manager);
-  initialize_dbus_interface (manager);

  manager->in_init = FALSE;
 }
@@ -447,9 +560,9 @@ meta_monitor_manager_set_power_save_mode (MetaMonitorManager *manager,
  manager->power_save_mode = mode;
 }

-void
-meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
-                                        int         n_old_outputs)
+static void
+free_output_array (MetaOutput *old_outputs,
+                   int         n_old_outputs)
 {
  int i;

@@ -462,19 +575,39 @@ meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
      g_free (old_outputs[i].modes);
      g_free (old_outputs[i].possible_crtcs);
      g_free (old_outputs[i].possible_clones);
+
+      if (old_outputs[i].driver_notify)
+        old_outputs[i].driver_notify (&old_outputs[i]);
    }

  g_free (old_outputs);
 }

+static void
+free_mode_array (MetaMonitorMode *old_modes,
+                 int              n_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]);
+    }
+
+  g_free (old_modes);
+}
+
 static void
 meta_monitor_manager_finalize (GObject *object)
 {
  MetaMonitorManager *manager = META_MONITOR_MANAGER (object);

-  meta_monitor_manager_free_output_array (manager->outputs, manager->n_outputs);
+  free_output_array (manager->outputs, manager->n_outputs);
+  free_mode_array (manager->modes, manager->n_modes);
  g_free (manager->monitor_infos);
-  g_free (manager->modes);
  g_free (manager->crtcs);

  G_OBJECT_CLASS (meta_monitor_manager_parent_class)->finalize (object);
@@ -544,9 +677,17 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
  object_class->finalize = meta_monitor_manager_finalize;

  klass->read_current = read_current_dummy;
-  klass->apply_configuration = apply_config_dummy;
-  klass->get_edid_file = get_edid_file_dummy;
  klass->read_edid = read_edid_dummy;
+  klass->get_edid_file = get_edid_file_dummy;
+  klass->apply_configuration = apply_config_dummy;
+
+  signals[MONITORS_CHANGED] =
+    g_signal_new ("monitors-changed",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  0,
+                  NULL, NULL, NULL,
+		  G_TYPE_NONE, 0);

  signals[CONFIRM_DISPLAY_CHANGE] =
    g_signal_new ("confirm-display-change",
@@ -583,41 +724,16 @@ diagonal_to_str (double d)
 }

 static char *
-make_display_name (MetaMonitorManager *manager,
-                   MetaOutput         *output)
+make_display_name (MetaOutput *output)
 {
-  if (g_str_has_prefix (output->name, "LVDS") ||
-      g_str_has_prefix (output->name, "eDP"))
-    return g_strdup (_("Built-in display"));
-
  if (output->width_mm != -1 && output->height_mm != -1)
    {
      double d = sqrt (output->width_mm * output->width_mm +
                       output->height_mm * output->height_mm);
      char *inches = diagonal_to_str (d / 25.4);
-      char *vendor_name;
      char *ret;

-      if (g_strcmp0 (output->vendor, "unknown") != 0)
-        {
-          if (!manager->pnp_ids)
-            manager->pnp_ids = gnome_pnp_ids_new ();
-
-          vendor_name = gnome_pnp_ids_get_pnp_id (manager->pnp_ids,
-                                                  output->vendor);
-
-          ret = g_strdup_printf ("%s %s", vendor_name, inches);
-
-          g_free (vendor_name);
-        }
-      else
-        {
-          /* TRANSLATORS: this is a monitor name (in case we don't know
-             the vendor), it's Unknown followed by a size in inches,
-             like 'Unknown 15"'
-          */
-          ret = g_strdup_printf (_("Unknown %s"), inches);
-        }
+      ret = g_strdup_printf ("%s %s", output->vendor, inches);

      g_free (inches);
      return ret;
@@ -693,12 +809,8 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                             g_variant_new_string (output->product));
      g_variant_builder_add (&properties, "{sv}", "serial",
                             g_variant_new_string (output->serial));
-      g_variant_builder_add (&properties, "{sv}", "width-mm",
-                             g_variant_new_int32 (output->width_mm));
-      g_variant_builder_add (&properties, "{sv}", "height-mm",
-                             g_variant_new_int32 (output->height_mm));
      g_variant_builder_add (&properties, "{sv}", "display-name",
-                             g_variant_new_take_string (make_display_name (manager, output)));
+                             g_variant_new_take_string (make_display_name (output)));
      g_variant_builder_add (&properties, "{sv}", "backlight",
                             g_variant_new_int32 (output->backlight));
      g_variant_builder_add (&properties, "{sv}", "primary",
@@ -866,7 +978,7 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
      crtc_info = g_slice_new (MetaCRTCInfo);
      crtc_info->outputs = g_ptr_array_new ();

-      if (crtc_id >= manager->n_crtcs)
+      if (crtc_id < 0 || crtc_id >= manager->n_crtcs)
        {
          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                                 G_DBUS_ERROR_INVALID_ARGS,
@@ -888,23 +1000,10 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto

      if (mode)
        {
-          int width, height;
-
-          if (meta_monitor_transform_is_rotated (transform))
-            {
-              width = mode->height;
-              height = mode->width;
-            }
-          else
-            {
-              width = mode->width;
-              height = mode->height;
-            }
-
          if (x < 0 ||
-              x + width > manager->max_screen_width ||
+              x + mode->width > manager->max_screen_width ||
              y < 0 ||
-              y + height > manager->max_screen_height)
+              y + mode->height > manager->max_screen_height)
            {
              g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                                     G_DBUS_ERROR_INVALID_ARGS,
@@ -912,8 +1011,8 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
              return TRUE;
            }

-          new_screen_width = MAX (new_screen_width, x + width);
-          new_screen_height = MAX (new_screen_height, y + height);
+          new_screen_width = MAX (new_screen_width, x + mode->width);
+          new_screen_height = MAX (new_screen_height, y + mode->height);
          crtc_info->x = x;
          crtc_info->y = y;
        }
@@ -924,8 +1023,7 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
        }

      if (transform < WL_OUTPUT_TRANSFORM_NORMAL ||
-          transform > WL_OUTPUT_TRANSFORM_FLIPPED_270 ||
-          ((crtc->all_transforms & (1 << transform)) == 0))
+          transform > WL_OUTPUT_TRANSFORM_FLIPPED_270)
        {
          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                                 G_DBUS_ERROR_INVALID_ARGS,
@@ -939,7 +1037,7 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
        {
          MetaOutput *output;

-          if (output_id >= manager->n_outputs)
+          if (output_id < 0 || output_id >= manager->n_outputs)
            {
              g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                                     G_DBUS_ERROR_INVALID_ARGS,
@@ -996,7 +1094,7 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
      MetaOutputInfo *output_info;
      gboolean primary, presentation;

-      if (output_id >= manager->n_outputs)
+      if (output_id < 0 || output_id >= manager->n_outputs)
        {
          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                                 G_DBUS_ERROR_INVALID_ARGS,
@@ -1089,7 +1187,7 @@ meta_monitor_manager_handle_change_backlight  (MetaDBusDisplayConfig *skeleton,
      return TRUE;
    }

-  if (output_id >= manager->n_outputs)
+  if (output_id < 0 || output_id >= manager->n_outputs)
    {
      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                             G_DBUS_ERROR_INVALID_ARGS,
@@ -1117,7 +1215,7 @@ meta_monitor_manager_handle_change_backlight  (MetaDBusDisplayConfig *skeleton,

  META_MONITOR_MANAGER_GET_CLASS (manager)->change_backlight (manager, output, value);

-  meta_dbus_display_config_complete_change_backlight (skeleton, invocation, output->backlight);
+  meta_dbus_display_config_complete_change_backlight (skeleton, invocation);
  return TRUE;
 }

@@ -1145,7 +1243,7 @@ meta_monitor_manager_handle_get_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
      return TRUE;
    }

-  if (crtc_id >= manager->n_crtcs)
+  if (crtc_id < 0 || crtc_id >= manager->n_crtcs)
    {
      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                             G_DBUS_ERROR_INVALID_ARGS,
@@ -1207,7 +1305,7 @@ meta_monitor_manager_handle_set_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
      return TRUE;
    }

-  if (crtc_id >= manager->n_crtcs)
+  if (crtc_id < 0 || crtc_id >= manager->n_crtcs)
    {
      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                             G_DBUS_ERROR_INVALID_ARGS,
@@ -1253,7 +1351,8 @@ on_bus_acquired (GDBusConnection *connection,
                 const char      *name,
                 gpointer         user_data)
 {
-  MetaMonitorManager *manager = user_data;
+  GTask *task = user_data;
+  MetaMonitorManager *manager = g_task_get_task_data (task);

  g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (manager),
                                    connection,
@@ -1266,7 +1365,11 @@ on_name_acquired (GDBusConnection *connection,
                  const char      *name,
                  gpointer         user_data)
 {
+  GTask *task = user_data;
+
  meta_topic (META_DEBUG_DBUS, "Acquired name %s\n", name);
+
+  g_task_return_boolean (task, TRUE);
 }

 static void
@@ -1277,9 +1380,14 @@ on_name_lost (GDBusConnection *connection,
  meta_topic (META_DEBUG_DBUS, "Lost or failed to acquire name %s\n", name);
 }

-static void
-initialize_dbus_interface (MetaMonitorManager *manager)
+void
+meta_monitor_manager_init_dbus (MetaMonitorManager   *manager,
+                                GAsyncReadyCallback   callback,
+                                gpointer              user_data)
 {
+  GTask *task = g_task_new (manager, NULL, callback, user_data);
+  g_task_set_task_data (task, g_object_ref (manager), g_object_unref);
+
  manager->dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION,
                                          "org.gnome.Mutter.DisplayConfig",
                                          G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
@@ -1288,24 +1396,32 @@ initialize_dbus_interface (MetaMonitorManager *manager)
                                          on_bus_acquired,
                                          on_name_acquired,
                                          on_name_lost,
-                                          g_object_ref (manager),
+                                          task,
                                          g_object_unref);
 }

-static MetaMonitorManager *global_monitor_manager;
+gboolean
+meta_monitor_manager_init_dbus_finish (MetaMonitorManager  *manager,
+                                       GAsyncResult        *result,
+                                       GError             **error)
+{
+  return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static MetaMonitorManager *global_manager;

 void
 meta_monitor_manager_initialize (void)
 {
-  global_monitor_manager = meta_monitor_manager_new ();
+  global_manager = meta_monitor_manager_new ();
 }

 MetaMonitorManager *
 meta_monitor_manager_get (void)
 {
-  g_assert (global_monitor_manager != NULL);
+  g_assert (global_manager != NULL);

-  return global_monitor_manager;
+  return global_manager;
 }

 MetaMonitorInfo *
@@ -1377,7 +1493,7 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)

  make_logical_config (manager);

-  g_signal_emit_by_name (manager, "monitors-changed");
+  g_signal_emit (manager, signals[MONITORS_CHANGED], 0);

  g_free (old_monitor_infos);
 }
@@ -1387,11 +1503,52 @@ meta_monitor_manager_handle_xevent (MetaMonitorManager *manager,
                                    XEvent             *event)
 {
  MetaMonitorManagerClass *klass;
+  MetaOutput *old_outputs;
+  MetaCRTC *old_crtcs;
+  MetaMonitorMode *old_modes;
+  unsigned int n_old_outputs, n_old_modes;
+  gboolean changed;

  klass = META_MONITOR_MANAGER_GET_CLASS (manager);
  if (klass->handle_xevent)
-    return klass->handle_xevent (manager, event);
+    changed = klass->handle_xevent (manager, event);
  else
+    changed = FALSE;
+
+  if (!changed)
    return FALSE;
+
+  /* Save the old structures, so they stay valid during the update */
+  old_outputs = manager->outputs;
+  n_old_outputs = manager->n_outputs;
+  old_modes = manager->modes;
+  n_old_modes = manager->n_modes;
+  old_crtcs = manager->crtcs;
+
+  read_current_config (manager);
+
+  /* Check if the current intended configuration has the same outputs
+     as the new real one. If so, this was a result of an ApplyConfiguration
+     call (or a change from ourselves), and we can go straight to rebuild
+     the logical config and tell the outside world.
+
+     Otherwise, this event was caused by hotplug, so give a chance to
+     MetaMonitorConfig.
+  */
+  if (meta_monitor_config_match_current (manager->config, manager))
+    {
+      meta_monitor_manager_rebuild_derived (manager);
+    }
+  else
+    {
+      if (!meta_monitor_config_apply_stored (manager->config, manager))
+        meta_monitor_config_make_default (manager->config, manager);
+    }
+
+  free_output_array (old_outputs, n_old_outputs);
+  free_mode_array (old_modes, n_old_modes);
+  g_free (old_crtcs);
+
+  return TRUE;
 }

--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -247,12 +247,12 @@ void meta_screen_set_active_workspace_hint (MetaScreen *screen);

 Window   meta_screen_create_guard_window (Display *xdisplay, MetaScreen *screen);

-gboolean meta_screen_handle_xevent (MetaScreen *screen,
-                                    XEvent     *xevent);
-
 int meta_screen_xinerama_index_to_monitor_index (MetaScreen *screen,
                                                 int         index);
 int meta_screen_monitor_index_to_xinerama_index (MetaScreen *screen,
                                                 int         index);

+gboolean meta_screen_handle_xevent (MetaScreen *screen,
+                                    XEvent     *xevent);
+
 #endif
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -45,8 +45,11 @@
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
 #include "core.h"
+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
+#endif
 #include "meta-cursor-tracker-private.h"
+#include "meta-idle-monitor-private.h"

 #include <X11/extensions/Xinerama.h>

@@ -674,8 +677,10 @@ meta_screen_new (MetaDisplay *display,
  screen->xscreen = ScreenOfDisplay (xdisplay, number);
  screen->xroot = xroot;
  screen->rect.x = screen->rect.y = 0;
-
+  
+#ifdef HAVE_WAYLAND
  if (!meta_is_wayland_compositor ())
+#endif
    meta_monitor_manager_initialize ();

  manager = meta_monitor_manager_get ();
@@ -686,6 +691,12 @@ meta_screen_new (MetaDisplay *display,
                                        &screen->rect.width,
                                        &screen->rect.height);

+#ifdef HAVE_WAYLAND
+  if (!meta_is_wayland_compositor ())
+#endif
+    meta_monitor_manager_init_dbus (manager, NULL, NULL);
+  meta_idle_monitor_init_dbus ();
+
  screen->current_cursor = -1; /* invalid/unset */
  screen->default_xvisual = DefaultVisualOfScreen (screen->xscreen);
  screen->default_depth = DefaultDepthOfScreen (screen->xscreen);
@@ -711,8 +722,8 @@ meta_screen_new (MetaDisplay *display,
  screen->guard_window = None;

  reload_monitor_infos (screen);
-
-  meta_cursor_tracker_get_for_screen (screen);
+  
+  meta_cursor_tracker_get_for_screen (screen);  
  meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);

  /* Handle creating a no_focus_window for this screen */  
@@ -2873,10 +2884,9 @@ on_monitors_changed (MetaMonitorManager *manager,
                       &changes);
    }

-  if (screen->display->compositor)
-    meta_compositor_sync_screen_size (screen->display->compositor,
-				      screen,
-                                      screen->rect.width, screen->rect.height);
+  meta_compositor_sync_screen_size (screen->display->compositor,
+                                    screen,
+                                    screen->rect.width, screen->rect.height);

  /* Queue a resize on all the windows */
  meta_screen_foreach_window (screen, meta_screen_resize_func, 0);
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -1051,6 +1051,7 @@ stack_tracker_event_received (MetaStackTracker *tracker,

  tracker->xserver_serial = op->any.serial;

+#warning "TODO: remove unused tracker->xserver_stack"
  /* XXX: With the design we have ended up with it looks like we've
   * ended up making it unnecessary to maintain tracker->xserver_stack
   * since we only need an xserver_stack during the
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -44,7 +44,17 @@
 #include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "meta-wayland-types.h"
+#ifdef HAVE_WAYLAND
+#include "meta-wayland-private.h"
+#endif
+
+/* XXX: We should find a nicer approach to deal with the
+ * circular dependency we have with the current headers
+ * (meta-wayland-private.h which typedefs MetaWaylandSurface
+ *  also includes window-private.h) */
+#ifndef HAVE_META_WAYLAND_SURFACE_TYPE
+typedef struct _MetaWaylandSurface MetaWaylandSurface;
+#endif

 typedef struct _MetaWindowQueue MetaWindowQueue;

@@ -331,6 +341,11 @@ struct _MetaWindow
  guint using_net_wm_icon_name         : 1; /* vs. plain wm_icon_name */
  guint using_net_wm_visible_icon_name : 1; /* tracked so we can clear it */

+  /* has a bounding shape mask */
+  guint has_shape : 1;
+  /* has an input shape mask */
+  guint has_input_shape : 1;
+
  /* icon props have changed */
  guint need_reread_icon : 1;
  
@@ -352,15 +367,9 @@ struct _MetaWindow
  /* if non-NULL, the bounds of the window frame */
  cairo_region_t *frame_bounds;

-  /* if non-NULL, the bounding shape region of the window */
-  cairo_region_t *shape_region;
-
  /* if non-NULL, the opaque region _NET_WM_OPAQUE_REGION */
  cairo_region_t *opaque_region;

-  /* the input shape region for picking */
-  cairo_region_t *input_region;
-
  /* if TRUE, the we have the new form of sync request counter which
   * also handles application frames */
  guint extended_sync_request_counter : 1;
@@ -678,6 +687,7 @@ void meta_window_update_icon_now (MetaWindow *window);

 void meta_window_update_role (MetaWindow *window);
 void meta_window_update_net_wm_type (MetaWindow *window);
+void meta_window_update_opaque_region (MetaWindow *window);
 void meta_window_update_for_monitors_changed (MetaWindow *window);
 void meta_window_update_on_all_workspaces (MetaWindow *window);

@@ -691,29 +701,4 @@ void meta_window_compute_tile_match (MetaWindow *window);

 gboolean meta_window_updates_are_frozen (MetaWindow *window);

-void meta_window_set_opaque_region        (MetaWindow     *window,
-                                           cairo_region_t *region);
-void meta_window_update_opaque_region_x11 (MetaWindow *window);
-
-void meta_window_set_input_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
-void meta_window_update_input_region_x11  (MetaWindow *window);
-
-void meta_window_set_shape_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
-void meta_window_update_shape_region_x11  (MetaWindow *window);
-
-void meta_window_set_title                (MetaWindow *window,
-                                           const char *title);
-void meta_window_set_wm_class             (MetaWindow *window,
-                                           const char *wm_class,
-                                           const char *wm_instance);
-void meta_window_set_gtk_dbus_properties  (MetaWindow *window,
-                                           const char *application_id,
-                                           const char *unique_bus_name,
-                                           const char *appmenu_path,
-                                           const char *menubar_path,
-                                           const char *application_object_path,
-                                           const char *window_object_path);
-
 #endif
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -489,19 +489,28 @@ static void
 set_window_title (MetaWindow *window,
                  const char *title)
 {
-  char *new_title = NULL;
+  char *str;
 
  gboolean modified =
    set_title_text (window,
                    window->using_net_wm_visible_name,
                    title,
                    window->display->atom__NET_WM_VISIBLE_NAME,
-                    &new_title);
+                    &window->title);
  window->using_net_wm_visible_name = modified;
  
-  meta_window_set_title (window, new_title);
+  /* strndup is a hack since GNU libc has broken %.10s */
+  str = g_strndup (window->title, 10);
+  g_free (window->desc);
+  window->desc = g_strdup_printf ("0x%lx (%s)", window->xwindow, str);
+  g_free (str);

-  g_free (new_title);
+  if (window->frame)
+    meta_ui_set_frame_title (window->screen->ui,
+                             window->frame->xwindow,
+                             window->title);
+
+  g_object_notify (G_OBJECT (window), "title");
 }

 static void
@@ -556,7 +565,7 @@ reload_opaque_region (MetaWindow    *window,
                      MetaPropValue *value,
                      gboolean       initial)
 {
-  meta_window_update_opaque_region_x11 (window);
+  meta_window_update_opaque_region (window);
 }

 static void
@@ -866,15 +875,23 @@ reload_wm_class (MetaWindow    *window,
                 MetaPropValue *value,
                 gboolean       initial)
 {
+  if (window->res_class)
+    g_free (window->res_class);
+  if (window->res_name)
+    g_free (window->res_name);
+
+  window->res_class = NULL;
+  window->res_name = NULL;
+
  if (value->type != META_PROP_VALUE_INVALID)
-    {
-      meta_window_set_wm_class (window,
-                                value->v.class_hint.res_class,
-                                value->v.class_hint.res_name);
-    }
-  else
-    {
-      meta_window_set_wm_class (window, NULL, NULL);
+    { 
+      if (value->v.class_hint.res_name)
+        window->res_name = g_strdup (value->v.class_hint.res_name);
+
+      if (value->v.class_hint.res_class)
+        window->res_class = g_strdup (value->v.class_hint.res_class);
+
+      g_object_notify (G_OBJECT (window), "wm-class");
    }

  meta_verbose ("Window %s class: '%s' name: '%s'\n",
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -62,7 +62,9 @@

 #include <X11/extensions/Xcomposite.h>

+#ifdef HAVE_WAYLAND
 #include "meta-wayland-private.h"
+#endif

 /* Windows that unmaximize to a size bigger than that fraction of the workarea
 * will be scaled down to that size (while maintaining aspect ratio).
@@ -822,6 +824,8 @@ meta_window_new_shared (MetaDisplay         *display,
                        Window               xwindow,
                        gboolean             must_be_viewable,
                        gulong               existing_wm_state,
+                        gboolean             has_shape,
+                        gboolean             has_input_shape,
                        MetaCompEffect       effect,
                        XWindowAttributes   *attrs)
 {
@@ -849,7 +853,9 @@ meta_window_new_shared (MetaDisplay         *display,
  window->dialog_pid = -1;

  window->client_type = client_type;
+#ifdef HAVE_WAYLAND
  window->surface = surface;
+#endif
  window->xwindow = xwindow;

  /* this is in window->screen->display, but that's too annoying to
@@ -874,6 +880,9 @@ meta_window_new_shared (MetaDisplay         *display,
  /* avoid tons of stack updates */
  meta_stack_freeze (window->screen->stack);

+  window->has_shape = has_shape;
+  window->has_input_shape = has_input_shape;
+
  window->rect.x = attrs->x;
  window->rect.y = attrs->y;
  window->rect.width = attrs->width;
@@ -1054,8 +1063,6 @@ meta_window_new_shared (MetaDisplay         *display,
        }

      meta_display_register_x_window (display, &window->xwindow, window);
-      meta_window_update_shape_region_x11 (window);
-      meta_window_update_input_region_x11 (window);
    }

  /* assign the window to its group, or create a new group if needed
@@ -1064,10 +1071,7 @@ meta_window_new_shared (MetaDisplay         *display,
  window->xgroup_leader = None;
  meta_window_compute_group (window);

-  if (client_type == META_WINDOW_CLIENT_TYPE_X11)
-    meta_window_load_initial_properties (window);
-  else
-    meta_wayland_surface_set_initial_state (window->surface, window);
+  meta_window_load_initial_properties (window);

  if (!window->override_redirect &&
      client_type == META_WINDOW_CLIENT_TYPE_X11)
@@ -1371,6 +1375,7 @@ display_notify_window (MetaDisplay *display, MetaWindow *window)
    g_signal_emit_by_name (window->display, "window-marked-urgent", window);
 }

+#ifdef HAVE_WAYLAND
 MetaWindow *
 meta_window_new_for_wayland (MetaDisplay        *display,
                             int                 width,
@@ -1425,6 +1430,8 @@ meta_window_new_for_wayland (MetaDisplay        *display,
                                   None,
                                   TRUE,
                                   WithdrawnState,
+                                   FALSE, /* has shape */
+                                   FALSE, /* has input shape */
                                   META_COMP_EFFECT_NONE,
                                   &attrs);

@@ -1440,6 +1447,7 @@ meta_window_new_for_wayland (MetaDisplay        *display,

  return window;
 }
+#endif

 MetaWindow*
 meta_window_new_with_attrs (MetaDisplay       *display,
@@ -1453,6 +1461,8 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  gulong existing_wm_state;
  MetaWindow *window;
  gulong event_mask;
+  gboolean has_shape = FALSE;
+  gboolean has_input_shape = FALSE;

  meta_verbose ("Attempting to manage 0x%lx\n", xwindow);

@@ -1572,6 +1582,53 @@ meta_window_new_with_attrs (MetaDisplay       *display,
      XISelectEvents (display->xdisplay, xwindow, &mask, 1);
    }

+#ifdef HAVE_SHAPE
+  if (META_DISPLAY_HAS_SHAPE (display))
+    {
+      int x_bounding, y_bounding, x_clip, y_clip;
+      unsigned w_bounding, h_bounding, w_clip, h_clip;
+      int bounding_shaped, clip_shaped;
+      XRectangle *input_rectangles;
+      int n_rects, ordering;
+
+      XShapeSelectInput (display->xdisplay, xwindow, ShapeNotifyMask);
+
+      XShapeQueryExtents (display->xdisplay, xwindow,
+                          &bounding_shaped, &x_bounding, &y_bounding,
+                          &w_bounding, &h_bounding,
+                          &clip_shaped, &x_clip, &y_clip,
+                          &w_clip, &h_clip);
+
+      has_shape = bounding_shaped != FALSE;
+
+      /* XXX: The x shape extension doesn't provide a way to only test if an
+       * input shape has been specified, so we have to query and throw away the
+       * rectangles. */
+      meta_error_trap_push (display);
+      input_rectangles = XShapeGetRectangles (display->xdisplay, xwindow,
+                                              ShapeInput, &n_rects, &ordering);
+      meta_error_trap_pop (display);
+      if (input_rectangles)
+        {
+          if (n_rects > 1 ||
+              (n_rects == 1 &&
+               (input_rectangles[0].x != x_bounding ||
+                input_rectangles[1].y != y_bounding ||
+                input_rectangles[2].width != w_bounding ||
+                input_rectangles[3].height != h_bounding)))
+            {
+              has_input_shape = TRUE;
+            }
+          XFree (input_rectangles);
+        }
+
+      meta_topic (META_DEBUG_SHAPES,
+                  "Window has_shape = %d extents %d,%d %u x %u\n",
+                  has_shape, x_bounding, y_bounding,
+                  w_bounding, h_bounding);
+    }
+#endif
+
  /* Get rid of any borders */
  if (attrs->border_width != 0)
    XSetWindowBorderWidth (display->xdisplay, xwindow, 0);
@@ -1605,6 +1662,8 @@ meta_window_new_with_attrs (MetaDisplay       *display,
                                   xwindow,
                                   must_be_viewable,
                                   existing_wm_state,
+                                   has_shape,
+                                   has_input_shape,
                                   effect,
                                   attrs);

@@ -2048,8 +2107,10 @@ meta_window_unmanage (MetaWindow  *window,
      meta_error_trap_pop (window->display);
    }

+#ifdef HAVE_WAYLAND
  if (window->surface)
    meta_wayland_surface_free (window->surface);
+#endif

  meta_prefs_remove_listener (prefs_changed_callback, window);

@@ -5951,7 +6012,7 @@ meta_window_get_outer_rect (const MetaWindow *window,

      if (window->has_custom_frame_extents)
        {
-          const GtkBorder *extents = &window->custom_frame_extents;
+          GtkBorder *extents = &window->custom_frame_extents;
          rect->x += extents->left;
          rect->y += extents->top;
          rect->width -= extents->left + extents->right;
@@ -7338,6 +7399,9 @@ void
 meta_window_set_focused_internal (MetaWindow *window,
                                  gboolean    focused)
 {
+  if (window->unmanaging)
+    return;
+
  if (focused)
    {
      window->has_focus = TRUE;
@@ -7757,25 +7821,14 @@ meta_window_update_net_wm_type (MetaWindow *window)
 }

 void
-meta_window_set_opaque_region (MetaWindow     *window,
-                               cairo_region_t *region)
-{
-  g_clear_pointer (&window->opaque_region, cairo_region_destroy);
-
-  if (region != NULL)
-    window->opaque_region = cairo_region_reference (region);
-
-  if (window->display->compositor)
-    meta_compositor_window_shape_changed (window->display->compositor, window);
-}
-
-void
-meta_window_update_opaque_region_x11 (MetaWindow *window)
+meta_window_update_opaque_region (MetaWindow *window)
 {
  cairo_region_t *opaque_region = NULL;
  gulong *region = NULL;
  int nitems;

+  g_clear_pointer (&window->opaque_region, cairo_region_destroy);
+
  if (meta_prop_get_cardinal_list (window->display,
                                   window->xwindow,
                                   window->display->atom__NET_WM_OPAQUE_REGION,
@@ -7818,191 +7871,11 @@ meta_window_update_opaque_region_x11 (MetaWindow *window)
    }

 out:
+  window->opaque_region = opaque_region;
  meta_XFree (region);

-  meta_window_set_opaque_region (window, opaque_region);
-  cairo_region_destroy (opaque_region);
-}
-
-static cairo_region_t *
-region_create_from_x_rectangles (const XRectangle *rects,
-                                 int n_rects)
-{
-  int i;
-  cairo_rectangle_int_t *cairo_rects = g_newa (cairo_rectangle_int_t, n_rects);
-
-  for (i = 0; i < n_rects; i ++)
-    {
-      cairo_rects[i].x = rects[i].x;
-      cairo_rects[i].y = rects[i].y;
-      cairo_rects[i].width = rects[i].width;
-      cairo_rects[i].height = rects[i].height;
-    }
-
-  return cairo_region_create_rectangles (cairo_rects, n_rects);
-}
-
-void
-meta_window_set_input_region (MetaWindow     *window,
-                              cairo_region_t *region)
-{
-  g_clear_pointer (&window->input_region, cairo_region_destroy);
-
-  if (region != NULL)
-    window->input_region = cairo_region_reference (region);
-
  if (window->display->compositor)
-    meta_compositor_window_shape_changed (window->display->compositor, window);
-}
-
-void
-meta_window_update_input_region_x11 (MetaWindow *window)
-{
-  cairo_region_t *region = NULL;
-
-#ifdef HAVE_SHAPE
-  if (META_DISPLAY_HAS_SHAPE (window->display))
-    {
-      /* Translate the set of XShape rectangles that we
-       * get from the X server to a cairo_region. */
-      XRectangle *rects = NULL;
-      int n_rects, ordering;
-
-      int x_bounding, y_bounding, x_clip, y_clip;
-      unsigned w_bounding, h_bounding, w_clip, h_clip;
-      int bounding_shaped, clip_shaped;
-
-      meta_error_trap_push (window->display);
-      XShapeQueryExtents (window->display->xdisplay, window->xwindow,
-                          &bounding_shaped, &x_bounding, &y_bounding,
-                          &w_bounding, &h_bounding,
-                          &clip_shaped, &x_clip, &y_clip,
-                          &w_clip, &h_clip);
-
-      rects = XShapeGetRectangles (window->display->xdisplay,
-                                   window->xwindow,
-                                   ShapeInput,
-                                   &n_rects,
-                                   &ordering);
-      meta_error_trap_pop (window->display);
-
-      /* XXX: The x shape extension doesn't provide a way to only test if an
-       * input shape has been specified, so we have to query and throw away the
-       * rectangles. */
-      if (rects)
-        {
-          if (n_rects > 1 ||
-              (n_rects == 1 &&
-               (rects[0].x != x_bounding ||
-                rects[1].y != y_bounding ||
-                rects[2].width != w_bounding ||
-                rects[3].height != h_bounding)))
-            region = region_create_from_x_rectangles (rects, n_rects);
-
-          XFree (rects);
-        }
-    }
-#endif /* HAVE_SHAPE */
-
-  if (region != NULL)
-    {
-      cairo_rectangle_int_t client_area;
-
-      client_area.x = 0;
-      client_area.y = 0;
-      client_area.width = window->rect.width;
-      client_area.height = window->rect.height;
-
-      /* The shape we get back from the client may have coordinates
-       * outside of the frame. The X SHAPE Extension requires that
-       * the overall shape the client provides never exceeds the
-       * "bounding rectangle" of the window -- the shape that the
-       * window would have gotten if it was unshaped. In our case,
-       * this is simply the client area.
-       */
-      cairo_region_intersect_rectangle (region, &client_area);
-    }
-
-  meta_window_set_input_region (window, region);
-  cairo_region_destroy (region);
-}
-
-void
-meta_window_set_shape_region (MetaWindow     *window,
-                              cairo_region_t *region)
-{
-  g_clear_pointer (&window->shape_region, cairo_region_destroy);
-
-  if (region != NULL)
-    window->shape_region = cairo_region_reference (region);
-
-  if (window->display->compositor)
-    meta_compositor_window_shape_changed (window->display->compositor, window);
-}
-
-void
-meta_window_update_shape_region_x11 (MetaWindow *window)
-{
-  cairo_region_t *region = NULL;
-
-#ifdef HAVE_SHAPE
-  if (META_DISPLAY_HAS_SHAPE (window->display))
-    {
-      /* Translate the set of XShape rectangles that we
-       * get from the X server to a cairo_region. */
-      XRectangle *rects = NULL;
-      int n_rects, ordering;
-
-      int x_bounding, y_bounding, x_clip, y_clip;
-      unsigned w_bounding, h_bounding, w_clip, h_clip;
-      int bounding_shaped, clip_shaped;
-
-      meta_error_trap_push (window->display);
-      XShapeQueryExtents (window->display->xdisplay, window->xwindow,
-                          &bounding_shaped, &x_bounding, &y_bounding,
-                          &w_bounding, &h_bounding,
-                          &clip_shaped, &x_clip, &y_clip,
-                          &w_clip, &h_clip);
-
-      if (bounding_shaped)
-        {
-          rects = XShapeGetRectangles (window->display->xdisplay,
-                                       window->xwindow,
-                                       ShapeBounding,
-                                       &n_rects,
-                                       &ordering);
-        }
-      meta_error_trap_pop (window->display);
-
-      if (rects)
-        {
-          region = region_create_from_x_rectangles (rects, n_rects);
-          XFree (rects);
-        }
-    }
-#endif /* HAVE_SHAPE */
-
-  if (region != NULL)
-    {
-      cairo_rectangle_int_t client_area;
-
-      client_area.x = 0;
-      client_area.y = 0;
-      client_area.width = window->rect.width;
-      client_area.height = window->rect.height;
-
-      /* The shape we get back from the client may have coordinates
-       * outside of the frame. The X SHAPE Extension requires that
-       * the overall shape the client provides never exceeds the
-       * "bounding rectangle" of the window -- the shape that the
-       * window would have gotten if it was unshaped. In our case,
-       * this is simply the client area.
-       */
-      cairo_region_intersect_rectangle (region, &client_area);
-    }
-
-  meta_window_set_shape_region (window, region);
-  cairo_region_destroy (region);
+    meta_compositor_window_x11_shape_changed (window->display->compositor, window);
 }

 static void
@@ -8706,13 +8579,10 @@ recalc_window_features (MetaWindow *window)

    case META_WINDOW_DIALOG:
    case META_WINDOW_MODAL_DIALOG:
-      /* only skip taskbar if we have a real transient parent
-         (and ignore the application hints) */
+      /* only skip taskbar if we have a real transient parent */
      if (window->xtransient_for != None &&
          window->xtransient_for != window->screen->xroot)
        window->skip_taskbar = TRUE;
-      else
-        window->skip_taskbar = FALSE;
      break;

    case META_WINDOW_NORMAL:
@@ -11470,78 +11340,3 @@ meta_window_can_close (MetaWindow *window)
 {
  return window->has_close_func;
 }
-
-void
-meta_window_set_title (MetaWindow *window,
-                       const char *title)
-{
-  char *str;
-
-  g_free (window->title);
-  window->title = g_strdup (title);
-
-  /* strndup is a hack since GNU libc has broken %.10s */
-  str = g_strndup (window->title, 10);
-  g_free (window->desc);
-  window->desc = g_strdup_printf ("0x%lx (%s)", window->xwindow, str);
-  g_free (str);
-
-  if (window->frame)
-    meta_ui_set_frame_title (window->screen->ui,
-                             window->frame->xwindow,
-                             window->title);
-
-  g_object_notify (G_OBJECT (window), "title");
-}
-
-void
-meta_window_set_wm_class (MetaWindow *window,
-                          const char *wm_class,
-                          const char *wm_instance)
-{
-  g_free (window->res_class);
-  g_free (window->res_name);
-
-  window->res_name = g_strdup (wm_instance);
-  window->res_class = g_strdup (wm_class);
-
-  g_object_notify (G_OBJECT (window), "wm-class");
-}
-
-void
-meta_window_set_gtk_dbus_properties (MetaWindow *window,
-                                     const char *application_id,
-                                     const char *unique_bus_name,
-                                     const char *appmenu_path,
-                                     const char *menubar_path,
-                                     const char *application_object_path,
-                                     const char *window_object_path)
-{
-  g_object_freeze_notify (G_OBJECT (window));
-
-  g_free (window->gtk_application_id);
-  window->gtk_application_id = g_strdup (application_id);
-  g_object_notify (G_OBJECT (window), "gtk-application-id");
-
-  g_free (window->gtk_unique_bus_name);
-  window->gtk_unique_bus_name = g_strdup (unique_bus_name);
-  g_object_notify (G_OBJECT (window), "gtk-unique-bus-name");
-
-  g_free (window->gtk_app_menu_object_path);
-  window->gtk_app_menu_object_path = g_strdup (appmenu_path);
-  g_object_notify (G_OBJECT (window), "gtk-app-menu-object-path");
-
-  g_free (window->gtk_menubar_object_path);
-  window->gtk_menubar_object_path = g_strdup (menubar_path);
-  g_object_notify (G_OBJECT (window), "gtk-menubar-object-path");
-
-  g_free (window->gtk_application_object_path);
-  window->gtk_application_object_path = g_strdup (application_object_path);
-  g_object_notify (G_OBJECT (window), "gtk-application-object-path");
-
-  g_free (window->gtk_window_object_path);
-  window->gtk_window_object_path = g_strdup (window_object_path);
-  g_object_notify (G_OBJECT (window), "gtk-window-object-path");
-
-  g_object_thaw_notify (G_OBJECT (window));
-}
--- a/src/idle-monitor.xml
+++ b/src/idle-monitor.xml
@@ -1,35 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-  <!--
-      org.gnome.Mutter.IdleMonitor:
-      @short_description: idle monitor interface
-
-      This interface is used by gnome-desktop to implement
-      user activity monitoring.
-  -->
-
-  <interface name="org.gnome.Mutter.IdleMonitor">
-    <method name="GetIdletime">
-      <arg name="idletime" direction="out" type="t"/>
-    </method>
-
-    <method name="AddIdleWatch">
-      <arg name="interval" direction="in" type="t" />
-      <arg name="id" direction="out" type="u" />
-    </method>
-
-    <method name="AddUserActiveWatch">
-      <arg name="id" direction="out" type="u" />
-    </method>
-
-    <method name="RemoveWatch">
-      <arg name="id" direction="in" type="u" />
-    </method>
-
-    <signal name="WatchFired">
-      <arg name="id" direction="out" type="u" />
-    </signal>
-  </interface>
-</node>
--- a/src/libmutter-wayland.pc.in
+++ b/src/libmutter-wayland.pc.in
@@ -1,18 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-girdir=@libdir@/mutter-wayland
-typelibdir=@libdir@/mutter-wayland
-
-mutter_major_version=@MUTTER_MAJOR_VERSION@
-mutter_minor_version=@MUTTER_MINOR_VERSION@
-mutter_micro_version=@MUTTER_MICRO_VERSION@
-mutter_plugin_api_version=@MUTTER_PLUGIN_API_VERSION@
-
-Name: libmutter-wayland
-Description: Mutter window manager library (Wayland branch)
-Requires: gsettings-desktop-schemas gtk+-3.0 @CLUTTER_PACKAGE@ x11 wayland-server
-Version: @VERSION@
-Libs: -L${libdir} -lmutter-wayland
-Cflags: -I${includedir}/mutter-wayland -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version}
--- a/src/libmutter.pc.in
+++ b/src/libmutter.pc.in
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+girdir=@libdir@/mutter
+typelibdir=@libdir@/mutter
+
+mutter_major_version=@MUTTER_MAJOR_VERSION@
+mutter_minor_version=@MUTTER_MINOR_VERSION@
+mutter_micro_version=@MUTTER_MICRO_VERSION@
+mutter_plugin_api_version=@MUTTER_PLUGIN_API_VERSION@
+
+Name: libmutter
+Description: Mutter window manager library
+Requires: gsettings-desktop-schemas gtk+-3.0 @CLUTTER_PACKAGE@ x11
+Version: @VERSION@
+Libs: -L${libdir} -lmutter
+Cflags: -I${includedir}/mutter -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version}
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -64,8 +64,8 @@ void meta_compositor_manage_screen   (MetaCompositor *compositor,
 void meta_compositor_unmanage_screen (MetaCompositor *compositor,
                                      MetaScreen     *screen);

-void meta_compositor_window_shape_changed (MetaCompositor *compositor,
-                                           MetaWindow     *window);
+void meta_compositor_window_x11_shape_changed (MetaCompositor *compositor,
+                                               MetaWindow     *window);

 gboolean meta_compositor_process_event (MetaCompositor *compositor,
                                        XEvent         *event,
--- a/src/meta/meta-cursor-tracker.h
+++ b/src/meta/meta-cursor-tracker.h
@@ -27,7 +27,6 @@
 #include <glib-object.h>
 #include <meta/types.h>
 #include <meta/workspace.h>
-#include <cogl/cogl.h>

 #define META_TYPE_CURSOR_TRACKER            (meta_cursor_tracker_get_type ())
 #define META_CURSOR_TRACKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_TRACKER, MetaCursorTracker))
--- a/src/meta/meta-idle-monitor.h
+++ b/src/meta/meta-idle-monitor.h
@@ -57,6 +57,6 @@ guint         meta_idle_monitor_add_user_active_watch (MetaIdleMonitor

 void          meta_idle_monitor_remove_watch          (MetaIdleMonitor          *monitor,
 						       guint                     id);
-gint64        meta_idle_monitor_get_idletime          (MetaIdleMonitor          *monitor);
+guint64       meta_idle_monitor_get_idletime          (MetaIdleMonitor          *monitor);

 #endif
--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.h
@@ -29,6 +29,11 @@
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>

+#ifdef HAVE_WAYLAND
+#include <wayland-server.h>
+#include "meta-wayland-private.h"
+#endif
+
 G_BEGIN_DECLS

 #define META_TYPE_SHAPED_TEXTURE            (meta_shaped_texture_get_type())
@@ -64,15 +69,29 @@ struct _MetaShapedTexture

 GType meta_shaped_texture_get_type (void) G_GNUC_CONST;

+ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow);
+#ifdef HAVE_WAYLAND
+ClutterActor *meta_shaped_texture_new_with_wayland_surface  (MetaWaylandSurface *surface);
+void meta_shaped_texture_set_wayland_surface                (MetaShapedTexture  *stex,
+                                                             MetaWaylandSurface *surface);
+MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex);
+#endif
+
 void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 					     gboolean           create_mipmaps);

-gboolean meta_shaped_texture_update_area (MetaShapedTexture *stex,
-                                          int                x,
-                                          int                y,
-                                          int                width,
-                                          int                height,
-                                          cairo_region_t    *unobscured_region);
+void meta_shaped_texture_update_area (MetaShapedTexture *stex,
+                                      int                x,
+                                      int                y,
+                                      int                width,
+                                      int                height);
+
+void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
+                                     Pixmap             pixmap);
+#ifdef HAVE_WAYLAND
+void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture  *stex,
+                                                MetaWaylandBuffer  *buffer);
+#endif

 CoglTexture * meta_shaped_texture_get_texture (MetaShapedTexture *stex);

@@ -81,12 +100,10 @@ void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
 void meta_shaped_texture_set_input_shape_region (MetaShapedTexture *stex,
                                                 cairo_region_t    *shape_region);

+/* Assumes ownership of clip_region */
 void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
 					  cairo_region_t    *clip_region);

-void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
-                                            cairo_region_t    *opaque_region);
-
 cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture     *stex,
                                                 cairo_rectangle_int_t *clip);

--- a/src/mutter-plugins.pc.in
+++ b/src/mutter-plugins.pc.in
@@ -0,0 +1,17 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+plugindir=@MUTTER_PLUGIN_DIR@
+libgnome_serverdir=@libexecdir@
+mutter_major_version=@MUTTER_MAJOR_VERSION@
+mutter_minor_version=@MUTTER_MINOR_VERSION@
+mutter_micro_version=@MUTTER_MICRO_VERSION@
+mutter_plugin_api_version=@MUTTER_PLUGIN_API_VERSION@
+
+Name: mutter-plugins
+Description: Dev parameters for mutter plugins
+Requires: @CLUTTER_PACKAGE@
+Version: @VERSION@
+Libs: @CLUTTER_LIBS@
+Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\"
--- a/src/mutter-wm.desktop.in
+++ b/src/mutter-wm.desktop.in
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Type=Application
+_Name=Mutter
+Exec=mutter
+# 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
+
+[Window Manager]
+SessionManaged=true
+
--- a/src/mutter-wayland.desktop.in
+++ b/src/mutter-wayland.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=Mutter (wayland compositor)
-Exec=mutter-launch -- mutter --nested
+_Name=Mutter
+Exec=mutter
 NoDisplay=true
 # name of loadable control center module
 X-GNOME-WMSettingsModule=metacity
@@ -12,5 +12,6 @@ X-GnomeWMSettingsLibrary=metacity
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=mutter
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Autostart-Phase=DisplayServer
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=true
--- a/src/org.gnome.mutter.gschema.xml.in
+++ b/src/org.gnome.mutter.gschema.xml.in
@@ -116,5 +116,34 @@
      <_summary>Cancel tab popup</_summary>
    </key>

+    <key name="switch-to-session-1" type="as">
+      <default><![CDATA[['<Primary><Alt>F1']]]></default>
+      <_summary>Switch to VT 1</_summary>
+    </key>
+    <key name="switch-to-session-2" type="as">
+      <default><![CDATA[['<Primary><Alt>F2']]]></default>
+      <_summary>Switch to VT 2</_summary>
+    </key>
+    <key name="switch-to-session-3" type="as">
+      <default><![CDATA[['<Primary><Alt>F3']]]></default>
+      <_summary>Switch to VT 3</_summary>
+    </key>
+    <key name="switch-to-session-4" type="as">
+      <default><![CDATA[['<Primary><Alt>F4']]]></default>
+      <_summary>Switch to VT 4</_summary>
+    </key>
+    <key name="switch-to-session-5" type="as">
+      <default><![CDATA[['<Primary><Alt>F5']]]></default>
+      <_summary>Switch to VT 5</_summary>
+    </key>
+    <key name="switch-to-session-6" type="as">
+      <default><![CDATA[['<Primary><Alt>F6']]]></default>
+      <_summary>Switch to VT 6</_summary>
+    </key>
+    <key name="switch-to-session-7" type="as">
+      <default><![CDATA[['<Primary><Alt>F7']]]></default>
+      <_summary>Switch to VT 7</_summary>
+    </key>
+
  </schema>
 </schemalist>
--- a/src/org.gnome.mutter.wayland.gschema.xml.in
+++ b/src/org.gnome.mutter.wayland.gschema.xml.in
@@ -1,33 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.mutter.wayland.keybindings" path="/org/gnome/mutter/wayland/keybindings/"
-	  gettext-domain="@GETTEXT_DOMAIN@">
-    <key name="switch-to-session-1" type="as">
-      <default><![CDATA[['<Primary><Alt>F1']]]></default>
-      <_summary>Switch to VT 1</_summary>
-    </key>
-    <key name="switch-to-session-2" type="as">
-      <default><![CDATA[['<Primary><Alt>F2']]]></default>
-      <_summary>Switch to VT 2</_summary>
-    </key>
-    <key name="switch-to-session-3" type="as">
-      <default><![CDATA[['<Primary><Alt>F3']]]></default>
-      <_summary>Switch to VT 3</_summary>
-    </key>
-    <key name="switch-to-session-4" type="as">
-      <default><![CDATA[['<Primary><Alt>F4']]]></default>
-      <_summary>Switch to VT 4</_summary>
-    </key>
-    <key name="switch-to-session-5" type="as">
-      <default><![CDATA[['<Primary><Alt>F5']]]></default>
-      <_summary>Switch to VT 5</_summary>
-    </key>
-    <key name="switch-to-session-6" type="as">
-      <default><![CDATA[['<Primary><Alt>F6']]]></default>
-      <_summary>Switch to VT 6</_summary>
-    </key>
-    <key name="switch-to-session-7" type="as">
-      <default><![CDATA[['<Primary><Alt>F7']]]></default>
-      <_summary>Switch to VT 7</_summary>
-    </key>
-  </schema>
-</schemalist>
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -430,11 +430,7 @@ locate_attributes (GMarkupParseContext *context,

  while (name != NULL)
    {
-      if (retloc == NULL)
-        {
-          retval = FALSE;
-          goto out;
-        }
+      g_return_val_if_fail (retloc != NULL, FALSE);

      g_assert (n_attrs < MAX_ATTRS);
      
@@ -3216,6 +3212,9 @@ parse_style_set_element (GMarkupParseContext  *context,
          meta_frame_style_ref (frame_style);
          info->style_set->tiled_right_styles[frame_focus] = frame_style;
          break;
+          meta_frame_style_ref (frame_style);
+          info->style_set->tiled_right_styles[frame_focus] = frame_style;
+          break;
        case META_FRAME_STATE_SHADED:
          if (info->style_set->shaded_styles[frame_resize][frame_focus])
            {
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -56,8 +56,6 @@ struct _MetaUI
 void
 meta_ui_init (void)
 {
-  gdk_set_allowed_backends ("x11");
-
  if (!gtk_init_check (NULL, NULL))
    meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
 }
--- a/src/wayland/meta-tty.c
+++ b/src/wayland/meta-tty.c
@@ -0,0 +1,436 @@
+/*
+ * Copyright © 2010 Intel Corporation
+ *             2013 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission.  The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <termios.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <linux/kd.h>
+#include <linux/vt.h>
+#include <linux/major.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "meta-tty.h"
+#include <gio/gio.h>
+#include <glib-unix.h>
+
+/* Introduced in 2.6.38 */
+#ifndef K_OFF
+#define K_OFF 0x04
+#endif
+
+struct _MetaTTYClass
+{
+  GObjectClass parent_class;
+};
+
+struct _MetaTTY
+{
+  GObject parent;
+
+  int fd;
+  struct termios terminal_attributes;
+
+  GMainContext *nested_context;
+  GMainLoop *nested_loop;
+
+  int input_source;
+  GSource *vt_enter_source, *vt_leave_source;
+  GSource *nested_term;
+  int vt, starting_vt;
+  int kb_mode;
+};
+
+enum {
+  SIGNAL_ENTER,
+  SIGNAL_LEAVE,
+  SIGNAL_LAST
+};
+
+static int signals[SIGNAL_LAST];
+
+static void meta_tty_initable_iface_init (GInitableIface *);
+
+G_DEFINE_TYPE_WITH_CODE (MetaTTY, meta_tty, G_TYPE_OBJECT,
+			 G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+						meta_tty_initable_iface_init));
+
+static gboolean
+quit_nested_loop (gpointer user_data)
+{
+  MetaTTY *tty = user_data;
+
+  g_main_loop_quit (tty->nested_loop);
+
+  return FALSE;
+}
+
+static gboolean
+vt_release_handler (gpointer user_data)
+{
+  MetaTTY *tty = user_data;
+
+  g_signal_emit (tty, signals[SIGNAL_LEAVE], 0);
+
+  ioctl (tty->fd, VT_RELDISP, 1);
+
+  /* We can't do anything at this point, because we don't
+     have input devices and we don't have the DRM master,
+     so let's run a nested busy loop until the VT is reentered */
+  g_main_loop_run (tty->nested_loop);
+
+  ioctl (tty->fd, VT_RELDISP, VT_ACKACQ);
+
+  g_signal_emit (tty, signals[SIGNAL_ENTER], 0);
+
+  return FALSE;
+}
+
+static int
+on_tty_input (int          fd, 
+	      GIOCondition mask,
+	      gpointer     user_data)
+{
+  MetaTTY *tty = user_data;
+
+  /* Ignore input to tty.  We get keyboard events from evdev */
+  tcflush(tty->fd, TCIFLUSH);
+
+  return 1;
+}
+
+static int
+try_open_vt (MetaTTY  *tty,
+	     GError  **error)
+{
+  int tty0, fd;
+  char filename[16];
+
+  tty0 = open ("/dev/tty0", O_WRONLY | O_CLOEXEC);
+  if (tty0 < 0)
+    {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Could not open tty0: %s", strerror (errno));
+      return -1;
+    }
+
+  if (ioctl (tty0, VT_OPENQRY, &tty->vt) < 0 || tty->vt == -1) {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Could not open tty0: %s", strerror (errno));
+      close (tty0);
+      return -1;
+  }
+
+  close (tty0);
+  snprintf (filename, sizeof filename, "/dev/tty%d", tty->vt);
+  g_debug("compositor: using new vt %s\n", filename);
+  fd = open (filename, O_RDWR | O_NOCTTY | O_CLOEXEC);
+  return fd;
+}
+
+gboolean
+meta_tty_activate_vt (MetaTTY  *tty,
+		      int       vt,
+		      GError  **error)
+{
+  if (ioctl(tty->fd, VT_ACTIVATE, vt) < 0)
+    {
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+		   strerror (errno));
+      return FALSE;
+    }
+  else
+    return TRUE;
+}
+
+static int
+env_get_fd (const char *env)
+{
+  const char *value;
+
+  value = g_getenv (env);
+
+  if (value == NULL)
+    return -1;
+  else
+    return g_ascii_strtoll (value, NULL, 10);
+}
+
+static gboolean
+meta_tty_initable_init(GInitable     *initable,
+		       GCancellable  *cancellable,
+		       GError       **error)
+{
+  MetaTTY *tty = META_TTY (initable);
+  struct termios raw_attributes;
+  struct vt_mode mode = { 0 };
+  int ret;
+	
+  struct stat buf;
+  struct vt_stat vts;
+
+  tty->fd = env_get_fd ("WESTON_TTY_FD");
+  if (tty->fd < 0)
+    tty->fd = STDIN_FILENO;
+
+  if (fstat(tty->fd, &buf) == 0 &&
+      major(buf.st_rdev) == TTY_MAJOR &&
+      minor(buf.st_rdev) > 0)
+    {
+      if (tty->fd == STDIN_FILENO)
+	tty->fd = fcntl(STDIN_FILENO, F_DUPFD_CLOEXEC, 0);
+      tty->vt = minor(buf.st_rdev);
+    }
+  else
+    {
+      /* Fall back to try opening a new VT.  This typically
+       * requires root. */
+      tty->fd = try_open_vt(tty, error);
+    }
+
+  if (tty->fd <= 0 && (!error || !*error))
+    {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Could not open tty0: %s", strerror (errno));
+      return FALSE;
+    }
+
+  if (ioctl(tty->fd, VT_GETSTATE, &vts) == 0)
+    tty->starting_vt = vts.v_active;
+  else
+    tty->starting_vt = tty->vt;
+  
+  if (tty->starting_vt != tty->vt)
+    {
+      if (ioctl(tty->fd, VT_ACTIVATE, tty->vt) < 0 ||
+	  ioctl(tty->fd, VT_WAITACTIVE, tty->vt) < 0)
+	{
+	  g_set_error (error, G_IO_ERROR,
+		       g_io_error_from_errno (errno),
+		       "Failed to switch to new vt: %s", strerror (errno));
+	  goto err;
+	}
+    }
+
+  if (tcgetattr(tty->fd, &tty->terminal_attributes) < 0)
+    {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Could not get terminal attributes: %s", strerror (errno));
+      goto err;
+    }
+
+  /* Ignore control characters and disable echo */
+  raw_attributes = tty->terminal_attributes;
+  cfmakeraw(&raw_attributes);
+
+  /* Fix up line endings to be normal (cfmakeraw hoses them) */
+  raw_attributes.c_oflag |= OPOST | OCRNL;
+  /* Don't generate ttou signals */
+  raw_attributes.c_oflag &= ~TOSTOP;
+
+  if (tcsetattr(tty->fd, TCSANOW, &raw_attributes) < 0)
+    g_warning("Could not put terminal into raw mode: %s", strerror (errno));
+
+  ioctl(tty->fd, KDGKBMODE, &tty->kb_mode);
+  ret = ioctl(tty->fd, KDSKBMODE, K_OFF);
+  if (ret)
+    {
+      ret = ioctl(tty->fd, KDSKBMODE, K_RAW);
+      if (ret)
+	{
+	  g_set_error (error, G_IO_ERROR,
+		       g_io_error_from_errno (errno),
+		       "Failed to set keyboard mode: %s", strerror (errno));
+	  goto err_attr;
+	}
+
+      tty->input_source = g_unix_fd_add (tty->fd,
+					 G_IO_IN,
+					 on_tty_input, tty);
+    }
+
+  ret = ioctl(tty->fd, KDSETMODE, KD_GRAPHICS);
+  if (ret)
+    {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Failed to set KD_GRAPHICS mode: %s", strerror (errno));
+      goto err_kdkbmode;
+    }
+
+  mode.mode = VT_PROCESS;
+  mode.relsig = SIGUSR1;
+  mode.acqsig = SIGUSR2;
+  if (ioctl(tty->fd, VT_SETMODE, &mode) < 0)
+    {
+      g_set_error (error, G_IO_ERROR,
+		   g_io_error_from_errno (errno),
+		   "Failed to take control of vt handling: %s", strerror (errno));
+      goto err_kdmode;
+    }
+
+  tty->vt_leave_source = g_unix_signal_source_new (SIGUSR1);
+  g_source_set_callback (tty->vt_leave_source, vt_release_handler, tty, NULL);
+
+  tty->vt_enter_source = g_unix_signal_source_new (SIGUSR2);
+  g_source_set_callback (tty->vt_enter_source, quit_nested_loop, tty, NULL);
+  tty->nested_term = g_unix_signal_source_new (SIGTERM);
+  g_source_set_callback (tty->nested_term, quit_nested_loop, tty, NULL);
+
+  tty->nested_context = g_main_context_new ();
+  tty->nested_loop = g_main_loop_new (tty->nested_context, FALSE);
+
+  g_source_attach (tty->vt_leave_source, NULL);
+  g_source_attach (tty->vt_enter_source, tty->nested_context);
+  g_source_attach (tty->nested_term, tty->nested_context);
+
+  return TRUE;
+
+ err_kdmode:
+  ioctl (tty->fd, KDSETMODE, KD_TEXT);
+
+ err_kdkbmode:
+  if (tty->input_source)
+    g_source_remove (tty->input_source);
+  ioctl (tty->fd, KDSKBMODE, tty->kb_mode);
+
+ err_attr:
+  tcsetattr (tty->fd, TCSANOW, &tty->terminal_attributes);
+  
+ err:
+  close (tty->fd);
+  return FALSE;
+}
+
+void
+meta_tty_reset (MetaTTY  *tty,
+		gboolean  warn_if_fail)
+{
+  struct vt_mode mode = { 0 };
+
+  if (ioctl (tty->fd, KDSKBMODE, tty->kb_mode) && warn_if_fail)
+    g_warning ("failed to restore keyboard mode: %s", strerror (errno));
+
+  if (ioctl (tty->fd, KDSETMODE, KD_TEXT) && warn_if_fail)
+    g_warning ("failed to set KD_TEXT mode on tty: %s", strerror (errno));
+
+  if (tcsetattr (tty->fd, TCSANOW, &tty->terminal_attributes) < 0 && warn_if_fail)
+    g_warning ("could not restore terminal to canonical mode");
+
+  mode.mode = VT_AUTO;
+  if (ioctl (tty->fd, VT_SETMODE, &mode) < 0 && warn_if_fail)
+    g_warning ("could not reset vt handling\n");
+
+  if (tty->vt != tty->starting_vt)
+    {
+      ioctl(tty->fd, VT_ACTIVATE, tty->starting_vt);
+      ioctl(tty->fd, VT_WAITACTIVE, tty->starting_vt);
+    }
+}
+
+static void
+meta_tty_finalize (GObject *object)
+{
+  MetaTTY *tty = META_TTY (object);
+
+  if (tty->input_source)
+    g_source_remove (tty->input_source);
+
+  g_source_destroy (tty->vt_enter_source);
+  g_source_destroy (tty->vt_leave_source);
+  g_source_destroy (tty->nested_term);
+
+  g_main_loop_unref (tty->nested_loop);
+  g_main_context_unref (tty->nested_context);
+
+  meta_tty_reset (tty, TRUE);
+
+  close (tty->fd);
+
+  G_OBJECT_CLASS (meta_tty_parent_class)->finalize (object);
+}
+
+static void
+meta_tty_init (MetaTTY *self)
+{
+}
+
+static void
+meta_tty_class_init (MetaTTYClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_tty_finalize;
+
+  signals[SIGNAL_ENTER] = g_signal_new ("enter",
+					G_TYPE_FROM_CLASS (klass),
+					G_SIGNAL_RUN_FIRST,
+					0, /* class offset */
+					NULL, NULL, /* accumulator */
+					g_cclosure_marshal_VOID__VOID,
+					G_TYPE_NONE, 0);
+
+  signals[SIGNAL_LEAVE] = g_signal_new ("leave",
+					G_TYPE_FROM_CLASS (klass),
+					G_SIGNAL_RUN_FIRST,
+					0, /* class offset */
+					NULL, NULL, /* accumulator */
+					g_cclosure_marshal_VOID__VOID,
+					G_TYPE_NONE, 0);
+}
+
+static void
+meta_tty_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = meta_tty_initable_init;
+}
+
+MetaTTY *
+meta_tty_new (void)
+{
+  GError *error;
+  MetaTTY *tty;
+
+  error = NULL;
+  tty = g_initable_new (META_TYPE_TTY, NULL, &error, NULL);
+
+  if (tty == NULL)
+    {
+      g_warning ("Failed to initalize TTY handling: %s", error->message);
+      g_error_free (error);
+    }
+
+  return tty;
+}
--- a/src/wayland/meta-tty.h
+++ b/src/wayland/meta-tty.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_TTY_H
+#define META_TTY_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define META_TYPE_TTY              (meta_tty_get_type())
+#define META_TTY(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_TTY, MetaTTY))
+#define META_TTY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_TTY, MetaTTYClass))
+#define META_IS_TTY(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_TTY))
+#define META_IS_TTY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_TTY))
+#define META_TTY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TTY, MetaTTYClass))
+
+typedef struct _MetaTTY      MetaTTY;
+typedef struct _MetaTTYClass MetaTTYClass;
+
+GType             meta_tty_get_type                (void) G_GNUC_CONST;
+
+MetaTTY          *meta_tty_new                     (void);
+
+gboolean          meta_tty_activate_vt             (MetaTTY  *self,
+						    int       number,
+						    GError  **error);
+
+void              meta_tty_reset                   (MetaTTY  *self,
+						    gboolean  warn_if_fail);
+
+G_END_DECLS
+
+#endif /* META_TTY_H */
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -33,7 +33,6 @@
 #include "meta-wayland-data-device.h"
 #include "meta-wayland-seat.h"
 #include "meta-wayland-pointer.h"
-#include "meta-wayland-private.h"

 static void
 data_offer_accept (struct wl_client *client,
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -58,7 +58,7 @@
 #include <sys/mman.h>
 #include <clutter/evdev/clutter-evdev.h>

-#include "meta-wayland-private.h"
+#include "meta-wayland-keyboard.h"

 static MetaWaylandSeat *
 meta_wayland_keyboard_get_seat (MetaWaylandKeyboard *keyboard)
@@ -274,29 +274,6 @@ static const MetaWaylandKeyboardGrabInterface
  default_grab_modifiers,
 };

-static void
-modal_key (MetaWaylandKeyboardGrab *grab,
-	   uint32_t                 time,
-	   uint32_t                 key,
-	   uint32_t                 state)
-{
-}
-
-static void
-modal_modifiers (MetaWaylandKeyboardGrab *grab,
-		 uint32_t                 serial,
-		 uint32_t                 mods_depressed,
-		 uint32_t                 mods_latched,
-		 uint32_t                 mods_locked,
-		 uint32_t                 group)
-{
-}
-
-static MetaWaylandKeyboardGrabInterface modal_grab = {
-  modal_key,
-  modal_modifiers,
-};
-
 gboolean
 meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
                            struct wl_display   *display,
@@ -493,7 +470,7 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
            goto found;
          }

-      g_warning ("unexpected key release event for key 0x%x", evdev_code);
+      g_warning ("unexpected key release event for key 0x%x (%d)", evdev_code, event->keyval);

    found:
      (void) 0;
@@ -538,29 +515,13 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,

      display = wl_client_get_display (client);
      serial = wl_display_next_serial (display);
-
-      /* If we're in a modal grab, the client is focused but doesn't see
-	 modifiers or pressed keys (and fix that up when we exit the modal) */
-      if (keyboard->grab->interface == &modal_grab)
-	{
-	  struct wl_array empty;
-	  wl_array_init (&empty);
-
-	  wl_keyboard_send_modifiers (resource, serial,
-				      0, 0, 0, 0);
-	  wl_keyboard_send_enter (resource, serial, surface->resource,
-				  &empty);
-	}
-      else
-	{
-	  wl_keyboard_send_modifiers (resource, serial,
-				      keyboard->modifier_state.mods_depressed,
-				      keyboard->modifier_state.mods_latched,
-				      keyboard->modifier_state.mods_locked,
-				      keyboard->modifier_state.group);
-	  wl_keyboard_send_enter (resource, serial, surface->resource,
-				  &keyboard->keys);
-	}
+      wl_keyboard_send_modifiers (resource, serial,
+                                  keyboard->modifier_state.mods_depressed,
+                                  keyboard->modifier_state.mods_latched,
+                                  keyboard->modifier_state.mods_locked,
+                                  keyboard->modifier_state.group);
+      wl_keyboard_send_enter (resource, serial, surface->resource,
+                              &keyboard->keys);
      wl_resource_add_destroy_listener (resource, &keyboard->focus_listener);
      keyboard->focus_serial = serial;
    }
@@ -605,32 +566,36 @@ meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard)
  wl_array_release (&keyboard->keys);
 }

+static void
+modal_key (MetaWaylandKeyboardGrab *grab,
+	   uint32_t                 time,
+	   uint32_t                 key,
+	   uint32_t                 state)
+{
+}
+
+static void
+modal_modifiers (MetaWaylandKeyboardGrab *grab,
+		 uint32_t                 serial,
+		 uint32_t                 mods_depressed,
+		 uint32_t                 mods_latched,
+		 uint32_t                 mods_locked,
+		 uint32_t                 group)
+{
+}
+
+static MetaWaylandKeyboardGrabInterface modal_grab = {
+  modal_key,
+  modal_modifiers,
+};
+
 gboolean
-meta_wayland_keyboard_begin_modal (MetaWaylandKeyboard *keyboard,
-				   guint32              timestamp)
+meta_wayland_keyboard_begin_modal (MetaWaylandKeyboard *keyboard)
 {
  MetaWaylandKeyboardGrab *grab;
-  uint32_t *end = (void *) ((char *) keyboard->keys.data +
-			    keyboard->keys.size);
-  uint32_t *k;
-  uint32_t serial;

  if (keyboard->grab != &keyboard->default_grab)
-    return FALSE; 
-
-  if (keyboard->focus)
-    {
-      /* Fake key release events for the focused app */
-      serial = wl_display_next_serial (keyboard->display);
-      keyboard->grab->interface->modifiers (keyboard->grab,
-					    serial,
-					    0, 0, 0, 0);
-
-      for (k = keyboard->keys.data; k < end; k++)
-	keyboard->grab->interface->key (keyboard->grab,
-					timestamp,
-					*k, 0);
-    }
+    return FALSE;

  grab = g_slice_new0 (MetaWaylandKeyboardGrab);
  grab->interface = &modal_grab;
@@ -640,14 +605,9 @@ meta_wayland_keyboard_begin_modal (MetaWaylandKeyboard *keyboard,
 }

 void
-meta_wayland_keyboard_end_modal (MetaWaylandKeyboard *keyboard,
-				 guint32              timestamp)
+meta_wayland_keyboard_end_modal (MetaWaylandKeyboard *keyboard)
 {
  MetaWaylandKeyboardGrab *grab;
-  uint32_t *end = (void *) ((char *) keyboard->keys.data +
-			    keyboard->keys.size);
-  uint32_t *k;
-  uint32_t serial;

  grab = keyboard->grab;

@@ -655,21 +615,4 @@ meta_wayland_keyboard_end_modal (MetaWaylandKeyboard *keyboard,

  meta_wayland_keyboard_end_grab (keyboard);
  g_slice_free (MetaWaylandKeyboardGrab, grab);
-
-  if (keyboard->focus)
-    {
-      /* Fake key press events for the focused app */
-      serial = wl_display_next_serial (keyboard->display);
-      keyboard->grab->interface->modifiers (keyboard->grab,
-					    serial,
-					    keyboard->modifier_state.mods_depressed,
-					    keyboard->modifier_state.mods_latched, 
-					    keyboard->modifier_state.mods_locked,
-					    keyboard->modifier_state.group);
-
-      for (k = keyboard->keys.data; k < end; k++)
-	keyboard->grab->interface->key (keyboard->grab,
-					timestamp,
-					*k, 1);
-    }
 }
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -48,78 +48,7 @@
 #include <clutter/clutter.h>
 #include <wayland-server.h>

-struct _MetaWaylandKeyboardGrabInterface
-{
-  void (*key) (MetaWaylandKeyboardGrab * grab, uint32_t time,
-               uint32_t key, uint32_t state);
-  void (*modifiers) (MetaWaylandKeyboardGrab * grab, uint32_t serial,
-                     uint32_t mods_depressed, uint32_t mods_latched,
-                     uint32_t mods_locked, uint32_t group);
-};
-
-struct _MetaWaylandKeyboardGrab
-{
-  const MetaWaylandKeyboardGrabInterface *interface;
-  MetaWaylandKeyboard *keyboard;
-  MetaWaylandSurface *focus;
-  uint32_t key;
-};
-
-typedef struct
-{
-  struct xkb_keymap *keymap;
-  int keymap_fd;
-  size_t keymap_size;
-  char *keymap_area;
-  xkb_mod_index_t shift_mod;
-  xkb_mod_index_t caps_mod;
-  xkb_mod_index_t ctrl_mod;
-  xkb_mod_index_t alt_mod;
-  xkb_mod_index_t mod2_mod;
-  xkb_mod_index_t mod3_mod;
-  xkb_mod_index_t super_mod;
-  xkb_mod_index_t mod5_mod;
-} MetaWaylandXkbInfo;
-
-typedef struct
-{
-  uint32_t mods_depressed;
-  uint32_t mods_latched;
-  uint32_t mods_locked;
-  uint32_t group;
-} MetaWaylandXkbState;
-
-struct _MetaWaylandKeyboard
-{
-  struct wl_list resource_list;
-  MetaWaylandSurface *focus;
-  struct wl_resource *focus_resource;
-  struct wl_listener focus_listener;
-  uint32_t focus_serial;
-  struct wl_signal focus_signal;
-
-  MetaWaylandKeyboardGrab *grab;
-  MetaWaylandKeyboardGrab default_grab;
-  uint32_t grab_key;
-  uint32_t grab_serial;
-  uint32_t grab_time;
-
-  struct wl_array keys;
-
-  MetaWaylandXkbState modifier_state;
-
-  struct wl_display *display;
-
-  struct xkb_context *xkb_context;
-  struct xkb_state *xkb_state;
-  gboolean is_evdev;
-
-  MetaWaylandXkbInfo xkb_info;
-  struct xkb_rule_names xkb_names;
-
-  MetaWaylandKeyboardGrab input_method_grab;
-  struct wl_resource *input_method_resource;
-};
+#include "meta-wayland-seat.h"

 gboolean
 meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
@@ -142,11 +71,9 @@ void
 meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);

 gboolean
-meta_wayland_keyboard_begin_modal (MetaWaylandKeyboard *keyboard,
-				   guint32              timestamp);
+meta_wayland_keyboard_begin_modal (MetaWaylandKeyboard *keyboard);
 void
-meta_wayland_keyboard_end_modal   (MetaWaylandKeyboard *keyboard,
-				   guint32              timestamp);
+meta_wayland_keyboard_end_modal   (MetaWaylandKeyboard *keyboard);

 void
 meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -44,7 +44,6 @@
 #include "config.h"

 #include "meta-wayland-pointer.h"
-#include "meta-wayland-private.h"

 #include <string.h>

@@ -325,21 +324,3 @@ meta_wayland_pointer_end_modal (MetaWaylandPointer *pointer)
  meta_wayland_pointer_end_grab (pointer);
  g_slice_free (MetaWaylandPointerGrab, grab);
 }
-
-/* Called when the focused resource is destroyed */
-void
-meta_wayland_pointer_destroy_focus (MetaWaylandPointer *pointer)
-{
-  if (pointer->grab == &pointer->default_grab)
-    {
-      /* The surface was destroyed, but had the implicit pointer grab.
-         Bypass the grab interface. */
-      g_assert (pointer->button_count > 0);
-
-      /* Note: we focus the NULL interface, not the current one, because
-	 we have button down, and the clients would be confused if the
-	 pointer enters the surface.
-      */
-      meta_wayland_pointer_set_focus (pointer, NULL, 0, 0);
-    }
-}
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -22,51 +22,7 @@

 #include <wayland-server.h>

-#include <glib.h>
-
-#include "meta-wayland-types.h"
-
-struct _MetaWaylandPointerGrabInterface
-{
-  void (*focus) (MetaWaylandPointerGrab * grab,
-                 MetaWaylandSurface * surface, wl_fixed_t x, wl_fixed_t y);
-  void (*motion) (MetaWaylandPointerGrab * grab,
-                  uint32_t time, wl_fixed_t x, wl_fixed_t y);
-  void (*button) (MetaWaylandPointerGrab * grab,
-                  uint32_t time, uint32_t button, uint32_t state);
-};
-
-struct _MetaWaylandPointerGrab
-{
-  const MetaWaylandPointerGrabInterface *interface;
-  MetaWaylandPointer *pointer;
-  MetaWaylandSurface *focus;
-  wl_fixed_t x, y;
-};
-
-struct _MetaWaylandPointer
-{
-  struct wl_list resource_list;
-  MetaWaylandSurface *focus;
-  struct wl_resource *focus_resource;
-  struct wl_listener focus_listener;
-  guint32 focus_serial;
-  struct wl_signal focus_signal;
-
-  MetaWaylandPointerGrab *grab;
-  MetaWaylandPointerGrab default_grab;
-  wl_fixed_t grab_x, grab_y;
-  guint32 grab_button;
-  guint32 grab_serial;
-  guint32 grab_time;
-
-  wl_fixed_t x, y;
-  MetaWaylandSurface *current;
-  struct wl_listener current_listener;
-  wl_fixed_t current_x, current_y;
-
-  guint32 button_count;
-};
+#include "meta-wayland-seat.h"

 void
 meta_wayland_pointer_init (MetaWaylandPointer *pointer);
@@ -79,10 +35,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
                                MetaWaylandSurface *surface,
                                wl_fixed_t sx,
                                wl_fixed_t sy);
-
-void
-meta_wayland_pointer_destroy_focus (MetaWaylandPointer *pointer);
-
 void
 meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
                                 MetaWaylandPointerGrab *grab);
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -28,12 +28,42 @@
 #include <cairo.h>

 #include "window-private.h"
-#include "meta-weston-launch.h"
+#include "meta-tty.h"
 #include <meta/meta-cursor-tracker.h>

-#include "meta-wayland-types.h"
-#include "meta-wayland-surface.h"
-#include "meta-wayland-seat.h"
+typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
+
+typedef struct _MetaWaylandSeat MetaWaylandSeat;
+typedef struct _MetaWaylandPointer MetaWaylandPointer;
+typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab;
+typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
+typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
+typedef struct _MetaWaylandKeyboardGrab MetaWaylandKeyboardGrab;
+typedef struct _MetaWaylandKeyboardGrabInterface MetaWaylandKeyboardGrabInterface;
+typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
+typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
+
+typedef struct
+{
+  struct wl_resource *resource;
+  struct wl_signal destroy_signal;
+  struct wl_listener destroy_listener;
+
+  union
+  {
+    struct wl_shm_buffer *shm_buffer;
+    struct wl_buffer *legacy_buffer;
+  };
+
+  int32_t width, height;
+  uint32_t busy_count;
+} MetaWaylandBuffer;
+
+typedef struct
+{
+  MetaWaylandBuffer *buffer;
+  struct wl_listener destroy_listener;
+} MetaWaylandBufferReference;

 typedef struct
 {
@@ -41,6 +71,46 @@ typedef struct
  cairo_region_t *region;
 } MetaWaylandRegion;

+struct _MetaWaylandSurface
+{
+  struct wl_resource *resource;
+  MetaWaylandCompositor *compositor;
+  guint32 xid;
+  int x;
+  int y;
+  MetaWaylandBufferReference buffer_ref;
+  MetaWindow *window;
+  gboolean has_shell_surface;
+
+  /* All the pending state, that wl_surface.commit will apply. */
+  struct
+  {
+    /* wl_surface.attach */
+    gboolean newly_attached;
+    MetaWaylandBuffer *buffer;
+    struct wl_listener buffer_destroy_listener;
+    int32_t sx;
+    int32_t sy;
+
+    /* wl_surface.damage */
+    cairo_region_t *damage;
+
+    /* wl_surface.frame */
+    struct wl_list frame_callback_list;
+  } pending;
+};
+
+#ifndef HAVE_META_WAYLAND_SURFACE_TYPE
+typedef struct _MetaWaylandSurface MetaWaylandSurface;
+#endif
+
+typedef struct
+{
+  MetaWaylandSurface *surface;
+  struct wl_resource *resource;
+  struct wl_listener surface_destroy_listener;
+} MetaWaylandShellSurface;
+
 typedef struct
 {
  GSource source;
@@ -60,11 +130,12 @@ typedef struct

 struct _MetaWaylandCompositor
 {
+  GHashTable *outputs;
+
  struct wl_display *wayland_display;
  struct wl_event_loop *wayland_loop;
  GMainLoop *init_loop;
  ClutterActor *stage;
-  GHashTable *outputs;
  GSource *wayland_event_source;
  GList *surfaces;
  struct wl_list frame_callbacks;
@@ -77,8 +148,9 @@ struct _MetaWaylandCompositor
  struct wl_client *xwayland_client;
  struct wl_resource *xserver_resource;

-  MetaLauncher *launcher;
+  MetaTTY *tty;
  int drm_fd;
+  GSocket *weston_launch;

  MetaWaylandSeat *seat;

@@ -91,6 +163,175 @@ struct _MetaWaylandCompositor
  guint32 implicit_grab_button;
 };

+struct _MetaWaylandPointerGrabInterface
+{
+  void (*focus) (MetaWaylandPointerGrab * grab,
+                 MetaWaylandSurface * surface, wl_fixed_t x, wl_fixed_t y);
+  void (*motion) (MetaWaylandPointerGrab * grab,
+                  uint32_t time, wl_fixed_t x, wl_fixed_t y);
+  void (*button) (MetaWaylandPointerGrab * grab,
+                  uint32_t time, uint32_t button, uint32_t state);
+};
+
+struct _MetaWaylandPointerGrab
+{
+  const MetaWaylandPointerGrabInterface *interface;
+  MetaWaylandPointer *pointer;
+  MetaWaylandSurface *focus;
+  wl_fixed_t x, y;
+};
+
+struct _MetaWaylandPointer
+{
+  struct wl_list resource_list;
+  MetaWaylandSurface *focus;
+  struct wl_resource *focus_resource;
+  struct wl_listener focus_listener;
+  guint32 focus_serial;
+  struct wl_signal focus_signal;
+
+  MetaWaylandPointerGrab *grab;
+  MetaWaylandPointerGrab default_grab;
+  wl_fixed_t grab_x, grab_y;
+  guint32 grab_button;
+  guint32 grab_serial;
+  guint32 grab_time;
+
+  wl_fixed_t x, y;
+  MetaWaylandSurface *current;
+  struct wl_listener current_listener;
+  wl_fixed_t current_x, current_y;
+
+  guint32 button_count;
+};
+
+struct _MetaWaylandKeyboardGrabInterface
+{
+  void (*key) (MetaWaylandKeyboardGrab * grab, uint32_t time,
+               uint32_t key, uint32_t state);
+  void (*modifiers) (MetaWaylandKeyboardGrab * grab, uint32_t serial,
+                     uint32_t mods_depressed, uint32_t mods_latched,
+                     uint32_t mods_locked, uint32_t group);
+};
+
+struct _MetaWaylandKeyboardGrab
+{
+  const MetaWaylandKeyboardGrabInterface *interface;
+  MetaWaylandKeyboard *keyboard;
+  MetaWaylandSurface *focus;
+  uint32_t key;
+};
+
+typedef struct
+{
+  struct xkb_keymap *keymap;
+  int keymap_fd;
+  size_t keymap_size;
+  char *keymap_area;
+  xkb_mod_index_t shift_mod;
+  xkb_mod_index_t caps_mod;
+  xkb_mod_index_t ctrl_mod;
+  xkb_mod_index_t alt_mod;
+  xkb_mod_index_t mod2_mod;
+  xkb_mod_index_t mod3_mod;
+  xkb_mod_index_t super_mod;
+  xkb_mod_index_t mod5_mod;
+} MetaWaylandXkbInfo;
+
+typedef struct
+{
+  uint32_t mods_depressed;
+  uint32_t mods_latched;
+  uint32_t mods_locked;
+  uint32_t group;
+} MetaWaylandXkbState;
+
+struct _MetaWaylandKeyboard
+{
+  struct wl_list resource_list;
+  MetaWaylandSurface *focus;
+  struct wl_resource *focus_resource;
+  struct wl_listener focus_listener;
+  uint32_t focus_serial;
+  struct wl_signal focus_signal;
+
+  MetaWaylandKeyboardGrab *grab;
+  MetaWaylandKeyboardGrab default_grab;
+  uint32_t grab_key;
+  uint32_t grab_serial;
+  uint32_t grab_time;
+
+  struct wl_array keys;
+
+  MetaWaylandXkbState modifier_state;
+
+  struct wl_display *display;
+
+  struct xkb_context *xkb_context;
+  struct xkb_state *xkb_state;
+  gboolean is_evdev;
+
+  MetaWaylandXkbInfo xkb_info;
+  struct xkb_rule_names xkb_names;
+
+  MetaWaylandKeyboardGrab input_method_grab;
+  struct wl_resource *input_method_resource;
+};
+
+struct _MetaWaylandDataOffer
+{
+  struct wl_resource *resource;
+  MetaWaylandDataSource *source;
+  struct wl_listener source_destroy_listener;
+};
+
+struct _MetaWaylandDataSource
+{
+  struct wl_resource *resource;
+  struct wl_array mime_types;
+
+  void (*accept) (MetaWaylandDataSource * source,
+                  uint32_t serial, const char *mime_type);
+  void (*send) (MetaWaylandDataSource * source,
+                const char *mime_type, int32_t fd);
+  void (*cancel) (MetaWaylandDataSource * source);
+};
+
+struct _MetaWaylandSeat
+{
+  struct wl_list base_resource_list;
+  struct wl_signal destroy_signal;
+
+  uint32_t selection_serial;
+  MetaWaylandDataSource *selection_data_source;
+  struct wl_listener selection_data_source_listener;
+  struct wl_signal selection_signal;
+
+  struct wl_list drag_resource_list;
+  struct wl_client *drag_client;
+  MetaWaylandDataSource *drag_data_source;
+  struct wl_listener drag_data_source_listener;
+  MetaWaylandSurface *drag_focus;
+  struct wl_resource *drag_focus_resource;
+  struct wl_listener drag_focus_listener;
+  MetaWaylandPointerGrab drag_grab;
+  MetaWaylandSurface *drag_surface;
+  struct wl_listener drag_icon_listener;
+  struct wl_signal drag_icon_signal;
+
+  MetaWaylandPointer pointer;
+  MetaWaylandKeyboard keyboard;
+
+  struct wl_display *display;
+
+  MetaCursorTracker *cursor_tracker;
+  MetaWaylandSurface *sprite;
+  int hotspot_x, hotspot_y;
+  struct wl_listener sprite_destroy_listener;
+
+  ClutterActor *current_stage;
+};
+
 void                    meta_wayland_init                       (void);
 void                    meta_wayland_finalize                   (void);

@@ -103,12 +344,9 @@ void                    meta_wayland_compositor_repick          (MetaWaylandComp
 void                    meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
                                                                 MetaWindow            *window);

-MetaLauncher           *meta_wayland_compositor_get_launcher    (MetaWaylandCompositor *compositor);
-
-MetaWaylandBuffer *     meta_wayland_buffer_from_resource       (struct wl_resource *resource);
-
-void                    meta_wayland_buffer_reference           (MetaWaylandBufferReference *ref,
-								 MetaWaylandBuffer          *buffer);
+MetaTTY                *meta_wayland_compositor_get_tty         (MetaWaylandCompositor *compositor);
+gboolean                meta_wayland_compositor_is_native       (MetaWaylandCompositor *compositor);

+void                    meta_wayland_surface_free               (MetaWaylandSurface    *surface);

 #endif /* META_WAYLAND_PRIVATE_H */
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -35,7 +35,6 @@
 #include "meta-wayland-data-device.h"
 #include "meta-window-actor-private.h"
 #include "meta/meta-shaped-texture.h"
-#include "meta-shaped-texture-private.h"
 #include "meta-wayland-stage.h"
 #include "meta-cursor-tracker-private.h"

--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -27,64 +27,7 @@
 #include <clutter/clutter.h>
 #include <glib.h>

-#include <meta/meta-cursor-tracker.h>
-#include "meta-wayland-types.h"
-#include "meta-wayland-keyboard.h"
-#include "meta-wayland-pointer.h"
-
-struct _MetaWaylandDataOffer
-{
-  struct wl_resource *resource;
-  MetaWaylandDataSource *source;
-  struct wl_listener source_destroy_listener;
-};
-
-struct _MetaWaylandDataSource
-{
-  struct wl_resource *resource;
-  struct wl_array mime_types;
-
-  void (*accept) (MetaWaylandDataSource * source,
-                  uint32_t serial, const char *mime_type);
-  void (*send) (MetaWaylandDataSource * source,
-                const char *mime_type, int32_t fd);
-  void (*cancel) (MetaWaylandDataSource * source);
-};
-
-struct _MetaWaylandSeat
-{
-  struct wl_list base_resource_list;
-  struct wl_signal destroy_signal;
-
-  uint32_t selection_serial;
-  MetaWaylandDataSource *selection_data_source;
-  struct wl_listener selection_data_source_listener;
-  struct wl_signal selection_signal;
-
-  struct wl_list drag_resource_list;
-  struct wl_client *drag_client;
-  MetaWaylandDataSource *drag_data_source;
-  struct wl_listener drag_data_source_listener;
-  MetaWaylandSurface *drag_focus;
-  struct wl_resource *drag_focus_resource;
-  struct wl_listener drag_focus_listener;
-  MetaWaylandPointerGrab drag_grab;
-  MetaWaylandSurface *drag_surface;
-  struct wl_listener drag_icon_listener;
-  struct wl_signal drag_icon_signal;
-
-  MetaWaylandPointer pointer;
-  MetaWaylandKeyboard keyboard;
-
-  struct wl_display *display;
-
-  MetaCursorTracker *cursor_tracker;
-  MetaWaylandSurface *sprite;
-  int hotspot_x, hotspot_y;
-  struct wl_listener sprite_destroy_listener;
-
-  ClutterActor *current_stage;
-};
+#include "meta-wayland-private.h"

 MetaWaylandSeat *
 meta_wayland_seat_new (struct wl_display *display,
--- a/src/wayland/meta-wayland-stage.c
+++ b/src/wayland/meta-wayland-stage.c
@@ -26,7 +26,6 @@
 #include <cogl/cogl-wayland-server.h>

 #include "meta-wayland-stage.h"
-#include "meta-wayland-private.h"
 #include "meta/meta-window-actor.h"
 #include "meta/meta-shaped-texture.h"
 #include "meta-cursor-tracker-private.h"
@@ -66,3 +65,4 @@ meta_wayland_stage_new (void)
                       "cursor-visible", FALSE,
                       NULL);
 }
+
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_WAYLAND_SURFACE_H
-#define META_WAYLAND_SURFACE_H
-
-#include <wayland-server.h>
-#include <xkbcommon/xkbcommon.h>
-#include <clutter/clutter.h>
-
-#include <glib.h>
-#include <cairo.h>
-
-#include <meta/meta-cursor-tracker.h>
-#include "meta-wayland-types.h"
-
-struct _MetaWaylandBuffer
-{
-  struct wl_resource *resource;
-  struct wl_signal destroy_signal;
-  struct wl_listener destroy_listener;
-
-  int32_t width, height;
-  uint32_t busy_count;
-};
-
-struct _MetaWaylandBufferReference
-{
-  MetaWaylandBuffer *buffer;
-  struct wl_listener destroy_listener;
-};
-
-typedef struct
-{
-  /* wl_surface.attach */
-  gboolean newly_attached;
-  MetaWaylandBuffer *buffer;
-  struct wl_listener buffer_destroy_listener;
-  int32_t sx;
-  int32_t sy;
-
-  /* wl_surface.damage */
-  cairo_region_t *damage;
-
-  cairo_region_t *input_region;
-  cairo_region_t *opaque_region;
-
-  /* wl_surface.frame */
-  struct wl_list frame_callback_list;
-} MetaWaylandDoubleBufferedState;
-
-typedef struct
-{
-  char *title;
-  char *wm_class;
-
-  char *gtk_application_id;
-  char *gtk_unique_bus_name;
-  char *gtk_app_menu_path;
-  char *gtk_menubar_path;
-  char *gtk_application_object_path;
-  char *gtk_window_object_path;
-} MetaWaylandSurfaceInitialState;
-
-struct _MetaWaylandSurface
-{
-  struct wl_resource *resource;
-  MetaWaylandCompositor *compositor;
-  guint32 xid;
-  int x;
-  int y;
-  MetaWaylandBufferReference buffer_ref;
-  MetaWindow *window;
-  gboolean has_shell_surface;
-  gboolean has_gtk_surface;
-
-  /* All the pending state, that wl_surface.commit will apply. */
-  MetaWaylandDoubleBufferedState pending;
-
-  /* All the initial state, that wl_shell_surface.set_* will apply
-     (through meta_window_new_for_wayland) */
-  MetaWaylandSurfaceInitialState *initial_state;
-};
-
-typedef struct
-{
-  MetaWaylandSurface *surface;
-  struct wl_resource *resource;
-  struct wl_listener surface_destroy_listener;
-} MetaWaylandSurfaceExtension;
-
-void                meta_wayland_init_shell     (MetaWaylandCompositor *compositor);
-
-MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *compositor,
-						 struct wl_client      *client,
-						 guint32                id,
-						 guint32                version);
-void                meta_wayland_surface_free   (MetaWaylandSurface    *surface);
-
-void                meta_wayland_surface_set_initial_state (MetaWaylandSurface *surface,
-							    MetaWindow         *window);
-
-#endif
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_WAYLAND_TYPES_H
-#define META_WAYLAND_TYPES_H
-
-typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
-
-typedef struct _MetaWaylandSeat MetaWaylandSeat;
-typedef struct _MetaWaylandPointer MetaWaylandPointer;
-typedef struct _MetaWaylandPointerGrab MetaWaylandPointerGrab;
-typedef struct _MetaWaylandPointerGrabInterface MetaWaylandPointerGrabInterface;
-typedef struct _MetaWaylandKeyboard MetaWaylandKeyboard;
-typedef struct _MetaWaylandKeyboardGrab MetaWaylandKeyboardGrab;
-typedef struct _MetaWaylandKeyboardGrabInterface MetaWaylandKeyboardGrabInterface;
-typedef struct _MetaWaylandDataOffer MetaWaylandDataOffer;
-typedef struct _MetaWaylandDataSource MetaWaylandDataSource;
-
-typedef struct _MetaWaylandBuffer MetaWaylandBuffer;
-typedef struct _MetaWaylandBufferReference MetaWaylandBufferReference;
-
-typedef struct _MetaWaylandSurface MetaWaylandSurface;
-
-#endif
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
--- a/src/wayland/meta-weston-launch.c
+++ b/src/wayland/meta-weston-launch.c
@@ -22,9 +22,6 @@
 #include <gio/gio.h>
 #include <gio/gunixfdmessage.h>

-#include <clutter/clutter.h>
-#include <clutter/evdev/clutter-evdev.h>
-
 #include <glib.h>
 #include <sys/time.h>
 #include <string.h>
@@ -43,59 +40,16 @@

 #include "meta-weston-launch.h"

-struct _MetaLauncherClass
-{
-  GObjectClass parent_class;
-
-  void (*enter) (MetaLauncher *);
-  void (*leave) (MetaLauncher *);
-};
-
-struct _MetaLauncher
-{
-  GObject parent;
-
-  GSocket *weston_launch;
-
-  gboolean vt_switched;
-
-  GMainContext *nested_context;
-  GMainLoop *nested_loop;
-
-  GSource *inner_source;
-  GSource *outer_source;
-};
-
-enum {
-  SIGNAL_ENTER,
-  SIGNAL_LEAVE,
-  SIGNAL_LAST
-};
-
-static int signals[SIGNAL_LAST];
-
-G_DEFINE_TYPE (MetaLauncher, meta_launcher, G_TYPE_OBJECT);
-
-static void handle_request_vt_switch (MetaLauncher *self);
-
 static gboolean
-request_vt_switch_idle (gpointer user_data)
-{
-  handle_request_vt_switch (user_data);
-
-  return FALSE;
-}
-
-static gboolean
-send_message_to_wl (MetaLauncher           *self,
+send_message_to_wl (GSocket                *weston_launch,
 		    void                   *message,
 		    gsize                   size,
 		    GSocketControlMessage  *out_cmsg,
 		    GSocketControlMessage **in_cmsg,
 		    GError                **error)
 {
-  struct weston_launcher_reply reply;
-  GInputVector in_iov = { &reply, sizeof (reply) };
+  int ok;
+  GInputVector in_iov = { &ok, sizeof (int) };
  GOutputVector out_iov = { message, size };
  GSocketControlMessage *out_all_cmsg[2];
  GSocketControlMessage **in_all_cmsg;
@@ -104,57 +58,26 @@ send_message_to_wl (MetaLauncher           *self,

  out_all_cmsg[0] = out_cmsg;
  out_all_cmsg[1] = NULL;
-  if (g_socket_send_message (self->weston_launch, NULL,
+  if (g_socket_send_message (weston_launch, NULL,
 			     &out_iov, 1,
 			     out_all_cmsg, -1,
 			     flags, NULL, error) != (gssize)size)
    return FALSE;

-  if (g_socket_receive_message (self->weston_launch, NULL,
+  if (g_socket_receive_message (weston_launch, NULL,
 				&in_iov, 1,
-			        &in_all_cmsg, NULL,
-				&flags, NULL, error) != sizeof (reply))
+				&in_all_cmsg, NULL,
+				&flags, NULL, error) != sizeof (int))
    return FALSE;

-  while (reply.header.opcode != ((struct weston_launcher_message*)message)->opcode)
+  if (ok != 0)
    {
-      /* There were events queued */
-      g_assert ((reply.header.opcode & WESTON_LAUNCHER_EVENT) == WESTON_LAUNCHER_EVENT);
-
-      /* This can never happen, because the only time mutter-launch can queue
-         this event is after confirming a VT switch, and we don't make requests
-         during that time.
-
-         Note that getting this event would be really bad, because we would be
-         in the wrong loop/context.
-      */
-      g_assert (reply.header.opcode != WESTON_LAUNCHER_SERVER_VT_ENTER);
-
-      switch (reply.header.opcode)
-	{
-	case WESTON_LAUNCHER_SERVER_REQUEST_VT_SWITCH:
-	  g_idle_add (request_vt_switch_idle, self);
-	  break;
-
-	default:
-	  g_assert_not_reached ();
-	}
-
-      if (g_socket_receive_message (self->weston_launch, NULL,
-				    &in_iov, 1,
-				    NULL, NULL,
-				    &flags, NULL, error) != sizeof (reply))
-	return FALSE;
-    }
-
-  if (reply.ret != 0)
-    {
-      if (reply.ret == -1)
+      if (ok == -1)
 	g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
 		     "Got failure from weston-launch");
      else
-	g_set_error (error, G_IO_ERROR, g_io_error_from_errno (-reply.ret),
-		     "Got failure from weston-launch: %s", strerror (-reply.ret));
+	g_set_error (error, G_IO_ERROR, g_io_error_from_errno (-ok),
+		     "Got failure from weston-launch: %s", strerror (-ok));

      for (i = 0; in_all_cmsg && in_all_cmsg[i]; i++)
 	g_object_unref (in_all_cmsg[i]);
@@ -172,282 +95,109 @@ send_message_to_wl (MetaLauncher           *self,

  g_free (in_all_cmsg);
  return TRUE;
-}
+}	    

 gboolean
-meta_launcher_set_drm_fd (MetaLauncher  *self,
-			  int            drm_fd,
-			  GError       **error)
+meta_weston_launch_set_master (GSocket   *weston_launch,
+			       int        drm_fd,
+			       gboolean   master,
+			       GError   **error)
 {
-  struct weston_launcher_message message;
-  GSocketControlMessage *cmsg;
-  gboolean ok;
-
-  message.opcode = WESTON_LAUNCHER_DRM_SET_FD;
-
-  cmsg = g_unix_fd_message_new ();
-  if (g_unix_fd_message_append_fd (G_UNIX_FD_MESSAGE (cmsg),
-				   drm_fd, error) == FALSE)
+  if (weston_launch)
    {
+      struct weston_launcher_set_master message;
+      GSocketControlMessage *cmsg;
+      gboolean ok;
+
+      message.header.opcode = WESTON_LAUNCHER_DRM_SET_MASTER;
+      message.set_master = master;
+
+      cmsg = g_unix_fd_message_new ();
+      if (g_unix_fd_message_append_fd (G_UNIX_FD_MESSAGE (cmsg),
+				       drm_fd, error) == FALSE)
+	{
+	  g_object_unref (cmsg);
+	  return FALSE;
+	}
+
+      ok = send_message_to_wl (weston_launch, &message, sizeof message, cmsg, NULL, error);
+
      g_object_unref (cmsg);
-      return FALSE;
+      return ok;
    }
+  else
+    {
+      int ret;

-  ok = send_message_to_wl (self, &message, sizeof message, cmsg, NULL, error);
+      if (master)
+	ret = drmSetMaster (drm_fd);
+      else
+	ret = drmDropMaster (drm_fd);

-  g_object_unref (cmsg);
-  return ok;
+      if (ret < 0)
+	{
+	  g_set_error (error, G_IO_ERROR, g_io_error_from_errno (-ret),
+		       "Failed to set DRM master directly: %s", strerror (-ret));
+	  return FALSE;
+	}
+      else
+	return TRUE;
+    }
 }

 int
-meta_launcher_open_input_device (MetaLauncher  *self,
-				 const char    *name,
-				 int            flags,
-				 GError       **error)
+meta_weston_launch_open_input_device (GSocket    *weston_launch,
+				      const char *name,
+				      int         flags,
+				      GError    **error)
 {
-  struct weston_launcher_open *message;
-  GSocketControlMessage *cmsg;
-  gboolean ok;
-  gsize size;
-  int *fds, n_fd;
-  int ret;
-
-  size = sizeof (struct weston_launcher_open) + strlen (name) + 1;
-  message = g_malloc (size);
-  message->header.opcode = WESTON_LAUNCHER_OPEN;
-  message->flags = flags;
-  strcpy (message->path, name);
-  message->path[strlen(name)] = 0;
-
-  ok = send_message_to_wl (self, message, size, NULL, &cmsg, error);
-
-  if (ok)
+  if (weston_launch)
    {
-      g_assert (G_IS_UNIX_FD_MESSAGE (cmsg));
+      struct weston_launcher_open *message;
+      GSocketControlMessage *cmsg;
+      gboolean ok;
+      gsize size;
+      int *fds, n_fd;
+      int ret;

-      fds = g_unix_fd_message_steal_fds (G_UNIX_FD_MESSAGE (cmsg), &n_fd);
-      g_assert (n_fd == 1);
+      size = sizeof (struct weston_launcher_open) + strlen (name) + 1;
+      message = g_malloc (size);
+      message->header.opcode = WESTON_LAUNCHER_OPEN;
+      message->flags = flags;
+      strcpy (message->path, name);
+      message->path[strlen(name)] = 0;

-      ret = fds[0];
-      g_free (fds);
-      g_object_unref (cmsg);
+      ok = send_message_to_wl (weston_launch, message, size,
+			       NULL, &cmsg, error);
+
+      if (ok)
+	{
+	  g_assert (G_IS_UNIX_FD_MESSAGE (cmsg));
+
+	  fds = g_unix_fd_message_steal_fds (G_UNIX_FD_MESSAGE (cmsg), &n_fd);
+	  g_assert (n_fd == 1);
+
+	  ret = fds[0];
+	  g_free (fds);
+	  g_object_unref (cmsg);
+	}
+      else
+	ret = -1;
+
+      g_free (message);
+      return ret;
    }
  else
-    ret = -1;
-
-  g_free (message);
-  return ret;
-}
-
-static void
-meta_launcher_finalize (GObject *object)
-{
-  MetaLauncher *launcher = META_LAUNCHER (object);
-
-  g_source_destroy (launcher->outer_source);
-  g_source_destroy (launcher->inner_source);
-
-  g_main_loop_unref (launcher->nested_loop);
-  g_main_context_unref (launcher->nested_context);
-
-  g_object_unref (launcher->weston_launch);
-
-  G_OBJECT_CLASS (meta_launcher_parent_class)->finalize (object);
-}
-
-static void
-meta_launcher_enter (MetaLauncher *launcher)
-{
-  ClutterBackend *backend;
-  CoglContext *cogl_context;
-  CoglDisplay *cogl_display;
-
-  backend = clutter_get_default_backend ();
-  cogl_context = clutter_backend_get_cogl_context (backend);
-  cogl_display = cogl_context_get_display (cogl_context);
-  cogl_kms_display_queue_modes_reset (cogl_display);
-
-  clutter_evdev_reclaim_devices ();
-}
-
-static void
-meta_launcher_leave (MetaLauncher *launcher)
-{
-  clutter_evdev_release_devices ();
-}
-
-static int
-on_evdev_device_open (const char  *path,
-		      int          flags,
-		      gpointer     user_data,
-		      GError     **error)
-{
-  MetaLauncher *launcher = user_data;
-
-  return meta_launcher_open_input_device (launcher, path, flags, error);
-}
-
-static void
-handle_vt_enter (MetaLauncher *launcher)
-{
-  g_assert (launcher->vt_switched);
-
-  g_main_loop_quit (launcher->nested_loop);
-}
-
-static void
-handle_request_vt_switch (MetaLauncher *launcher)
-{
-  struct weston_launcher_message message;
-  GError *error;
-  gboolean ok;
-
-  g_signal_emit (launcher, signals[SIGNAL_LEAVE], 0);
-
-  message.opcode = WESTON_LAUNCHER_CONFIRM_VT_SWITCH;
-
-  error = NULL;
-  ok = send_message_to_wl (launcher, &message, sizeof (message), NULL, NULL, &error);
-  if (!ok) {
-    g_warning ("Failed to acknowledge VT switch: %s", error->message);
-    g_error_free (error);
-
-    return;
-  }
-
-  g_assert (!launcher->vt_switched);
-  launcher->vt_switched = TRUE;
-
-  /* We can't do anything at this point, because we don't
-     have input devices and we don't have the DRM master,
-     so let's run a nested busy loop until the VT is reentered */
-  g_main_loop_run (launcher->nested_loop);
-
-  g_assert (launcher->vt_switched);
-  launcher->vt_switched = FALSE;
-
-  g_signal_emit (launcher, signals[SIGNAL_ENTER], 0);
-}
-
-static gboolean
-on_socket_readable (GSocket      *socket,
-		    GIOCondition  condition,
-		    gpointer      user_data)
-{
-  MetaLauncher *launcher = user_data;
-  struct weston_launcher_event event;
-  gssize read;
-  GError *error;
-
-  if ((condition & G_IO_IN) == 0)
-    return TRUE;
-
-  error = NULL;
-  read = g_socket_receive (socket, (char*)&event, sizeof(event), NULL, &error);
-  if (read < (gssize)sizeof(event))
    {
-      g_warning ("Error reading from weston-launcher socket: %s", error->message);
-      g_error_free (error);
-      return TRUE;
+      int ret;
+
+      ret = open (name, flags, 0);
+
+      if (ret < 0)
+	g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+		     "Failed to open input device directly: %s", strerror (errno));
+
+      return ret;
    }
-
-  switch (event.header.opcode)
-    {
-    case WESTON_LAUNCHER_SERVER_REQUEST_VT_SWITCH:
-      handle_request_vt_switch (launcher);
-      break;
-
-    case WESTON_LAUNCHER_SERVER_VT_ENTER:
-      handle_vt_enter (launcher);
-      break;
-    }
-
-  return TRUE;
-}
-
-static int
-env_get_fd (const char *env)
-{
-  const char *value;
-
-  value = g_getenv (env);
-
-  if (value == NULL)
-    return -1;
-  else
-    return g_ascii_strtoll (value, NULL, 10);
-}
-
-static void
-meta_launcher_init (MetaLauncher *self)
-{
-  int launch_fd;
-
-  launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
-  if (launch_fd < 0)
-    g_error ("Invalid mutter-launch socket");
-
-  self->weston_launch = g_socket_new_from_fd (launch_fd, NULL);
-
-  clutter_evdev_set_open_callback (on_evdev_device_open, self);
-
-  self->nested_context = g_main_context_new ();
-  self->nested_loop = g_main_loop_new (self->nested_context, FALSE);
-
-  self->outer_source = g_socket_create_source (self->weston_launch, G_IO_IN, NULL);
-  g_source_set_callback (self->outer_source, (GSourceFunc)on_socket_readable, self, NULL);
-  g_source_attach (self->outer_source, NULL);
-  g_source_unref (self->outer_source);
-
-  self->inner_source = g_socket_create_source (self->weston_launch, G_IO_IN, NULL);
-  g_source_set_callback (self->inner_source, (GSourceFunc)on_socket_readable, self, NULL);
-  g_source_attach (self->inner_source, self->nested_context);
-  g_source_unref (self->inner_source);
-}
-
-static void
-meta_launcher_class_init (MetaLauncherClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_launcher_finalize;
-
-  klass->enter = meta_launcher_enter;
-  klass->leave = meta_launcher_leave;
-
-  signals[SIGNAL_ENTER] = g_signal_new ("enter",
-					G_TYPE_FROM_CLASS (klass),
-					G_SIGNAL_RUN_FIRST,
-					G_STRUCT_OFFSET (MetaLauncherClass, enter),
-					NULL, NULL, /* accumulator */
-					g_cclosure_marshal_VOID__VOID,
-					G_TYPE_NONE, 0);
-
-  signals[SIGNAL_LEAVE] = g_signal_new ("leave",
-					G_TYPE_FROM_CLASS (klass),
-					G_SIGNAL_RUN_FIRST,
-					G_STRUCT_OFFSET (MetaLauncherClass, leave),
-					NULL, NULL, /* accumulator */
-					g_cclosure_marshal_VOID__VOID,
-					G_TYPE_NONE, 0);
-}
-
-MetaLauncher *
-meta_launcher_new (void)
-{
-  return g_object_new (META_TYPE_LAUNCHER, NULL);
-}
-
-gboolean
-meta_launcher_activate_vt (MetaLauncher  *launcher,
-			   int            vt,
-			   GError       **error)
-{
-  struct weston_launcher_activate_vt message;
-
-  message.header.opcode = WESTON_LAUNCHER_ACTIVATE_VT;
-  message.vt = vt;
-
-  return send_message_to_wl (launcher, &message, sizeof (message), NULL, NULL, error);
 }

--- a/src/wayland/meta-weston-launch.h
+++ b/src/wayland/meta-weston-launch.h
@@ -21,35 +21,36 @@
 #define META_WESTON_LAUNCH_H

 #include <glib-object.h>
-#include "weston-launch.h"

-#define META_TYPE_LAUNCHER              (meta_launcher_get_type())
-#define META_LAUNCHER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_LAUNCHER, MetaLauncher))
-#define META_LAUNCHER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_LAUNCHER, MetaLauncherClass))
-#define META_IS_LAUNCHER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_LAUNCHER))
-#define META_IS_LAUNCHER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_LAUNCHER))
-#define META_LAUNCHER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), META_LAUNCHER, MetaLauncherClass))
+/* Keep this in sync with weston-launch */

-typedef struct _MetaLauncher      MetaLauncher;
-typedef struct _MetaLauncherClass MetaLauncherClass;
+enum weston_launcher_opcode {
+	WESTON_LAUNCHER_OPEN,
+	WESTON_LAUNCHER_DRM_SET_MASTER
+};

-GType             meta_launcher_get_type                (void) G_GNUC_CONST;
+struct weston_launcher_message {
+	int opcode;
+};

-MetaLauncher     *meta_launcher_new                     (void);
+struct weston_launcher_open {
+	struct weston_launcher_message header;
+	int flags;
+	char path[0];
+};

-gboolean          meta_launcher_activate_vt             (MetaLauncher  *self,
-							 int            number,
-							 GError       **error);
+struct weston_launcher_set_master {
+	struct weston_launcher_message header;
+	int set_master;
+};

-gboolean          meta_launcher_set_drm_fd              (MetaLauncher  *self,
-							 int            drm_fd,
-							 GError       **error);
-gboolean          meta_launcher_set_master              (MetaLauncher  *self,
-							 gboolean       master,
-							 GError       **error);
-int               meta_launcher_open_input_device       (MetaLauncher  *self,
-							 const char    *name,
-							 int            flags,
-							 GError       **error);
+gboolean meta_weston_launch_set_master (GSocket   *weston_launch,
+					int        drm_fd,
+					gboolean   master,
+					GError   **error);
+int      meta_weston_launch_open_input_device (GSocket     *weston_launch,
+					       const char  *name,
+					       int          flags,
+					       GError     **error);

 #endif
--- a/src/wayland/meta-xwayland-private.h
+++ b/src/wayland/meta-xwayland-private.h
@@ -27,9 +27,6 @@
 gboolean
 meta_xwayland_start (MetaWaylandCompositor *compositor);

-void
-meta_xwayland_complete_init (void);
-
 void
 meta_xwayland_stop (MetaWaylandCompositor *compositor);

--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -430,19 +430,14 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)

  g_main_loop_run (compositor->init_loop);

-  return TRUE;
-}
-
-/* To be called right after connecting */
-void
-meta_xwayland_complete_init (void)
-{
  /* We install an X IO error handler in addition to the child watch,
     because after Xlib connects our child watch may not be called soon
     enough, and therefore we won't crash when X exits (and most important
     we won't reset the tty).
  */
  XSetIOErrorHandler (x_io_error);
+
+  return TRUE;
 }

 void
--- a/src/wayland/weston-launch.c
+++ b/src/wayland/weston-launch.c
@@ -46,7 +46,6 @@
 #include <termios.h>
 #include <linux/vt.h>
 #include <linux/major.h>
-#include <linux/kd.h>

 #include <pwd.h>
 #include <grp.h>
@@ -54,18 +53,13 @@

 #include <xf86drm.h>

+#ifdef HAVE_SYSTEMD_LOGIN
 #include <systemd/sd-login.h>
+#endif

 #include "weston-launch.h"

 #define MAX_ARGV_SIZE 256
-#define DRM_MAJOR     226
-
-enum vt_state {
-	VT_HAS_VT,
-	VT_PENDING_CONFIRM,
-	VT_NOT_HAVE_VT,
-};

 struct weston_launch {
 	struct pam_conv pc;
@@ -80,27 +74,64 @@ struct weston_launch {
 	pid_t child;
 	int verbose;
 	char *new_user;
-
-	struct termios terminal_attributes;
-	int kb_mode;
-	enum vt_state vt_state;
-
-        int drm_fd;
 };

 union cmsg_data { unsigned char b[4]; int fd; };

-static void quit (struct weston_launch *wl, int status);
+static gid_t *
+read_groups(void)
+{
+	int n;
+	gid_t *groups;
+	
+	n = getgroups(0, NULL);
+
+	if (n < 0) {
+		fprintf(stderr, "Unable to retrieve groups: %m\n");
+		return NULL;
+	}
+
+	groups = malloc(n * sizeof(gid_t));
+	if (!groups)
+		return NULL;
+
+	if (getgroups(n, groups) < 0) {
+		fprintf(stderr, "Unable to retrieve groups: %m\n");
+		free(groups);
+		return NULL;
+	}
+	return groups;
+}

 static int
 weston_launch_allowed(struct weston_launch *wl)
 {
+	struct group *gr;
+	gid_t *groups;
+	int i;
+#ifdef HAVE_SYSTEMD_LOGIN
 	char *session, *seat;
 	int err;
+#endif

 	if (getuid() == 0)
 		return 1;

+	gr = getgrnam("weston-launch");
+	if (gr) {
+		groups = read_groups();
+		if (groups) {
+			for (i = 0; groups[i]; ++i) {
+				if (groups[i] == gr->gr_gid) {
+					free(groups);
+					return 1;
+				}
+			}
+			free(groups);
+		}
+	}
+
+#ifdef HAVE_SYSTEMD_LOGIN
 	err = sd_pid_get_session(getpid(), &session);
 	if (err == 0 && session) {
 		if (sd_session_is_active(session) &&
@@ -111,10 +142,52 @@ weston_launch_allowed(struct weston_launch *wl)
 		}
 		free(session);
 	}
+#endif
 	
 	return 0;
 }

+static int
+pam_conversation_fn(int msg_count,
+		    const struct pam_message **messages,
+		    struct pam_response **responses,
+		    void *user_data)
+{
+	return PAM_SUCCESS;
+}
+
+static int
+setup_pam(struct weston_launch *wl)
+{
+	int err;
+
+	wl->pc.conv = pam_conversation_fn;
+	wl->pc.appdata_ptr = wl;
+
+	err = pam_start("login", wl->pw->pw_name, &wl->pc, &wl->ph);
+	if (err != PAM_SUCCESS) {
+		fprintf(stderr, "failed to start pam transaction: %d: %s\n",
+			err, pam_strerror(wl->ph, err));
+		return -1;
+	}
+
+	err = pam_set_item(wl->ph, PAM_TTY, ttyname(wl->tty));
+	if (err != PAM_SUCCESS) {
+		fprintf(stderr, "failed to set PAM_TTY item: %d: %s\n",
+			err, pam_strerror(wl->ph, err));
+		return -1;
+	}
+
+	err = pam_open_session(wl->ph, 0);
+	if (err != PAM_SUCCESS) {
+		fprintf(stderr, "failed to open pam session: %d: %s\n",
+			err, pam_strerror(wl->ph, err));
+		return -1;
+	}
+
+	return 0;
+}
+
 static int
 setup_launcher_socket(struct weston_launch *wl)
 {
@@ -148,7 +221,6 @@ setup_signals(struct weston_launch *wl)
 	sigaddset(&mask, SIGCHLD);
 	sigaddset(&mask, SIGINT);
 	sigaddset(&mask, SIGTERM);
-	sigaddset(&mask, SIGUSR1);
 	ret = sigprocmask(SIG_BLOCK, &mask, NULL);
 	assert(ret == 0);

@@ -169,61 +241,48 @@ setenv_fd(const char *env, int fd)
 }

 static int
-handle_setdrmfd(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
+handle_setmaster(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 {
-        struct weston_launcher_reply reply;
+	int ret = -1;
 	struct cmsghdr *cmsg;
+	struct weston_launcher_set_master *message;
 	union cmsg_data *data;
-	struct stat s;

-	reply.header.opcode = WESTON_LAUNCHER_DRM_SET_FD;
-	reply.ret = -1;
-
-	if (wl->drm_fd != -1) {
-		error(0, 0, "DRM FD already set");
-		reply.ret = -EINVAL;
+	if (len != sizeof(*message)) {
+		error(0, 0, "missing value in setmaster request");
 		goto out;
 	}

+	message = msg->msg_iov->iov_base;
+
 	cmsg = CMSG_FIRSTHDR(msg);
 	if (!cmsg ||
 	    cmsg->cmsg_level != SOL_SOCKET ||
 	    cmsg->cmsg_type != SCM_RIGHTS) {
 		error(0, 0, "invalid control message");
-		reply.ret = -EINVAL;
 		goto out;
 	}

 	data = (union cmsg_data *) CMSG_DATA(cmsg);
-	if (data->fd < 0) {
+	if (data->fd == -1) {
 		error(0, 0, "missing drm fd in socket request");
-		reply.ret = -EINVAL;
 		goto out;
 	}

-	if (fstat(data->fd, &s) < 0) {
-		reply.ret = -errno;
-		goto out;
-	}
+	if (message->set_master)
+		ret = drmSetMaster(data->fd);
+	else
+		ret = drmDropMaster(data->fd);

-	if (major(s.st_rdev) != DRM_MAJOR) {
-		fprintf(stderr, "FD is not for DRM\n");
-		reply.ret = -EPERM;
-		goto out;
-	}
-
-	wl->drm_fd = data->fd;
-	reply.ret = drmSetMaster(data->fd);
-	if (reply.ret < 0)
-		reply.ret = -errno;
+	close(data->fd);

 	if (wl->verbose)
-		fprintf(stderr, "weston-launch: set drm FD, ret: %d, fd: %d\n",
-			reply.ret, data->fd);
+		fprintf(stderr, "weston-launch: %sMaster, ret: %d, fd: %d\n",
+			message->set_master ? "set" : "drop", ret, data->fd);

 out:
 	do {
-		len = send(wl->sock[0], &reply, sizeof reply, 0);
+		len = send(wl->sock[0], &ret, sizeof ret, 0);
 	} while (len < 0 && errno == EINTR);
 	if (len < 0)
 		return -1;
@@ -231,87 +290,10 @@ out:
 	return 0;
 }

-static int
-handle_confirm_vt_switch(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
-{
-        struct weston_launcher_reply reply;
-
-	reply.header.opcode = WESTON_LAUNCHER_CONFIRM_VT_SWITCH;
-	reply.ret = -1;
-
-	if (wl->vt_state != VT_PENDING_CONFIRM) {
-		error(0, 0, "unexpected CONFIRM_VT_SWITCH");
-		goto out;
-	}
-
-	if (wl->drm_fd != -1) {
-		int ret;
-
-		ret = drmDropMaster(wl->drm_fd);
-		if (ret < 0) {
-			fprintf(stderr, "failed to drop DRM master: %m\n");
-		} else if (wl->verbose) {
-			fprintf(stderr, "dropped DRM master for VT switch\n");
-		}
-	}
-
-	wl->vt_state = VT_NOT_HAVE_VT;
-	ioctl(wl->tty, VT_RELDISP, 1);
-
-	if (wl->verbose)
-		fprintf(stderr, "weston-launcher: confirmed VT switch\n");
-
-	reply.ret = 0;
-
-out:
-	do {
-		len = send(wl->sock[0], &reply, sizeof reply, 0);
-	} while (len < 0 && errno == EINTR);
-	if (len < 0)
-		return -1;
-
-	return 0;
-}
-
-static int
-handle_activate_vt(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
-{
-        struct weston_launcher_reply reply;
-	struct weston_launcher_activate_vt *message;
-
-	reply.header.opcode = WESTON_LAUNCHER_ACTIVATE_VT;
-	reply.ret = -1;
-
-	if (len != sizeof(*message)) {
-		error(0, 0, "missing value in activate_vt request");
-		goto out;
-	}
-
-	message = msg->msg_iov->iov_base;
-
-	reply.ret = ioctl(wl->tty, VT_ACTIVATE, message->vt);
-	if (reply.ret < 0)
-		reply.ret = -errno;
-
-	if (wl->verbose)
-		fprintf(stderr, "weston-launch: activate VT, ret: %d\n", reply.ret);
-
-out:
-	do {
-		len = send(wl->sock[0], &reply, sizeof reply, 0);
-	} while (len < 0 && errno == EINTR);
-	if (len < 0)
-		return -1;
-
-	return 0;
-}
-
-
 static int
 handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 {
-        struct weston_launcher_reply reply;
-	int fd = -1;
+	int fd = -1, ret = -1;
 	char control[CMSG_SPACE(sizeof(fd))];
 	struct cmsghdr *cmsg;
 	struct stat s;
@@ -320,9 +302,6 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 	struct weston_launcher_open *message;
 	union cmsg_data *data;

-	reply.header.opcode = WESTON_LAUNCHER_OPEN;
-	reply.ret = -1;
-
 	message = msg->msg_iov->iov_base;
 	if ((size_t)len < sizeof(*message))
 		goto err0;
@@ -330,16 +309,13 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 	/* Ensure path is null-terminated */
 	((char *) message)[len-1] = '\0';

-	if (stat(message->path, &s) < 0) {
-		reply.ret = -errno;
+	if (stat(message->path, &s) < 0)
 		goto err0;
-	}

 	fd = open(message->path, message->flags);
 	if (fd < 0) {
 		fprintf(stderr, "Error opening device %s: %m\n",
 			message->path);
-		reply.ret = -errno;
 		goto err0;
 	}

@@ -348,7 +324,6 @@ handle_open(struct weston_launch *wl, struct msghdr *msg, ssize_t len)
 		fd = -1;
 		fprintf(stderr, "Device %s is not an input device\n",
 			message->path);
-		reply.ret = -EPERM;
 		goto err0;
 	}

@@ -366,14 +341,14 @@ err0:
 		data = (union cmsg_data *) CMSG_DATA(cmsg);
 		data->fd = fd;
 		nmsg.msg_controllen = cmsg->cmsg_len;
-		reply.ret = 0;
+		ret = 0;
 	}
-	iov.iov_base = &reply;
-	iov.iov_len = sizeof reply;
+	iov.iov_base = &ret;
+	iov.iov_len = sizeof ret;

 	if (wl->verbose)
 		fprintf(stderr, "weston-launch: opened %s: ret: %d, fd: %d\n",
-			message->path, reply.ret, fd);
+			message->path, ret, fd);
 	do {
 		len = sendmsg(wl->sock[0], &nmsg, 0);
 	} while (len < 0 && errno == EINTR);
@@ -417,55 +392,22 @@ handle_socket_msg(struct weston_launch *wl)
 	case WESTON_LAUNCHER_OPEN:
 		ret = handle_open(wl, &msg, len);
 		break;
-	case WESTON_LAUNCHER_DRM_SET_FD:
-		ret = handle_setdrmfd(wl, &msg, len);
-		break;
-	case WESTON_LAUNCHER_CONFIRM_VT_SWITCH:
-		ret = handle_confirm_vt_switch(wl, &msg, len);
-		break;
-	case WESTON_LAUNCHER_ACTIVATE_VT:
-		ret = handle_activate_vt(wl, &msg, len);
+	case WESTON_LAUNCHER_DRM_SET_MASTER:
+		ret = handle_setmaster(wl, &msg, len);
 		break;
 	}

 	return ret;
 }

-static void
-tty_reset(struct weston_launch *wl)
-{
-	struct vt_mode mode = { 0 };
-
-	if (ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-		fprintf(stderr, "failed to restore keyboard mode: %m\n");
-
-	if (ioctl(wl->tty, KDSETMODE, KD_TEXT))
-		fprintf(stderr, "failed to set KD_TEXT mode on tty: %m\n");
-
-	if (tcsetattr(wl->tty, TCSANOW, &wl->terminal_attributes) < 0)
-		fprintf(stderr, "could not restore terminal to canonical mode\n");
-
-	mode.mode = VT_AUTO;
-	if (ioctl(wl->tty, VT_SETMODE, &mode) < 0)
-		fprintf(stderr, "could not reset vt handling\n");
-}
-
 static void
 quit(struct weston_launch *wl, int status)
 {
 	int err;

-	if (wl->child > 0)
-		kill(wl->child, SIGKILL);
-
 	close(wl->signalfd);
 	close(wl->sock[0]);

-	if (wl->drm_fd > 0)
-		close(wl->drm_fd);
-
-	tty_reset(wl);
-
 	if (wl->new_user) {
 		err = pam_close_session(wl->ph, 0);
 		if (err)
@@ -477,46 +419,6 @@ quit(struct weston_launch *wl, int status)
 	exit(status);
 }

-static int
-handle_vt_switch(struct weston_launch *wl)
-{
-	struct weston_launcher_event message;
-	ssize_t len;
-
-	if (wl->vt_state == VT_HAS_VT) {
-		wl->vt_state = VT_PENDING_CONFIRM;
-		message.header.opcode = WESTON_LAUNCHER_SERVER_REQUEST_VT_SWITCH;
-	} else if (wl->vt_state == VT_NOT_HAVE_VT) {
-		wl->vt_state = VT_HAS_VT;
-		ioctl(wl->tty, VT_RELDISP, VT_ACKACQ);
-
-		if (wl->drm_fd != -1) {
-			int ret;
-
-			ret = drmSetMaster(wl->drm_fd);
-			if (ret < 0) {
-				fprintf(stderr, "failed to become DRM master: %m\n");
-				/* This is very, very bad, and the compositor will crash soon,
-				   but oh well... */
-			} else if (wl->verbose) {
-				fprintf(stderr, "became DRM master after VT switch\n");
-			}
-		}
-
-		message.header.opcode = WESTON_LAUNCHER_SERVER_VT_ENTER;
-	} else
-		return -1;
-
-	message.detail = 0;
-
-	do {
-		len = send(wl->sock[0], &message, sizeof(message), 0);
-	} while (len < 0 && errno == EINTR);
-
-	return 0;
-}
-
-
 static int
 handle_signal(struct weston_launch *wl)
 {
@@ -553,8 +455,6 @@ handle_signal(struct weston_launch *wl)
 		if (wl->child)
 			kill(wl->child, sig.ssi_signo);
 		break;
-	case SIGUSR1:
-		return handle_vt_switch(wl);
 	default:
 		return -1;
 	}
@@ -563,102 +463,87 @@ handle_signal(struct weston_launch *wl)
 }

 static int
-setup_tty(struct weston_launch *wl)
+setup_tty(struct weston_launch *wl, const char *tty)
 {
 	struct stat buf;
-	struct termios raw_attributes;
-	struct vt_mode mode = { 0 };
-	char *session, *tty;
-	char path[PATH_MAX];
-	int ok;
+	char *t;

-	ok = sd_pid_get_session(getpid(), &session);
-	if (ok < 0)
-	  error(1, -ok, "could not determine current session");
+	if (!wl->new_user) {
+		wl->tty = STDIN_FILENO;
+	} else if (tty) {
+		t = ttyname(STDIN_FILENO);
+		if (t && strcmp(t, tty) == 0)
+			wl->tty = STDIN_FILENO;
+		else
+			wl->tty = open(tty, O_RDWR | O_NOCTTY);
+	} else {
+		int tty0 = open("/dev/tty0", O_WRONLY | O_CLOEXEC);
+		char filename[16];

-	ok = sd_session_get_tty(session, &tty);
-	if (ok == 0) {
-		snprintf(path, PATH_MAX, "/dev/%s", tty);
-		wl->tty = open(path, O_RDWR | O_NOCTTY | O_CLOEXEC);
-		free(tty);
-#ifdef HAVE_SD_SESSION_GET_VT
-	} else if (ok == -ENOENT) {
-		/* Negative errnos are cool, right?
-		   So cool that we can't distinguish "session not found"
-		   from "key does not exist in the session file"!
-		   Let's assume the latter, as we got the value
-		   from sd_pid_get_session()...
-		*/
+		if (tty0 < 0)
+			error(1, errno, "could not open tty0");

-		ok = sd_session_get_vt(session, &tty);
-		if (ok < 0)
-			error(1, -ok, "could not determine current TTY");
+		if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1)
+			error(1, errno, "failed to find non-opened console"); 

-		snprintf(path, PATH_MAX, "/dev/tty%s", tty);
-		wl->tty = open(path, O_RDWR | O_NOCTTY | O_CLOEXEC);
-		free(tty);
-#endif
-	} else
-		error(1, -ok, "could not determine current TTY");
+		snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr);
+		wl->tty = open(filename, O_RDWR | O_NOCTTY);
+		close(tty0);
+	}

 	if (wl->tty < 0)
 		error(1, errno, "failed to open tty");

-	if (fstat(wl->tty, &buf) < 0)
-		error(1, errno, "stat %s failed", path);
+	if (tty) {
+		if (fstat(wl->tty, &buf) < 0)
+			error(1, errno, "stat %s failed", tty);

-	if (major(buf.st_rdev) != TTY_MAJOR)
-		error(1, 0, "invalid tty device: %s", path);
+		if (major(buf.st_rdev) != TTY_MAJOR)
+			error(1, 0, "invalid tty device: %s", tty);

-	wl->ttynr = minor(buf.st_rdev);
-
-	if (tcgetattr(wl->tty, &wl->terminal_attributes) < 0)
-		error(1, errno, "could not get terminal attributes");
-
-	/* Ignore control characters and disable echo */
-	raw_attributes = wl->terminal_attributes;
-	cfmakeraw(&raw_attributes);
-
-	/* Fix up line endings to be normal (cfmakeraw hoses them) */
-	raw_attributes.c_oflag |= OPOST | OCRNL;
-	/* Don't generate ttou signals */
-	raw_attributes.c_oflag &= ~TOSTOP;
-
-	if (tcsetattr(wl->tty, TCSANOW, &raw_attributes) < 0)
-	        error(1, errno, "could not put terminal into raw mode");
-
-	ioctl(wl->tty, KDGKBMODE, &wl->kb_mode);
-	ok = ioctl(wl->tty, KDSKBMODE, K_OFF);
-	if (ok < 0) {
-		ok = ioctl(wl->tty, KDSKBMODE, K_RAW);
-		if (ok < 0)
-			error(1, errno, "failed to set keyboard mode on tty");
+		wl->ttynr = minor(buf.st_rdev);
 	}

-	ok = ioctl(wl->tty, KDSETMODE, KD_GRAPHICS);
-	if (ok < 0)
-		error(1, errno, "failed to set KD_GRAPHICS mode on tty");
-
-	wl->vt_state = VT_HAS_VT;
-	mode.mode = VT_PROCESS;
-	mode.relsig = SIGUSR1;
-	mode.acqsig = SIGUSR1;
-	ok = ioctl(wl->tty, VT_SETMODE, &mode);
-	if (ok < 0)
-		error(1, errno, "failed to take control of vt handling");
-
 	return 0;
 }

 static void
-drop_privileges(struct weston_launch *wl)
+setup_session(struct weston_launch *wl)
 {
+	char **env;
+	char *term;
+	int i;
+
+	if (wl->tty != STDIN_FILENO) {
+		if (setsid() < 0)
+			error(1, errno, "setsid failed");
+		if (ioctl(wl->tty, TIOCSCTTY, 0) < 0)
+			error(1, errno, "TIOCSCTTY failed - tty is in use");
+	}
+
 	if (setgid(wl->pw->pw_gid) < 0 ||
 #ifdef HAVE_INITGROUPS
 	    initgroups(wl->pw->pw_name, wl->pw->pw_gid) < 0 ||
 #endif
 	    setuid(wl->pw->pw_uid) < 0)
 		error(1, errno, "dropping privileges failed");
+
+	term = getenv("TERM");
+	clearenv();
+	setenv("TERM", term, 1);
+	setenv("USER", wl->pw->pw_name, 1);
+	setenv("LOGNAME", wl->pw->pw_name, 1);
+	setenv("HOME", wl->pw->pw_dir, 1);
+	setenv("SHELL", wl->pw->pw_shell, 1);
+
+	env = pam_getenvlist(wl->ph);
+	if (env) {
+		for (i = 0; env[i]; ++i) {
+			if (putenv(env[i]) < 0)
+				error(0, 0, "putenv %s failed", env[i]);
+		}
+		free(env);
+	}
 }

 static void
@@ -671,11 +556,14 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])

 	if (wl->verbose)
 		printf("weston-launch: spawned weston with pid: %d\n", getpid());
+	if (wl->new_user)
+		setup_session(wl);

-	drop_privileges(wl);
+	if (wl->tty != STDIN_FILENO)
+		setenv_fd("WESTON_TTY_FD", wl->tty);

 	setenv_fd("WESTON_LAUNCHER_SOCK", wl->sock[1]);
-	setenv("LD_LIBRARY_PATH", LIBDIR, 1);
+
 	unsetenv("DISPLAY");

 	/* Do not give our signal mask to the new process. */
@@ -683,7 +571,6 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])
 	sigaddset(&mask, SIGTERM);
 	sigaddset(&mask, SIGCHLD);
 	sigaddset(&mask, SIGINT);
-	sigaddset(&mask, SIGUSR1);
 	sigprocmask(SIG_UNBLOCK, &mask, NULL);

 	snprintf (command, PATH_MAX, "%s \"$@\"", argv[0]);
@@ -705,6 +592,7 @@ help(const char *name)
 {
 	fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
 	fprintf(stderr, "  -u, --user      Start session as specified username\n");
+	fprintf(stderr, "  -t, --tty       Start session on alternative tty\n");
 	fprintf(stderr, "  -v, --verbose   Be verbose\n");
 	fprintf(stderr, "  -h, --help      Display this help message\n");
 }
@@ -714,17 +602,27 @@ main(int argc, char *argv[])
 {
 	struct weston_launch wl;
 	int i, c;
+	char *tty = NULL;
 	struct option opts[] = {
+		{ "user",    required_argument, NULL, 'u' },
+		{ "tty",     required_argument, NULL, 't' },
 		{ "verbose", no_argument,       NULL, 'v' },
 		{ "help",    no_argument,       NULL, 'h' },
 		{ 0,         0,                 NULL,  0  }
 	};	

 	memset(&wl, 0, sizeof wl);
-	wl.drm_fd = -1;

 	while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) {
 		switch (c) {
+		case 'u':
+			wl.new_user = optarg;
+			if (getuid() != 0)
+				error(1, 0, "Permission denied. -u allowed for root only");
+			break;
+		case 't':
+			tty = optarg;
+			break;
 		case 'v':
 			wl.verbose = 1;
 			break;
@@ -737,20 +635,31 @@ main(int argc, char *argv[])
 	if ((argc - optind) > (MAX_ARGV_SIZE - 6))
 		error(1, E2BIG, "Too many arguments to pass to weston");

-	if (optind >= argc)
-		error(1, 0, "Expected program argument");
-	if (strcmp (argv[optind], "mutter-wayland") &&
-	    strcmp (argv[optind], "gnome-shell-wayland"))
-	  error(1, 0, "mutter-launch can only be used to launch mutter or gnome-shell");
+	if (strcmp (argv[optind], "mutter") &&
+	    strcmp (argv[optind], "gnome-shell") &&
+	    strcmp (argv[optind], "gnome-shell-real") && 0)
+		error(1, 0, "mutter-launch can only be used to launch mutter or gnome-shell");

-	wl.pw = getpwuid(getuid());
+	if (wl.new_user)
+		wl.pw = getpwnam(wl.new_user);
+	else
+		wl.pw = getpwuid(getuid());
 	if (wl.pw == NULL)
 		error(1, errno, "failed to get username");

 	if (!weston_launch_allowed(&wl))
-		error(1, 0, "Permission denied. You must run from an active and local (systemd) session.");
+		error(1, 0, "Permission denied. You should either:\n"
+#ifdef HAVE_SYSTEMD_LOGIN
+		      " - run from an active and local (systemd) session.\n"
+#else
+		      " - enable systemd session support for weston-launch.\n"
+#endif
+		      " - or add yourself to the 'weston-launch' group.");

-	if (setup_tty(&wl) < 0)
+	if (setup_tty(&wl, tty) < 0)
+		exit(EXIT_FAILURE);
+
+	if (wl.new_user && setup_pam(&wl) < 0)
 		exit(EXIT_FAILURE);

 	if (setup_launcher_socket(&wl) < 0)
@@ -769,6 +678,8 @@ main(int argc, char *argv[])
 		launch_compositor(&wl, argc - optind, argv + optind);

 	close(wl.sock[1]);
+	if (wl.tty != STDIN_FILENO)
+		close(wl.tty);

 	while (1) {
 		struct pollfd fds[2];
--- a/src/wayland/weston-launch.h
+++ b/src/wayland/weston-launch.h
@@ -1,6 +1,5 @@
 /*
 * Copyright © 2012 Benjamin Franzke
- *             2013 Red Hat, Inc.
 *
 * Permission to use, copy, modify, distribute, and sell this software and
 * its documentation for any purpose is hereby granted without fee, provided
@@ -24,21 +23,9 @@
 #ifndef _WESTON_LAUNCH_H_
 #define _WESTON_LAUNCH_H_

-enum weston_launcher_message_type {
-	WESTON_LAUNCHER_REQUEST,
-	WESTON_LAUNCHER_EVENT,
-};
-
 enum weston_launcher_opcode {
-	WESTON_LAUNCHER_OPEN              = (1 << 1 | WESTON_LAUNCHER_REQUEST),
-	WESTON_LAUNCHER_DRM_SET_FD        = (2 << 1 | WESTON_LAUNCHER_REQUEST),
-	WESTON_LAUNCHER_ACTIVATE_VT       = (3 << 1 | WESTON_LAUNCHER_REQUEST),
-	WESTON_LAUNCHER_CONFIRM_VT_SWITCH = (4 << 1 | WESTON_LAUNCHER_REQUEST),
-};
-
-enum weston_launcher_server_opcode {
-	WESTON_LAUNCHER_SERVER_REQUEST_VT_SWITCH = (1 << 1 | WESTON_LAUNCHER_EVENT),
-	WESTON_LAUNCHER_SERVER_VT_ENTER          = (2 << 1 | WESTON_LAUNCHER_EVENT),
+	WESTON_LAUNCHER_OPEN,
+	WESTON_LAUNCHER_DRM_SET_MASTER
 };

 struct weston_launcher_message {
@@ -51,19 +38,9 @@ struct weston_launcher_open {
 	char path[0];
 };

-struct weston_launcher_activate_vt {
+struct weston_launcher_set_master {
 	struct weston_launcher_message header;
-	int vt;
-};
-
-struct weston_launcher_reply {
-	struct weston_launcher_message header;
-	int ret;
-};
-
-struct weston_launcher_event {
-	struct weston_launcher_message header;
-	int detail; /* unused, but makes sure replies and events are serialized the same */
+	int set_master;
 };

 #endif
--- a/src/xrandr.xml
+++ b/src/xrandr.xml
@@ -149,9 +149,11 @@

 	@serial must match the serial from the last GetResources() call,
 	or org.freedesktop.DBus.AccessDenied will be generated.
+	(XXX: a better error maybe?)

 	If @persistent is true, mutter will attempt to replicate this
 	configuration the next time this HW layout appears.
+	(XXX: or is this gnome-settings-daemon role?)

 	@crtcs represents the new logical configuration, as a list
 	of structures containing:
@@ -205,14 +207,11 @@

 	Changes the backlight of @output to @value, which is
 	expressed as a percentage and rounded to the HW limits.
-
-        Returns the new value after rounding.
    -->
    <method name="ChangeBacklight">
      <arg name="serial" direction="in" type="u" />
      <arg name="output" direction="in" type="u" />
      <arg name="value" direction="in" type="i" />
-      <arg name="new_value" direction="out" type="i" />
    </method>

    <!--
@@ -280,14 +279,5 @@
 	XRandR interface directly).
    -->
    <property name="PowerSaveMode" type="i" access="readwrite" />
-
-    <!--
-        MonitorsChanged:
-
-	The signal is emitted every time the screen configuration
-	changes.
-	The client should then call GetResources() to read the new layout.
-    -->
-    <signal name="MonitorsChanged" />
  </interface>
 </node>
Author	SHA1	Message	Date
Giovanni Campagna	e2c768d682	MetaWaylandSeat: reset pointer focus always when it might be different It can happen because of a grab that the current surface changes but the focus doesn't. Later on, when the grab ends, we would keep the previous focus until the user goes out of the window and back in again.	2013-08-14 18:42:07 +02:00
Giovanni Campagna	a67c12e873	MetaIdleMonitor: add a DBus interface for the idle monitor To allow other clients (gnome-session, gnome-settings-daemon) to monitor user activity, introduce a DBus interface for the idle monitor inside mutter. https://bugzilla.gnome.org/show_bug.cgi?id=706005	2013-08-14 18:42:07 +02:00
Giovanni Campagna	1dd31d67ab	Add a new helper for tracking user idle activity When running as a wayland compositor, we can't use the xserver's IDLETIME, because that's updated only in response to X events. But we have all the events ourselves, so we can just run the timer in process. https://bugzilla.gnome.org/show_bug.cgi?id=706005	2013-08-14 18:42:07 +02:00
Giovanni Campagna	b1419e2966	wayland: implement support for plugin modality Calling XIGrabDevice has no effect under wayland, because the xserver is getting events from us. Instead, we need to use our own interfaces for grabs. At the same time, we can simplify the public API, as plugins should always listen for events using clutter. https://bugzilla.gnome.org/show_bug.cgi?id=705917	2013-08-14 18:31:00 +02:00
Giovanni Campagna	6924e760c4	MonitorManager: add a KMS backend Using the new Cogl API to actually modeset (because we can't use the DRM API directly without controlling buffer swap), we can finally have a KMS monitor backend, which means full display configuration when running on bare metal.	2013-08-14 10:03:50 +02:00
Giovanni Campagna	fa9e90fe25	[NOT FOR REVIEW] More debug	2013-08-14 10:03:50 +02:00
Giovanni Campagna	806d9ddb22	[NOT FOR REVIEW] debug stuff	2013-08-14 10:03:50 +02:00
Giovanni Campagna	a8425496ad	[NOT FOR REVIEW] [SECURITY BUG] Allow spawning anything with mutter-launch	2013-08-14 10:03:50 +02:00
Giovanni Campagna	e9434732d4	MetaWayland: implement spawning dbus and gnome-session If we launch gnome-session ourselves after setting up XWayland, we then get gnome-settings-daemon and all the required session stuff, which means we can run a full regular gnome session.	2013-08-14 10:03:50 +02:00
Giovanni Campagna	bbf07c9b17	MonitorManager: add EDID properties to the output DBus description Add "edid-file", if we have one (in the KMS case, where we can point people to the right sysfs file), or "edid" with inline data. These are needed by colord to build the default ICC profile for uncalibrated displays.	2013-08-14 10:03:50 +02:00
Giovanni Campagna	804c2be976	MetaWayland: or maybe don't do it for override redirect windows? I don't know, OR windows are not appearing at all.	2013-08-14 10:03:50 +02:00
Giovanni Campagna	9bdcc9c418	meta-wayland: intersect the damage region with the window size before applying According to the wayland documentation, damage outside the window size is ignored. This happened with xwayland+wlshm (causing a GL error when calling TexSubImage2D), probably due to not resizing the buffer until we receive the corresponding X event. Might also be an off-by-one in xwayland, as the window size did not actually change. Note: we might want to take the configure_notify path instead, and keep the GL/clutter size consistent with wayland rather than X, because in the end that's what matters for events and composition.	2013-08-14 10:03:50 +02:00
Giovanni Campagna	cee22daf55	MonitorManager: split the XRandR parts in a subclass Instead of keeping a forest of if backend else ..., use a subclass and virtual functions to discriminate between XRandR and the dummy backend (which lives in the parent class togheter with the common code)	2013-08-14 10:03:49 +02:00
Giovanni Campagna	63fdf8bcb8	MetaWindow: don't set focus to unmanaged window Closing the last window causes the no-focus window to gain focus, which causes mutter to unfocus the just closed window, and that crashes. As focusing a window that is about to be destroyed does not make sense, avoid a crash in this case. Note: this is probably a reference counting bug in MetaWayland actually.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	62442cf0ce	MetaPlugin: add a UI hook for confirming display changes We want to show a dialog when a display change happens from the control center. To do so, add a new vfunc to MetaPlugin and call it when a configuration change is requested via DBus.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	c1549af840	MonitorConfig: handle changes in the laptop lid This way we don't need to track the current and previous configuration in gnome-settings-daemon, when we already do so in mutter.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	8325f0eda5	MonitorManager: add gamma support Add GetCrtcGamma() and SetCrtcGamma(), that wrap the similarly named XRandR API. These are used by GnomeRR inside the color plugin of the control center (and may go away if the color plugin decides to do something different under wayland)	2013-08-14 10:03:49 +02:00
Giovanni Campagna	14931ed391	MetaWayland: don't destroy the output list, emit the right events instead Destroying the output list causes toolkits to believe that all monitors were unplugged, which then causes assertions in code that have outside knowledge of this not having happened (like in code using GnomeRR DBus API).	2013-08-14 10:03:49 +02:00
Giovanni Campagna	c06762518e	MonitorManager: ignore configuration changes that disable all outputs If we compute a screen size of 0 in either direction, we crash later on, as it is invalid for clutter, cogl and X.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	8483dec921	MonitorManager: add support for backlight GnomeRR needs that too. The backlight is exported as a normalized 0-100 value, or -1 if not supported. Clamping to HW limits is handled by the backend. Changing backlight uses a different method call, to avoid recomputing the full display configuration every time the user presses the backlight keys.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	d7e970cb0a	MonitorManager: further extend the dummy backend The default configuration is extended, which is only possible if there are as many CRTCs as outputs, so make sure that's true. Also, add more and bigger modes, so that different sizes will be chosen for the three outputs. A nice side effect of this is that with a real 1920x1080 + 1600x900 layout, if you disable the VGA you get a stage that matches the screen size, which triggers the legacy fullscreen path in the outside mutter.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	b383d55988	MonitorManager: store the presentation mode bit in XRandR Use a private output property to store if the output is in presentation mode or not, so that this information is not lost after the configuration read back from the server.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	25f82424b8	MonitorConfig: add support for default configurations Activate the presentation bit on new hotplugged monitors, while making a fully extended setup when running for the first time.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	7764e1f3ff	MonitorConfig: add CRTC assignment Ripped off libgnome-desktop, trimming the parts that checked that the configuration was plausible, as that should be done in gnome-control-center before asking mutter for a change.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	ce3ec40036	MonitorManager: add support for persistent monitor configurations Add a new object, MetaMonitorConfig, that takes care of converting between the logical configurations stored in monitors.xml and the HW resources exposed by MonitorManager. This commit includes loading and saving of configurations, but still missing is the actual CRTC assignments and a default configuration when none is found in the file.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	22a668f2cf	MonitorManager: remove Cogl backend It was useful initially to evaluate the Cogl API, which might be what we will use to wrap the low-level KMS API, but it's incomplete and just getting in the way.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	97ff406102	MonitorManager: add support for DPMS levels To the XRandR and dummy backend (and as usual the dummy backend has no effect)	2013-08-14 10:03:49 +02:00
Giovanni Campagna	e2f06dfa8c	MonitorManager: inherit directly from DisplayConfig instead of handling signals This way we can handle properties too.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	ee6b729196	MonitorManager: fix handling of output transform Read the current transform from XRandR, and expose the transforms that are really supported on the bus. The dummy backend now advertises all transforms, since it doesn't actually apply them.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	0d1647cbc4	default plugin: add a random color background on each monitor Instead of a full white background, make one with a random color. This way the different "monitors" are visible and it's easier to debug the DBus API.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	49a83138f4	Remove duplicate path for resizing clutter stage Handle it in meta_compositor_sync_stage_size(), like we do under X11.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	1e3aad2d8c	DisplayConfig: make the dummy backend writable Add a number of dummy outputs and modes to the dummy backend, and implement the writing bits. The only visible effect is that you can change the screen size, which resizes the output window.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	33c0c1dc18	Reverse handling of XRandR events between Screen and MonitorManager Now MonitorManager does its own handling of XRandR events, which means we no longer handle ConfigureNotify on the root window. MetaScreen reacts to MonitorManager::monitor-changed and updates its internal state, including the new size. This paves the way for doing display configuration using only the dummy backend, which would allow testing wl_output interfaces.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	e261f0ac39	DisplayConfig: add the write side of the API Implement ApplyConfiguration in terms of XRandR calls. Error checking is done before actually committing the configuration. If mutter is using one of the other monitor config backends, an error is reported and nothing happens.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	528219fcbf	Extend the DBus XRandR protocol to expose cloning restriction Turns out that even if two outputs say that they can be controlled by a given CRTC, you can't configure them in the same CRTC unless they are marked as "possible clones" one of the other. This can further restrict the configuration options, so we need to expose this limitation in the DBus API.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	d9a5f2638a	Add the write side of the DBus protocol too This is just in the documentation for now, to attract wider feedback before we start looking at how to implement this for real.	2013-08-14 10:03:49 +02:00
Giovanni Campagna	738b0eee1d	Introduce a new DBus interface for display configuration This new interface will be used by the control center and possibly the settings daemon to configure the screens. It is designed to resemble a simplified XRandR, while still exposing all the quirks of the hardware, so that the panel can limit the user choices appropriately. To do so, MetaMonitorMode needs to track CRTCs, outputs and modes, so the low level objects have been decoupled from the high-level MetaMonitorInfo, which is used by core and API and offers a simplified view of HW, that hides away the details of what is cloned and how. This is still not efficient as it should be, because on every HW change we drop all data structures and rebuild them from scratch (which is not expensive because there aren't many of them, but at least in the XRandR path it involves a few sync X calls)	2013-08-14 10:03:49 +02:00
Giovanni Campagna	0480d6c898	wayland: apply stage size according to the monitor config Still 1024x768, because we don't have a way to configure that, but at least now it's hardcoded in the right place.	2013-08-14 10:03:48 +02:00
Giovanni Campagna	2777dfc533	Split monitor handling into an helper object Create a new singleton object, MetaMonitorManager, which deals with reading the XRandR configuration and in the future applying the new one. This is required because xwayland will not bind the xserver interface until he has seen the current wl_outputs, so we can't wait until MetaScreen is built to expose them.	2013-08-14 10:03:48 +02:00
Giovanni Campagna	cf296f26b1	Rework and consolidate monitor handling between MetaScreen and MetaWaylandCompositor Consolidate all places that deal with output configuration in MetaScreen, which gets it either from XRandR or from Cogl (which in turn would read it from XRandR or KMS, depending on the backend). We still need to read the Xinerama config, even when running xwayland, because we need the indices for _NET_WM_FULLSCREEN_MONITORS, but now we do it only when needed. Also, now MetaWaylandCompositor listens for MetaScreen::monitor-changed and exports the real configuration on the wayland socket.	2013-08-14 10:03:48 +02:00
Giovanni Campagna	b8f6801d20	compositor: fix focusing the stage window We can't use the X11 stage window, if clutter is not using the X11 backend (and even if it was, it would be bogus when the xwayland server is not the one clutter is talking to). Instead, we introduce the concept of "focus type", which we use to differentiate the various meanings of None in the focus_xwindow field.	2013-08-14 10:03:48 +02:00
Giovanni Campagna	2a1c0429dd	Add MetaCursorTracker, a new helper for tracking the cursor sprite Under X, we need to use XFixes to watch the cursor changing, while on wayland, we're in charge of setting and painting the cursor. MetaCursorTracker provides the abstraction layer for gnome-shell, which can thus drop ShellXFixesCursor. In the future, it may grow the ability to watch for pointer position too, especially if CursorEvents are added to the next version of XInput2, and thus it would also replace the PointerWatcher we use for gnome-shell's magnifier. https://bugzilla.gnome.org/show_bug.cgi?id=705911	2013-08-14 10:03:09 +02:00
Giovanni Campagna	5ae9457176	wayland: fix a compiler warning Implicit declaration of memset	2013-08-14 09:43:38 +02:00
Giovanni Campagna	e158500ef0	MetaWaylandKeyboard: use the new clutter-evdev support for xkbcommon We need to track the full xkb_state to have the necessary information to send to the clients, otherwise they may get confused and lock or invert the modifiers. In the evdev backend, we just retrieve the same state object that clutter is using, while in the other backends we fake the state using what clutter is providing (which is a subset of what X11 provides, which would be necessary to have full state) https://bugzilla.gnome.org/show_bug.cgi?id=705862	2013-08-14 09:43:38 +02:00
Giovanni Campagna	b29d8046b0	MetaWayland: redirect stdin/stdout/stderr when running on bare metal We need to spawn background processes for gnome-session and friends, so we need to make sure they don't try to read or write from our terminal. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	fa3ca2bf10	Add a crash handler to restore the TTY and keyboard mode If mutter crashes on secondary VT, it leaves you with a raw keyboard that doesn't switch with Alt+FN and no way to get out. At least, let's provide a decent error message that we crash and let's restore everything to sane defaults. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	fc42b478bd	Fix handling SIGTERM while DRM-locked And at the same time, clean up the signal handling in the regular case. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	0e0e0a4c7e	Add keybindings for switching VTs Once mutter is started from weston-launch on its own VT, there is no way to change VT again (for example to actually start an application), because the keyboard is put in raw mode. So introduce some keybindings mimicking the standard X ones (Ctrl+Alt+Fn) that switch the VT manually when activated. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	c96fd23e79	Improve handling while VT switched When we don't have the DRM master, there is absolutely nothing we can do (no event processing, no video output), so emulate the old X DRM lock with a nested GMainContext without sources. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	045d03014d	wayland: add input device handling too Use the new hook in clutter-evdev to ask weston-launch for the FDs of the input devices we need. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	a83049c103	wayland: add TTY and DRM master management through weston-launch To run mutter as a display server, one needs to acquire and release the DRM master, which is only possible for root, so we take advantage of weston-launch, a small setuid helper binary written for the weston project. We import our own slightly modified copy of it, because weston-launch only launches weston, for security reasons. https://bugzilla.gnome.org/show_bug.cgi?id=705861	2013-08-14 09:43:38 +02:00
Giovanni Campagna	5f4121830c	MetaWayland: install an X io error handler This way can detect X disconnections correctly, crash with a core dump and reset the tty.	2013-08-14 09:43:38 +02:00
Giovanni Campagna	43d499318f	wayland: move XWayland support code to its own file Given that xwayland code is already split in meta-xwayland, it makes sense to have there the implementation of the private xserver protocol too. https://bugzilla.gnome.org/show_bug.cgi?id=705816	2013-08-14 09:43:12 +02:00
Giovanni Campagna	f2fab33551	wayland: don't use fork() and SIGCHLD to spawn processes It is a very bad idea in a glib program (especially one heavily using glib child watching facilities, like gnome-shell) to handle SIGCHLD. While we're there, let's also use g_spawn_async, which solves some malloc-after-fork problems and makes the code generally cleaner. https://bugzilla.gnome.org/show_bug.cgi?id=705816	2013-08-14 09:43:08 +02:00