Bump version to 3.13.1

Update NEWS.

.gitignore

@@ -22,7 +22,7 @@ missing
 src/50-mutter-navigation.xml
 src/50-mutter-system.xml
 src/50-mutter-windows.xml
-src/mutter-wm.desktop
+src/mutter.desktop
 src/mutter-wayland.desktop
 *.o
 *.a
@@ -46,8 +46,8 @@ POTFILES
 po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
-libmutter-wayland.pc
-mutter-wayland
+libmutter.pc
+mutter
 mutter-launch
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
@@ -56,6 +56,7 @@ org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
+m4/*
 mutter-grayscale
 mutter-mag
 mutter-message
@@ -77,7 +78,6 @@ src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
-src/mutter-plugins.pc
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
 src/xdg-shell-protocol.c

Makefile.am

@@ -1,6 +1,8 @@
 
 SUBDIRS=src po doc
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

NEWS

@@ -1,3 +1,33 @@
+3.13.1
+======
+* Fix opacity values from _NET_WM_WINDOW_OPACITY [Nirbheek; #727874]
+* Merge wayland branch [Jasper, Giovanni, Robert B., Neil, Adel, Rui, Jonas,
+  Lionel, Tim, Owen, Florian, Colin W., Cosimo, Ray, Kalev, Pavel, Robert A.,
+  Magdalen, Marek, Matthias, Alban, Seán, Daniel, Stefano, Carlos, Colin G.,
+  Andreas, Alexander, Ryan, Marc-André, Asad, Alberto, Bastien, Hans,
+  Debarshi, Sindhu, Andika, Rico, Olav]
+* Don't prevent workspace switches for present_with_time() [Florian; #728018]
+* Add shortcuts for switching to the last workspace [Elad; #659288]
+* Make move/resize menu items behave like the keybindings [Jasper; #728617]
+* Misc. bug fixes and cleanups  [Jasper, Bastien, Florian, Adel; #720631,
+  #727979, #728423, #728395, #729044]
+
+Contributors:
+  Jonas Ådahl, Elad Alfassa, Robert Ancell, Magdalen Berns, Robert Bragg,
+  Giovanni Campagna, Cosimo Cecchi, Marek Chalupa, Nirbheek Chauhan,
+  Matthias Clasen, Alban Crequy, Seán de Búrca, Daniel Drake, Jason Ekstrand,
+  Stefano Facchini, Adel Gadllah, Carlos Garnacho, Colin Guthrie,
+  Andreas Heider, Lionel Landwerlin, Alexander Larsson, Kalev Lember,
+  Ryan Lortie, Tim Lunn, Marc-André Lureau, Rui Matos, Asad Mehmood,
+  Alberto Milone, Florian Müllner, Bastien Nocera, Hans Petter Jansson,
+  Debarshi Ray, Neil Roberts, Sindhu S, Jasper St. Pierre, Ray Strode,
+  Andika Triwidada, Rico Tzschichholz, Pavel Vasin, Olav Vitters,
+  Colin Walters, A. Walton, Owen W. Taylor
+
+Translations:
+  Inaki Larranaga Murgoitio [eu], marablack3 [el], Daniel Mustieles [es],
+  Fran Diéguez [gl], Yosef Or Boczko [he], Dirgita [id]
+
 3.12.0
 ======
 * Fix grab issue with SSD xwayland windows [Rui; #726123]

configure.ac

@@ -2,8 +2,8 @@ AC_PREREQ(2.50)
 AC_CONFIG_MACRO_DIR([m4])
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [12])
-m4_define([mutter_micro_version], [0])
+m4_define([mutter_minor_version], [13])
+m4_define([mutter_micro_version], [1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -13,6 +13,7 @@ m4_define([mutter_plugin_api_version], [3])
 AC_INIT([mutter], [mutter_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 
@@ -20,10 +21,6 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects])
 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
@@ -39,7 +36,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])
 
@@ -72,12 +69,12 @@ CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0
 
 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.3.7
+   gtk+-3.0 >= 3.9.11
    gio-2.0 >= 2.25.10
    pango >= 1.2.0
    cairo >= 1.10.0
    gsettings-desktop-schemas >= 3.7.3
-   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
+   xcomposite >= 0.2 xfixes xext xdamage xi >= 1.6.0
    $CLUTTER_PACKAGE >= 1.17.5
    cogl-1.0 >= 1.17.1
    upower-glib >= 0.99.0
@@ -133,7 +130,7 @@ AC_ARG_WITH([wayland-protocols],
 AC_ARG_WITH([xwayland-path],
             [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
             [XWAYLAND_PATH="$withval"],
-            [XWAYLAND_PATH="$bindir/Xorg"])
+            [XWAYLAND_PATH="$bindir/Xwayland"])
 
 AM_GLIB_GNU_GETTEXT
 
@@ -252,28 +249,6 @@ if test x$have_xinerama = xno; then
    AC_MSG_ERROR([Xinerama extension was not found])
 fi
 
-SHAPE_LIBS=
-found_shape=no
-AC_CHECK_LIB(Xext, XShapeQueryExtension,
-               [AC_CHECK_HEADER(X11/extensions/shape.h,
-                                SHAPE_LIBS=-lXext found_shape=yes)],
-               , $ALL_X_LIBS)
-
-if test x$enable_shape = xno; then
-   found_shape=no
-fi
-
-if test x$enable_shape = xyes; then
-   if test "$found_shape" = "no"; then
-      AC_MSG_ERROR([--enable-shape forced and Shape not found])
-      exit 1
-   fi
-fi
-
-if test "x$found_shape" = "xyes"; then
-   AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
-fi
-
 found_xkb=no
 AC_CHECK_LIB(X11, XkbQueryExtension,
                [AC_CHECK_HEADER(X11/XKBlib.h,
@@ -291,37 +266,13 @@ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
                [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                 RANDR_LIBS=-lXrandr found_randr=yes,,
 				[#include <X11/Xlib.h>])],
-               , -lXrender -lXext $ALL_X_LIBS)
+               , -lXext $ALL_X_LIBS)
 
 if test "x$found_randr" = "xyes"; then
    AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
 fi
 
-XSYNC_LIBS=
-found_xsync=no
-AC_CHECK_LIB(Xext, XSyncQueryExtension,
-               [AC_CHECK_HEADER(X11/extensions/sync.h,
-                                found_xsync=yes,,
-				[#include <X11/Xlib.h>])],
-               , $ALL_X_LIBS)
-
-if test x$enable_xsync = xno; then
-   found_xsync=no
-fi
-
-if test x$enable_xsync = xyes; then
-   if test "$found_xsync" = "no"; then
-      AC_MSG_ERROR([--enable-xsync forced and XSync not found])
-      exit 1
-   fi
-fi
-
-if test "x$found_xsync" = "xyes"; then
-   XSYNC_LIBS=-lXext
-   AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
-fi
-
-MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+MUTTER_LIBS="$MUTTER_LIBS $RANDR_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 
 found_sm=no
 case "$MUTTER_LIBS" in
@@ -451,7 +402,7 @@ doc/man/Makefile
 doc/reference/Makefile
 doc/reference/meta-docs.sgml
 src/Makefile
-src/libmutter-wayland.pc
+src/libmutter.pc
 src/compositor/plugins/Makefile
 po/Makefile.in
 ])
@@ -468,7 +419,7 @@ fi
 
 dnl ==========================================================================
 echo "
-mutter-wayland-$VERSION
+mutter-$VERSION
 
 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
@@ -478,8 +429,6 @@ mutter-wayland-$VERSION
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
-	Shape extension:          ${found_shape}
-	Xsync:                    ${found_xsync}
 "
 
 

data/Makefile.am

@@ -0,0 +1,3 @@
+defaultcursordir = $(datadir)/mutter/cursors
+
+dist_defaultcursor_DATA = left_ptr.png

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

mutter.doap

@@ -21,7 +21,6 @@ environment.</description>
   -->
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
-  <download-page rdf:resource="http://download.gnome.org/sources/mutter-wayland/" />
   <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />

po/POTFILES.in

@@ -3,6 +3,7 @@
 src/50-mutter-navigation.xml.in
 src/50-mutter-system.xml.in
 src/50-mutter-windows.xml.in
+src/backends/meta-monitor-manager.c
 src/compositor/compositor.c
 src/compositor/meta-background.c
 src/core/bell.c
@@ -12,16 +13,12 @@ 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
-src/x11/session.c
 src/core/util.c
 src/core/window.c
-src/x11/window-props.c
-src/x11/xprops.c
-src/mutter-wayland.desktop.in
+src/mutter.desktop.in
 src/org.gnome.mutter.gschema.xml.in
 src/org.gnome.mutter.wayland.gschema.xml.in
 src/ui/frames.c
@@ -30,3 +27,6 @@ src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
+src/x11/session.c
+src/x11/window-props.c
+src/x11/xprops.c

po/sk.po

@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-24 21:44+0000\n"
-"PO-Revision-Date: 2013-05-18 16:53+0100\n"
-"Last-Translator: Jan Kyselica <kyselica.jan@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 17:41+0000\n"
+"PO-Revision-Date: 2013-08-02 14:46+0200\n"
+"Last-Translator: Ján Kyselica <kyselica.jan@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
@@ -87,9 +87,8 @@ msgstr "Prepnúť okná aplikácie"
 # PK: zisti co to robi
 # description
 #: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
 msgid "Switch system controls"
-msgstr "Prepnúť medzi systémovými ovládacími prvkami"
+msgstr "Prepnúť medzi ovládacími prvkami systému"
 
 # description
 #: ../src/50-mutter-navigation.xml.in.h:14
@@ -104,9 +103,8 @@ msgstr "Prepnúť okná aplikácie priamo"
 # MČ: podobne ako vyššie: „cycle-panels“
 # description
 #: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
 msgid "Switch system controls directly"
-msgstr "Prepnúť medzi systémovými ovládacími prvkami priamo"
+msgstr "Prepnúť medzi ovládacími prvkami systému priamo"
 
 # description
 #: ../src/50-mutter-navigation.xml.in.h:17
@@ -267,13 +265,13 @@ msgstr "Zobraziť rozdelenie napravo"
 # PK: je %i cislo obrazovky? ak ano tak "č. %i"
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:571
-#, fuzzy, c-format
+#: ../src/compositor/compositor.c:596
+#, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr ""
-"Pre obrazovku %i na displeji „%s“ je spustený už iný správca rozloženia."
+"Pre obrazovku č. %i na displeji „%s“ je spustený už iný správca rozloženia."
 
 #: ../src/compositor/meta-background.c:1076
 msgid "background texture could not be created from file"
@@ -313,18 +311,18 @@ msgstr "_Počkať"
 msgid "_Force Quit"
 msgstr "_Vynútiť ukončenie"
 
-#: ../src/core/display.c:401
+#: ../src/core/display.c:421
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Rozšírenie %s, potrebné pre kompozitné prostredie, chýba"
 
 # X window system preloz, napr. system na spravu okien X
-#: ../src/core/display.c:493
+#: ../src/core/display.c:513
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Zlyhalo otvorenie displeja systému na správu okien X „%s“\n"
 
-#: ../src/core/keybindings.c:970
+#: ../src/core/keybindings.c:1136
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -332,7 +330,7 @@ msgid ""
 msgstr ""
 "Iný program už používa kláves %s s modifikátormi %x ako klávesovú skratku\n"
 
-#: ../src/core/keybindings.c:1151
+#: ../src/core/keybindings.c:1333
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "„%s“ nie je platný akcelerátor\n"
@@ -378,6 +376,20 @@ msgid ""
 msgstr ""
 "Nepodarilo sa nájsť tému! Overte, že %s existuje a obsahuje obvyklé témy.\n"
 
+#: ../src/core/monitor.c:702
+msgid "Built-in display"
+msgstr "Vstavaný displej"
+
+#. 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"'
+#.
+#: ../src/core/monitor.c:730
+#, c-format
+#| msgid "Unknown element %s"
+msgid "Unknown %s"
+msgstr "Neznámy %s"
+
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -403,7 +415,7 @@ msgstr "Zobrazí verziu"
 msgid "Mutter plugin to use"
 msgstr "Použije zásuvný modul Mutter"
 
-#: ../src/core/prefs.c:1193
+#: ../src/core/prefs.c:1202
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -411,12 +423,12 @@ msgstr ""
 "Náhradné riešenia pre chybné aplikácie nie sú povolené. Niektoré aplikácie "
 "sa nemusia správať správne.\n"
 
-#: ../src/core/prefs.c:1268
+#: ../src/core/prefs.c:1277
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Nepodarilo sa spracovať popis písma „%s“ z kľúča GSettings %s\n"
 
-#: ../src/core/prefs.c:1334
+#: ../src/core/prefs.c:1343
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -425,7 +437,7 @@ msgstr ""
 "V konfiguračnej databáze sa našlo „%s“, čo nie je platná hodnota pre "
 "modifikátor tlačidla myši\n"
 
-#: ../src/core/prefs.c:1881
+#: ../src/core/prefs.c:1909
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -434,17 +446,17 @@ msgstr ""
 "V konfiguračnej databáze sa našlo „%s“, čo nie je platná hodnota pre "
 "klávesovú skratku „%s“\n"
 
-#: ../src/core/prefs.c:1945
+#: ../src/core/prefs.c:1999
 #, c-format
 msgid "Workspace %d"
 msgstr "Pracovný priestor č. %d"
 
-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:537
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka č. %d na displeji „%s“ nie je platná\n"
 
-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:553
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -453,7 +465,7 @@ msgstr ""
 "Obrazovka č. %d na displeji „%s“ už má správcu okien. Skúste použiť prepínač "
 "--replace, aby sa aktuálny správca nahradil.\n"
 
-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:580
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -461,12 +473,12 @@ msgstr ""
 "Nepodarilo sa získať výber správcu okien pre obrazovku č. %d na displeji "
 "„%s“\n"
 
-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Obrazovka č. %d na displeji „%s“ už má správcu okien\n"
 
-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:850
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nepodarilo sa uvoľniť obrazovku č. %d na displeji „%s“\n"
@@ -542,8 +554,7 @@ msgstr "Zlyhalo otvorenie súboru so záznamom pomocou fdopen() %s: %s\n"
 msgid "Opened log file %s\n"
 msgstr "Otvorený súbor so záznamom %s\n"
 
-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
-#, c-format
+#: ../src/core/util.c:119
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n"
 
@@ -551,20 +562,20 @@ msgstr "Mutter bol skompilovaný bez výpisu podrobností pri behu\n"
 msgid "Window manager: "
 msgstr "Správca okien: "
 
-#: ../src/core/util.c:412
+#: ../src/core/util.c:414
 msgid "Bug in window manager: "
 msgstr "Chyba v správcovi okien: "
 
-#: ../src/core/util.c:443
+#: ../src/core/util.c:445
 msgid "Window manager warning: "
 msgstr "Varovanie správcu okien: "
 
-#: ../src/core/util.c:471
+#: ../src/core/util.c:473
 msgid "Window manager error: "
 msgstr "Chyba správcu okien: "
 
 #. first time through
-#: ../src/core/window.c:7505
+#: ../src/core/window.c:7533
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -580,7 +591,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8229
+#: ../src/core/window.c:8257
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -590,7 +601,7 @@ msgstr ""
 "nastavuje minimálnu veľkosť %d x %d a maximálnu veľkosť %d x %d. To nedáva "
 "zmysel.\n"
 
-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:347
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Aplikácia nastavila neplatné _NET_WM_PID %lu\n"
@@ -598,18 +609,18 @@ msgstr "Aplikácia nastavila neplatné _NET_WM_PID %lu\n"
 # PK: co je toto?
 # JK: nedokazem zistit
 # PM: vyžiadaj komentár od vývojárov, pomožeme aj ostatným prekladateľom
-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:463
 #, fuzzy, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
 
-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1546
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Neplatné WM_TRANSIENT_FOR okno 0x%lx nastavené pre %s.\n"
 
 # MČ: zacykliť sa, alebo vytvoriť slučku.
-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1557
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR okno 0x%lx  pre %s môže vytvoriť slučku.\n"
@@ -697,9 +708,9 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"Ak je povolené, upustenie okien pri zvislých okrajoch obrazovky ich "
-"zvislo maximalizuje a vodorovná veľkosť sa zmení na polovicu dostupnej "
-"plochy. Upustenie okien pri vrchnom okraji obrazovky ich maximalizuje úplne."
+"Ak je povolené, upustenie okien pri zvislých okrajoch obrazovky ich zvislo "
+"maximalizuje a vodorovná veľkosť sa zmení na polovicu dostupnej plochy. "
+"Upustenie okien pri vrchnom okraji obrazovky ich maximalizuje úplne."
 
 # summary
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
@@ -735,9 +746,8 @@ msgstr ""
 # PM: ja by som dal Bez vyvovlávania tabulátorom
 # summary
 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
-#, fuzzy
 msgid "No tab popup"
-msgstr "Nepoužívať prekryvnú ponuku tabulátora"
+msgstr "Bez vyvolávania tabulátorom"
 
 # MČ: Neviem, čo to presne má robiť, ale popis som pochopil inak. „…či sa má používať rozbaľovacia ponuka a zvýraznenie rámikom sa má vypnúť…“
 # description
@@ -806,109 +816,104 @@ msgstr "Vybrať okno z rozbaľovacej ponuky tabulátoru"
 msgid "Cancel tab popup"
 msgstr "Zrušit rozbaľovaciu ponuku tabulátoru"
 
-#: ../src/tools/mutter-message.c:123
-#, c-format
-msgid "Usage: %s\n"
-msgstr "Použitie: %s\n"
-
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:67
 msgid "Mi_nimize"
 msgstr "Mi_nimalizovať"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:69
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovať"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:71
 msgid "Unma_ximize"
 msgstr "Zrušiť ma_ximalizáciu"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:73
 msgid "Roll _Up"
 msgstr "_Zabaliť"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:75
 msgid "_Unroll"
 msgstr "_Rozbaliť"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:77
 msgid "_Move"
 msgstr "Pre_miestniť"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:79
 msgid "_Resize"
 msgstr "Zmeniť veľko_sť"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:83
+#: ../src/ui/menu.c:81
 msgid "Move Titlebar On_screen"
 msgstr "Presunúť titulok na _obrazovku"
 
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
+#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
 msgid "Always on _Top"
 msgstr "Vždy na_vrchu"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:88
 msgid "_Always on Visible Workspace"
 msgstr "Vž_dy na viditeľnom pracovnom priestore"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:90
 msgid "_Only on This Workspace"
 msgstr "_Len na tomto pracovnom priestore"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:92
 msgid "Move to Workspace _Left"
 msgstr "Presunúť na pracovný priestor vľav_o"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace R_ight"
 msgstr "Presunúť na pracovný priestor v_pravo"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace _Up"
 msgstr "Presunúť na pracovný priestor _hore"
 
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:100
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Down"
 msgstr "Presunúť na pracovný priestor _dole"
 
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:104
+#: ../src/ui/menu.c:102
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: ../src/ui/menu.c:204
+#: ../src/ui/menu.c:202
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Pracovná priestor %d%n"
 
-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:212
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Pracovný priestor 1_0"
 
-#: ../src/ui/menu.c:216
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Pracovný priestor %s%d"
 
-#: ../src/ui/menu.c:397
+#: ../src/ui/menu.c:384
 msgid "Move to Another _Workspace"
 msgstr "P_resunúť na iný pracovný priestor"
 
@@ -1066,21 +1071,21 @@ msgstr ""
 # MČ: Preformuloval by som koniec: „platné sú len znaky A-Za-z0-9-_“
 # PK: color_name je asi nejaky atribut, to sa nepreklada, ked tak do zatvorky
 #: ../src/ui/theme.c:1219
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr ""
-"V parametri názov_farby pre gtk:custom je neplatný znak „%c“, platné sú len "
+"V parametri color_name (názov farby) pre gtk:custom je neplatný znak „%c“, platné sú len "
 "znaky A-Za-z0-9-_"
 
 #: ../src/ui/theme.c:1233
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr ""
-"Formát Gtk:custom je  „gtk:custom(názov_farby,fallback)“, „%s“ tomu "
+"Formát Gtk:custom je  „gtk:custom(color_name,fallback)“, „%s“ tomu "
 "nezodpovedá"
 
 #: ../src/ui/theme.c:1278
@@ -1266,20 +1271,20 @@ msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "Chýbajúce <frame state=„%s“ resize=„%s“ focus=„%s“ style=„whatever“/>"
 
-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Zlyhalo načítanie témy „%s“: %s\n"
 
 # PK: prvok?
 # JK: XML značka (XML tag)
-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Pre tému „%s“ nie je nastavená <%s>"
 
-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1288,13 +1293,13 @@ msgstr ""
 "Pre typ okna „%s“ nie je sada štýlov v téme „%s“, pridajte prvok <window "
 "type=„%s“ style_set=„whatever“/>"
 
-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "Používateľské konštanty musia začínať veľkým písmenom, „%s“ nezačína"
 
-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konštanta „%s“ už je definovaná"
@@ -1397,7 +1402,7 @@ msgstr "<%s> musí uvádzať buď geometriu alebo rodiča, ktorý má geometriu"
 msgid "You must specify a background for an alpha value to be meaningful"
 msgstr "Ak má byť hodnota alpha zmysluplná, tak musíte vybrať nejaké pozadie"
 
-# PM: asi atribút type
+#  PM: asi atribút type
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123
 #: ../src/ui/theme-parser.c:1264
 #, fuzzy, c-format
@@ -1559,6 +1564,7 @@ msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "„%s“ nie je platná hodnota pre atribút zmeny veľkosti"
 
 # PK: shaded states? to zatvorky daj popis co je resize
+# PM: skôr "pre stavy maximized (maximalizovaný)/shaded (zatienený)"
 #: ../src/ui/theme-parser.c:3147
 #, fuzzy, c-format
 msgid ""
@@ -1700,221 +1706,172 @@ msgstr "<%s> uvedený dvakrát pre túto tému"
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Zlyhalo nájdenie platného súboru pre tému%s\n"
 
-#: ../src/ui/theme-viewer.c:99
-msgid "_Windows"
-msgstr "_Okná"
+#~ msgid "Usage: %s\n"
+#~ msgstr "Použitie: %s\n"
 
-#: ../src/ui/theme-viewer.c:100
-msgid "_Dialog"
-msgstr "_Dialógové okno"
+#~ msgid "_Windows"
+#~ msgstr "_Okná"
 
-#: ../src/ui/theme-viewer.c:101
-msgid "_Modal dialog"
-msgstr "_Modálne dialógové okno"
+#~ msgid "_Dialog"
+#~ msgstr "_Dialógové okno"
 
-#: ../src/ui/theme-viewer.c:102
-msgid "_Utility"
-msgstr "_Nástroje"
+#~ msgid "_Modal dialog"
+#~ msgstr "_Modálne dialógové okno"
 
-#: ../src/ui/theme-viewer.c:103
-msgid "_Splashscreen"
-msgstr "Ú_vodná obrazovka"
+#~ msgid "_Utility"
+#~ msgstr "_Nástroje"
+
+#~ msgid "_Splashscreen"
+#~ msgstr "Ú_vodná obrazovka"
 
 # MČ: nie som si istý prekladom „dok“, nemal by to byť „panel“?
-#: ../src/ui/theme-viewer.c:104
-msgid "_Top dock"
-msgstr "_Horný panel"
+#~ msgid "_Top dock"
+#~ msgstr "_Horný panel"
 
-#: ../src/ui/theme-viewer.c:105
-msgid "_Bottom dock"
-msgstr "_Spodný panel"
+#~ msgid "_Bottom dock"
+#~ msgstr "_Spodný panel"
 
-#: ../src/ui/theme-viewer.c:106
-msgid "_Left dock"
-msgstr "Ľ_avý panel"
+#~ msgid "_Left dock"
+#~ msgstr "Ľ_avý panel"
 
-#: ../src/ui/theme-viewer.c:107
-msgid "_Right dock"
-msgstr "_Pravý panel"
+#~ msgid "_Right dock"
+#~ msgstr "_Pravý panel"
 
-#: ../src/ui/theme-viewer.c:108
-msgid "_All docks"
-msgstr "_Všetky panely"
+#~ msgid "_All docks"
+#~ msgstr "_Všetky panely"
 
-#: ../src/ui/theme-viewer.c:109
-msgid "Des_ktop"
-msgstr "P_racovná plocha"
+#~ msgid "Des_ktop"
+#~ msgstr "P_racovná plocha"
 
 # tooltip
-#: ../src/ui/theme-viewer.c:115
-msgid "Open another one of these windows"
-msgstr "Otvorí ďalšie z týchto okien"
+#~ msgid "Open another one of these windows"
+#~ msgstr "Otvorí ďalšie z týchto okien"
 
 # PK: prekladat to v uvodzovkach? nahlas bug
 # tooltip
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123
-#: ../src/ui/theme-viewer.c:117
 #, fuzzy
-msgid "This is a demo button with an 'open' icon"
-msgstr "Toto je ukážkové tlačidlo s ikonou „open“"
+#~ msgid "This is a demo button with an 'open' icon"
+#~ msgstr "Toto je ukážkové tlačidlo s ikonou „open“"
 
 # tooltip
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=698123
-#: ../src/ui/theme-viewer.c:119
 #, fuzzy
-msgid "This is a demo button with a 'quit' icon"
-msgstr "Toto je ukážkové tlačidlo s ikonou „quit“"
+#~ msgid "This is a demo button with a 'quit' icon"
+#~ msgstr "Toto je ukážkové tlačidlo s ikonou „quit“"
 
 # label
-#: ../src/ui/theme-viewer.c:248
-msgid "This is a sample message in a sample dialog"
-msgstr "Toto je ukážková správa v ukážkovom dialógovom okne"
+#~ msgid "This is a sample message in a sample dialog"
+#~ msgstr "Toto je ukážková správa v ukážkovom dialógovom okne"
 
 # PK: falosna
-#: ../src/ui/theme-viewer.c:328
-#, c-format
-msgid "Fake menu item %d\n"
-msgstr "Falošná položka ponuky č. %d\n"
+#~ msgid "Fake menu item %d\n"
+#~ msgstr "Falošná položka ponuky č. %d\n"
 
-#: ../src/ui/theme-viewer.c:363
-msgid "Border-only window"
-msgstr "Okno len s okrajom"
+#~ msgid "Border-only window"
+#~ msgstr "Okno len s okrajom"
 
-#: ../src/ui/theme-viewer.c:365
-msgid "Bar"
-msgstr "Lišta"
+#~ msgid "Bar"
+#~ msgstr "Lišta"
 
-#: ../src/ui/theme-viewer.c:382
-msgid "Normal Application Window"
-msgstr "Normálne aplikačné okno"
+#~ msgid "Normal Application Window"
+#~ msgstr "Normálne aplikačné okno"
 
-#: ../src/ui/theme-viewer.c:386
-msgid "Dialog Box"
-msgstr "Dialógové okno"
+#~ msgid "Dialog Box"
+#~ msgstr "Dialógové okno"
 
-#: ../src/ui/theme-viewer.c:390
-msgid "Modal Dialog Box"
-msgstr "Modálne dialógové okno"
+#~ msgid "Modal Dialog Box"
+#~ msgstr "Modálne dialógové okno"
 
-#: ../src/ui/theme-viewer.c:394
-msgid "Utility Palette"
-msgstr "Paleta nástrojov"
+#~ msgid "Utility Palette"
+#~ msgstr "Paleta nástrojov"
 
-#: ../src/ui/theme-viewer.c:398
-msgid "Torn-off Menu"
-msgstr "Vypnúť ponuku"
+#~ msgid "Torn-off Menu"
+#~ msgstr "Vypnúť ponuku"
 
-#: ../src/ui/theme-viewer.c:402
-msgid "Border"
-msgstr "Okraj"
+#~ msgid "Border"
+#~ msgstr "Okraj"
 
-#: ../src/ui/theme-viewer.c:406
-msgid "Attached Modal Dialog"
-msgstr "Pričlenené modálne okno"
+#~ msgid "Attached Modal Dialog"
+#~ msgstr "Pričlenené modálne okno"
 
-#: ../src/ui/theme-viewer.c:737
-#, c-format
-msgid "Button layout test %d"
-msgstr "Test rozloženia tlačidiel č. %d"
+#~ msgid "Button layout test %d"
+#~ msgstr "Test rozloženia tlačidiel č. %d"
 
 # PK: plural forms
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987
-#: ../src/ui/theme-viewer.c:766
-#, fuzzy, c-format
-msgid "%g milliseconds to draw one window frame"
-msgstr "%g milisekúnd pre vykreslenie jedného rámca okna"
+#, fuzzy
+#~ msgid "%g milliseconds to draw one window frame"
+#~ msgstr "%g milisekúnd pre vykreslenie jedného rámca okna"
 
-#: ../src/ui/theme-viewer.c:811
-#, c-format
-msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
-msgstr "Použitie: metacity-theme-viewer [NÁZOVTÉMY]\n"
+#~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+#~ msgstr "Použitie: metacity-theme-viewer [NÁZOVTÉMY]\n"
 
-#: ../src/ui/theme-viewer.c:818
-#, c-format
-msgid "Error loading theme: %s\n"
-msgstr "Chyba pri načítavaní témy: %s\n"
+#~ msgid "Error loading theme: %s\n"
+#~ msgstr "Chyba pri načítavaní témy: %s\n"
 
 # PK: plural forms
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987
-#: ../src/ui/theme-viewer.c:824
-#, fuzzy, c-format
-msgid "Loaded theme \"%s\" in %g seconds\n"
-msgstr "Téma „%s“ načítaná za %g sekúnd\n"
+#, fuzzy
+#~ msgid "Loaded theme \"%s\" in %g seconds\n"
+#~ msgstr "Téma „%s“ načítaná za %g sekúnd\n"
 
 # PK: inde titulku, aky je rozdiel
-#: ../src/ui/theme-viewer.c:869
-msgid "Normal Title Font"
-msgstr "Obyčajné písmo titulku"
+#~ msgid "Normal Title Font"
+#~ msgstr "Obyčajné písmo titulku"
 
-#: ../src/ui/theme-viewer.c:875
-msgid "Small Title Font"
-msgstr "Malé písmo titulku"
+#~ msgid "Small Title Font"
+#~ msgstr "Malé písmo titulku"
 
-#: ../src/ui/theme-viewer.c:881
-msgid "Large Title Font"
-msgstr "Veľké písmo titulku"
+#~ msgid "Large Title Font"
+#~ msgstr "Veľké písmo titulku"
 
-#: ../src/ui/theme-viewer.c:886
-msgid "Button Layouts"
-msgstr "Rozloženia tlačidiel"
+#~ msgid "Button Layouts"
+#~ msgstr "Rozloženia tlačidiel"
 
-#: ../src/ui/theme-viewer.c:891
-msgid "Benchmark"
-msgstr "Test rýchlosti"
+#~ msgid "Benchmark"
+#~ msgstr "Test rýchlosti"
 
-#: ../src/ui/theme-viewer.c:947
-msgid "Window Title Goes Here"
-msgstr "Sem príde názov okna"
+#~ msgid "Window Title Goes Here"
+#~ msgstr "Sem príde názov okna"
 
 # PK: plural forms
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987
-#: ../src/ui/theme-viewer.c:1053
-#, fuzzy, c-format
-msgid ""
-"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
-"seconds wall clock time including X server resources (%g milliseconds per "
-"frame)\n"
-msgstr ""
-"Vykreslených %d rámcov za %g sekúnd na strane klienta (%g milisekúnd na "
-"rámec) a %g sekúnd celkového času vrátane zdrojov servera X (%g milisekúnd "
-"na rámec)\n"
+#, fuzzy
+#~ msgid ""
+#~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and "
+#~ "%g seconds wall clock time including X server resources (%g milliseconds "
+#~ "per frame)\n"
+#~ msgstr ""
+#~ "Vykreslených %d rámcov za %g sekúnd na strane klienta (%g milisekúnd na "
+#~ "rámec) a %g sekúnd celkového času vrátane zdrojov servera X (%g "
+#~ "milisekúnd na rámec)\n"
 
-#: ../src/ui/theme-viewer.c:1273
-msgid "position expression test returned TRUE but set error"
-msgstr "test výrazu polohy vrátil TRUE, ale nastavil chybu"
+#~ msgid "position expression test returned TRUE but set error"
+#~ msgstr "test výrazu polohy vrátil TRUE, ale nastavil chybu"
 
-#: ../src/ui/theme-viewer.c:1275
-msgid "position expression test returned FALSE but didn't set error"
-msgstr "test výrazu polohy vrátil FALSE, ale nenastavil chybu"
+#~ msgid "position expression test returned FALSE but didn't set error"
+#~ msgstr "test výrazu polohy vrátil FALSE, ale nenastavil chybu"
 
-#: ../src/ui/theme-viewer.c:1279
-msgid "Error was expected but none given"
-msgstr "Bola očakávaná chyba, ale žiadna nenastala"
+#~ msgid "Error was expected but none given"
+#~ msgstr "Bola očakávaná chyba, ale žiadna nenastala"
 
-#: ../src/ui/theme-viewer.c:1281
-#, c-format
-msgid "Error %d was expected but %d given"
-msgstr "Bola očakávaná chyba %d, ale nastala %d"
+#~ msgid "Error %d was expected but %d given"
+#~ msgstr "Bola očakávaná chyba %d, ale nastala %d"
 
-#: ../src/ui/theme-viewer.c:1287
-#, c-format
-msgid "Error not expected but one was returned: %s"
-msgstr "Chyba nebola očakávaná, ale bola vrátená: %s"
+#~ msgid "Error not expected but one was returned: %s"
+#~ msgstr "Chyba nebola očakávaná, ale bola vrátená: %s"
 
-#: ../src/ui/theme-viewer.c:1291
-#, c-format
-msgid "x value was %d, %d was expected"
-msgstr "hodnota x bola %d, očakávaná bola %d"
+#~ msgid "x value was %d, %d was expected"
+#~ msgstr "hodnota x bola %d, očakávaná bola %d"
 
-#: ../src/ui/theme-viewer.c:1294
-#, c-format
-msgid "y value was %d, %d was expected"
-msgstr "hodnota y bola %d, očakávaná bola %d"
+#~ msgid "y value was %d, %d was expected"
+#~ msgstr "hodnota y bola %d, očakávaná bola %d"
 
 # PK: plural forms
 # JK: https://bugzilla.gnome.org/show_bug.cgi?id=697987
-#: ../src/ui/theme-viewer.c:1359
-#, fuzzy, c-format
-msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr ""
-"%d výrazov pre súradnice analyzovaných za %g sekúnd (priemer %g sekúnd)\n"
+#, fuzzy
+#~ msgid ""
+#~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+#~ msgstr ""
+#~ "%d výrazov pre súradnice analyzovaných za %g sekúnd (priemer %g sekúnd)\n"

src/50-mutter-navigation.xml.in

@@ -17,6 +17,9 @@
 	<KeyListEntry name="move-to-workspace-4"
 	              _description="Move window to workspace 4" />
 
+        <KeyListEntry name="move-to-workspace-last"
+                      _description="Move window to last workspace" />
+
 	<KeyListEntry name="move-to-workspace-left"
 	              _description="Move window one workspace to the left" />
 
@@ -77,6 +80,9 @@
 	<KeyListEntry name="switch-to-workspace-4"
 	              _description="Switch to workspace 4" />
 
+	<KeyListEntry name="switch-to-workspace-last"
+	              _description="Switch to last workspace" />
+
 	<KeyListEntry name="switch-to-workspace-left"
 	              _description="Move to workspace left" />
 

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
 
@@ -11,7 +11,6 @@ INCLUDES=								\
 	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \
 	$(MUTTER_CFLAGS)						\
-	-I$(top_builddir)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/backends						\
 	-I$(srcdir)/core						\
@@ -41,23 +40,24 @@ mutter_built_sources = \
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
 	xdg-shell-protocol.c			\
-	xdg-shell-server-protocol.h		\
-	xserver-protocol.c			\
-	xserver-server-protocol.h
+	xdg-shell-server-protocol.h
 
 wayland_protocols = \
 	wayland/protocol/gtk-shell.xml		\
-	wayland/protocol/xdg-shell.xml		\
-	wayland/protocol/xserver.xml
+	wayland/protocol/xdg-shell.xml
 
-libmutter_wayland_la_SOURCES =			\
+libmutter_la_SOURCES =				\
 	backends/meta-backend.c			\
 	backends/meta-backend.h			\
+	backends/meta-backend-private.h		\
 	backends/meta-cursor.c			\
 	backends/meta-cursor.h			\
 	backends/meta-cursor-private.h		\
 	backends/meta-cursor-tracker.c		\
 	backends/meta-cursor-tracker-private.h	\
+	backends/meta-cursor-renderer.c		\
+	backends/meta-cursor-renderer.h		\
+	backends/meta-display-config-shared.h	\
 	backends/meta-idle-monitor.c		\
 	backends/meta-idle-monitor-private.h	\
 	backends/meta-idle-monitor-dbus.c	\
@@ -70,18 +70,24 @@ libmutter_wayland_la_SOURCES =			\
 	backends/meta-monitor-manager-dummy.h	\
 	backends/edid-parse.c			\
 	backends/edid.h				\
+	backends/native/meta-backend-native.c		\
+	backends/native/meta-backend-native.h		\
+	backends/native/meta-cursor-renderer-native.c	\
+	backends/native/meta-cursor-renderer-native.h	\
 	backends/native/meta-idle-monitor-native.c	\
 	backends/native/meta-idle-monitor-native.h	\
 	backends/native/meta-monitor-manager-kms.c	\
 	backends/native/meta-monitor-manager-kms.h	\
-	backends/native/meta-weston-launch.c		\
-	backends/native/meta-weston-launch.h		\
+	backends/native/meta-launcher.c			\
+	backends/native/meta-launcher.h			\
+	backends/x11/meta-backend-x11.c			\
+	backends/x11/meta-backend-x11.h			\
 	backends/x11/meta-idle-monitor-xsync.c		\
 	backends/x11/meta-idle-monitor-xsync.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
 	backends/x11/meta-monitor-manager-xrandr.h	\
-	backends/x11/meta-xrandr-shared.h		\
-	core/above-tab-keycode.c		\
+	core/meta-accel-parse.c			\
+	core/meta-accel-parse.h			\
 	core/barrier.c				\
 	meta/barrier.h				\
 	core/bell.c				\
@@ -116,6 +122,8 @@ libmutter_wayland_la_SOURCES =			\
 	compositor/meta-surface-actor-x11.h	\
 	compositor/meta-surface-actor-wayland.c	\
 	compositor/meta-surface-actor-wayland.h	\
+	compositor/meta-stage.h			\
+	compositor/meta-stage.c			\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@@ -214,8 +222,9 @@ libmutter_wayland_la_SOURCES =			\
 	wayland/meta-wayland.c			\
 	wayland/meta-wayland.h			\
 	wayland/meta-wayland-private.h		\
-	wayland/meta-xwayland-private.h		\
 	wayland/meta-xwayland.c			\
+	wayland/meta-xwayland.h			\
+	wayland/meta-xwayland-private.h		\
 	wayland/meta-wayland-data-device.c      \
 	wayland/meta-wayland-data-device.h      \
 	wayland/meta-wayland-keyboard.c		\
@@ -224,20 +233,20 @@ libmutter_wayland_la_SOURCES =			\
 	wayland/meta-wayland-pointer.h		\
 	wayland/meta-wayland-seat.c		\
 	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-wayland-versions.h		\
+	wayland/meta-wayland-outputs.c		\
+	wayland/meta-wayland-outputs.h		\
 	wayland/window-wayland.c		\
 	wayland/window-wayland.h
 
-nodist_libmutter_wayland_la_SOURCES =		\
+nodist_libmutter_la_SOURCES =			\
 	$(mutter_built_sources)
 
-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
@@ -275,16 +284,16 @@ 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
 
 bin_PROGRAMS+=mutter-launch
 
@@ -319,15 +328,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) $(nodist_libmutter_wayland_la_SOURCES))
+	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
 @META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 
 endif
@@ -338,14 +347,14 @@ testasyncgetprop_SOURCES = x11/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)
 
@@ -366,7 +375,7 @@ 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	\
@@ -377,7 +386,7 @@ CLEANFILES =					\
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = libmutter-wayland.pc
+pkgconfig_DATA = libmutter.pc
 
 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_files)		\
@@ -389,7 +398,7 @@ EXTRA_DIST=$(desktopfiles_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-enum-types.h.in \
 	mutter-enum-types.c.in \
 	org.gnome.Mutter.DisplayConfig.xml	\

src/backends/meta-backend-private.h

@@ -0,0 +1,67 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+
+#ifndef META_BACKEND_PRIVATE_H
+#define META_BACKEND_PRIVATE_H
+
+#include <glib-object.h>
+
+#include "meta-backend.h"
+
+#define META_TYPE_BACKEND             (meta_backend_get_type ())
+#define META_BACKEND(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND, MetaBackend))
+#define META_BACKEND_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BACKEND, MetaBackendClass))
+#define META_IS_BACKEND(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BACKEND))
+#define META_IS_BACKEND_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BACKEND))
+#define META_BACKEND_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BACKEND, MetaBackendClass))
+
+struct _MetaBackend
+{
+  GObject parent;
+
+  MetaIdleMonitor *device_monitors[256];
+  int device_id_max;
+};
+
+struct _MetaBackendClass
+{
+  GObjectClass parent_class;
+
+  void (* post_init) (MetaBackend *backend);
+
+  MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
+                                             int          device_id);
+  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend);
+  MetaCursorRenderer * (* create_cursor_renderer) (MetaBackend *backend);
+
+  gboolean (* grab_device) (MetaBackend *backend,
+                            int          device_id,
+                            uint32_t     timestamp);
+  gboolean (* ungrab_device) (MetaBackend *backend,
+                              int          device_id,
+                              uint32_t     timestamp);
+};
+
+#endif /* META_BACKEND_PRIVATE_H */

src/backends/meta-backend.c

@@ -25,14 +25,193 @@
 #include "config.h"
 
 #include "meta-backend.h"
-#include <meta/main.h>
+#include "meta-backend-private.h"
 
-#include <gdk/gdkx.h>
 #include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
 
-#include "backends/native/meta-weston-launch.h"
-#include <meta/util.h>
+#include "backends/x11/meta-backend-x11.h"
+#include "backends/native/meta-backend-native.h"
+
+static MetaBackend *_backend;
+
+MetaBackend *
+meta_get_backend (void)
+{
+  return _backend;
+}
+
+struct _MetaBackendPrivate
+{
+  MetaMonitorManager *monitor_manager;
+  MetaCursorRenderer *cursor_renderer;
+};
+typedef struct _MetaBackendPrivate MetaBackendPrivate;
+
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaBackend, meta_backend, G_TYPE_OBJECT);
+
+static void
+meta_backend_finalize (GObject *object)
+{
+  MetaBackend *backend = META_BACKEND (object);
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+  int i;
+
+  g_clear_object (&priv->monitor_manager);
+
+  for (i = 0; i <= backend->device_id_max; i++)
+    {
+      if (backend->device_monitors[i])
+        g_object_unref (backend->device_monitors[i]);
+    }
+
+  G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
+}
+
+static void
+meta_backend_real_post_init (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
+  priv->monitor_manager = META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
+}
+
+static MetaCursorRenderer *
+meta_backend_real_create_cursor_renderer (MetaBackend *backend)
+{
+  return meta_cursor_renderer_new ();
+}
+
+static gboolean
+meta_backend_real_grab_device (MetaBackend *backend,
+                               int          device_id,
+                               uint32_t     timestamp)
+{
+  /* Do nothing */
+  return TRUE;
+}
+
+static gboolean
+meta_backend_real_ungrab_device (MetaBackend *backend,
+                                 int          device_id,
+                                 uint32_t     timestamp)
+{
+  /* Do nothing */
+  return TRUE;
+}
+
+static void
+meta_backend_class_init (MetaBackendClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_backend_finalize;
+
+  klass->post_init = meta_backend_real_post_init;
+  klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
+  klass->grab_device = meta_backend_real_grab_device;
+  klass->ungrab_device = meta_backend_real_ungrab_device;
+}
+
+static void
+meta_backend_init (MetaBackend *backend)
+{
+  _backend = backend;
+}
+
+/* FIXME -- destroy device monitors at some point */
+G_GNUC_UNUSED static void
+destroy_device_monitor (MetaBackend *backend,
+                        int          device_id)
+{
+  g_clear_object (&backend->device_monitors[device_id]);
+  if (device_id == backend->device_id_max)
+    backend->device_id_max--;
+}
+
+static MetaIdleMonitor *
+meta_backend_create_idle_monitor (MetaBackend *backend,
+                                  int          device_id)
+{
+  return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id);
+}
+
+static void
+meta_backend_post_init (MetaBackend *backend)
+{
+  META_BACKEND_GET_CLASS (backend)->post_init (backend);
+}
+
+MetaIdleMonitor *
+meta_backend_get_idle_monitor (MetaBackend *backend,
+                               int          device_id)
+{
+  g_return_val_if_fail (device_id >= 0 && device_id < 256, NULL);
+
+  if (!backend->device_monitors[device_id])
+    {
+      backend->device_monitors[device_id] = meta_backend_create_idle_monitor (backend, device_id);
+      backend->device_id_max = MAX (backend->device_id_max, device_id);
+    }
+
+  return backend->device_monitors[device_id];
+}
+
+MetaMonitorManager *
+meta_backend_get_monitor_manager (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  return priv->monitor_manager;
+}
+
+MetaCursorRenderer *
+meta_backend_get_cursor_renderer (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  return priv->cursor_renderer;
+}
+
+gboolean
+meta_backend_grab_device (MetaBackend *backend,
+                          int          device_id,
+                          uint32_t     timestamp)
+{
+  return META_BACKEND_GET_CLASS (backend)->grab_device (backend, device_id, timestamp);
+}
+
+gboolean
+meta_backend_ungrab_device (MetaBackend *backend,
+                            int          device_id,
+                            uint32_t     timestamp)
+{
+  return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp);
+}
+
+static GType
+get_backend_type (void)
+{
+#if defined(CLUTTER_WINDOWING_X11)
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    return META_TYPE_BACKEND_X11;
+#endif
+
+#if defined(CLUTTER_WINDOWING_EGL)
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
+    return META_TYPE_BACKEND_NATIVE;
+#endif
+
+  g_assert_not_reached ();
+}
+
+static void
+meta_create_backend (void)
+{
+  /* meta_backend_init() above install the backend globally so
+   * so meta_get_backend() works even during initialization. */
+  g_object_new (get_backend_type (), NULL);
+}
 
 /* Mutter is responsible for pulling events off the X queue, so Clutter
  * doesn't need (and shouldn't) run its normal event source which polls
@@ -82,37 +261,12 @@ static GSourceFuncs event_funcs = {
   event_dispatch
 };
 
-static MetaLauncher *launcher;
-
 void
 meta_clutter_init (void)
 {
   GSource *source;
 
-  /* When running as an X11 compositor, we install our own event filter and
-   * pass events to Clutter explicitly, so we need to prevent Clutter from
-   * handling our events.
-   *
-   * However, when running as a Wayland compostior under X11 nested, Clutter
-   * Clutter needs to see events related to its own window. We need to
-   * eventually replace this with a proper frontend / backend split: Clutter
-   * under nested is connecting to the "host X server" to get its events it
-   * needs to put up a window, and GTK+ is connecting to the "inner X server".
-   * The two would the same in the X11 compositor case, but not when running
-   * XWayland as a Wayland compositor.
-   */
-  if (!meta_is_wayland_compositor ())
-    {
-      clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-      clutter_x11_disable_event_retrieval ();
-    }
-
-  /* If we're running on bare metal, we're a display server,
-   * so start talking to weston-launch. */
-#if defined(CLUTTER_WINDOWING_EGL)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
-    launcher = meta_launcher_new ();
-#endif
+  meta_create_backend ();
 
   if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     g_error ("Unable to initialize Clutter.\n");
@@ -120,38 +274,6 @@ meta_clutter_init (void)
   source = g_source_new (&event_funcs, sizeof (GSource));
   g_source_attach (source, NULL);
   g_source_unref (source);
-}
-
-gboolean
-meta_activate_vt (int vt, GError **error)
-{
-  if (launcher)
-    return meta_launcher_activate_vt (launcher, vt, error);
-  else
-    {
-      g_debug ("Ignoring VT switch keybinding, not running as display server");
-      return TRUE;
-    }
-}
-
-/**
- * meta_activate_session:
- *
- * Tells mutter to activate the session. When mutter is a
- * Wayland compositor, this tells logind to switch over to
- * the new session.
- */
-gboolean
-meta_activate_session (void)
-{
-  GError *error = NULL;
-
-  if (!meta_launcher_activate_vt (launcher, -1, &error))
-    {
-      g_warning ("Could not activate session: %s\n", error->message);
-      g_error_free (error);
-      return FALSE;
-    }
-
-  return TRUE;
+
+  meta_backend_post_init (_backend);
 }

src/backends/meta-backend.h

@@ -27,8 +27,29 @@
 
 #include <glib-object.h>
 
+#include <meta/meta-idle-monitor.h>
+#include "meta-monitor-manager.h"
+#include "meta-cursor-renderer.h"
+
+typedef struct _MetaBackend        MetaBackend;
+typedef struct _MetaBackendClass   MetaBackendClass;
+
+GType meta_backend_get_type (void);
+
+MetaBackend * meta_get_backend (void);
+
+MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
+                                                 int          device_id);
+MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
+MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
+
+gboolean meta_backend_grab_device (MetaBackend *backend,
+                                   int          device_id,
+                                   uint32_t     timestamp);
+gboolean meta_backend_ungrab_device (MetaBackend *backend,
+                                     int          device_id,
+                                     uint32_t     timestamp);
+
 void meta_clutter_init (void);
 
-gboolean meta_activate_vt (int vt, GError **error);
-
 #endif /* META_BACKEND_H */

src/backends/meta-cursor-private.h

@@ -36,6 +36,7 @@ typedef struct {
 struct _MetaCursorReference {
   int ref_count;
 
+  MetaCursor cursor;
   MetaCursorImage image;
 };
 

src/backends/meta-cursor-renderer.c

@@ -0,0 +1,161 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include "config.h"
+
+#include "meta-cursor-renderer.h"
+#include "meta-cursor-private.h"
+
+#include <cogl/cogl.h>
+#include <cogl/cogl-wayland-server.h>
+#include <clutter/clutter.h>
+
+#include "meta-stage.h"
+
+#include "wayland/meta-wayland-private.h"
+
+struct _MetaCursorRendererPrivate
+{
+  int current_x, current_y;
+  MetaRectangle current_rect;
+
+  MetaCursorReference *displayed_cursor;
+};
+typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);
+
+static void
+queue_redraw (MetaCursorRenderer *renderer)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+  MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
+  ClutterActor *stage = compositor->stage;
+
+  /* During early initialization, we can have no stage */
+  if (!stage)
+    return;
+
+  /* If we're not using a MetaStage, quit early */
+  if (!META_IS_STAGE (stage))
+    return;
+
+  meta_stage_set_cursor (META_STAGE (stage),
+                         priv->displayed_cursor,
+                         &priv->current_rect);
+}
+
+static void
+meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer)
+{
+  queue_redraw (renderer);
+}
+
+static void
+meta_cursor_renderer_class_init (MetaCursorRendererClass *klass)
+{
+  klass->update_cursor = meta_cursor_renderer_real_update_cursor;
+}
+
+static void
+meta_cursor_renderer_init (MetaCursorRenderer *renderer)
+{
+}
+
+static void
+update_cursor (MetaCursorRenderer *renderer)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  if (priv->displayed_cursor)
+    {
+      CoglTexture *texture;
+      int hot_x, hot_y;
+
+      texture = meta_cursor_reference_get_cogl_texture (priv->displayed_cursor, &hot_x, &hot_y);
+
+      priv->current_rect.x = priv->current_x - hot_x;
+      priv->current_rect.y = priv->current_y - hot_y;
+      priv->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture));
+      priv->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture));
+    }
+  else
+    {
+      priv->current_rect.x = 0;
+      priv->current_rect.y = 0;
+      priv->current_rect.width = 0;
+      priv->current_rect.height = 0;
+    }
+
+  META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer);
+}
+
+MetaCursorRenderer *
+meta_cursor_renderer_new (void)
+{
+  return g_object_new (META_TYPE_CURSOR_RENDERER, NULL);
+}
+
+void
+meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
+                                 MetaCursorReference *cursor)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  if (priv->displayed_cursor == cursor)
+    return;
+
+  priv->displayed_cursor = cursor;
+  update_cursor (renderer);
+}
+
+void
+meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
+                                   int x, int y)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  g_assert (meta_is_wayland_compositor ());
+
+  priv->current_x = x;
+  priv->current_y = y;
+
+  update_cursor (renderer);
+}
+
+MetaCursorReference *
+meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  return priv->displayed_cursor;
+}
+
+const MetaRectangle *
+meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer)
+{
+  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
+
+  return &priv->current_rect;
+}

src/backends/meta-cursor-renderer.h

@@ -0,0 +1,70 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#ifndef META_CURSOR_RENDERER_H
+#define META_CURSOR_RENDERER_H
+
+#include <glib-object.h>
+
+#include <meta/screen.h>
+#include "meta-cursor.h"
+
+#include <gbm.h>
+
+#define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ())
+#define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer))
+#define META_CURSOR_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
+#define META_IS_CURSOR_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER))
+#define META_IS_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_RENDERER))
+#define META_CURSOR_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))
+
+typedef struct _MetaCursorRenderer        MetaCursorRenderer;
+typedef struct _MetaCursorRendererClass   MetaCursorRendererClass;
+
+struct _MetaCursorRenderer
+{
+  GObject parent;
+};
+
+struct _MetaCursorRendererClass
+{
+  GObjectClass parent_class;
+
+  void (* update_cursor) (MetaCursorRenderer *renderer);
+};
+
+GType meta_cursor_renderer_get_type (void) G_GNUC_CONST;
+
+MetaCursorRenderer * meta_cursor_renderer_new (void);
+
+void meta_cursor_renderer_set_cursor (MetaCursorRenderer  *renderer,
+                                      MetaCursorReference *cursor);
+
+void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
+                                        int x, int y);
+
+MetaCursorReference * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
+const MetaRectangle * meta_cursor_renderer_get_rect (MetaCursorRenderer *renderer);
+
+#endif /* META_CURSOR_RENDERER_H */

src/backends/meta-cursor-tracker-private.h

@@ -24,16 +24,18 @@
 
 #include <meta/meta-cursor-tracker.h>
 #include <wayland-server.h>
+#include <gbm.h>
 
 #include "meta-cursor.h"
+#include "meta-cursor-renderer.h"
 
 struct _MetaCursorTracker {
   GObject parent_instance;
 
   MetaScreen *screen;
+  MetaCursorRenderer *renderer;
 
   gboolean is_showing;
-  gboolean has_hw_cursor;
 
   /* The cursor tracker stores the cursor for the current grab
    * operation, the cursor for the window with pointer focus, and
@@ -60,17 +62,6 @@ struct _MetaCursorTracker {
   MetaCursorReference *window_cursor;
 
   MetaCursorReference *root_cursor;
-
-  MetaCursorReference *theme_cursors[META_CURSOR_LAST];
-
-  int current_x, current_y;
-  MetaRectangle current_rect;
-  MetaRectangle previous_rect;
-  gboolean previous_is_valid;
-
-  CoglPipeline *pipeline;
-  int drm_fd;
-  struct gbm_device *gbm;
 };
 
 struct _MetaCursorTrackerClass {
@@ -91,8 +82,7 @@ void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker   *tracker,
 void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
 					      int                new_x,
 					      int                new_y);
-void     meta_cursor_tracker_paint           (MetaCursorTracker *tracker);
 
-void     meta_cursor_tracker_force_update (MetaCursorTracker *tracker);
+MetaCursorReference * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
 
 #endif

src/backends/meta-cursor-tracker.c

@@ -36,15 +36,15 @@
 #include <cogl/cogl.h>
 #include <cogl/cogl-wayland-server.h>
 #include <clutter/clutter.h>
-#include <gbm.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
+#include "meta-backend.h"
+
 #include "meta-cursor-private.h"
 #include "meta-cursor-tracker-private.h"
 #include "screen-private.h"
-#include "meta-monitor-manager.h"
 
 #include "wayland/meta-wayland-private.h"
 
@@ -57,10 +57,42 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-static void meta_cursor_tracker_set_crtc_has_hw_cursor (MetaCursorTracker *tracker,
-                                                        MetaCRTC          *crtc,
-                                                        gboolean           has_hw_cursor);
-static void sync_cursor (MetaCursorTracker *tracker);
+static MetaCursorReference *
+get_displayed_cursor (MetaCursorTracker *tracker)
+{
+  if (!tracker->is_showing)
+    return NULL;
+
+  if (tracker->grab_cursor)
+    return tracker->grab_cursor;
+
+  if (tracker->has_window_cursor)
+    return tracker->window_cursor;
+
+  return tracker->root_cursor;
+}
+
+static void
+update_displayed_cursor (MetaCursorTracker *tracker)
+{
+  meta_cursor_renderer_set_cursor (tracker->renderer, tracker->displayed_cursor);
+}
+
+static void
+sync_cursor (MetaCursorTracker *tracker)
+{
+  MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker);
+
+  if (tracker->displayed_cursor == displayed_cursor)
+    return;
+
+  g_clear_pointer (&tracker->displayed_cursor, meta_cursor_reference_unref);
+  if (displayed_cursor)
+    tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);
+
+  update_displayed_cursor (tracker);
+  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
+}
 
 static void
 meta_cursor_tracker_init (MetaCursorTracker *self)
@@ -77,22 +109,12 @@ static void
 meta_cursor_tracker_finalize (GObject *object)
 {
   MetaCursorTracker *self = META_CURSOR_TRACKER (object);
-  int i;
 
   if (self->displayed_cursor)
     meta_cursor_reference_unref (self->displayed_cursor);
   if (self->root_cursor)
     meta_cursor_reference_unref (self->root_cursor);
 
-  for (i = 0; i < META_CURSOR_LAST; i++)
-    if (self->theme_cursors[i])
-      meta_cursor_reference_unref (self->theme_cursors[i]);
-
-  if (self->pipeline)
-    cogl_object_unref (self->pipeline);
-  if (self->gbm)
-    gbm_device_destroy (self->gbm);
-
   G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object);
 }
 
@@ -111,64 +133,20 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
                                           G_TYPE_NONE, 0);
 }
 
-static void
-on_monitors_changed (MetaMonitorManager *monitors,
-                     MetaCursorTracker  *tracker)
-{
-  MetaCRTC *crtcs;
-  unsigned int i, n_crtcs;
-
-  if (!tracker->has_hw_cursor)
-    return;
-
-  /* Go through the new list of monitors, find out where the cursor is */
-  meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
-
-  for (i = 0; i < n_crtcs; i++)
-    {
-      MetaRectangle *rect = &crtcs[i].rect;
-      gboolean has;
-
-      has = meta_rectangle_overlap (&tracker->current_rect, rect);
-
-      /* Need to do it unconditionally here, our tracking is
-         wrong because we reloaded the CRTCs */
-      meta_cursor_tracker_set_crtc_has_hw_cursor (tracker, &crtcs[i], has);
-    }
-}
-
 static MetaCursorTracker *
 make_wayland_cursor_tracker (MetaScreen *screen)
 {
+  MetaBackend *backend = meta_get_backend ();
   MetaWaylandCompositor *compositor;
-  CoglContext *ctx;
-  MetaMonitorManager *monitors;
   MetaCursorTracker *self;
 
   self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
   self->screen = screen;
-
-  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  self->pipeline = cogl_pipeline_new (ctx);
+  self->renderer = meta_backend_get_cursor_renderer (backend);
 
   compositor = meta_wayland_compositor_get_default ();
-  compositor->seat->cursor_tracker = self;
-  meta_cursor_tracker_update_position (self,
-                                       wl_fixed_to_int (compositor->seat->pointer.x),
-                                       wl_fixed_to_int (compositor->seat->pointer.y));
-
-#if defined(CLUTTER_WINDOWING_EGL)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
-    {
-      CoglRenderer *cogl_renderer = cogl_display_get_renderer (cogl_context_get_display (ctx));
-      self->drm_fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
-      self->gbm = gbm_create_device (self->drm_fd);
-    }
-#endif
-
-  monitors = meta_monitor_manager_get ();
-  g_signal_connect_object (monitors, "monitors-changed",
-                           G_CALLBACK (on_monitors_changed), self, 0);
+  compositor->seat->pointer.cursor_tracker = self;
+  meta_cursor_tracker_update_position (self, 0, 0);
 
   return self;
 }
@@ -176,8 +154,12 @@ make_wayland_cursor_tracker (MetaScreen *screen)
 static MetaCursorTracker *
 make_x11_cursor_tracker (MetaScreen *screen)
 {
-  MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
+  MetaBackend *backend = meta_get_backend ();
+  MetaCursorTracker *self;
+
+  self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
   self->screen = screen;
+  self->renderer = meta_backend_get_cursor_renderer (backend);
 
   XFixesSelectCursorInput (screen->display->xdisplay,
                            screen->xroot,
@@ -186,6 +168,17 @@ make_x11_cursor_tracker (MetaScreen *screen)
   return self;
 }
 
+static MetaCursorTracker *
+meta_cursor_tracker_new (MetaScreen *screen)
+{
+  if (meta_is_wayland_compositor ())
+    return make_wayland_cursor_tracker (screen);
+  else
+    return make_x11_cursor_tracker (screen);
+}
+
+static MetaCursorTracker *_cursor_tracker;
+
 /**
  * meta_cursor_tracker_get_for_screen:
  * @screen: the #MetaScreen
@@ -197,18 +190,10 @@ make_x11_cursor_tracker (MetaScreen *screen)
 MetaCursorTracker *
 meta_cursor_tracker_get_for_screen (MetaScreen *screen)
 {
-  MetaCursorTracker *self;
+  if (!_cursor_tracker)
+    _cursor_tracker = meta_cursor_tracker_new (screen);
 
-  if (screen->cursor_tracker)
-    return screen->cursor_tracker;
-
-  if (meta_is_wayland_compositor ())
-    self = make_wayland_cursor_tracker (screen);
-  else
-    self = make_x11_cursor_tracker (screen);
-
-  screen->cursor_tracker = self;
-  return self;
+  return _cursor_tracker;
 }
 
 static void
@@ -406,184 +391,6 @@ meta_cursor_tracker_set_root_cursor (MetaCursorTracker   *tracker,
   sync_cursor (tracker);
 }
 
-static gboolean
-should_have_hw_cursor (MetaCursorTracker *tracker)
-{
-  if (tracker->displayed_cursor)
-    return (meta_cursor_reference_get_gbm_bo (tracker->displayed_cursor, NULL, NULL) != NULL);
-  else
-    return FALSE;
-}
-
-static void
-update_hw_cursor (MetaCursorTracker *tracker)
-{
-  MetaMonitorManager *monitors;
-  MetaCRTC *crtcs;
-  unsigned int i, n_crtcs;
-  gboolean enabled;
-
-  enabled = should_have_hw_cursor (tracker);
-  tracker->has_hw_cursor = enabled;
-
-  monitors = meta_monitor_manager_get ();
-  meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
-
-  for (i = 0; i < n_crtcs; i++)
-    {
-      MetaRectangle *rect = &crtcs[i].rect;
-      gboolean has;
-
-      has = enabled && meta_rectangle_overlap (&tracker->current_rect, rect);
-
-      if (has || crtcs[i].has_hw_cursor)
-        meta_cursor_tracker_set_crtc_has_hw_cursor (tracker, &crtcs[i], has);
-    }
-}
-
-static void
-move_hw_cursor (MetaCursorTracker *tracker)
-{
-  MetaMonitorManager *monitors;
-  MetaCRTC *crtcs;
-  unsigned int i, n_crtcs;
-
-  monitors = meta_monitor_manager_get ();
-  meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
-
-  g_assert (tracker->has_hw_cursor);
-
-  for (i = 0; i < n_crtcs; i++)
-    {
-      MetaRectangle *rect = &crtcs[i].rect;
-      gboolean has;
-
-      has = meta_rectangle_overlap (&tracker->current_rect, rect);
-
-      if (has != crtcs[i].has_hw_cursor)
-        meta_cursor_tracker_set_crtc_has_hw_cursor (tracker, &crtcs[i], has);
-      if (has)
-        drmModeMoveCursor (tracker->drm_fd, crtcs[i].crtc_id,
-                           tracker->current_rect.x - rect->x,
-                           tracker->current_rect.y - rect->y);
-    }
-}
-
-static MetaCursorReference *
-get_displayed_cursor (MetaCursorTracker *tracker)
-{
-  if (!tracker->is_showing)
-    return NULL;
-
-  if (tracker->grab_cursor)
-    return tracker->grab_cursor;
-
-  if (tracker->has_window_cursor)
-    return tracker->window_cursor;
-
-  return tracker->root_cursor;
-}
-
-static void
-update_displayed_cursor (MetaCursorTracker *tracker)
-{
-  if (meta_is_wayland_compositor ())
-    {
-      if (tracker->displayed_cursor)
-        {
-          CoglTexture *texture = meta_cursor_reference_get_cogl_texture (tracker->displayed_cursor, NULL, NULL);
-          cogl_pipeline_set_layer_texture (tracker->pipeline, 0, texture);
-        }
-      else
-        cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL);
-
-      update_hw_cursor (tracker);
-    }
-}
-
-static void
-sync_displayed_cursor (MetaCursorTracker *tracker)
-{
-  MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker);
-
-  if (tracker->displayed_cursor == displayed_cursor)
-    return;
-
-  g_clear_pointer (&tracker->displayed_cursor, meta_cursor_reference_unref);
-  if (displayed_cursor)
-    tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);
-
-  update_displayed_cursor (tracker);
-  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
-}
-
-static void
-meta_cursor_tracker_queue_redraw (MetaCursorTracker *tracker)
-{
-  MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
-  ClutterActor *stage = compositor->stage;
-  cairo_rectangle_int_t clip;
-
-  g_assert (meta_is_wayland_compositor ());
-
-  /* Clear the location the cursor was at before, if we need to. */
-  if (tracker->previous_is_valid)
-    {
-      clip.x = tracker->previous_rect.x;
-      clip.y = tracker->previous_rect.y;
-      clip.width = tracker->previous_rect.width;
-      clip.height = tracker->previous_rect.height;
-      clutter_actor_queue_redraw_with_clip (stage, &clip);
-      tracker->previous_is_valid = FALSE;
-    }
-
-  if (tracker->has_hw_cursor || !tracker->displayed_cursor)
-    return;
-
-  clip.x = tracker->current_rect.x;
-  clip.y = tracker->current_rect.y;
-  clip.width = tracker->current_rect.width;
-  clip.height = tracker->current_rect.height;
-  clutter_actor_queue_redraw_with_clip (stage, &clip);
-}
-
-static void
-sync_cursor (MetaCursorTracker *tracker)
-{
-  MetaCursorReference *displayed_cursor;
-
-  sync_displayed_cursor (tracker);
-  displayed_cursor = tracker->displayed_cursor;
-
-  if (displayed_cursor)
-    {
-      CoglTexture *texture;
-      int hot_x, hot_y;
-
-      texture = meta_cursor_reference_get_cogl_texture (displayed_cursor, &hot_x, &hot_y);
-
-      tracker->current_rect.x = tracker->current_x - hot_x;
-      tracker->current_rect.y = tracker->current_y - hot_y;
-      tracker->current_rect.width = cogl_texture_get_width (COGL_TEXTURE (texture));
-      tracker->current_rect.height = cogl_texture_get_height (COGL_TEXTURE (texture));
-    }
-  else
-    {
-      tracker->current_rect.x = 0;
-      tracker->current_rect.y = 0;
-      tracker->current_rect.width = 0;
-      tracker->current_rect.height = 0;
-    }
-
-  if (meta_is_wayland_compositor ())
-    {
-      if (tracker->has_hw_cursor)
-        move_hw_cursor (tracker);
-      else
-        meta_cursor_tracker_queue_redraw (tracker);
-    }
-}
-
 void
 meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
                                      int                new_x,
@@ -591,61 +398,7 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
 {
   g_assert (meta_is_wayland_compositor ());
 
-  tracker->current_x = new_x;
-  tracker->current_y = new_y;
-
-  sync_cursor (tracker);
-}
-
-void
-meta_cursor_tracker_paint (MetaCursorTracker *tracker)
-{
-  g_assert (meta_is_wayland_compositor ());
-
-  if (tracker->has_hw_cursor || !tracker->displayed_cursor)
-    return;
-
-  cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
-                                   tracker->pipeline,
-                                   tracker->current_rect.x,
-                                   tracker->current_rect.y,
-                                   tracker->current_rect.x +
-                                   tracker->current_rect.width,
-                                   tracker->current_rect.y +
-                                   tracker->current_rect.height);
-
-  tracker->previous_rect = tracker->current_rect;
-  tracker->previous_is_valid = TRUE;
-}
-
-static void
-meta_cursor_tracker_set_crtc_has_hw_cursor (MetaCursorTracker *tracker,
-                                            MetaCRTC          *crtc,
-                                            gboolean           has)
-{
-  if (has)
-    {
-      MetaCursorReference *displayed_cursor = tracker->displayed_cursor;
-      struct gbm_bo *bo;
-      union gbm_bo_handle handle;
-      int width, height;
-      int hot_x, hot_y;
-
-      bo = meta_cursor_reference_get_gbm_bo (displayed_cursor, &hot_x, &hot_y);
-
-      handle = gbm_bo_get_handle (bo);
-      width = gbm_bo_get_width (bo);
-      height = gbm_bo_get_height (bo);
-
-      drmModeSetCursor2 (tracker->drm_fd, crtc->crtc_id, handle.u32,
-                         width, height, hot_x, hot_y);
-      crtc->has_hw_cursor = TRUE;
-    }
-  else
-    {
-      drmModeSetCursor2 (tracker->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
-      crtc->has_hw_cursor = FALSE;
-    }
+  meta_cursor_renderer_set_position (tracker->renderer, new_x, new_y);
 }
 
 static void
@@ -728,11 +481,8 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
     }
 }
 
-void
-meta_cursor_tracker_force_update (MetaCursorTracker *tracker)
+MetaCursorReference *
+meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
 {
-  g_assert (meta_is_wayland_compositor ());
-
-  update_hw_cursor (tracker);
-  sync_cursor (tracker);
+  return tracker->displayed_cursor;
 }

src/backends/meta-cursor.c

@@ -27,7 +27,8 @@
 
 #include "display-private.h"
 #include "screen-private.h"
-#include "meta-cursor-tracker-private.h" /* for tracker->gbm */
+#include "meta-backend.h"
+#include "backends/native/meta-cursor-renderer-native.h"
 
 #include <string.h>
 
@@ -70,124 +71,67 @@ meta_cursor_reference_unref (MetaCursorReference *self)
     meta_cursor_reference_free (self);
 }
 
-static void
-translate_meta_cursor (MetaCursor   cursor,
-                       guint       *glyph_out,
-                       const char **name_out)
+static const char *
+translate_meta_cursor (MetaCursor cursor)
 {
-  guint glyph = XC_num_glyphs;
-  const char *name = NULL;
-
   switch (cursor)
     {
     case META_CURSOR_DEFAULT:
-      glyph = XC_left_ptr;
-      break;
+      return "left_ptr";
     case META_CURSOR_NORTH_RESIZE:
-      glyph = XC_top_side;
-      break;
+      return "top_side";
     case META_CURSOR_SOUTH_RESIZE:
-      glyph = XC_bottom_side;
-      break;
+      return "bottom_side";
     case META_CURSOR_WEST_RESIZE:
-      glyph = XC_left_side;
-      break;
+      return "left_side";
     case META_CURSOR_EAST_RESIZE:
-      glyph = XC_right_side;
-      break;
+      return "right_side";
     case META_CURSOR_SE_RESIZE:
-      glyph = XC_bottom_right_corner;
-      break;
+      return "bottom_right_corner";
     case META_CURSOR_SW_RESIZE:
-      glyph = XC_bottom_left_corner;
-      break;
+      return "bottom_left_corner";
     case META_CURSOR_NE_RESIZE:
-      glyph = XC_top_right_corner;
-      break;
+      return "top_right_corner";
     case META_CURSOR_NW_RESIZE:
-      glyph = XC_top_left_corner;
-      break;
+      return "top_left_corner";
     case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
-      glyph = XC_fleur;
-      break;
+      return "fleur";
     case META_CURSOR_BUSY:
-      glyph = XC_watch;
-      break;
+      return "watch";
     case META_CURSOR_DND_IN_DRAG:
-      name = "dnd-none";
-      break;
+      return "dnd-none";
     case META_CURSOR_DND_MOVE:
-      name = "dnd-move";
-      break;
+      return "dnd-move";
     case META_CURSOR_DND_COPY:
-      name = "dnd-copy";
-      break;
+      return "dnd-copy";
     case META_CURSOR_DND_UNSUPPORTED_TARGET:
-      name = "dnd-none";
-      break;
+      return "dnd-none";
     case META_CURSOR_POINTING_HAND:
-      glyph = XC_hand2;
-      break;
+      return "hand2";
     case META_CURSOR_CROSSHAIR:
-      glyph = XC_crosshair;
-      break;
+      return "crosshair";
     case META_CURSOR_IBEAM:
-      glyph = XC_xterm;
-      break;
-
+      return "xterm";
     default:
-      g_assert_not_reached ();
-      glyph = 0; /* silence compiler */
       break;
     }
 
-  *glyph_out = glyph;
-  *name_out = name;
-}
-
-static Cursor
-load_cursor_on_server (MetaDisplay *display,
-                       MetaCursor   cursor)
-{
-  Cursor xcursor;
-  guint glyph;
-  const char *name;
-
-  translate_meta_cursor (cursor, &glyph, &name);
-
-  if (name != NULL)
-    xcursor = XcursorLibraryLoadCursor (display->xdisplay, name);
-  else
-    xcursor = XCreateFontCursor (display->xdisplay, glyph);
-
-  return xcursor;
+  g_assert_not_reached ();
 }
 
 Cursor
-meta_display_create_x_cursor (MetaDisplay *display,
-                              MetaCursor cursor)
+meta_cursor_create_x_cursor (Display    *xdisplay,
+                             MetaCursor  cursor)
 {
-  return load_cursor_on_server (display, cursor);
+  return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
 }
 
 static XcursorImage *
-load_cursor_on_client (MetaDisplay *display,
-                       MetaCursor   cursor)
+load_cursor_on_client (MetaCursor cursor)
 {
-  XcursorImage *image;
-  guint glyph;
-  const char *name;
-  const char *theme = XcursorGetTheme (display->xdisplay);
-  int size = XcursorGetDefaultSize (display->xdisplay);
-
-  translate_meta_cursor (cursor, &glyph, &name);
-
-  if (name != NULL)
-    image = XcursorLibraryLoadImage (name, theme, size);
-  else
-    image = XcursorShapeLoadImage (glyph, theme, size);
-
-  return image;
+  return XcursorLibraryLoadImage (translate_meta_cursor (cursor),
+                                  meta_prefs_get_cursor_theme (),
+                                  meta_prefs_get_cursor_size ());
 }
 
 static void
@@ -224,9 +168,20 @@ meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
     meta_warning ("HW cursor for format %d not supported\n", gbm_format);
 }
 
+static struct gbm_device *
+get_gbm_device (void)
+{
+  MetaBackend *meta_backend = meta_get_backend ();
+  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
+
+  if (META_IS_CURSOR_RENDERER_NATIVE (renderer))
+    return meta_cursor_renderer_native_get_gbm_device (META_CURSOR_RENDERER_NATIVE (renderer));
+  else
+    return NULL;
+}
+
 static void
-meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
-                                           MetaCursorImage   *image,
+meta_cursor_image_load_from_xcursor_image (MetaCursorImage   *image,
                                            XcursorImage      *xc_image)
 {
   int width, height, rowstride;
@@ -234,6 +189,7 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
   uint32_t gbm_format;
   ClutterBackend *clutter_backend;
   CoglContext *cogl_context;
+  struct gbm_device *gbm;
 
   width           = xc_image->width;
   height          = xc_image->height;
@@ -258,8 +214,9 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
                                                   (uint8_t *) xc_image->pixels,
                                                   NULL);
 
-  if (tracker->gbm)
-    meta_cursor_image_load_gbm_buffer (tracker->gbm,
+  gbm = get_gbm_device ();
+  if (gbm)
+    meta_cursor_image_load_gbm_buffer (gbm,
                                        image,
                                        (uint8_t *) xc_image->pixels,
                                        width, height, rowstride,
@@ -267,34 +224,32 @@ meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
 }
 
 MetaCursorReference *
-meta_cursor_reference_from_theme (MetaCursorTracker  *tracker,
-                                  MetaCursor          cursor)
+meta_cursor_reference_from_theme (MetaCursor cursor)
 {
   MetaCursorReference *self;
   XcursorImage *image;
 
-  if (tracker->theme_cursors[cursor])
-    return meta_cursor_reference_ref (tracker->theme_cursors[cursor]);
-
-  image = load_cursor_on_client (tracker->screen->display, cursor);
+  image = load_cursor_on_client (cursor);
   if (!image)
     return NULL;
 
   self = g_slice_new0 (MetaCursorReference);
   self->ref_count = 1;
-  meta_cursor_image_load_from_xcursor_image (tracker, &self->image, image);
+  self->cursor = cursor;
+  meta_cursor_image_load_from_xcursor_image (&self->image, image);
 
   XcursorImageDestroy (image);
   return self;
 }
 
 static void
-meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
-                                    MetaCursorImage    *image,
+meta_cursor_image_load_from_buffer (MetaCursorImage    *image,
                                     struct wl_resource *buffer,
                                     int                 hot_x,
                                     int                 hot_y)
 {
+  struct gbm_device *gbm = get_gbm_device ();
+
   ClutterBackend *backend;
   CoglContext *cogl_context;
   struct wl_shm_buffer *shm_buffer;
@@ -315,7 +270,7 @@ meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
   shm_buffer = wl_shm_buffer_get (buffer);
   if (shm_buffer)
     {
-      if (tracker->gbm)
+      if (gbm)
         {
           int rowstride = wl_shm_buffer_get_stride (shm_buffer);
 
@@ -341,7 +296,7 @@ meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
               gbm_format = GBM_FORMAT_ARGB8888;
             }
 
-          meta_cursor_image_load_gbm_buffer (tracker->gbm,
+          meta_cursor_image_load_gbm_buffer (gbm,
                                              image,
                                              (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
                                              width, height, rowstride,
@@ -362,9 +317,9 @@ meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
           return;
         }
 
-      if (tracker->gbm)
+      if (gbm)
         {
-          image->bo = gbm_bo_import (tracker->gbm, GBM_BO_IMPORT_WL_BUFFER,
+          image->bo = gbm_bo_import (gbm, GBM_BO_IMPORT_WL_BUFFER,
                                      buffer, GBM_BO_USE_CURSOR_64X64);
           if (!image->bo)
             meta_warning ("Importing HW cursor from wl_buffer failed\n");
@@ -373,8 +328,7 @@ meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
 }
 
 MetaCursorReference *
-meta_cursor_reference_from_buffer (MetaCursorTracker  *tracker,
-                                   struct wl_resource *buffer,
+meta_cursor_reference_from_buffer (struct wl_resource *buffer,
                                    int                 hot_x,
                                    int                 hot_y)
 {
@@ -382,7 +336,7 @@ meta_cursor_reference_from_buffer (MetaCursorTracker  *tracker,
 
   self = g_slice_new0 (MetaCursorReference);
   self->ref_count = 1;
-  meta_cursor_image_load_from_buffer (tracker, &self->image, buffer, hot_x, hot_y);
+  meta_cursor_image_load_from_buffer (&self->image, buffer, hot_x, hot_y);
 
   return self;
 }
@@ -410,3 +364,9 @@ meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
     *hot_y = cursor->image.hot_y;
   return cursor->image.bo;
 }
+
+MetaCursor
+meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)
+{
+  return cursor->cursor;
+}

src/backends/meta-cursor.h

@@ -27,16 +27,18 @@ typedef struct _MetaCursorReference MetaCursorReference;
 MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *cursor);
 void meta_cursor_reference_unref (MetaCursorReference *cursor);
 
-#include <meta/meta-cursor-tracker.h>
 #include <meta/common.h>
 #include <wayland-server.h>
 
-MetaCursorReference * meta_cursor_reference_from_theme  (MetaCursorTracker  *tracker,
-                                                         MetaCursor          cursor);
+MetaCursorReference * meta_cursor_reference_from_theme  (MetaCursor          cursor);
 
-MetaCursorReference * meta_cursor_reference_from_buffer (MetaCursorTracker  *tracker,
-                                                         struct wl_resource *buffer,
+MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer,
                                                          int                 hot_x,
                                                          int                 hot_y);
 
+MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor);
+
+Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
+                                    MetaCursor  cursor);
+
 #endif /* META_CURSOR_H */

src/backends/meta-idle-monitor.c

@@ -38,8 +38,7 @@
 #include <meta/meta-idle-monitor.h>
 #include "meta-idle-monitor-private.h"
 #include "meta-idle-monitor-dbus.h"
-#include "backends/x11/meta-idle-monitor-xsync.h"
-#include "backends/native/meta-idle-monitor-native.h"
+#include "meta-backend.h"
 
 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
 
@@ -54,9 +53,6 @@ static GParamSpec *obj_props[PROP_LAST];
 
 G_DEFINE_TYPE (MetaIdleMonitor, meta_idle_monitor, G_TYPE_OBJECT)
 
-static MetaIdleMonitor *device_monitors[256];
-static int              device_id_max;
-
 void
 _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch)
 {
@@ -160,36 +156,6 @@ meta_idle_monitor_init (MetaIdleMonitor *monitor)
 {
 }
 
-static GType
-get_idle_monitor_type (void)
-{
-  if (meta_is_wayland_compositor ())
-    return META_TYPE_IDLE_MONITOR_NATIVE;
-  else
-    return META_TYPE_IDLE_MONITOR_XSYNC;
-}
-
-static void
-ensure_device_monitor (int device_id)
-{
-  if (device_monitors[device_id])
-    return;
-
-  device_monitors[device_id] = g_object_new (get_idle_monitor_type (),
-                                             "device-id", device_id,
-                                             NULL);
-  device_id_max = MAX (device_id_max, device_id);
-}
-
-/* FIXME -- destroy device monitors at some point */
-G_GNUC_UNUSED static void
-destroy_device_monitor (int device_id)
-{
-  g_clear_object (&device_monitors[device_id]);
-  if (device_id == device_id_max)
-    device_id_max--;
-}
-
 /**
  * meta_idle_monitor_get_core:
  *
@@ -200,8 +166,8 @@ destroy_device_monitor (int device_id)
 MetaIdleMonitor *
 meta_idle_monitor_get_core (void)
 {
-  ensure_device_monitor (0);
-  return device_monitors[0];
+  MetaBackend *backend = meta_get_backend ();
+  return meta_backend_get_idle_monitor (backend, 0);
 }
 
 /**
@@ -215,10 +181,8 @@ meta_idle_monitor_get_core (void)
 MetaIdleMonitor *
 meta_idle_monitor_get_for_device (int device_id)
 {
-  g_return_val_if_fail (device_id > 0 && device_id < 256, NULL);
-
-  ensure_device_monitor (device_id);
-  return device_monitors[device_id];
+  MetaBackend *backend = meta_get_backend ();
+  return meta_backend_get_idle_monitor (backend, device_id);
 }
 
 static MetaIdleMonitorWatch *
@@ -352,16 +316,3 @@ meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor)
 {
   return META_IDLE_MONITOR_GET_CLASS (monitor)->get_idletime (monitor);
 }
-
-void
-meta_idle_monitor_xsync_handle_xevent_all (XEvent *xevent)
-{
-  int i;
-
-  if (meta_is_wayland_compositor ())
-    return;
-
-  for (i = 0; i <= device_id_max; i++)
-    if (device_monitors[i])
-      meta_idle_monitor_xsync_handle_xevent (device_monitors[i], (XSyncAlarmNotifyEvent*)xevent);
-}

src/backends/meta-monitor-config.c

@@ -840,6 +840,9 @@ meta_monitor_config_get_stored (MetaMonitorConfig *self,
   MetaConfiguration key;
   MetaConfiguration *stored;
 
+  if (n_outputs == 0)
+    return NULL;
+
   make_config_key (&key, outputs, n_outputs, -1);
   stored = g_hash_table_lookup (self->configs, &key);
 
@@ -1247,6 +1250,12 @@ meta_monitor_config_make_default (MetaMonitorConfig  *self,
   outputs = meta_monitor_manager_get_outputs (manager, &n_outputs);
   meta_monitor_manager_get_screen_limits (manager, &max_width, &max_height);
 
+  if (n_outputs == 0)
+    {
+      meta_verbose ("No output connected, not applying configuration\n");
+      return;
+    }
+
   default_config = make_default_config (self, outputs, n_outputs, max_width, max_height);
 
   if (default_config != NULL)

src/backends/meta-monitor-manager.c

@@ -36,9 +36,8 @@
 #include "util-private.h"
 #include <meta/errors.h>
 #include "meta-monitor-config.h"
-#include "backends/native/meta-monitor-manager-kms.h"
 #include "backends/x11/meta-monitor-manager-xrandr.h"
-#include "meta-monitor-manager-dummy.h"
+#include "meta-backend.h"
 
 enum {
   CONFIRM_DISPLAY_CHANGE,
@@ -168,58 +167,6 @@ make_logical_config (MetaMonitorManager *manager)
   manager->monitor_infos = (void*)g_array_free (monitor_infos, FALSE);
 }
 
-static GType
-get_default_backend (void)
-{
-#if defined(CLUTTER_WINDOWING_EGL)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
-    return META_TYPE_MONITOR_MANAGER_KMS;
-#endif
-
-#if defined(CLUTTER_WINDOWING_X11)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-    {
-      /* If we're a Wayland compositor using the X11 backend,
-       * we're a nested configuration, so return the dummy
-       * monitor setup. */
-      if (meta_is_wayland_compositor ())
-        return META_TYPE_MONITOR_MANAGER_DUMMY;
-      else
-        return META_TYPE_MONITOR_MANAGER_XRANDR;
-    }
-#endif
-
-#if defined(CLUTTER_WINDOWING_WAYLAND)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WAYLAND))
-    {
-      /* Use the dummy implementation on Wayland for now.
-       * In the future, we should support wl_fullscreen_output
-       * which will have CRTC management in the protocol. */
-      return META_TYPE_MONITOR_MANAGER_DUMMY;
-    }
-#endif
-
-  g_assert_not_reached ();
-}
-
-static MetaMonitorManager *
-meta_monitor_manager_new (void)
-{
-  const char *env;
-  GType type;
-
-  env = g_getenv ("META_DEBUG_MULTIMONITOR");
-
-  if (env == NULL)
-    type = get_default_backend ();
-  else if (strcmp (env, "xrandr") == 0)
-    type = META_TYPE_MONITOR_MANAGER_XRANDR;
-  else
-    type = META_TYPE_MONITOR_MANAGER;
-
-  return g_object_new (type, NULL);
-}
-
 static void
 meta_monitor_manager_constructed (GObject *object)
 {
@@ -536,13 +483,13 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
 
       g_variant_builder_add (&crtc_builder, "(uxiiiiiuaua{sv})",
                              i, /* ID */
-                             crtc->crtc_id,
+                             (gint64)crtc->crtc_id,
                              (int)crtc->rect.x,
                              (int)crtc->rect.y,
                              (int)crtc->rect.width,
                              (int)crtc->rect.height,
                              (int)(crtc->current_mode ? crtc->current_mode - manager->modes : -1),
-                             crtc->transform,
+                             (guint32)crtc->transform,
                              &transforms,
                              NULL /* properties */);
     }
@@ -613,7 +560,7 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
 
       g_variant_builder_add (&output_builder, "(uxiausauaua{sv})",
                              i, /* ID */
-                             output->output_id,
+                             (gint64)output->output_id,
                              (int)(output->crtc ? output->crtc - manager->crtcs : -1),
                              &crtcs,
                              output->name,
@@ -628,9 +575,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
 
       g_variant_builder_add (&mode_builder, "(uxuud)",
                              i, /* ID */
-                             mode->mode_id,
-                             mode->width,
-                             mode->height,
+                             (gint64)mode->mode_id,
+                             (guint32)mode->width,
+                             (guint32)mode->height,
                              (double)mode->refresh_rate);
     }
 
@@ -931,6 +878,7 @@ meta_monitor_manager_handle_apply_configuration  (MetaDBusDisplayConfig *skeleto
   if (persistent)
     {
       manager->persistent_timeout_id = g_timeout_add_seconds (20, save_config_timeout, manager);
+      g_source_set_name_by_id (manager->persistent_timeout_id, "[mutter] save_config_timeout");
       g_signal_emit (manager, signals[CONFIRM_DISPLAY_CHANGE], 0);
     }
 
@@ -1178,20 +1126,12 @@ initialize_dbus_interface (MetaMonitorManager *manager)
                                           g_object_unref);
 }
 
-static MetaMonitorManager *global_monitor_manager;
-
-void
-meta_monitor_manager_initialize (void)
-{
-  global_monitor_manager = meta_monitor_manager_new ();
-}
-
 MetaMonitorManager *
 meta_monitor_manager_get (void)
 {
-  g_assert (global_monitor_manager != NULL);
+  MetaBackend *backend = meta_get_backend ();
 
-  return global_monitor_manager;
+  return meta_backend_get_monitor_manager (backend);
 }
 
 MetaMonitorInfo *
@@ -1277,16 +1217,3 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager)
   g_free (old_monitor_infos);
 }
 
-gboolean
-meta_monitor_manager_handle_xevent (MetaMonitorManager *manager,
-                                    XEvent             *event)
-{
-  MetaMonitorManagerClass *klass;
-
-  klass = META_MONITOR_MANAGER_GET_CLASS (manager);
-  if (klass->handle_xevent)
-    return klass->handle_xevent (manager, event);
-  else
-    return FALSE;
-}
-

src/backends/meta-monitor-manager.h

@@ -46,6 +46,7 @@
 
 #include "meta-display-config-shared.h"
 #include "meta-dbus-display-config.h"
+#include "meta-cursor.h"
 
 typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;
 typedef struct _MetaMonitorManager         MetaMonitorManager;
@@ -123,8 +124,7 @@ struct _MetaCRTC
   /* Used when changing configuration */
   gboolean is_dirty;
 
-  /* Updated by MetaCursorTracker */
-  gboolean has_hw_cursor;
+  MetaCursorReference *cursor;
 };
 
 struct _MetaMonitorMode
@@ -285,14 +285,10 @@ struct _MetaMonitorManagerClass
                           unsigned short     *,
                           unsigned short     *,
                           unsigned short     *);
-
-  gboolean (*handle_xevent) (MetaMonitorManager *,
-                             XEvent             *);
 };
 
 GType meta_monitor_manager_get_type (void);
 
-void                meta_monitor_manager_initialize (void);
 MetaMonitorManager *meta_monitor_manager_get  (void);
 
 void                meta_monitor_manager_rebuild_derived   (MetaMonitorManager *manager);
@@ -313,9 +309,6 @@ void                meta_monitor_manager_get_resources     (MetaMonitorManager
 
 int                 meta_monitor_manager_get_primary_index (MetaMonitorManager *manager);
 
-gboolean            meta_monitor_manager_handle_xevent     (MetaMonitorManager *manager,
-                                                            XEvent             *event);
-
 void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *manager,
                                                             int                *width,
                                                             int                *height);

src/backends/native/meta-backend-native.c

@@ -0,0 +1,235 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include "config.h"
+
+#include <meta/main.h>
+#include <clutter/evdev/clutter-evdev.h>
+#include "meta-backend-native.h"
+
+#include "meta-idle-monitor-native.h"
+#include "meta-monitor-manager-kms.h"
+#include "meta-cursor-renderer-native.h"
+#include "meta-launcher.h"
+
+struct _MetaBackendNativePrivate
+{
+  MetaLauncher *launcher;
+};
+typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND);
+
+/*
+ * The pointer constrain code is mostly a rip-off of the XRandR code from Xorg.
+ * (from xserver/randr/rrcrtc.c, RRConstrainCursorHarder)
+ *
+ * Copyright © 2006 Keith Packard
+ * Copyright 2010 Red Hat, Inc
+ *
+ */
+
+static gboolean
+check_all_screen_monitors(MetaMonitorInfo *monitors,
+			  unsigned         n_monitors,
+			  float            x,
+			  float            y)
+{
+  unsigned int i;
+
+  for (i = 0; i < n_monitors; i++)
+    {
+      MetaMonitorInfo *monitor = &monitors[i];
+      int left, right, top, bottom;
+
+      left = monitor->rect.x;
+      right = left + monitor->rect.width;
+      top = monitor->rect.y;
+      bottom = left + monitor->rect.height;
+
+      if ((x >= left) && (x < right) && (y >= top) && (y < bottom))
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+constrain_all_screen_monitors (ClutterInputDevice *device,
+			       MetaMonitorInfo    *monitors,
+			       unsigned            n_monitors,
+			       float              *x,
+			       float              *y)
+{
+  ClutterPoint current;
+  unsigned int i;
+
+  clutter_input_device_get_coords (device, NULL, &current);
+
+  /* if we're trying to escape, clamp to the CRTC we're coming from */
+  for (i = 0; i < n_monitors; i++)
+    {
+      MetaMonitorInfo *monitor = &monitors[i];
+      int left, right, top, bottom;
+      float nx, ny;
+
+      left = monitor->rect.x;
+      right = left + monitor->rect.width;
+      top = monitor->rect.y;
+      bottom = left + monitor->rect.height;
+
+      nx = current.x;
+      ny = current.y;
+
+      if ((nx >= left) && (nx < right) && (ny >= top) && (ny < bottom))
+	{
+	  if (*x < left)
+	    *x = left;
+	  if (*x >= right)
+	    *x = right - 1;
+	  if (*y < top)
+	    *y = top;
+	  if (*y >= bottom)
+	    *y = bottom - 1;
+
+	  return;
+        }
+    }
+}
+
+static void
+pointer_constrain_callback (ClutterInputDevice *device,
+			    guint32             time,
+			    float              *new_x,
+			    float              *new_y,
+			    gpointer            user_data)
+{
+  MetaMonitorManager *monitor_manager;
+  MetaMonitorInfo *monitors;
+  unsigned int n_monitors;
+  gboolean ret;
+
+  monitor_manager = meta_monitor_manager_get ();
+  monitors = meta_monitor_manager_get_monitor_infos (monitor_manager, &n_monitors);
+
+  /* if we're moving inside a monitor, we're fine */
+  ret = check_all_screen_monitors(monitors, n_monitors, *new_x, *new_y);
+  if (ret == TRUE)
+    return;
+
+  /* if we're trying to escape, clamp to the CRTC we're coming from */
+  constrain_all_screen_monitors(device, monitors, n_monitors, new_x, new_y);
+}
+
+static void
+meta_backend_native_post_init (MetaBackend *backend)
+{
+  ClutterDeviceManager *manager = clutter_device_manager_get_default ();
+
+  META_BACKEND_CLASS (meta_backend_native_parent_class)->post_init (backend);
+
+  clutter_evdev_set_pointer_constrain_callback (manager, pointer_constrain_callback,
+                                                NULL, NULL);
+}
+
+static MetaIdleMonitor *
+meta_backend_native_create_idle_monitor (MetaBackend *backend,
+                                         int          device_id)
+{
+  return g_object_new (META_TYPE_IDLE_MONITOR_NATIVE,
+                       "device-id", device_id,
+                       NULL);
+}
+
+static MetaMonitorManager *
+meta_backend_native_create_monitor_manager (MetaBackend *backend)
+{
+  return g_object_new (META_TYPE_MONITOR_MANAGER_KMS, NULL);
+}
+
+static MetaCursorRenderer *
+meta_backend_native_create_cursor_renderer (MetaBackend *backend)
+{
+  return g_object_new (META_TYPE_CURSOR_RENDERER_NATIVE, NULL);
+}
+
+static void
+meta_backend_native_class_init (MetaBackendNativeClass *klass)
+{
+  MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
+
+  backend_class->post_init = meta_backend_native_post_init;
+  backend_class->create_idle_monitor = meta_backend_native_create_idle_monitor;
+  backend_class->create_monitor_manager = meta_backend_native_create_monitor_manager;
+  backend_class->create_cursor_renderer = meta_backend_native_create_cursor_renderer;
+}
+
+static void
+meta_backend_native_init (MetaBackendNative *native)
+{
+  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
+
+  /* We're a display server, so start talking to weston-launch. */
+  priv->launcher = meta_launcher_new ();
+}
+
+gboolean
+meta_activate_vt (int vt, GError **error)
+{
+  MetaBackend *backend = meta_get_backend ();
+  MetaBackendNative *native = META_BACKEND_NATIVE (backend);
+  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
+
+  return meta_launcher_activate_vt (priv->launcher, vt, error);
+}
+
+/**
+ * meta_activate_session:
+ *
+ * Tells mutter to activate the session. When mutter is a
+ * Wayland compositor, this tells logind to switch over to
+ * the new session.
+ */
+gboolean
+meta_activate_session (void)
+{
+  GError *error = NULL;
+  MetaBackend *backend = meta_get_backend ();
+
+  /* Do nothing. */
+  if (!META_IS_BACKEND_NATIVE (backend))
+    return TRUE;
+
+  MetaBackendNative *native = META_BACKEND_NATIVE (backend);
+  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
+
+  if (!meta_launcher_activate_session (priv->launcher, &error))
+    {
+      g_warning ("Could not activate session: %s\n", error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}

src/backends/native/meta-backend-native.h

@@ -0,0 +1,54 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#ifndef META_BACKEND_NATIVE_H
+#define META_BACKEND_NATIVE_H
+
+#include "backends/meta-backend-private.h"
+
+#define META_TYPE_BACKEND_NATIVE             (meta_backend_native_get_type ())
+#define META_BACKEND_NATIVE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND_NATIVE, MetaBackendNative))
+#define META_BACKEND_NATIVE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BACKEND_NATIVE, MetaBackendNativeClass))
+#define META_IS_BACKEND_NATIVE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BACKEND_NATIVE))
+#define META_IS_BACKEND_NATIVE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BACKEND_NATIVE))
+#define META_BACKEND_NATIVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BACKEND_NATIVE, MetaBackendNativeClass))
+
+typedef struct _MetaBackendNative        MetaBackendNative;
+typedef struct _MetaBackendNativeClass   MetaBackendNativeClass;
+
+struct _MetaBackendNative
+{
+  MetaBackend parent;
+};
+
+struct _MetaBackendNativeClass
+{
+  MetaBackendClass parent_class;
+};
+
+GType meta_backend_native_get_type (void) G_GNUC_CONST;
+
+gboolean meta_activate_vt (int vt, GError **error);
+
+#endif /* META_BACKEND_NATIVE_H */

src/backends/native/meta-cursor-renderer-native.c

@@ -0,0 +1,208 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include "config.h"
+
+#include "meta-cursor-renderer-native.h"
+
+#include <gbm.h>
+
+#include "meta-cursor-private.h"
+#include "meta-monitor-manager.h"
+
+struct _MetaCursorRendererNativePrivate
+{
+  gboolean has_hw_cursor;
+
+  int drm_fd;
+  struct gbm_device *gbm;
+};
+typedef struct _MetaCursorRendererNativePrivate MetaCursorRendererNativePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRendererNative, meta_cursor_renderer_native, META_TYPE_CURSOR_RENDERER);
+
+static void
+meta_cursor_renderer_native_finalize (GObject *object)
+{
+  MetaCursorRendererNative *renderer = META_CURSOR_RENDERER_NATIVE (object);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (renderer);
+
+  if (priv->gbm)
+    gbm_device_destroy (priv->gbm);
+
+  G_OBJECT_CLASS (meta_cursor_renderer_native_parent_class)->finalize (object);
+}
+
+static void
+set_crtc_cursor (MetaCursorRendererNative *native,
+                 MetaCRTC                 *crtc,
+                 MetaCursorReference      *cursor,
+                 gboolean                  force)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+
+  if (crtc->cursor == cursor && !force)
+    return;
+
+  crtc->cursor = cursor;
+
+  if (cursor)
+    {
+      struct gbm_bo *bo;
+      union gbm_bo_handle handle;
+      int width, height;
+      int hot_x, hot_y;
+
+      bo = meta_cursor_reference_get_gbm_bo (cursor, &hot_x, &hot_y);
+
+      handle = gbm_bo_get_handle (bo);
+      width = gbm_bo_get_width (bo);
+      height = gbm_bo_get_height (bo);
+
+      drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32,
+                         width, height, hot_x, hot_y);
+    }
+  else
+    {
+      drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
+    }
+}
+
+static void
+update_hw_cursor (MetaCursorRendererNative *native,
+                  gboolean                  force)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
+  const MetaRectangle *cursor_rect = meta_cursor_renderer_get_rect (renderer);
+  MetaCursorReference *cursor = meta_cursor_renderer_get_cursor (renderer);
+  MetaMonitorManager *monitors;
+  MetaCRTC *crtcs;
+  unsigned int i, n_crtcs;
+
+  monitors = meta_monitor_manager_get ();
+  meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
+
+  for (i = 0; i < n_crtcs; i++)
+    {
+      gboolean crtc_should_have_cursor;
+      MetaCursorReference *crtc_cursor;
+      MetaRectangle *crtc_rect;
+
+      crtc_rect = &crtcs[i].rect;
+
+      crtc_should_have_cursor = (priv->has_hw_cursor && meta_rectangle_overlap (cursor_rect, crtc_rect));
+      if (crtc_should_have_cursor)
+        crtc_cursor = cursor;
+      else
+        crtc_cursor = NULL;
+
+      set_crtc_cursor (native, &crtcs[i], crtc_cursor, force);
+
+      if (cursor)
+        {
+          drmModeMoveCursor (priv->drm_fd, crtcs[i].crtc_id,
+                             cursor_rect->x - crtc_rect->x,
+                             cursor_rect->y - crtc_rect->y);
+        }
+    }
+}
+
+static gboolean
+should_have_hw_cursor (MetaCursorRenderer *renderer)
+{
+  MetaCursorReference *cursor = meta_cursor_renderer_get_cursor (renderer);
+
+  if (cursor)
+    return (meta_cursor_reference_get_gbm_bo (cursor, NULL, NULL) != NULL);
+  else
+    return FALSE;
+}
+
+static void
+meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *renderer)
+{
+  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+
+  priv->has_hw_cursor = should_have_hw_cursor (renderer);
+  update_hw_cursor (native, FALSE);
+
+  /* Fall back to the stage-based cursor if we don't have HW cursors. */
+  if (!priv->has_hw_cursor)
+    META_CURSOR_RENDERER_CLASS (meta_cursor_renderer_native_parent_class)->update_cursor (renderer);
+}
+
+static void
+meta_cursor_renderer_native_class_init (MetaCursorRendererNativeClass *klass)
+{
+  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_cursor_renderer_native_finalize;
+  renderer_class->update_cursor = meta_cursor_renderer_native_update_cursor;
+}
+
+static void
+on_monitors_changed (MetaMonitorManager       *monitors,
+                     MetaCursorRendererNative *native)
+{
+  /* Our tracking is all messed up, so force an update. */
+  update_hw_cursor (native, TRUE);
+}
+
+static void
+meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+  MetaMonitorManager *monitors;
+
+  monitors = meta_monitor_manager_get ();
+  g_signal_connect_object (monitors, "monitors-changed",
+                           G_CALLBACK (on_monitors_changed), native, 0);
+
+#if defined(CLUTTER_WINDOWING_EGL)
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
+    {
+      CoglRenderer *cogl_renderer = cogl_display_get_renderer (cogl_context_get_display (ctx));
+      priv->drm_fd = cogl_kms_renderer_get_kms_fd (cogl_renderer);
+      priv->gbm = gbm_create_device (priv->drm_fd);
+    }
+#endif
+}
+
+struct gbm_device *
+meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *native)
+{
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+
+  return priv->gbm;
+}
+
+void
+meta_cursor_renderer_native_force_update (MetaCursorRendererNative *native)
+{
+  update_hw_cursor (native, TRUE);
+}

src/backends/native/meta-cursor-renderer-native.h

@@ -0,0 +1,55 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#ifndef META_CURSOR_RENDERER_NATIVE_H
+#define META_CURSOR_RENDERER_NATIVE_H
+
+#include "meta-cursor-renderer.h"
+
+#define META_TYPE_CURSOR_RENDERER_NATIVE             (meta_cursor_renderer_native_get_type ())
+#define META_CURSOR_RENDERER_NATIVE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNative))
+#define META_CURSOR_RENDERER_NATIVE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNativeClass))
+#define META_IS_CURSOR_RENDERER_NATIVE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER_NATIVE))
+#define META_IS_CURSOR_RENDERER_NATIVE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_RENDERER_NATIVE))
+#define META_CURSOR_RENDERER_NATIVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNativeClass))
+
+typedef struct _MetaCursorRendererNative        MetaCursorRendererNative;
+typedef struct _MetaCursorRendererNativeClass   MetaCursorRendererNativeClass;
+
+struct _MetaCursorRendererNative
+{
+  MetaCursorRenderer parent;
+};
+
+struct _MetaCursorRendererNativeClass
+{
+  MetaCursorRendererClass parent_class;
+};
+
+GType meta_cursor_renderer_native_get_type (void) G_GNUC_CONST;
+
+struct gbm_device * meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *renderer);
+void meta_cursor_renderer_native_force_update (MetaCursorRendererNative *renderer);
+
+#endif /* META_CURSOR_RENDERER_NATIVE_H */

src/backends/native/meta-launcher.c

@@ -17,34 +17,27 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "meta-launcher.h"
+#include "weston-launch.h"
 
-#include <gio/gio.h>
 #include <gio/gunixfdmessage.h>
 
 #include <clutter/clutter.h>
 #include <clutter/egl/clutter-egl.h>
 #include <clutter/evdev/clutter-evdev.h>
 
-#include <glib.h>
-#include <sys/time.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 #include <stdlib.h>
-#include <sys/wait.h>
-
-#include <drm.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
+#include <string.h>
 
 #include "wayland/meta-wayland-private.h"
-#include "meta-cursor-tracker-private.h"
-#include "meta-weston-launch.h"
+#include "backends/meta-backend.h"
+#include "meta-cursor-renderer-native.h"
 
 struct _MetaLauncher
 {
@@ -71,11 +64,11 @@ request_vt_switch_idle (gpointer user_data)
 
 static gboolean
 send_message_to_wl (MetaLauncher           *self,
-		    void                   *message,
-		    gsize                   size,
-		    GSocketControlMessage  *out_cmsg,
-		    GSocketControlMessage **in_cmsg,
-		    GError                **error)
+                    void                   *message,
+                    gsize                   size,
+                    GSocketControlMessage  *out_cmsg,
+                    GSocketControlMessage **in_cmsg,
+                    GError                **error)
 {
   struct weston_launcher_reply reply;
   GInputVector in_iov = { &reply, sizeof (reply) };
@@ -88,19 +81,21 @@ 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,
-			     &out_iov, 1,
-			     out_all_cmsg, -1,
-			     flags, NULL, error) != (gssize)size)
+                             &out_iov, 1,
+                             out_all_cmsg, -1,
+                             flags, NULL, error) != (gssize)size)
     return FALSE;
 
   if (g_socket_receive_message (self->weston_launch, NULL,
-				&in_iov, 1,
-			        &in_all_cmsg, NULL,
-				&flags, NULL, error) != sizeof (reply))
+                                &in_iov, 1,
+                                &in_all_cmsg, NULL,
+                                &flags, NULL, error) != sizeof (reply))
     return FALSE;
 
   while (reply.header.opcode != ((struct weston_launcher_message*)message)->opcode)
     {
+      guint id;
+
       /* There were events queued */
       g_assert ((reply.header.opcode & WESTON_LAUNCHER_EVENT) == WESTON_LAUNCHER_EVENT);
 
@@ -114,33 +109,34 @@ send_message_to_wl (MetaLauncher           *self,
       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;
+        {
+        case WESTON_LAUNCHER_SERVER_REQUEST_VT_SWITCH:
+          id = g_idle_add (request_vt_switch_idle, self);
+          g_source_set_name_by_id (id, "[mutter] request_vt_switch_idle");
+          break;
 
-	default:
-	  g_assert_not_reached ();
-	}
+        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;
+                                    &in_iov, 1,
+                                    NULL, NULL,
+                                    &flags, NULL, error) != sizeof (reply))
+        return FALSE;
     }
 
   if (reply.ret != 0)
     {
       if (reply.ret == -1)
-	g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-		     "Got failure from weston-launch");
+        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 (-reply.ret),
+                     "Got failure from weston-launch: %s", strerror (-reply.ret));
 
       for (i = 0; in_all_cmsg && in_all_cmsg[i]; i++)
-	g_object_unref (in_all_cmsg[i]);
+        g_object_unref (in_all_cmsg[i]);
       g_free (in_all_cmsg);
 
       return FALSE;
@@ -149,7 +145,7 @@ send_message_to_wl (MetaLauncher           *self,
   if (in_all_cmsg && in_all_cmsg[0])
     {
       for (i = 1; in_all_cmsg[i]; i++)
-	g_object_unref (in_all_cmsg[i]);
+        g_object_unref (in_all_cmsg[i]);
       *in_cmsg = in_all_cmsg[0];
     }
 
@@ -198,7 +194,7 @@ meta_launcher_open_device (MetaLauncher  *self,
 }
 
 static void
-meta_launcher_enter (MetaLauncher *launcher)
+session_unpause (void)
 {
   ClutterBackend *backend;
   CoglContext *cogl_context;
@@ -213,27 +209,29 @@ meta_launcher_enter (MetaLauncher *launcher)
 
   {
     MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
+    MetaBackend *backend = meta_get_backend ();
+    MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (backend);
 
     /* When we mode-switch back, we need to immediately queue a redraw
      * in case nothing else queued one for us, and force the cursor to
      * update. */
 
     clutter_actor_queue_redraw (compositor->stage);
-    meta_cursor_tracker_force_update (compositor->seat->cursor_tracker);
+    meta_cursor_renderer_native_force_update (META_CURSOR_RENDERER_NATIVE (renderer));
   }
 }
 
 static void
-meta_launcher_leave (MetaLauncher *launcher)
+session_pause (void)
 {
   clutter_evdev_release_devices ();
 }
 
 static int
 on_evdev_device_open (const char  *path,
-		      int          flags,
-		      gpointer     user_data,
-		      GError     **error)
+                      int          flags,
+                      gpointer     user_data,
+                      GError     **error)
 {
   MetaLauncher *launcher = user_data;
 
@@ -241,8 +239,8 @@ on_evdev_device_open (const char  *path,
 }
 
 static void
-on_evdev_device_close (int          fd,
-                       gpointer     user_data)
+on_evdev_device_close (int      fd,
+                       gpointer user_data)
 {
   close (fd);
 }
@@ -253,6 +251,8 @@ handle_vt_enter (MetaLauncher *launcher)
   g_assert (launcher->vt_switched);
 
   g_main_loop_quit (launcher->nested_loop);
+
+  session_unpause ();
 }
 
 static void
@@ -262,7 +262,7 @@ handle_request_vt_switch (MetaLauncher *launcher)
   GError *error;
   gboolean ok;
 
-  meta_launcher_leave (launcher);
+  session_pause ();
 
   message.opcode = WESTON_LAUNCHER_CONFIRM_VT_SWITCH;
 
@@ -286,13 +286,13 @@ handle_request_vt_switch (MetaLauncher *launcher)
   g_assert (launcher->vt_switched);
   launcher->vt_switched = FALSE;
 
-  meta_launcher_enter (launcher);
+  session_unpause ();
 }
 
 static gboolean
 on_socket_readable (GSocket      *socket,
-		    GIOCondition  condition,
-		    gpointer      user_data)
+                    GIOCondition  condition,
+                    gpointer      user_data)
 {
   MetaLauncher *launcher = user_data;
   struct weston_launcher_event event;
@@ -342,7 +342,9 @@ MetaLauncher *
 meta_launcher_new (void)
 {
   MetaLauncher *self = g_slice_new0 (MetaLauncher);
+  GError *error = NULL;
   int launch_fd;
+  int kms_fd;
 
   launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
   if (launch_fd < 0)
@@ -363,22 +365,15 @@ meta_launcher_new (void)
   g_source_attach (self->inner_source, self->nested_context);
   g_source_unref (self->inner_source);
 
+  kms_fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error);
+  if (error)
+    g_error ("Failed to open /dev/dri/card0: %s", error->message);
+
+  clutter_egl_set_kms_fd (kms_fd);
   clutter_evdev_set_device_callbacks (on_evdev_device_open,
                                       on_evdev_device_close,
                                       self);
 
-#if defined(CLUTTER_WINDOWING_EGL)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
-    {
-      GError *error = NULL;
-      int fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error);
-      if (error)
-        g_error ("Failed to open /dev/dri/card0: %s", error->message);
-
-      clutter_egl_set_kms_fd (fd);
-    }
-#endif
-
   return self;
 }
 
@@ -396,10 +391,17 @@ meta_launcher_free (MetaLauncher *launcher)
   g_slice_free (MetaLauncher, launcher);
 }
 
+gboolean
+meta_launcher_activate_session (MetaLauncher  *launcher,
+                                GError       **error)
+{
+  return meta_launcher_activate_vt (launcher, -1, error);
+}
+
 gboolean
 meta_launcher_activate_vt (MetaLauncher  *launcher,
-			   signed char    vt,
-			   GError       **error)
+                           signed char    vt,
+                           GError       **error)
 {
   struct weston_launcher_activate_vt message;
 
@@ -408,4 +410,3 @@ meta_launcher_activate_vt (MetaLauncher  *launcher,
 
   return send_message_to_wl (launcher, &message, sizeof (message), NULL, NULL, error);
 }
-

src/backends/native/meta-launcher.h

@@ -17,18 +17,21 @@
  * 02111-1307, USA.
  */
 
-#ifndef META_WESTON_LAUNCH_H
-#define META_WESTON_LAUNCH_H
+#ifndef META_LAUNCHER_H
+#define META_LAUNCHER_H
 
 #include <glib-object.h>
-#include "weston-launch.h"
 
 typedef struct _MetaLauncher MetaLauncher;
 
 MetaLauncher     *meta_launcher_new                     (void);
 void              meta_launcher_free                    (MetaLauncher  *self);
 
+gboolean          meta_launcher_activate_session        (MetaLauncher  *self,
+							 GError       **error);
+
 gboolean          meta_launcher_activate_vt             (MetaLauncher  *self,
 							 signed char    vt,
 							 GError       **error);
-#endif
+
+#endif /* META_LAUNCHER_H */

src/backends/x11/meta-backend-x11.c

@@ -0,0 +1,385 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include "config.h"
+
+#include "meta-backend-x11.h"
+
+#include <clutter/x11/clutter-x11.h>
+
+#include <X11/extensions/sync.h>
+
+#include "meta-idle-monitor-xsync.h"
+#include "meta-monitor-manager-xrandr.h"
+#include "backends/meta-monitor-manager-dummy.h"
+
+#include "meta-cursor-tracker-private.h"
+#include "meta-cursor.h"
+#include <meta/util.h>
+#include "display-private.h"
+#include "compositor/compositor-private.h"
+
+struct _MetaBackendX11Private
+{
+  /* The host X11 display */
+  Display *xdisplay;
+  GSource *source;
+
+  int xsync_event_base;
+  int xsync_error_base;
+
+  int xinput_opcode;
+  int xinput_event_base;
+  int xinput_error_base;
+};
+typedef struct _MetaBackendX11Private MetaBackendX11Private;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendX11, meta_backend_x11, META_TYPE_BACKEND);
+
+static void
+handle_alarm_notify (MetaBackend *backend,
+                     XEvent      *event)
+{
+  int i;
+
+  for (i = 0; i <= backend->device_id_max; i++)
+    if (backend->device_monitors[i])
+      meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i], (XSyncAlarmNotifyEvent*) event);
+}
+
+static Window
+get_stage_window (MetaBackendX11 *x11)
+{
+  MetaDisplay *display = meta_get_display ();
+  MetaCompositor *compositor = display->compositor;
+  ClutterStage *stage = CLUTTER_STAGE (compositor->stage);
+
+  return clutter_x11_get_stage_window (stage);
+}
+
+static void
+translate_device_event (MetaBackendX11 *x11,
+                        XIDeviceEvent  *device_event)
+{
+  Window stage_window = get_stage_window (x11);
+
+  if (device_event->event != stage_window)
+    {
+      /* This codepath should only ever trigger as an X11 compositor,
+       * and never under nested, as under nested all backend events
+       * should be reported with respect to the stage window. */
+      g_assert (!meta_is_wayland_compositor ());
+
+      device_event->event = stage_window;
+
+      /* As an X11 compositor, the stage window is always at 0,0, so
+       * using root coordinates will give us correct stage coordinates
+       * as well... */
+      device_event->event_x = device_event->root_x;
+      device_event->event_y = device_event->root_y;
+    }
+}
+
+/* Clutter makes the assumption that there is only one X window
+ * per stage, which is a valid assumption to make for a generic
+ * application toolkit. As such, it will ignore any events sent
+ * to the a stage that isn't its X window.
+ *
+ * When running as an X window manager, we need to respond to
+ * events from lots of windows. Trick Clutter into translating
+ * these events by pretending we got an event on the stage window.
+ */
+static void
+maybe_spoof_event_as_stage_event (MetaBackendX11 *x11,
+                                  XEvent         *event)
+{
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  if (event->type == GenericEvent &&
+      event->xcookie.extension == priv->xinput_opcode)
+    {
+      XIEvent *input_event = (XIEvent *) event->xcookie.data;
+
+      switch (input_event->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+          translate_device_event (x11, (XIDeviceEvent *) input_event);
+          break;
+        default:
+          break;
+        }
+    }
+}
+
+static void
+handle_host_xevent (MetaBackend *backend,
+                    XEvent      *event)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  gboolean bypass_clutter = FALSE;
+
+  XGetEventData (priv->xdisplay, &event->xcookie);
+
+  if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))
+    handle_alarm_notify (backend, event);
+
+  {
+    MetaMonitorManager *manager = meta_backend_get_monitor_manager (backend);
+    if (META_IS_MONITOR_MANAGER_XRANDR (manager) &&
+        meta_monitor_manager_xrandr_handle_xevent (META_MONITOR_MANAGER_XRANDR (manager), event))
+      {
+        bypass_clutter = TRUE;
+        goto out;
+      }
+  }
+
+  maybe_spoof_event_as_stage_event (x11, event);
+
+ out:
+  if (!bypass_clutter)
+    clutter_x11_handle_event (event);
+
+  XFreeEventData (priv->xdisplay, &event->xcookie);
+}
+
+typedef struct {
+  GSource base;
+  GPollFD event_poll_fd;
+  MetaBackend *backend;
+} XEventSource;
+
+static gboolean
+x_event_source_prepare (GSource *source,
+                        int     *timeout)
+{
+  XEventSource *x_source = (XEventSource *) source;
+  MetaBackend *backend = x_source->backend;
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  *timeout = -1;
+
+  return XPending (priv->xdisplay);
+}
+
+static gboolean
+x_event_source_check (GSource *source)
+{
+  XEventSource *x_source = (XEventSource *) source;
+  MetaBackend *backend = x_source->backend;
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  return XPending (priv->xdisplay);
+}
+
+static gboolean
+x_event_source_dispatch (GSource     *source,
+                         GSourceFunc  callback,
+                         gpointer     user_data)
+{
+  XEventSource *x_source = (XEventSource *) source;
+  MetaBackend *backend = x_source->backend;
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  while (XPending (priv->xdisplay))
+    {
+      XEvent event;
+
+      XNextEvent (priv->xdisplay, &event);
+
+      handle_host_xevent (backend, &event);
+    }
+
+  return TRUE;
+}
+
+static GSourceFuncs x_event_funcs = {
+  x_event_source_prepare,
+  x_event_source_check,
+  x_event_source_dispatch,
+};
+
+static GSource *
+x_event_source_new (MetaBackend *backend)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  GSource *source;
+  XEventSource *x_source;
+
+  source = g_source_new (&x_event_funcs, sizeof (XEventSource));
+  x_source = (XEventSource *) source;
+  x_source->backend = backend;
+  x_source->event_poll_fd.fd = ConnectionNumber (priv->xdisplay);
+  x_source->event_poll_fd.events = G_IO_IN;
+  g_source_add_poll (source, &x_source->event_poll_fd);
+
+  g_source_attach (source, NULL);
+  return source;
+}
+
+static void
+meta_backend_x11_post_init (MetaBackend *backend)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  int major, minor;
+
+  priv->xdisplay = clutter_x11_get_default_display ();
+
+  priv->source = x_event_source_new (backend);
+
+  if (!XSyncQueryExtension (priv->xdisplay, &priv->xsync_event_base, &priv->xsync_error_base) ||
+      !XSyncInitialize (priv->xdisplay, &major, &minor))
+    meta_fatal ("Could not initialize XSync");
+
+  {
+    int major = 2, minor = 3;
+    gboolean has_xi = FALSE;
+
+    if (XQueryExtension (priv->xdisplay,
+                         "XInputExtension",
+                         &priv->xinput_opcode,
+                         &priv->xinput_error_base,
+                         &priv->xinput_event_base))
+      {
+        if (XIQueryVersion (priv->xdisplay, &major, &minor) == Success)
+          {
+            int version = (major * 10) + minor;
+            if (version >= 22)
+              has_xi = TRUE;
+          }
+      }
+
+    if (!has_xi)
+      meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
+  }
+
+  META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
+}
+
+static MetaIdleMonitor *
+meta_backend_x11_create_idle_monitor (MetaBackend *backend,
+                                      int          device_id)
+{
+  return g_object_new (META_TYPE_IDLE_MONITOR_XSYNC,
+                       "device-id", device_id,
+                       NULL);
+}
+
+static MetaMonitorManager *
+meta_backend_x11_create_monitor_manager (MetaBackend *backend)
+{
+  /* If we're a Wayland compositor using the X11 backend,
+   * we're a nested configuration, so return the dummy
+   * monitor setup. */
+  if (meta_is_wayland_compositor ())
+    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
+
+  return g_object_new (META_TYPE_MONITOR_MANAGER_XRANDR, NULL);
+}
+
+static gboolean
+meta_backend_x11_grab_device (MetaBackend *backend,
+                              int          device_id,
+                              uint32_t     timestamp)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+  XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+  int ret;
+
+  XISetMask (mask.mask, XI_ButtonPress);
+  XISetMask (mask.mask, XI_ButtonRelease);
+  XISetMask (mask.mask, XI_Enter);
+  XISetMask (mask.mask, XI_Leave);
+  XISetMask (mask.mask, XI_Motion);
+  XISetMask (mask.mask, XI_KeyPress);
+  XISetMask (mask.mask, XI_KeyRelease);
+
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
+  MetaCursorReference *cursor_ref = meta_cursor_tracker_get_displayed_cursor (tracker);
+  MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref);
+
+  ret = XIGrabDevice (priv->xdisplay, device_id,
+                      get_stage_window (x11),
+                      timestamp,
+                      meta_cursor_create_x_cursor (priv->xdisplay, cursor),
+                      XIGrabModeAsync, XIGrabModeAsync,
+                      False, /* owner_events */
+                      &mask);
+
+  return (ret == Success);
+}
+
+static gboolean
+meta_backend_x11_ungrab_device (MetaBackend *backend,
+                                int          device_id,
+                                uint32_t     timestamp)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  int ret;
+
+  ret = XIUngrabDevice (priv->xdisplay, device_id, timestamp);
+
+  return (ret == Success);
+}
+
+static void
+meta_backend_x11_class_init (MetaBackendX11Class *klass)
+{
+  MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
+
+  backend_class->post_init = meta_backend_x11_post_init;
+  backend_class->create_idle_monitor = meta_backend_x11_create_idle_monitor;
+  backend_class->create_monitor_manager = meta_backend_x11_create_monitor_manager;
+
+  backend_class->grab_device = meta_backend_x11_grab_device;
+  backend_class->ungrab_device = meta_backend_x11_ungrab_device;
+}
+
+static void
+meta_backend_x11_init (MetaBackendX11 *x11)
+{
+  /* We do X11 event retrieval ourselves */
+  clutter_x11_disable_event_retrieval ();
+}
+
+Display *
+meta_backend_x11_get_xdisplay (MetaBackendX11 *x11)
+{
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  return priv->xdisplay;
+}
+

src/backends/x11/meta-backend-x11.h

@@ -0,0 +1,56 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#ifndef META_BACKEND_X11_H
+#define META_BACKEND_X11_H
+
+#include "backends/meta-backend-private.h"
+
+#include <X11/Xlib.h>
+
+#define META_TYPE_BACKEND_X11             (meta_backend_x11_get_type ())
+#define META_BACKEND_X11(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BACKEND_X11, MetaBackendX11))
+#define META_BACKEND_X11_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BACKEND_X11, MetaBackendX11Class))
+#define META_IS_BACKEND_X11(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BACKEND_X11))
+#define META_IS_BACKEND_X11_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BACKEND_X11))
+#define META_BACKEND_X11_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BACKEND_X11, MetaBackendX11Class))
+
+typedef struct _MetaBackendX11        MetaBackendX11;
+typedef struct _MetaBackendX11Class   MetaBackendX11Class;
+
+struct _MetaBackendX11
+{
+  MetaBackend parent;
+};
+
+struct _MetaBackendX11Class
+{
+  MetaBackendClass parent_class;
+};
+
+GType meta_backend_x11_get_type (void) G_GNUC_CONST;
+
+Display * meta_backend_x11_get_xdisplay (MetaBackendX11 *backend);
+
+#endif /* META_BACKEND_X11_H */

src/backends/x11/meta-idle-monitor-xsync.c

@@ -25,8 +25,7 @@
 #include "meta-idle-monitor-xsync.h"
 #include "meta-idle-monitor-private.h"
 
-#include <meta/util.h>
-#include "display-private.h"
+#include "meta-backend-x11.h"
 
 #include <string.h>
 
@@ -191,10 +190,9 @@ static void
 meta_idle_monitor_xsync_constructed (GObject *object)
 {
   MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (object);
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
 
-  g_assert (!meta_is_wayland_compositor ());
-
-  monitor_xsync->display = meta_get_display ()->xdisplay;
+  monitor_xsync->display = meta_backend_x11_get_xdisplay (backend);
   init_xsync (monitor_xsync);
 
   G_OBJECT_CLASS (meta_idle_monitor_xsync_parent_class)->constructed (object);
@@ -291,7 +289,10 @@ meta_idle_monitor_xsync_make_watch (MetaIdleMonitor           *monitor,
           g_hash_table_add (monitor_xsync->alarms, (gpointer) watch_xsync->xalarm);
 
           if (meta_idle_monitor_get_idletime (monitor) > (gint64)timeout_msec)
-            watch->idle_source_id = g_idle_add (fire_watch_idle, watch);
+            {
+              watch->idle_source_id = g_idle_add (fire_watch_idle, watch);
+              g_source_set_name_by_id (watch->idle_source_id, "[mutter] fire_watch_idle");
+            }
         }
       else
         {

src/backends/x11/meta-idle-monitor-xsync.h

@@ -44,6 +44,4 @@ GType meta_idle_monitor_xsync_get_type (void);
 void meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor       *monitor,
                                             XSyncAlarmNotifyEvent *xevent);
 
-void meta_idle_monitor_xsync_handle_xevent_all (XEvent *xevent);
-
 #endif /* META_IDLE_MONITOR_XSYNC_H */

src/backends/x11/meta-monitor-manager-xrandr.c

@@ -36,6 +36,7 @@
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/dpms.h>
 
+#include "meta-backend-x11.h"
 #include <meta/main.h>
 #include <meta/errors.h>
 #include "edid.h"
@@ -141,16 +142,16 @@ static gboolean
 output_get_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                                 MetaOutput               *output)
 {
-  MetaDisplay *display = meta_get_display ();
   gboolean value;
-  Atom actual_type;
+  Atom atom, actual_type;
   int actual_format;
   unsigned long nitems, bytes_after;
   unsigned char *buffer;
 
+  atom = XInternAtom (manager_xrandr->xdisplay, "_MUTTER_PRESENTATION_OUTPUT", False);
   XRRGetOutputProperty (manager_xrandr->xdisplay,
                         (XID)output->output_id,
-                        display->atom__MUTTER_PRESENTATION_OUTPUT,
+                        atom,
                         0, G_MAXLONG, False, False, XA_CARDINAL,
                         &actual_type, &actual_format,
                         &nitems, &bytes_after, &buffer);
@@ -177,16 +178,16 @@ static int
 output_get_backlight_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                              MetaOutput               *output)
 {
-  MetaDisplay *display = meta_get_display ();
   gboolean value;
-  Atom actual_type;
+  Atom atom, actual_type;
   int actual_format;
   unsigned long nitems, bytes_after;
   unsigned char *buffer;
 
+  atom = XInternAtom (manager_xrandr->xdisplay, "Backlight", False);
   XRRGetOutputProperty (manager_xrandr->xdisplay,
                         (XID)output->output_id,
-                        display->atom_BACKLIGHT,
+                        atom,
                         0, G_MAXLONG, False, False, XA_INTEGER,
                         &actual_type, &actual_format,
                         &nitems, &bytes_after, &buffer);
@@ -205,14 +206,13 @@ static void
 output_get_backlight_limits_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                                     MetaOutput               *output)
 {
-  MetaDisplay *display = meta_get_display ();
+  Atom atom;
   XRRPropertyInfo *info;
 
-  meta_error_trap_push (display);
+  atom = XInternAtom (manager_xrandr->xdisplay, "Backlight", False);
   info = XRRQueryOutputProperty (manager_xrandr->xdisplay,
                                  (XID)output->output_id,
-                                 display->atom_BACKLIGHT);
-  meta_error_trap_pop (display);
+                                 atom);
 
   if (info == NULL)
     {
@@ -314,14 +314,13 @@ static gboolean
 output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr,
                                 XID                       output_id)
 {
-  MetaDisplay *display = meta_get_display ();
+  Atom atom;
   XRRPropertyInfo *info;
   gboolean result = FALSE;
 
-  meta_error_trap_push (display);
+  atom = XInternAtom (manager_xrandr->xdisplay, "hotplug_mode_update", False);
   info = XRRQueryOutputProperty (manager_xrandr->xdisplay, output_id,
-                                 display->atom_hotplug_mode_update);
-  meta_error_trap_pop (display);
+                                 atom);
 
   if (info)
     {
@@ -350,9 +349,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
     XRRFreeScreenResources (manager_xrandr->resources);
   manager_xrandr->resources = NULL;
 
-  meta_error_trap_push (meta_get_display ());
   dpms_capable = DPMSCapable (manager_xrandr->xdisplay);
-  meta_error_trap_pop (meta_get_display ());
 
   if (dpms_capable &&
       DPMSInfo (manager_xrandr->xdisplay, &dpms_state, &dpms_enabled) &&
@@ -452,10 +449,8 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
       XRRFreeCrtcInfo (crtc);
     }
 
-  meta_error_trap_push (meta_get_display ());
   primary_output = XRRGetOutputPrimary (manager_xrandr->xdisplay,
 					DefaultRootWindow (manager_xrandr->xdisplay));
-  meta_error_trap_pop (meta_get_display ());
 
   n_actual_outputs = 0;
   for (i = 0; i < (unsigned)resources->noutput; i++)
@@ -637,10 +632,8 @@ meta_monitor_manager_xrandr_set_power_save_mode (MetaMonitorManager *manager,
     return;
   }
 
-  meta_error_trap_push (meta_get_display ());
   DPMSForceLevel (manager_xrandr->xdisplay, state);
   DPMSSetTimeouts (manager_xrandr->xdisplay, 0, 0, 0);
-  meta_error_trap_pop (meta_get_display ());
 }
 
 static Rotation
@@ -674,12 +667,13 @@ output_set_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
                                 MetaOutput               *output,
                                 gboolean                  presentation)
 {
-  MetaDisplay *display = meta_get_display ();
+  Atom atom;
   int value = presentation;
 
+  atom = XInternAtom (manager_xrandr->xdisplay, "_MUTTER_PRESENTATION_OUTPUT", False);
   XRRChangeOutputProperty (manager_xrandr->xdisplay,
                            (XID)output->output_id,
-                           display->atom__MUTTER_PRESENTATION_OUTPUT,
+                           atom,
                            XA_CARDINAL, 32, PropModeReplace,
                            (unsigned char*) &value, 1);
 }
@@ -692,11 +686,10 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
 						 unsigned int         n_outputs)
 {
   MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
-  MetaDisplay *display = meta_get_display ();
   unsigned i;
   int width, height, width_mm, height_mm;
 
-  meta_display_grab (display);
+  XGrabServer (manager_xrandr->xdisplay);
 
   /* First compute the new size of the screen (framebuffer) */
   width = 0; height = 0;
@@ -790,10 +783,8 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
    */
   width_mm = (width / DPI_FALLBACK) * 25.4 + 0.5;
   height_mm = (height / DPI_FALLBACK) * 25.4 + 0.5;
-  meta_error_trap_push (display);
   XRRSetScreenSize (manager_xrandr->xdisplay, DefaultRootWindow (manager_xrandr->xdisplay),
                     width, height, width_mm, height_mm);
-  meta_error_trap_pop (display);
 
   for (i = 0; i < n_crtcs; i++)
     {
@@ -850,7 +841,6 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
               goto next;
             }
 
-          meta_error_trap_push (display);
           ok = XRRSetCrtcConfig (manager_xrandr->xdisplay,
                                  manager_xrandr->resources,
                                  (XID)crtc->crtc_id,
@@ -859,7 +849,6 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
                                  (XID)mode->mode_id,
                                  wl_transform_to_xrandr (crtc_info->transform),
                                  outputs, n_outputs);
-          meta_error_trap_pop (display);
 
           if (ok != Success)
             {
@@ -900,11 +889,9 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
 
       if (output_info->is_primary)
         {
-          meta_error_trap_push (display);
           XRRSetOutputPrimary (manager_xrandr->xdisplay,
                                DefaultRootWindow (manager_xrandr->xdisplay),
                                (XID)output_info->output->output_id);
-          meta_error_trap_pop (display);
         }
 
       output_set_presentation_xrandr (manager_xrandr,
@@ -930,7 +917,7 @@ meta_monitor_manager_xrandr_apply_configuration (MetaMonitorManager *manager,
       output->is_primary = FALSE;
     }
 
-  meta_display_ungrab (display);
+  XUngrabServer (manager_xrandr->xdisplay);
 }
 
 static void
@@ -939,18 +926,17 @@ meta_monitor_manager_xrandr_change_backlight (MetaMonitorManager *manager,
 					      gint                value)
 {
   MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
-  MetaDisplay *display = meta_get_display ();
+  Atom atom;
   int hw_value;
 
   hw_value = round ((double)value / 100.0 * output->backlight_max + output->backlight_min);
 
-  meta_error_trap_push (display);
+  atom = XInternAtom (manager_xrandr->xdisplay, "Backlight", False);
   XRRChangeOutputProperty (manager_xrandr->xdisplay,
                            (XID)output->output_id,
-                           display->atom_BACKLIGHT,
+                           atom,
                            XA_INTEGER, 32, PropModeReplace,
                            (unsigned char *) &hw_value, 1);
-  meta_error_trap_pop (display);
 
   /* We're not selecting for property notifies, so update the value immediately */
   output->backlight = normalize_backlight (output, hw_value);
@@ -1008,11 +994,65 @@ meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager)
   meta_monitor_manager_rebuild_derived (manager);
 }
 
-static gboolean
-meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManager *manager,
-					   XEvent             *event)
+static void
+meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr)
 {
-  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+
+  manager_xrandr->xdisplay = meta_backend_x11_get_xdisplay (backend);
+
+  if (!XRRQueryExtension (manager_xrandr->xdisplay,
+			  &manager_xrandr->rr_event_base,
+			  &manager_xrandr->rr_error_base))
+    {
+      return;
+    }
+  else
+    {
+      /* We only use ScreenChangeNotify, but GDK uses the others,
+	 and we don't want to step on its toes */
+      XRRSelectInput (manager_xrandr->xdisplay,
+		      DefaultRootWindow (manager_xrandr->xdisplay),
+		      RRScreenChangeNotifyMask
+		      | RRCrtcChangeNotifyMask
+		      | RROutputPropertyNotifyMask);
+    }
+}
+
+static void
+meta_monitor_manager_xrandr_finalize (GObject *object)
+{
+  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (object);
+
+  if (manager_xrandr->resources)
+    XRRFreeScreenResources (manager_xrandr->resources);
+  manager_xrandr->resources = NULL;
+
+  G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->finalize (object);
+}
+
+static void
+meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
+{
+  MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_monitor_manager_xrandr_finalize;
+
+  manager_class->read_current = meta_monitor_manager_xrandr_read_current;
+  manager_class->read_edid = meta_monitor_manager_xrandr_read_edid;
+  manager_class->apply_configuration = meta_monitor_manager_xrandr_apply_configuration;
+  manager_class->set_power_save_mode = meta_monitor_manager_xrandr_set_power_save_mode;
+  manager_class->change_backlight = meta_monitor_manager_xrandr_change_backlight;
+  manager_class->get_crtc_gamma = meta_monitor_manager_xrandr_get_crtc_gamma;
+  manager_class->set_crtc_gamma = meta_monitor_manager_xrandr_set_crtc_gamma;
+}
+
+gboolean
+meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr,
+					   XEvent                   *event)
+{
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_xrandr);
   MetaOutput *old_outputs;
   MetaCRTC *old_crtcs;
   MetaMonitorMode *old_modes;
@@ -1073,59 +1113,3 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManager *manager,
 
   return TRUE;
 }
-
-static void
-meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr)
-{
-  MetaDisplay *display = meta_get_display ();
-
-  manager_xrandr->xdisplay = display->xdisplay;
-
-  if (!XRRQueryExtension (manager_xrandr->xdisplay,
-			  &manager_xrandr->rr_event_base,
-			  &manager_xrandr->rr_error_base))
-    {
-      return;
-    }
-  else
-    {
-      /* We only use ScreenChangeNotify, but GDK uses the others,
-	 and we don't want to step on its toes */
-      XRRSelectInput (manager_xrandr->xdisplay,
-		      DefaultRootWindow (manager_xrandr->xdisplay),
-		      RRScreenChangeNotifyMask
-		      | RRCrtcChangeNotifyMask
-		      | RROutputPropertyNotifyMask);
-    }
-}
-
-static void
-meta_monitor_manager_xrandr_finalize (GObject *object)
-{
-  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (object);
-
-  if (manager_xrandr->resources)
-    XRRFreeScreenResources (manager_xrandr->resources);
-  manager_xrandr->resources = NULL;
-
-  G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->finalize (object);
-}
-
-static void
-meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
-{
-  MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_monitor_manager_xrandr_finalize;
-
-  manager_class->read_current = meta_monitor_manager_xrandr_read_current;
-  manager_class->read_edid = meta_monitor_manager_xrandr_read_edid;
-  manager_class->apply_configuration = meta_monitor_manager_xrandr_apply_configuration;
-  manager_class->set_power_save_mode = meta_monitor_manager_xrandr_set_power_save_mode;
-  manager_class->change_backlight = meta_monitor_manager_xrandr_change_backlight;
-  manager_class->get_crtc_gamma = meta_monitor_manager_xrandr_get_crtc_gamma;
-  manager_class->set_crtc_gamma = meta_monitor_manager_xrandr_set_crtc_gamma;
-  manager_class->handle_xevent = meta_monitor_manager_xrandr_handle_xevent;
-}
-

src/backends/x11/meta-monitor-manager-xrandr.h

@@ -37,4 +37,7 @@ typedef struct _MetaMonitorManagerXrandr         MetaMonitorManagerXrandr;
 
 GType meta_monitor_manager_xrandr_get_type (void);
 
+gboolean meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager,
+                                                    XEvent                   *event);
+
 #endif /* META_MONITOR_MANAGER_XRANDR_H */

src/compositor/compositor.c

@@ -72,6 +72,7 @@
 #include <meta/meta-shadow-factory.h>
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
+#include "meta-stage.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
 #include "util-private.h"
@@ -79,6 +80,9 @@
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
+#include "backends/meta-backend.h"
+#include "backends/x11/meta-backend-x11.h"
+
 #include "wayland/meta-wayland-private.h"
 
 static gboolean
@@ -147,16 +151,13 @@ process_damage (MetaCompositor     *compositor,
 static Window
 get_output_window (MetaCompositor *compositor)
 {
-  MetaDisplay *display = compositor->display;
-  Display *xdisplay = display->xdisplay;
-  Window output, xroot;
-  XWindowAttributes attr;
-  long event_mask;
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
+  Window output;
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
 
-  xroot = display->screen->xroot;
-  output = XCompositeGetOverlayWindow (xdisplay, xroot);
+  output = XCompositeGetOverlayWindow (xdisplay, DefaultRootWindow (xdisplay));
 
   meta_core_add_old_event_mask (xdisplay, output, &mask);
 
@@ -171,12 +172,6 @@ get_output_window (MetaCompositor *compositor)
   XISetMask (mask.mask, XI_Motion);
   XISelectEvents (xdisplay, output, &mask, 1);
 
-  event_mask = ExposureMask | PropertyChangeMask;
-  if (XGetWindowAttributes (xdisplay, output, &attr))
-    event_mask |= attr.your_event_mask;
-
-  XSelectInput (xdisplay, output, event_mask);
-
   return output;
 }
 
@@ -327,38 +322,16 @@ meta_stage_is_focused (MetaScreen *screen)
 }
 
 static gboolean
-begin_modal_x11 (MetaCompositor   *compositor,
-                 MetaPlugin       *plugin,
-                 MetaModalOptions  options,
-                 guint32           timestamp)
+grab_devices (MetaModalOptions  options,
+              guint32           timestamp)
 {
-  MetaDisplay    *display     = compositor->display;
-  Display        *xdpy        = meta_display_get_xdisplay (display);
-  Window          grab_window = clutter_x11_get_stage_window (CLUTTER_STAGE (compositor->stage));
-  int             result;
-  gboolean        pointer_grabbed = FALSE;
-  gboolean        keyboard_grabbed = FALSE;
+  MetaBackend *backend = META_BACKEND (meta_get_backend ());
+  gboolean pointer_grabbed = FALSE;
+  gboolean keyboard_grabbed = FALSE;
 
   if ((options & META_MODAL_POINTER_ALREADY_GRABBED) == 0)
     {
-      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
-      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-
-      XISetMask (mask.mask, XI_ButtonPress);
-      XISetMask (mask.mask, XI_ButtonRelease);
-      XISetMask (mask.mask, XI_Enter);
-      XISetMask (mask.mask, XI_Leave);
-      XISetMask (mask.mask, XI_Motion);
-
-      result = XIGrabDevice (xdpy,
-                             META_VIRTUAL_CORE_POINTER_ID,
-                             grab_window,
-                             timestamp,
-                             None,
-                             XIGrabModeAsync, XIGrabModeAsync,
-                             False, /* owner_events */
-                             &mask);
-      if (result != Success)
+      if (!meta_backend_grab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp))
         goto fail;
 
       pointer_grabbed = TRUE;
@@ -366,22 +339,7 @@ begin_modal_x11 (MetaCompositor   *compositor,
 
   if ((options & META_MODAL_KEYBOARD_ALREADY_GRABBED) == 0)
     {
-      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
-      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-
-      XISetMask (mask.mask, XI_KeyPress);
-      XISetMask (mask.mask, XI_KeyRelease);
-
-      result = XIGrabDevice (xdpy,
-                             META_VIRTUAL_CORE_KEYBOARD_ID,
-                             grab_window,
-                             timestamp,
-                             None,
-                             XIGrabModeAsync, XIGrabModeAsync,
-                             False, /* owner_events */
-                             &mask);
-
-      if (result != Success)
+      if (!meta_backend_grab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp))
         goto fail;
 
       keyboard_grabbed = TRUE;
@@ -391,9 +349,9 @@ begin_modal_x11 (MetaCompositor   *compositor,
 
  fail:
   if (pointer_grabbed)
-    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+    meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
   if (keyboard_grabbed)
-    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
+    meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
 
   return FALSE;
 }
@@ -413,9 +371,14 @@ meta_begin_modal_for_plugin (MetaCompositor   *compositor,
   if (is_modal (display) || display->grab_op != META_GRAB_OP_NONE)
     return FALSE;
 
-  if (!meta_is_wayland_compositor ())
-    if (!begin_modal_x11 (compositor, plugin, options, timestamp))
-      return FALSE;
+  /* XXX: why is this needed? */
+  XIUngrabDevice (display->xdisplay,
+                  META_VIRTUAL_CORE_POINTER_ID,
+                  timestamp);
+  XSync (display->xdisplay, False);
+
+  if (!grab_devices (options, timestamp))
+    return FALSE;
 
   display->grab_op = META_GRAB_OP_COMPOSITOR;
   display->grab_window = NULL;
@@ -434,7 +397,7 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
                            guint32         timestamp)
 {
   MetaDisplay *display = compositor->display;
-  Display *xdpy = meta_display_get_xdisplay (display);
+  MetaBackend *backend = meta_get_backend ();
 
   g_return_if_fail (is_modal (display));
 
@@ -443,15 +406,11 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
   display->grab_have_pointer = FALSE;
   display->grab_have_keyboard = FALSE;
 
+  meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+  meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
+
   if (meta_is_wayland_compositor ())
-    {
-      meta_display_sync_wayland_input_focus (display);
-    }
-  else
-    {
-      XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
-      XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
-    }
+    meta_display_sync_wayland_input_focus (display);
 }
 
 static void
@@ -491,7 +450,7 @@ redirect_windows (MetaScreen *screen)
    */
   while (TRUE)
     {
-      meta_error_trap_push_with_return (display);
+      meta_error_trap_push (display);
       XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
       XSync (xdisplay, FALSE);
 
@@ -519,16 +478,17 @@ meta_compositor_manage (MetaCompositor *compositor)
   MetaScreen *screen = display->screen;
   Window xwin = 0;
   gint width, height;
-  MetaWaylandCompositor *wayland_compositor;
 
   meta_screen_set_cm_selection (display->screen);
 
-  /* We will have already created a stage if running as a wayland
-   * compositor... */
   if (meta_is_wayland_compositor ())
     {
-      wayland_compositor = meta_wayland_compositor_get_default ();
-      compositor->stage = wayland_compositor->stage;
+      MetaWaylandCompositor *wayland_compositor = meta_wayland_compositor_get_default ();
+
+      compositor->stage = meta_stage_new ();
+      clutter_actor_show (compositor->stage);
+
+      wayland_compositor->stage = compositor->stage;
 
       meta_screen_get_size (screen, &width, &height);
       clutter_actor_set_size (compositor->stage, width, height);
@@ -545,12 +505,12 @@ meta_compositor_manage (MetaCompositor *compositor)
       XResizeWindow (xdisplay, xwin, width, height);
 
         {
-          long event_mask;
+          MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+          Display *backend_xdisplay = meta_backend_x11_get_xdisplay (backend);
           unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
           XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-          XWindowAttributes attr;
 
-          meta_core_add_old_event_mask (xdisplay, xwin, &mask);
+          meta_core_add_old_event_mask (backend_xdisplay, xwin, &mask);
 
           XISetMask (mask.mask, XI_KeyPress);
           XISetMask (mask.mask, XI_KeyRelease);
@@ -564,13 +524,7 @@ meta_compositor_manage (MetaCompositor *compositor)
           XIClearMask (mask.mask, XI_TouchBegin);
           XIClearMask (mask.mask, XI_TouchEnd);
           XIClearMask (mask.mask, XI_TouchUpdate);
-          XISelectEvents (xdisplay, xwin, &mask, 1);
-
-          event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;
-          if (XGetWindowAttributes (xdisplay, xwin, &attr))
-            event_mask |= attr.your_event_mask;
-
-          XSelectInput (xdisplay, xwin, event_mask);
+          XISelectEvents (backend_xdisplay, xwin, &mask, 1);
         }
     }
 
@@ -754,29 +708,6 @@ meta_compositor_queue_frame_drawn (MetaCompositor *compositor,
   meta_window_actor_queue_frame_drawn (window_actor, no_delay_frame);
 }
 
-static gboolean
-is_grabbed_event (MetaDisplay *display,
-                  XEvent      *event)
-{
-  if (event->type == GenericEvent &&
-      event->xcookie.extension == display->xinput_opcode)
-    {
-      XIEvent *xev = (XIEvent *) event->xcookie.data;
-
-      switch (xev->evtype)
-        {
-        case XI_Motion:
-        case XI_ButtonPress:
-        case XI_ButtonRelease:
-        case XI_KeyPress:
-        case XI_KeyRelease:
-          return TRUE;
-        }
-    }
-
-  return FALSE;
-}
-
 void
 meta_compositor_window_shape_changed (MetaCompositor *compositor,
                                       MetaWindow     *window)
@@ -813,82 +744,6 @@ meta_compositor_window_surface_changed (MetaCompositor *compositor,
   meta_window_actor_update_surface (window_actor);
 }
 
-static gboolean
-event_is_passive_button_grab (MetaDisplay   *display,
-                              XIDeviceEvent *device_event)
-{
-  /* see display.c for which events are passive button
-     grabs (meta_display_grab_window_buttons() and
-     meta_display_handle_events())
-     we need to filter them here because normally they
-     would be sent to gtk+ (they are on gtk+ frame xwindow),
-     but we want to redirect them to clutter
-  */
-
-  if (device_event->evtype != XI_ButtonPress)
-    return FALSE;
-
-  if (display->window_grab_modifiers == 0)
-    return FALSE;
-
-  if ((device_event->mods.effective & display->window_grab_modifiers) !=
-      display->window_grab_modifiers)
-    return FALSE;
-
-  return device_event->detail < 4;
-}
-
-/* Clutter makes the assumption that there is only one X window
- * per stage, which is a valid assumption to make for a generic
- * application toolkit. As such, it will ignore any events sent
- * to the a stage that isn't its X window.
- *
- * When running as an X window manager, we need to respond to
- * events from lots of windows. Trick Clutter into translating
- * these events by pretending we got an event on the stage window.
- */
-static void
-maybe_spoof_event_as_stage_event (MetaCompositor *compositor,
-                                  MetaWindow     *window,
-                                  XEvent         *event)
-{
-  MetaDisplay *display = compositor->display;
-
-  if (event->type == GenericEvent &&
-      event->xcookie.extension == display->xinput_opcode)
-    {
-      XIEvent *input_event = (XIEvent *) event->xcookie.data;
-      XIDeviceEvent *device_event = ((XIDeviceEvent *) input_event);
-
-      switch (input_event->evtype)
-        {
-        case XI_Motion:
-        case XI_ButtonPress:
-        case XI_ButtonRelease:
-          /* If this is a window frame, and we think GTK+ needs to handle the event,
-             let GTK+ handle it without mangling */
-          if (window && window->frame && device_event->event == window->frame->xwindow &&
-              (meta_grab_op_is_clicking (display->grab_op) ||
-               (display->grab_op == META_GRAB_OP_NONE && !event_is_passive_button_grab (display, device_event))))
-            break;
-
-        case XI_KeyPress:
-        case XI_KeyRelease:
-            /* If this is a GTK+ widget, like a window menu, let GTK+ handle
-             * it as-is without mangling. */
-            if (meta_ui_window_is_widget (display->screen->ui, device_event->event))
-              break;
-
-            device_event->event = clutter_x11_get_stage_window (CLUTTER_STAGE (compositor->stage));
-            device_event->event_x = device_event->root_x;
-            device_event->event_y = device_event->root_y;
-          break;
-        default:
-          break;
-        }
-    }
-}
-
 /**
  * meta_compositor_process_event: (skip)
  * @compositor: 
@@ -901,20 +756,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
                                MetaWindow     *window)
 {
-  MetaDisplay *display = compositor->display;
-
-  if (is_modal (display) && is_grabbed_event (display, event))
-    {
-      meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event);
-
-      /* We always consume events even if the plugin says it didn't handle them;
-       * exclusive is exclusive */
-      return TRUE;
-    }
-
-  if (!meta_is_wayland_compositor ())
-    maybe_spoof_event_as_stage_event (compositor, window, event);
-
   if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
     return TRUE;
 

src/compositor/meta-background.c

@@ -26,8 +26,6 @@
 
 #include <config.h>
 
-#include <cogl/cogl-texture-pixmap-x11.h>
-
 #include <clutter/clutter.h>
 
 #include "cogl-utils.h"
@@ -755,88 +753,6 @@ set_filename (MetaBackground *self,
   priv->filename = g_strdup (filename);
 }
 
-static Pixmap
-get_still_frame_for_monitor (MetaScreen *screen,
-                             int         monitor)
-{
-  MetaDisplay *display = meta_screen_get_display (screen);
-  Display *xdisplay = meta_display_get_xdisplay (display);
-  Window xroot = meta_screen_get_xroot (screen);
-  Pixmap pixmap;
-  GC gc;
-  XGCValues values;
-  MetaRectangle geometry;
-  int depth;
-
-  meta_screen_get_monitor_geometry (screen, monitor, &geometry);
-
-  depth = DefaultDepth (xdisplay, meta_screen_get_screen_number (screen));
-
-  pixmap = XCreatePixmap (xdisplay,
-                          xroot,
-                          geometry.width, geometry.height, depth);
-
-  values.function = GXcopy;
-  values.plane_mask = AllPlanes;
-  values.fill_style = FillSolid;
-  values.subwindow_mode = IncludeInferiors;
-
-  gc = XCreateGC (xdisplay,
-                  xroot,
-                  GCFunction | GCPlaneMask | GCFillStyle | GCSubwindowMode,
-                  &values);
-
-  XCopyArea (xdisplay,
-             xroot, pixmap, gc,
-             geometry.x, geometry.y,
-             geometry.width, geometry.height,
-             0, 0);
-
-  XFreeGC (xdisplay, gc);
-
-  return pixmap;
-}
-
-/**
- * meta_background_load_still_frame:
- * @self: the #MetaBackground
- *
- * Takes a screenshot of the desktop and uses it as the background
- * source.
- */
-void
-meta_background_load_still_frame (MetaBackground *self)
-{
-  MetaBackgroundPrivate *priv = self->priv;
-  MetaDisplay *display = meta_screen_get_display (priv->screen);
-  Pixmap still_frame;
-  CoglTexture *texture;
-  CoglContext *context = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  GError *error = NULL;
-
-  ensure_pipeline (self);
-
-  unset_texture (self);
-  set_style (self, G_DESKTOP_BACKGROUND_STYLE_STRETCHED);
-
-  still_frame = get_still_frame_for_monitor (priv->screen, priv->monitor);
-  XSync (meta_display_get_xdisplay (display), False);
-
-  meta_error_trap_push (display);
-  texture = COGL_TEXTURE (cogl_texture_pixmap_x11_new (context, still_frame, FALSE, &error));
-  meta_error_trap_pop (display);
-
-  if (error != NULL)
-    {
-      g_warning ("Failed to create background texture from pixmap: %s",
-                 error->message);
-      g_error_free (error);
-      return;
-    }
-
-  set_texture (self, texture);
-}
-
 /**
  * meta_background_load_gradient:
  * @self: the #MetaBackground

src/compositor/meta-plugin.c

@@ -81,18 +81,8 @@ _meta_plugin_xevent_filter (MetaPlugin *plugin,
 {
   MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
 
-  /* When mutter is running as a wayland compositor, things like input
-   * events just come directly from clutter so it won't have disabled
-   * clutter's event retrieval and won't need to forward it events (if
-   * it did it would lead to recursion). Also when running as a
-   * wayland compositor we shouldn't be assuming that we're running
-   * with the clutter x11 backend.
-   */
-
-  if (klass->xevent_filter && klass->xevent_filter (plugin, xev))
-    return TRUE;
-  else if (!meta_is_wayland_compositor ())
-    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
+  if (klass->xevent_filter)
+    return klass->xevent_filter (plugin, xev);
   else
     return FALSE;
 }

src/compositor/meta-stage.c

@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include <config.h>
+
+#include "meta-stage.h"
+
+#include "meta-cursor-private.h"
+#include "meta-backend.h"
+#include <meta/util.h>
+
+struct _MetaStagePrivate {
+  CoglPipeline *pipeline;
+  gboolean should_paint_cursor;
+
+  MetaCursorReference *cursor;
+
+  MetaRectangle current_rect;
+  MetaRectangle previous_rect;
+  gboolean previous_is_valid;
+};
+typedef struct _MetaStagePrivate MetaStagePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaStage, meta_stage, CLUTTER_TYPE_STAGE);
+
+static void
+update_pipeline (MetaStage *stage)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  if (priv->cursor)
+    {
+      CoglTexture *texture = meta_cursor_reference_get_cogl_texture (priv->cursor, NULL, NULL);
+      cogl_pipeline_set_layer_texture (priv->pipeline, 0, texture);
+    }
+  else
+    cogl_pipeline_set_layer_texture (priv->pipeline, 0, NULL);
+}
+
+static void
+meta_stage_finalize (GObject *object)
+{
+  MetaStage *stage = META_STAGE (object);
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  if (priv->pipeline)
+    cogl_object_unref (priv->pipeline);
+}
+
+static void
+paint_cursor (MetaStage *stage)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  g_assert (meta_is_wayland_compositor ());
+
+  if (!priv->cursor)
+    return;
+
+  cogl_framebuffer_draw_rectangle (cogl_get_draw_framebuffer (),
+                                   priv->pipeline,
+                                   priv->current_rect.x,
+                                   priv->current_rect.y,
+                                   priv->current_rect.x +
+                                   priv->current_rect.width,
+                                   priv->current_rect.y +
+                                   priv->current_rect.height);
+
+  priv->previous_rect = priv->current_rect;
+  priv->previous_is_valid = TRUE;
+}
+
+static void
+meta_stage_paint (ClutterActor *actor)
+{
+  MetaStage *stage = META_STAGE (actor);
+
+  CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor);
+
+  if (meta_is_wayland_compositor ())
+    paint_cursor (stage);
+}
+
+static void
+meta_stage_class_init (MetaStageClass *klass)
+{
+  ClutterActorClass *actor_class = (ClutterActorClass *) klass;
+  GObjectClass *object_class = (GObjectClass *) klass;
+
+  object_class->finalize = meta_stage_finalize;
+
+  actor_class->paint = meta_stage_paint;
+}
+
+static void
+meta_stage_init (MetaStage *stage)
+{
+  CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  priv->pipeline = cogl_pipeline_new (ctx);
+
+  clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), FALSE);
+}
+
+ClutterActor *
+meta_stage_new (void)
+{
+  return g_object_new (META_TYPE_STAGE,
+                       "cursor-visible", FALSE,
+                       NULL);
+}
+
+static void
+queue_redraw (MetaStage *stage)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+  cairo_rectangle_int_t clip;
+
+  /* Clear the location the cursor was at before, if we need to. */
+  if (priv->previous_is_valid)
+    {
+      clip.x = priv->previous_rect.x;
+      clip.y = priv->previous_rect.y;
+      clip.width = priv->previous_rect.width;
+      clip.height = priv->previous_rect.height;
+      clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
+      priv->previous_is_valid = FALSE;
+    }
+
+  /* And queue a redraw for the current cursor location. */
+  if (priv->cursor)
+    {
+      clip.x = priv->current_rect.x;
+      clip.y = priv->current_rect.y;
+      clip.width = priv->current_rect.width;
+      clip.height = priv->current_rect.height;
+      clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
+    }
+}
+
+void
+meta_stage_set_cursor (MetaStage           *stage,
+                       MetaCursorReference *cursor,
+                       MetaRectangle       *rect)
+{
+  MetaStagePrivate *priv = meta_stage_get_instance_private (stage);
+
+  if (priv->cursor != cursor)
+    {
+      priv->cursor = cursor;
+      update_pipeline (stage);
+    }
+
+  priv->current_rect = *rect;
+  queue_redraw (stage);
+}

src/compositor/meta-stage.h

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * 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_STAGE_H
+#define META_STAGE_H
+
+#include <clutter/clutter.h>
+
+#include "meta-cursor.h"
+#include <meta/boxes.h>
+
+G_BEGIN_DECLS
+
+#define META_TYPE_STAGE            (meta_stage_get_type ())
+#define META_STAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_STAGE, MetaStage))
+#define META_STAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_STAGE, MetaStageClass))
+#define META_IS_STAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_STAGE))
+#define META_IS_STAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_STAGE))
+#define META_STAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_STAGE, MetaStageClass))
+
+typedef struct _MetaStage      MetaStage;
+typedef struct _MetaStageClass MetaStageClass;
+
+struct _MetaStageClass
+{
+  ClutterStageClass parent_class;
+};
+
+struct _MetaStage
+{
+  ClutterStage parent;
+};
+
+GType             meta_stage_get_type                (void) G_GNUC_CONST;
+
+ClutterActor     *meta_stage_new                     (void);
+
+void meta_stage_set_cursor (MetaStage           *stage,
+                            MetaCursorReference *cursor,
+                            MetaRectangle       *rect);
+G_END_DECLS
+
+#endif /* META_STAGE_H */

src/compositor/meta-texture-tower.c

@@ -60,6 +60,7 @@ struct _MetaTextureTower
   CoglTexture *textures[MAX_TEXTURE_LEVELS];
   CoglOffscreen *fbos[MAX_TEXTURE_LEVELS];
   Box invalid[MAX_TEXTURE_LEVELS];
+  CoglPipeline *pipeline_template;
 };
 
 /**
@@ -91,6 +92,9 @@ meta_texture_tower_free (MetaTextureTower *tower)
 {
   g_return_if_fail (tower != NULL);
 
+  if (tower->pipeline_template != NULL)
+    cogl_object_unref (tower->pipeline_template);
+
   meta_texture_tower_set_base_texture (tower, NULL);
 
   g_slice_free (MetaTextureTower, tower);
@@ -373,7 +377,7 @@ texture_tower_create_texture (MetaTextureTower *tower,
   tower->invalid[level].y2 = height;
 }
 
-static gboolean
+static void
 texture_tower_revalidate_fbo (MetaTextureTower *tower,
                               int               level)
 {
@@ -384,174 +388,50 @@ texture_tower_revalidate_fbo (MetaTextureTower *tower,
   int dest_texture_width = cogl_texture_get_width (dest_texture);
   int dest_texture_height = cogl_texture_get_height (dest_texture);
   Box *invalid = &tower->invalid[level];
-  CoglMatrix modelview;
+  CoglFramebuffer *fb;
+  CoglError *catch_error = NULL;
+  CoglPipeline *pipeline;
 
   if (tower->fbos[level] == NULL)
-    tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);
+    tower->fbos[level] = cogl_offscreen_new_with_texture (dest_texture);
 
-  if (tower->fbos[level] == NULL)
-    return FALSE;
+  fb = COGL_FRAMEBUFFER (tower->fbos[level]);
 
-  cogl_push_framebuffer (COGL_FRAMEBUFFER (tower->fbos[level]));
-
-  cogl_ortho (0, dest_texture_width, dest_texture_height, 0, -1., 1.);
-
-  cogl_matrix_init_identity (&modelview);
-  cogl_set_modelview_matrix (&modelview);
-
-  cogl_set_source_texture (tower->textures[level - 1]);
-  cogl_rectangle_with_texture_coords (invalid->x1, invalid->y1,
-                                      invalid->x2, invalid->y2,
-                                      (2. * invalid->x1) / source_texture_width,
-                                      (2. * invalid->y1) / source_texture_height,
-                                      (2. * invalid->x2) / source_texture_width,
-                                      (2. * invalid->y2) / source_texture_height);
-
-  cogl_pop_framebuffer ();
-
-  return TRUE;
-}
-
-static void
-fill_copy (guchar       *buf,
-           const guchar *source,
-           int           width)
-{
-  memcpy (buf, source, width * 4);
-}
-
-static void
-fill_scale_down (guchar       *buf,
-                 const guchar *source,
-                 int           width)
-{
-  while (width > 1)
+  if (!cogl_framebuffer_allocate (fb, &catch_error))
     {
-      buf[0] = (source[0] + source[4]) / 2;
-      buf[1] = (source[1] + source[5]) / 2;
-      buf[2] = (source[2] + source[6]) / 2;
-      buf[3] = (source[3] + source[7]) / 2;
-
-      buf += 4;
-      source += 8;
-      width -= 2;
+      cogl_error_free (catch_error);
+      return;
     }
 
-  if (width > 0)
+  cogl_framebuffer_orthographic (fb, 0, 0, dest_texture_width, dest_texture_height, -1., 1.);
+
+  if (!tower->pipeline_template)
     {
-      buf[0] = source[0] / 2;
-      buf[1] = source[1] / 2;
-      buf[2] = source[2] / 2;
-      buf[3] = source[3] / 2;
-    }
-}
-
-static void
-texture_tower_revalidate_client (MetaTextureTower *tower,
-                                 int               level)
-{
-  CoglTexture *source_texture = tower->textures[level - 1];
-  int source_texture_width = cogl_texture_get_width (source_texture);
-  int source_texture_height = cogl_texture_get_height (source_texture);
-  guint source_rowstride;
-  guchar *source_data;
-  CoglTexture *dest_texture = tower->textures[level];
-  int dest_texture_width = cogl_texture_get_width (dest_texture);
-  int dest_texture_height = cogl_texture_get_height (dest_texture);
-  int dest_x = tower->invalid[level].x1;
-  int dest_y = tower->invalid[level].y1;
-  int dest_width = tower->invalid[level].x2 - tower->invalid[level].x1;
-  int dest_height = tower->invalid[level].y2 - tower->invalid[level].y1;
-  guchar *dest_data;
-  guchar *source_tmp1 = NULL, *source_tmp2 = NULL;
-  int i, j;
-
-  source_rowstride = source_texture_width * 4;
-
-  source_data = g_malloc (source_texture_height * source_rowstride);
-  cogl_texture_get_data (source_texture, TEXTURE_FORMAT, source_rowstride,
-                         source_data);
-
-  dest_data = g_malloc (dest_height * dest_width * 4);
-
-  if (dest_texture_height < source_texture_height)
-    {
-      source_tmp1 = g_malloc (dest_width * 4);
-      source_tmp2 = g_malloc (dest_width * 4);
+      CoglContext *ctx =
+        clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      tower->pipeline_template = cogl_pipeline_new (ctx);
+      cogl_pipeline_set_blend (tower->pipeline_template, "RGBA = ADD (SRC_COLOR, 0)", NULL);
     }
 
-  for (i = 0; i < dest_height; i++)
-    {
-      guchar *dest_row = dest_data + i * dest_width * 4;
-      if (dest_texture_height < source_texture_height)
-        {
-          guchar *source1, *source2;
-          guchar *dest;
+  pipeline = cogl_pipeline_copy (tower->pipeline_template);
+  cogl_pipeline_set_layer_texture (pipeline, 0, tower->textures[level - 1]);
 
-          if (dest_texture_width < source_texture_width)
-            {
-              fill_scale_down (source_tmp1,
-                               source_data + ((i + dest_y) * 2) * source_rowstride + dest_x * 2 * 4,
-                               dest_width * 2);
-              fill_scale_down (source_tmp2,
-                               source_data + ((i + dest_y) * 2 + 1) * source_rowstride + dest_x * 2 * 4,
-                               dest_width * 2);
-            }
-          else
-            {
-              fill_copy (source_tmp1,
-                         source_data + ((i + dest_y) * 2) * source_rowstride + dest_x * 4,
-                         dest_width);
-              fill_copy (source_tmp2,
-                         source_data + ((i + dest_y) * 2 + 1) * source_rowstride + dest_x * 4,
-                         dest_width);
-            }
+  cogl_framebuffer_draw_textured_rectangle (fb, pipeline,
+                                            invalid->x1, invalid->y1,
+                                            invalid->x2, invalid->y2,
+                                            (2. * invalid->x1) / source_texture_width,
+                                            (2. * invalid->y1) / source_texture_height,
+                                            (2. * invalid->x2) / source_texture_width,
+                                            (2. * invalid->y2) / source_texture_height);
 
-          source1 = source_tmp1;
-          source2 = source_tmp2;
-
-          dest = dest_row;
-          for (j = 0; j < dest_width * 4; j++)
-            *(dest++) = (*(source1++) + *(source2++)) / 2;
-        }
-      else
-        {
-          if (dest_texture_width < source_texture_width)
-            fill_scale_down (dest_row,
-                             source_data + (i + dest_y) * source_rowstride + dest_x * 2 * 4,
-                             dest_width * 2);
-          else
-            fill_copy (dest_row,
-                       source_data + (i + dest_y) * source_rowstride,
-                       dest_width);
-        }
-    }
-
-  cogl_texture_set_region (dest_texture,
-                           0, 0,
-                           dest_x, dest_y,
-                           dest_width, dest_height,
-                           dest_width, dest_height,
-                           TEXTURE_FORMAT,
-                           4 * dest_width,
-                           dest_data);
-
-  if (dest_texture_height < source_texture_height)
-    {
-      g_free (source_tmp1);
-      g_free (source_tmp2);
-    }
-
-  g_free (source_data);
-  g_free (dest_data);
+  cogl_object_unref (pipeline);
 }
 
 static void
 texture_tower_revalidate (MetaTextureTower *tower,
                           int               level)
 {
-  if (!texture_tower_revalidate_fbo (tower, level))
-    texture_tower_revalidate_client (tower, level);
+  texture_tower_revalidate_fbo (tower, level);
 }
 
 /**

src/compositor/meta-window-actor.c

@@ -702,7 +702,6 @@ static gboolean
 meta_window_actor_has_shadow (MetaWindowActor *self)
 {
   MetaWindowActorPrivate *priv = self->priv;
-  MetaWindowType window_type = meta_window_get_window_type (priv->window);
 
   if (priv->no_shadow)
     return FALSE;
@@ -741,25 +740,6 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
   if (priv->window->override_redirect)
     return TRUE;
 
-  /*
-   * Don't put shadow around DND icon windows
-   */
-  if (window_type == META_WINDOW_DND ||
-      window_type == META_WINDOW_DESKTOP)
-    return FALSE;
-
-  if (window_type == META_WINDOW_MENU
-#if 0
-      || window_type == META_WINDOW_DROPDOWN_MENU
-#endif
-      )
-    return TRUE;
-
-#if 0
-  if (window_type == META_WINDOW_TOOLTIP)
-    return TRUE;
-#endif
-
   return FALSE;
 }
 
@@ -875,6 +855,7 @@ queue_send_frame_messages_timeout (MetaWindowActor *self)
   * 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);
+  g_source_set_name_by_id (priv->send_frame_messages_timer, "[mutter] send_frame_messages_timeout");
 }
 
 void

src/compositor/plugins/default.c

@@ -34,7 +34,6 @@
 
 #define DESTROY_TIMEOUT   100
 #define MINIMIZE_TIMEOUT  250
-#define MAXIMIZE_TIMEOUT  250
 #define MAP_TIMEOUT       250
 #define SWITCH_TIMEOUT    500
 
@@ -77,18 +76,6 @@ static void map        (MetaPlugin      *plugin,
                         MetaWindowActor *actor);
 static void destroy    (MetaPlugin      *plugin,
                         MetaWindowActor *actor);
-static void maximize   (MetaPlugin      *plugin,
-                        MetaWindowActor *actor,
-                        gint             x,
-                        gint             y,
-                        gint             width,
-                        gint             height);
-static void unmaximize (MetaPlugin      *plugin,
-                        MetaWindowActor *actor,
-                        gint             x,
-                        gint             y,
-                        gint             width,
-                        gint             height);
 
 static void switch_workspace (MetaPlugin          *plugin,
                               gint                 from,
@@ -135,12 +122,8 @@ typedef struct _ActorPrivate
   ClutterActor *orig_parent;
 
   ClutterTimeline *tml_minimize;
-  ClutterTimeline *tml_maximize;
   ClutterTimeline *tml_destroy;
   ClutterTimeline *tml_map;
-
-  gboolean      is_minimized : 1;
-  gboolean      is_maximized : 1;
 } ActorPrivate;
 
 /* callback data for when animations complete */
@@ -216,8 +199,6 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
   plugin_class->start            = start;
   plugin_class->map              = map;
   plugin_class->minimize         = minimize;
-  plugin_class->maximize         = maximize;
-  plugin_class->unmaximize       = unmaximize;
   plugin_class->destroy          = destroy;
   plugin_class->switch_workspace = switch_workspace;
   plugin_class->show_tile_preview = show_tile_preview;
@@ -522,8 +503,6 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
       ActorPrivate *apriv = get_actor_private (window_actor);
 
-      apriv->is_minimized = TRUE;
-
       animation = clutter_actor_animate (actor,
                                          CLUTTER_EASE_IN_SINE,
                                          MINIMIZE_TIMEOUT,
@@ -544,115 +523,6 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
     meta_plugin_minimize_completed (plugin, window_actor);
 }
 
-/*
- * Minimize effect completion callback; this function restores actor state, and
- * calls the manager callback function.
- */
-static void
-on_maximize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
-{
-  /*
-   * Must reverse the effect of the effect.
-   */
-  MetaPlugin *plugin = data->plugin;
-  MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
-  ActorPrivate *apriv = get_actor_private (window_actor);
-
-  apriv->tml_maximize = NULL;
-
-  /* FIXME - don't assume the original scale was 1.0 */
-  clutter_actor_set_scale (data->actor, 1.0, 1.0);
-
-  /* Now notify the manager that we are done with this effect */
-  meta_plugin_maximize_completed (plugin, window_actor);
-
-  g_free (data);
-}
-
-/*
- * The Nature of Maximize operation is such that it is difficult to do a visual
- * effect that would work well. Scaling, the obvious effect, does not work that
- * well, because at the end of the effect we end up with window content bigger
- * and differently laid out than in the real window; this is a proof concept.
- *
- * (Something like a sound would be more appropriate.)
- */
-static void
-maximize (MetaPlugin *plugin,
-          MetaWindowActor *window_actor,
-          gint end_x, gint end_y, gint end_width, gint end_height)
-{
-  MetaWindowType type;
-  ClutterActor *actor = CLUTTER_ACTOR (window_actor);
-  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
-
-  gdouble  scale_x = 1.0;
-  gdouble  scale_y = 1.0;
-
-  type = meta_window_get_window_type (meta_window);
-
-  if (type == META_WINDOW_NORMAL)
-    {
-      ClutterAnimation *animation;
-      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
-      ActorPrivate *apriv = get_actor_private (window_actor);
-      gfloat width, height;
-      gfloat x, y;
-
-      apriv->is_maximized = TRUE;
-
-      clutter_actor_get_size (actor, &width, &height);
-      clutter_actor_get_position (actor, &x, &y);
-
-      /*
-       * Work out the scale and anchor point so that the window is expanding
-       * smoothly into the target size.
-       */
-      scale_x = (gdouble)end_width / (gdouble) width;
-      scale_y = (gdouble)end_height / (gdouble) height;
-
-      animation = clutter_actor_animate (actor,
-                                         CLUTTER_EASE_IN_SINE,
-                                         MAXIMIZE_TIMEOUT,
-                                         "scale-x", scale_x,
-                                         "scale-y", scale_y,
-                                         NULL);
-      apriv->tml_maximize = clutter_animation_get_timeline (animation);
-      data->plugin = plugin;
-      data->actor = actor;
-      g_signal_connect (apriv->tml_maximize, "completed",
-                        G_CALLBACK (on_maximize_effect_complete),
-                        data);
-      return;
-    }
-
-  meta_plugin_maximize_completed (plugin, window_actor);
-}
-
-/*
- * See comments on the maximize() function.
- *
- * (Just a skeleton code.)
- */
-static void
-unmaximize (MetaPlugin *plugin,
-            MetaWindowActor *window_actor,
-            gint end_x, gint end_y, gint end_width, gint end_height)
-{
-  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
-  MetaWindowType type = meta_window_get_window_type (meta_window);
-
-  if (type == META_WINDOW_NORMAL)
-    {
-      ActorPrivate *apriv = get_actor_private (window_actor);
-
-      apriv->is_maximized = FALSE;
-    }
-
-  /* Do this conditionally, if the effect requires completion callback. */
-  meta_plugin_unmaximize_completed (plugin, window_actor);
-}
-
 static void
 on_map_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
 {
@@ -708,9 +578,6 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)
       g_signal_connect (apriv->tml_map, "completed",
                         G_CALLBACK (on_map_effect_complete),
                         data);
-
-      apriv->is_minimized = FALSE;
-
     }
   else
     meta_plugin_map_completed (plugin, window_actor);
@@ -871,12 +738,6 @@ kill_window_effects (MetaPlugin      *plugin,
       g_signal_emit_by_name (apriv->tml_minimize, "completed", NULL);
     }
 
-  if (apriv->tml_maximize)
-    {
-      clutter_timeline_stop (apriv->tml_maximize);
-      g_signal_emit_by_name (apriv->tml_maximize, "completed", NULL);
-    }
-
   if (apriv->tml_map)
     {
       clutter_timeline_stop (apriv->tml_map);

src/core/above-tab-keycode.c

@@ -1,241 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Find the keycode for the key above the tab key */
-/*
- * Copyright 2010 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/* The standard cycle-windows keybinding should be the key above the
- * tab key. This will have a different keysym on different keyboards -
- * it's the ` (grave) key on US keyboards but something else on many
- * other national layouts. So we need to figure out the keycode for
- * this key without reference to key symbol.
- *
- * The "correct" way to do this is to get the XKB geometry from the
- * X server, find the Tab key, find the key above the Tab key in the
- * same section and use the keycode for that key. This is what I
- * implemented here, but unfortunately, fetching the geometry is rather
- * slow (It could take 20ms or more.)
- *
- * If you looking for a way to optimize Mutter startup performance:
- * On all Linux systems using evdev the key above TAB will have
- * keycode 49. (KEY_GRAVE=41 + the 8 code point offset between
- * evdev keysyms and X keysyms.) So a configure option
- * --with-above-tab-keycode=49 could be added that bypassed this
- * code. It wouldn't work right for displaying Mutter remotely
- * to a non-Linux X server, but that is pretty rare.
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "display-private.h"
-
-#include <X11/keysym.h>
-
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
-
-static guint
-compute_above_tab_keycode (Display *xdisplay)
-{
-  XkbDescPtr keyboard;
-  XkbGeometryPtr geometry;
-  int i, j, k;
-  int tab_keycode;
-  char *tab_name;
-  XkbSectionPtr tab_section;
-  XkbBoundsRec tab_bounds;
-  XkbKeyPtr best_key = NULL;
-  guint best_keycode = (guint)-1;
-  int best_x_dist = G_MAXINT;
-  int best_y_dist = G_MAXINT;
-
-  /* We need only the Names and the Geometry, but asking for these results
-   * in the Keyboard information retrieval failing for unknown reasons.
-   * (Testing with xorg-1.9.1.) So we ask for a part that we don't need
-   * as well.
-   */
-  keyboard = XkbGetKeyboard (xdisplay,
-                             XkbGBN_ClientSymbolsMask | XkbGBN_KeyNamesMask | XkbGBN_GeometryMask,
-                             XkbUseCoreKbd);
-  if (!keyboard)
-    return best_keycode;
-
-  geometry = keyboard->geom;
-
-  /* There could potentially be multiple keys with the Tab keysym on the keyboard;
-   * but XKeysymToKeycode() returns us the one that the alt-Tab binding will
-   * use which is good enough
-   */
-  tab_keycode = XKeysymToKeycode (xdisplay, XK_Tab);
-  if (tab_keycode == 0 || tab_keycode < keyboard->min_key_code || tab_keycode > keyboard->max_key_code)
-    goto out;
-
-  /* The keyboard geometry is stored by key "name" rather than keycode.
-   * (Key names are 4-character strings like like TAB or AE01.) We use the
-   * 'names' part of the keyboard description to map keycode to key name.
-   *
-   * XKB has a "key aliases" feature where a single keyboard key can have
-   * multiple names (with separate sets of aliases in the 'names' part and
-   * in the 'geometry' part), but I don't really understand it or how it is used,
-   * so I'm ignoring it here.
-   */
-
-  tab_name = keyboard->names->keys[tab_keycode].name; /* Not NULL terminated! */
-
-  /* First, iterate through the keyboard geometry to find the tab key; the keyboard
-   * geometry has a three-level heirarchy of section > row > key
-   */
-  for (i = 0; i < geometry->num_sections; i++)
-    {
-      XkbSectionPtr section = &geometry->sections[i];
-      for (j = 0; j < section->num_rows; j++)
-        {
-          int x = 0;
-          int y = 0;
-
-          XkbRowPtr row = &section->rows[j];
-          for (k = 0; k < row->num_keys; k++)
-            {
-              XkbKeyPtr key = &row->keys[k];
-              XkbShapePtr shape = XkbKeyShape (geometry, key);
-
-              if (row->vertical)
-                y += key->gap;
-              else
-                x += key->gap;
-
-              if (strncmp (key->name.name, tab_name, XkbKeyNameLength) == 0)
-                {
-                  tab_section = section;
-                  tab_bounds = shape->bounds;
-                  tab_bounds.x1 += row->left + x;
-                  tab_bounds.x2 += row->left + x;
-                  tab_bounds.y1 += row->top + y;
-                  tab_bounds.y2 += row->top + y;
-
-                  goto found_tab;
-                }
-
-              if (row->vertical)
-                y += (shape->bounds.y2 - shape->bounds.y1);
-              else
-                x += (shape->bounds.x2 - shape->bounds.x1);
-            }
-        }
-    }
-
-  /* No tab key found */
-  goto out;
-
- found_tab:
-
-  /* Now find the key that:
-   *  - Is in the same section as the Tab key
-   *  - Has a horizontal center in the Tab key's horizonal bounds
-   *  - Is above the Tab key at a distance closer than any other key
-   *  - In case of ties, has its horizontal center as close as possible
-   *    to the Tab key's horizontal center
-   */
-  for (j = 0; j < tab_section->num_rows; j++)
-    {
-      int x = 0;
-      int y = 0;
-
-      XkbRowPtr row = &tab_section->rows[j];
-      for (k = 0; k < row->num_keys; k++)
-        {
-          XkbKeyPtr key = &row->keys[k];
-          XkbShapePtr shape = XkbKeyShape(geometry, key);
-          XkbBoundsRec bounds = shape->bounds;
-          int x_center;
-          int x_dist, y_dist;
-
-          if (row->vertical)
-            y += key->gap;
-          else
-            x += key->gap;
-
-          bounds.x1 += row->left + x;
-          bounds.x2 += row->left + x;
-          bounds.y1 += row->top + y;
-          bounds.y2 += row->top + y;
-
-          y_dist = tab_bounds.y1 - bounds.y2;
-          if (y_dist < 0)
-            continue;
-
-          x_center = (bounds.x1 + bounds.x2) / 2;
-          if (x_center < tab_bounds.x1 || x_center > tab_bounds.x2)
-            continue;
-
-          x_dist = ABS (x_center - (tab_bounds.x1 + tab_bounds.x2) / 2);
-
-          if (y_dist < best_y_dist ||
-              (y_dist == best_y_dist && x_dist < best_x_dist))
-            {
-              best_key = key;
-              best_x_dist = x_dist;
-              best_y_dist = y_dist;
-             }
-
-          if (row->vertical)
-            y += (shape->bounds.y2 - shape->bounds.y1);
-          else
-            x += (shape->bounds.x2 - shape->bounds.x1);
-        }
-    }
-
-  if (best_key == NULL)
-    goto out;
-
-  /* Now we need to resolve the name of the best key back to a keycode */
-  for (i = keyboard->min_key_code; i < keyboard->max_key_code; i++)
-    {
-      if (strncmp (best_key->name.name, keyboard->names->keys[i].name, XkbKeyNameLength) == 0)
-        {
-          best_keycode = i;
-          break;
-        }
-    }
-
- out:
-  XkbFreeKeyboard (keyboard, 0, True);
-
-  return best_keycode;
-}
-#else /* !HAVE_XKB */
-static guint
-compute_above_tab_keycode (Display *xdisplay)
-{
-  return XKeysymToKeycode (xdisplay, XK_grave);
-}
-#endif /* HAVE_XKB */
-
-guint
-meta_display_get_above_tab_keycode (MetaDisplay *display)
-{
-  if (display->above_tab_keycode == 0) /* not yet computed */
-    display->above_tab_keycode = compute_above_tab_keycode (display->xdisplay);
-
-  if (display->above_tab_keycode == (guint)-1) /* failed to compute */
-    return 0;
-  else
-    return display->above_tab_keycode;
-}

src/core/bell.c

@@ -120,6 +120,7 @@ bell_unflash_frame (gpointer data)
 static void
 bell_flash_window_frame (MetaWindow *window)
 {
+  guint id;
   g_assert (window->frame != NULL);
   window->frame->is_flashing = 1;
   meta_frame_queue_draw (window->frame);
@@ -128,8 +129,9 @@ bell_flash_window_frame (MetaWindow *window)
    * we are guaranteed to get at least one frame drawn in the
    * flashed state, no matter how loaded we are.
    */
-  g_timeout_add_full (META_PRIORITY_REDRAW, 100,
-      bell_unflash_frame, window->frame, NULL);
+  id = g_timeout_add_full (META_PRIORITY_REDRAW, 100,
+        bell_unflash_frame, window->frame, NULL);
+  g_source_set_name_by_id (id, "[mutter] bell_unflash_frame");
 }
 
 /**

src/core/constraints.c

@@ -199,14 +199,6 @@ static void place_window_if_needed       (MetaWindow     *window,
                                           ConstraintInfo *info);
 static void update_onscreen_requirements (MetaWindow     *window,
                                           ConstraintInfo *info);
-static void extend_by_frame              (MetaWindow     *window,
-                                          MetaRectangle  *rect);
-static void unextend_by_frame            (MetaWindow     *window,
-                                          MetaRectangle  *rect);
-static inline void get_size_limits       (MetaWindow    *window,
-                                          gboolean       include_frame,
-                                          MetaRectangle *min_size,
-                                          MetaRectangle *max_size);
 
 typedef gboolean (* ConstraintFunc) (MetaWindow         *window,
                                      ConstraintInfo     *info,
@@ -500,7 +492,6 @@ place_window_if_needed(MetaWindow     *window,
       meta_window_get_frame_rect (window, &placed_rect);
 
       orig_rect = info->orig;
-      extend_by_frame (window, &orig_rect);
 
       meta_window_place (window, orig_rect.x, orig_rect.y,
                          &placed_rect.x, &placed_rect.y);
@@ -622,11 +613,6 @@ update_onscreen_requirements (MetaWindow     *window,
    * problematic case but this may need to be revisited.
    */
 
-  /* The require onscreen/on-single-monitor and titlebar_visible
-   * stuff is relative to the outer window, not the inner
-   */
-  extend_by_frame (window, &info->current);
-
   /* Update whether we want future constraint runs to require the
    * window to be on fully onscreen.
    */
@@ -675,28 +661,10 @@ update_onscreen_requirements (MetaWindow     *window,
                     window->desc,
                     window->require_titlebar_visible ? "TRUE" : "FALSE");
     }
-
-  /* Don't forget to restore the position of the window */
-  unextend_by_frame (window, &info->current);
-}
-
-static void
-extend_by_frame (MetaWindow    *window,
-                 MetaRectangle *rect)
-{
-  meta_window_client_rect_to_frame_rect (window, rect, rect);
-}
-
-static void
-unextend_by_frame (MetaWindow    *window,
-                   MetaRectangle *rect)
-{
-  meta_window_frame_rect_to_client_rect (window, rect, rect);
 }
 
 static inline void
 get_size_limits (MetaWindow    *window,
-                 gboolean       include_frame,
                  MetaRectangle *min_size,
                  MetaRectangle *max_size)
 {
@@ -709,11 +677,8 @@ get_size_limits (MetaWindow    *window,
   max_size->width  = window->size_hints.max_width;
   max_size->height = window->size_hints.max_height;
 
-  if (include_frame)
-    {
-      meta_window_client_rect_to_frame_rect (window, min_size, min_size);
-      meta_window_client_rect_to_frame_rect (window, max_size, max_size);
-    }
+  meta_window_client_rect_to_frame_rect (window, min_size, min_size);
+  meta_window_client_rect_to_frame_rect (window, max_size, max_size);
 }
 
 static gboolean
@@ -737,13 +702,11 @@ constrain_modal_dialog (MetaWindow         *window,
   */
 
   child_rect = info->current;
-  extend_by_frame (window, &child_rect);
 
   meta_window_get_frame_rect (parent, &parent_rect);
 
   child_rect.x = parent_rect.x + (parent_rect.width / 2  - child_rect.width / 2);
   child_rect.y = parent_rect.y + (parent_rect.height / 2 - child_rect.height / 2);
-  unextend_by_frame (window, &child_rect);
   x = child_rect.x;
   y = child_rect.y;
 
@@ -810,19 +773,16 @@ constrain_maximization (MetaWindow         *window,
       active_workspace_struts = window->screen->active_workspace->all_struts;
 
       target_size = info->current;
-      extend_by_frame (window, &target_size);
       meta_rectangle_expand_to_avoiding_struts (&target_size,
                                                 &info->entire_monitor,
                                                 direction,
                                                 active_workspace_struts);
    }
-  /* Now make target_size = maximized size of client window */
-  unextend_by_frame (window, &target_size);
 
   /* Check min size constraints; max size constraints are ignored for maximized
    * windows, as per bug 327543.
    */
-  get_size_limits (window, FALSE, &min_size, &max_size);
+  get_size_limits (window, &min_size, &max_size);
   hminbad = target_size.width < min_size.width && window->maximized_horizontally;
   vminbad = target_size.height < min_size.height && window->maximized_vertically;
   if (hminbad || vminbad)
@@ -876,12 +836,11 @@ constrain_tiling (MetaWindow         *window,
    * use an external function for the actual calculation
    */
   meta_window_get_current_tile_area (window, &target_size);
-  unextend_by_frame (window, &target_size);
 
   /* Check min size constraints; max size constraints are ignored as for
    * maximized windows.
    */
-  get_size_limits (window, FALSE, &min_size, &max_size);
+  get_size_limits (window, &min_size, &max_size);
   hminbad = target_size.width < min_size.width;
   vminbad = target_size.height < min_size.height;
   if (hminbad || vminbad)
@@ -924,7 +883,7 @@ constrain_fullscreen (MetaWindow         *window,
 
   monitor = info->entire_monitor;
 
-  get_size_limits (window, FALSE, &min_size, &max_size);
+  get_size_limits (window, &min_size, &max_size);
   too_big =   !meta_rectangle_could_fit_rect (&monitor, &min_size);
   too_small = !meta_rectangle_could_fit_rect (&max_size, &monitor);
   if (too_big || too_small)
@@ -1033,7 +992,7 @@ constrain_size_limits (MetaWindow         *window,
     return TRUE;
 
   /* Determine whether constraint is already satisfied; exit if it is */
-  get_size_limits (window, FALSE, &min_size, &max_size);
+  get_size_limits (window, &min_size, &max_size);
   /* We ignore max-size limits for maximized windows; see #327543 */
   if (window->maximized_horizontally)
     max_size.width = MAX (max_size.width, info->current.width);
@@ -1225,8 +1184,7 @@ do_screen_and_monitor_relative_constraints (
 
   /* Determine whether constraint applies; exit if it doesn't */
   how_far_it_can_be_smushed = info->current;
-  get_size_limits (window, TRUE, &min_size, &max_size);
-  extend_by_frame (window, &info->current);
+  get_size_limits (window, &min_size, &max_size);
 
   if (info->action_type != ACTION_MOVE)
     {
@@ -1245,10 +1203,7 @@ do_screen_and_monitor_relative_constraints (
     meta_rectangle_contained_in_region (region_spanning_rectangles,
                                         &info->current);
   if (exit_early || constraint_satisfied || check_only)
-    {
-      unextend_by_frame (window, &info->current);
-      return constraint_satisfied;
-    }
+    return constraint_satisfied;
 
   /* Enforce constraint */
 
@@ -1270,7 +1225,6 @@ do_screen_and_monitor_relative_constraints (
                                       info->fixed_directions,
                                       &info->current);
 
-  unextend_by_frame (window, &info->current);
   return TRUE;
 }
 

src/core/core.c

@@ -261,45 +261,6 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
                                        timestamp);
 }
 
-void
-meta_core_lower_beneath_grab_window (Display *xdisplay,
-                                     Window   xwindow,
-                                     guint32  timestamp)
-{
-  XWindowChanges changes;
-  MetaDisplay *display;
-  MetaScreen *screen;
-  MetaWindow *grab_window;
-  MetaStackWindow stack_window;
-  MetaStackWindow stack_sibling;
-
-  display = meta_display_for_x_display (xdisplay);
-  screen = display->screen;
-  grab_window = display->grab_window;
-
-  if (grab_window == NULL)
-    return;
-
-  changes.stack_mode = Below;
-  changes.sibling = meta_window_get_toplevel_xwindow (grab_window);
-
-  stack_window.any.type = META_WINDOW_CLIENT_TYPE_X11;
-  stack_window.x11.xwindow = xwindow;
-  stack_sibling.any.type = META_WINDOW_CLIENT_TYPE_X11;
-  stack_sibling.x11.xwindow = changes.sibling;
-  meta_stack_tracker_record_lower_below (screen->stack_tracker,
-                                         &stack_window,
-                                         &stack_sibling,
-                                         XNextRequest (screen->display->xdisplay));
-
-  meta_error_trap_push (display);
-  XConfigureWindow (xdisplay,
-                    xwindow,
-                    CWSibling | CWStackMode,
-                    &changes);
-  meta_error_trap_pop (display);
-}
-
 void
 meta_core_user_focus (Display *xdisplay,
                       Window   frame_xwindow,
@@ -659,36 +620,6 @@ meta_core_get_grab_op (Display *xdisplay)
   return display->grab_op;
 }
 
-Window
-meta_core_get_grab_frame (Display *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  g_assert (display != NULL);
-  
-  if (display->grab_op != META_GRAB_OP_NONE &&
-      display->grab_window &&
-      display->grab_window->frame)
-    return display->grab_window->frame->xwindow;
-  else
-    return None;
-}
-
-int
-meta_core_get_grab_button (Display  *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  if (display->grab_op == META_GRAB_OP_NONE)
-    return -1;
-  
-  return display->grab_button;
-}
-
 void
 meta_core_grab_buttons  (Display *xdisplay,
                          Window   frame_xwindow)

src/core/core.h

@@ -114,10 +114,6 @@ void meta_core_user_focus   (Display *xdisplay,
                              Window   frame_xwindow,
                              guint32  timestamp);
 
-void meta_core_lower_beneath_grab_window (Display *xdisplay,
-                                          Window   xwindow,
-                                          guint32  timestamp);
-
 void meta_core_minimize         (Display *xdisplay,
                                  Window   frame_xwindow);
 void meta_core_toggle_maximize  (Display *xdisplay,
@@ -182,8 +178,6 @@ gboolean   meta_core_begin_grab_op (Display    *xdisplay,
 void       meta_core_end_grab_op   (Display    *xdisplay,
                                     guint32     timestamp);
 MetaGrabOp meta_core_get_grab_op     (Display    *xdisplay);
-Window     meta_core_get_grab_frame  (Display   *xdisplay);
-int        meta_core_get_grab_button (Display  *xdisplay);
 
 
 void       meta_core_grab_buttons  (Display *xdisplay,

src/core/display-private.h

@@ -43,9 +43,7 @@
 #include <libsn/sn.h>
 #endif
 
-#ifdef HAVE_XSYNC
 #include <X11/extensions/sync.h>
-#endif
 
 typedef struct _MetaStack      MetaStack;
 typedef struct _MetaUISlave    MetaUISlave;
@@ -147,13 +145,10 @@ struct _MetaDisplay
   guint focused_by_us : 1;
   
   /*< private-ish >*/
-  guint error_trap_synced_at_last_pop : 1;
   MetaScreen *screen;
   GHashTable *xids;
   GHashTable *wayland_windows;
-  int error_traps;
-  int (* error_trap_handler) (Display     *display,
-                              XErrorEvent *error);  
+
   int server_grab_count;
 
   /* serials of leave/unmap events that may
@@ -199,7 +194,6 @@ struct _MetaDisplay
   int           grab_tile_monitor_number;
   int         grab_latest_motion_x;
   int         grab_latest_motion_y;
-  gulong      grab_mask;
   guint       grab_have_pointer : 1;
   guint       grab_have_keyboard : 1;
   guint       grab_frame_action : 1;
@@ -209,9 +203,7 @@ struct _MetaDisplay
   MetaRectangle grab_initial_window_pos;
   int         grab_initial_x, grab_initial_y;  /* These are only relevant for */
   gboolean    grab_threshold_movement_reached; /* raise_on_click == FALSE.    */
-  MetaResizePopup *grab_resize_popup;
   GTimeVal    grab_last_moveresize_time;
-  GList*      grab_old_window_stacking;
   MetaEdgeResistanceData *grab_edge_resistance_data;
   unsigned int grab_last_user_action_was_snap;
   guint32     grab_timestamp;
@@ -234,11 +226,7 @@ struct _MetaDisplay
   int             max_keycode;
   KeySym *keymap;
   int keysyms_per_keycode;
-  XModifierKeymap *modmap;
-  unsigned int above_tab_keycode;
   unsigned int ignored_modifier_mask;
-  unsigned int num_lock_mask;
-  unsigned int scroll_lock_mask;
   unsigned int hyper_mask;
   unsigned int super_mask;
   unsigned int meta_mask;
@@ -274,9 +262,6 @@ struct _MetaDisplay
   /* Managed by compositor.c */
   MetaCompositor *compositor;
 
-  int render_event_base;
-  int render_error_base;
-
   int composite_event_base;
   int composite_error_base;
   int composite_major_version;
@@ -292,28 +277,14 @@ struct _MetaDisplay
 #ifdef HAVE_STARTUP_NOTIFICATION
   SnDisplay *sn_display;
 #endif
-#ifdef HAVE_XSYNC
   int xsync_event_base;
   int xsync_error_base;
-#endif
-#ifdef HAVE_SHAPE
   int shape_event_base;
   int shape_error_base;
-#endif
-#ifdef HAVE_XSYNC
   unsigned int have_xsync : 1;
 #define META_DISPLAY_HAS_XSYNC(display) ((display)->have_xsync)
-#else
-#define META_DISPLAY_HAS_XSYNC(display) FALSE
-#endif
-#ifdef HAVE_SHAPE
   unsigned int have_shape : 1;
 #define META_DISPLAY_HAS_SHAPE(display) ((display)->have_shape)
-#else
-#define META_DISPLAY_HAS_SHAPE(display) FALSE
-#endif
-  unsigned int have_render : 1;
-#define META_DISPLAY_HAS_RENDER(display) ((display)->have_render)
   unsigned int have_composite : 1;
   unsigned int have_damage : 1;
 #define META_DISPLAY_HAS_COMPOSITE(display) ((display)->have_composite)
@@ -376,7 +347,6 @@ void        meta_display_register_wayland_window   (MetaDisplay *display,
 void        meta_display_unregister_wayland_window (MetaDisplay *display,
                                                     MetaWindow  *window);
 
-#ifdef HAVE_XSYNC
 MetaWindow* meta_display_lookup_sync_alarm     (MetaDisplay *display,
                                                 XSyncAlarm   alarm);
 void        meta_display_register_sync_alarm   (MetaDisplay *display,
@@ -384,7 +354,6 @@ void        meta_display_register_sync_alarm   (MetaDisplay *display,
                                                 MetaWindow  *window);
 void        meta_display_unregister_sync_alarm (MetaDisplay *display,
                                                 XSyncAlarm   alarm);
-#endif /* HAVE_XSYNC */
 
 void        meta_display_notify_window_created (MetaDisplay  *display,
                                                 MetaWindow   *window);
@@ -399,9 +368,7 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
                                              MetaCursor   cursor);
 
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
-                                          MetaScreen  *screen,
                                           MetaGrabOp   op,
-                                          Window       grab_xwindow,
                                           guint32      timestamp);
 
 void    meta_display_check_threshold_reached (MetaDisplay *display,
@@ -432,9 +399,6 @@ const char* meta_event_detail_to_string (int d);
 void meta_display_queue_retheme_all_windows (MetaDisplay *display);
 void meta_display_retheme_all (void);
 
-void meta_display_set_cursor_theme (const char *theme, 
-				    int         size);
-
 void meta_display_ping_window      (MetaWindow         *window,
                                     guint32             timestamp,
                                     MetaWindowPingFunc  ping_reply_func,
@@ -447,10 +411,10 @@ int meta_resize_gravity_from_grab_op (MetaGrabOp op);
 
 gboolean meta_grab_op_is_moving   (MetaGrabOp op);
 gboolean meta_grab_op_is_resizing (MetaGrabOp op);
+gboolean meta_grab_op_is_moving_or_resizing (MetaGrabOp op);
 gboolean meta_grab_op_is_mouse    (MetaGrabOp op);
-gboolean meta_grab_op_is_clicking (MetaGrabOp op);
-gboolean meta_grab_op_is_wayland  (MetaGrabOp op);
 gboolean meta_grab_op_is_keyboard (MetaGrabOp op);
+gboolean meta_grab_op_should_block_wayland (MetaGrabOp op);
 
 void meta_display_devirtualize_modifiers (MetaDisplay        *display,
                                           MetaVirtualModifier modifiers,
@@ -470,9 +434,6 @@ void meta_display_accelerator_activate (MetaDisplay     *display,
                                         ClutterKeyEvent *event);
 gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
 
-/* In above-tab-keycode.c */
-guint meta_display_get_above_tab_keycode (MetaDisplay *display);
-
 #ifdef HAVE_XI23
 gboolean meta_display_process_barrier_event (MetaDisplay *display,
                                              XIEvent     *event);

src/core/display.c

@@ -41,7 +41,6 @@
 #include <meta/errors.h>
 #include "keybindings-private.h"
 #include <meta/prefs.h>
-#include "resizepopup.h"
 #include "workspace-private.h"
 #include "bell.h"
 #include <meta/compositor.h>
@@ -50,15 +49,14 @@
 #include "mutter-enum-types.h"
 #include "meta-idle-monitor-dbus.h"
 #include "meta-cursor-tracker-private.h"
+#include "meta-backend.h"
+#include "backends/x11/meta-backend-x11.h"
 
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
-#ifdef HAVE_SHAPE
 #include <X11/extensions/shape.h>
-#endif
 #include <X11/Xcursor/Xcursor.h>
-#include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xfixes.h>
@@ -145,10 +143,12 @@ static MetaDisplay *the_display = NULL;
 static const char *gnome_wm_keybindings = "Mutter";
 static const char *net_wm_name = "Mutter";
 
+static void update_cursor_theme (void);
 static void    update_window_grab_modifiers (MetaDisplay *display);
 
 static void    prefs_changed_callback    (MetaPreference pref,
                                           void          *data);
+
 static void
 meta_display_get_property(GObject         *object,
                           guint            prop_id,
@@ -363,12 +363,10 @@ static void
 enable_compositor (MetaDisplay *display)
 {
   if (!META_DISPLAY_HAS_COMPOSITE (display) ||
-      !META_DISPLAY_HAS_DAMAGE (display) ||
-      !META_DISPLAY_HAS_RENDER (display))
+      !META_DISPLAY_HAS_DAMAGE (display))
     {
       meta_warning ("Missing %s extension required for compositing",
-                    !META_DISPLAY_HAS_COMPOSITE (display) ? "composite" :
-                    !META_DISPLAY_HAS_DAMAGE (display) ? "damage" : "render");
+                    !META_DISPLAY_HAS_COMPOSITE (display) ? "composite" : "damage");
       return;
     }
 
@@ -472,9 +470,6 @@ meta_display_open (void)
    */
   the_display->name = g_strdup (XDisplayName (NULL));
   the_display->xdisplay = xdisplay;
-  the_display->error_trap_synced_at_last_pop = TRUE;
-  the_display->error_traps = 0;
-  the_display->error_trap_handler = NULL;
   the_display->server_grab_count = 0;
   the_display->display_opening = TRUE;
 
@@ -485,7 +480,6 @@ meta_display_open (void)
   the_display->focus_serial = 0;
   the_display->server_focus_window = None;
   the_display->server_focus_serial = 0;
-  the_display->grab_old_window_stacking = NULL;
 
   the_display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */
   the_display->allow_terminal_deactivation = TRUE; /* Only relevant for when a
@@ -562,13 +556,11 @@ meta_display_open (void)
 
   the_display->grab_op = META_GRAB_OP_NONE;
   the_display->grab_window = NULL;
-  the_display->grab_resize_popup = NULL;
   the_display->grab_tile_mode = META_TILE_NONE;
   the_display->grab_tile_monitor_number = -1;
 
   the_display->grab_edge_resistance_data = NULL;
 
-#ifdef HAVE_XSYNC
   {
     int major, minor;
 
@@ -601,12 +593,7 @@ meta_display_open (void)
                   the_display->xsync_error_base,
                   the_display->xsync_event_base);
   }
-#else  /* HAVE_XSYNC */
-  meta_verbose ("Not compiled with Xsync support\n");
-#endif /* !HAVE_XSYNC */
 
-
-#ifdef HAVE_SHAPE
   {
     the_display->have_shape = FALSE;
     
@@ -627,30 +614,6 @@ meta_display_open (void)
                   the_display->shape_error_base,
                   the_display->shape_event_base);
   }
-#else  /* HAVE_SHAPE */
-  meta_verbose ("Not compiled with Shape support\n");
-#endif /* !HAVE_SHAPE */
-
-  {
-    the_display->have_render = FALSE;
-    
-    the_display->render_error_base = 0;
-    the_display->render_event_base = 0;
-    
-    if (!XRenderQueryExtension (the_display->xdisplay,
-                                &the_display->render_event_base,
-                                &the_display->render_error_base))
-      {
-        the_display->render_error_base = 0;
-        the_display->render_event_base = 0;
-      }
-    else
-      the_display->have_render = TRUE;
-    
-    meta_verbose ("Attempted to init Render, found error base %d event base %d\n",
-                  the_display->render_error_base,
-                  the_display->render_event_base);
-  }
 
   {
     the_display->have_composite = FALSE;
@@ -759,10 +722,7 @@ meta_display_open (void)
       meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
   }
 
-  {
-    XcursorSetTheme (the_display->xdisplay, meta_prefs_get_cursor_theme ());
-    XcursorSetDefaultSize (the_display->xdisplay, meta_prefs_get_cursor_size ());
-  }
+  update_cursor_theme ();
 
   /* Create the leader window here. Set its properties and
    * use the timestamp from one of the PropertyNotify events
@@ -1016,9 +976,6 @@ meta_display_close (MetaDisplay *display,
       return;
     }
 
-  if (display->error_traps > 0)
-    meta_bug ("Display closed with error traps pending\n");
-
   display->closing += 1;
 
   meta_prefs_remove_listener (prefs_changed_callback, display);
@@ -1029,9 +986,6 @@ meta_display_close (MetaDisplay *display,
     g_source_remove (display->focus_timeout_id);
   display->focus_timeout_id = 0;
 
-  if (display->grab_old_window_stacking)
-    g_list_free (display->grab_old_window_stacking);
-
   /* Stop caring about events */
   meta_display_free_events (display);
   
@@ -1154,27 +1108,6 @@ meta_get_display (void)
   return the_display;
 }
 
-static gboolean
-grab_op_is_mouse_only (MetaGrabOp op)
-{
-  switch (op)
-    {
-    case META_GRAB_OP_MOVING:
-    case META_GRAB_OP_RESIZING_SE:
-    case META_GRAB_OP_RESIZING_S:      
-    case META_GRAB_OP_RESIZING_SW:      
-    case META_GRAB_OP_RESIZING_N:
-    case META_GRAB_OP_RESIZING_NE:
-    case META_GRAB_OP_RESIZING_NW:
-    case META_GRAB_OP_RESIZING_W:
-    case META_GRAB_OP_RESIZING_E:
-      return TRUE;
-
-    default:
-      return FALSE;
-    }
-}
-
 gboolean
 meta_grab_op_is_mouse (MetaGrabOp op)
 {
@@ -1189,17 +1122,6 @@ meta_grab_op_is_mouse (MetaGrabOp op)
     case META_GRAB_OP_RESIZING_NW:
     case META_GRAB_OP_RESIZING_W:
     case META_GRAB_OP_RESIZING_E:
-    case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
-    case META_GRAB_OP_KEYBOARD_RESIZING_S:
-    case META_GRAB_OP_KEYBOARD_RESIZING_N:
-    case META_GRAB_OP_KEYBOARD_RESIZING_W:
-    case META_GRAB_OP_KEYBOARD_RESIZING_E:
-    case META_GRAB_OP_KEYBOARD_RESIZING_SE:
-    case META_GRAB_OP_KEYBOARD_RESIZING_NE:
-    case META_GRAB_OP_KEYBOARD_RESIZING_SW:
-    case META_GRAB_OP_KEYBOARD_RESIZING_NW:
-    case META_GRAB_OP_KEYBOARD_MOVING:
-    case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
     default:
@@ -1222,7 +1144,6 @@ meta_grab_op_is_keyboard (MetaGrabOp op)
     case META_GRAB_OP_KEYBOARD_RESIZING_NE:
     case META_GRAB_OP_KEYBOARD_RESIZING_SW:
     case META_GRAB_OP_KEYBOARD_RESIZING_NW:
-    case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
     default:
@@ -1274,32 +1195,31 @@ meta_grab_op_is_moving (MetaGrabOp op)
 }
 
 gboolean
-meta_grab_op_is_clicking (MetaGrabOp grab_op)
+meta_grab_op_is_moving_or_resizing (MetaGrabOp op)
 {
-  switch (grab_op)
-    {
-    case META_GRAB_OP_CLICKING_MINIMIZE:
-    case META_GRAB_OP_CLICKING_MAXIMIZE:
-    case META_GRAB_OP_CLICKING_UNMAXIMIZE:
-    case META_GRAB_OP_CLICKING_DELETE:
-    case META_GRAB_OP_CLICKING_MENU:
-    case META_GRAB_OP_CLICKING_SHADE:
-    case META_GRAB_OP_CLICKING_UNSHADE:
-    case META_GRAB_OP_CLICKING_ABOVE:
-    case META_GRAB_OP_CLICKING_UNABOVE:
-    case META_GRAB_OP_CLICKING_STICK:
-    case META_GRAB_OP_CLICKING_UNSTICK:
-      return TRUE;
-
-    default:
-      return FALSE;
-    }
+  return (meta_grab_op_is_moving (op) ||
+          meta_grab_op_is_resizing (op));
 }
 
+/**
+ * meta_grab_op_should_block_wayland:
+ * @op: A #MetaGrabOp
+ *
+ * Starting a grab with one of these grab operations means
+ * that we will remove key / pointer focus from the current
+ * Wayland focus.
+ */
 gboolean
-meta_grab_op_is_wayland (MetaGrabOp op)
+meta_grab_op_should_block_wayland (MetaGrabOp op)
 {
-  return (op != META_GRAB_OP_NONE && !meta_grab_op_is_clicking (op));
+  switch (op)
+    {
+    case META_GRAB_OP_WAYLAND_POPUP:
+    case META_GRAB_OP_NONE:
+      return FALSE;
+    default:
+      return TRUE;
+    }
 }
 
 /**
@@ -1383,19 +1303,6 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
   return timestamp;
 }
 
-/**
- * meta_display_get_ignored_modifier_mask:
- * @display: a #MetaDisplay
- *
- * Returns: a mask of modifiers that should be ignored
- *          when matching keybindings to events
- */
-unsigned int
-meta_display_get_ignored_modifier_mask (MetaDisplay *display)
-{
-  return display->ignored_modifier_mask;
-}
-
 /**
  * meta_display_add_ignored_crossing_serial:
  * @display: a #MetaDisplay
@@ -1485,54 +1392,17 @@ meta_display_queue_autoraise_callback (MetaDisplay *display,
                         meta_prefs_get_auto_raise_delay (),
                         window_raise_with_delay_callback,
                         window, NULL);
+  g_source_set_name_by_id (display->autoraise_timeout_id, "[mutter] window_raise_with_delay_callback");
   display->autoraise_window = window;
 }
 
-#if 0
-static void
-handle_net_restack_window (MetaDisplay* display,
-                           XEvent *event)
-{
-  MetaWindow *window;
-
-  window = meta_display_lookup_x_window (display,
-                                         event->xclient.window);
-
-  if (window)
-    {
-      /* FIXME: The EWMH includes a sibling for the restack request, but we
-       * (stupidly) don't currently support these types of raises.
-       *
-       * Also, unconditionally following these is REALLY stupid--we should
-       * combine this code with the stuff in
-       * meta_window_x11_configure_request() which is smart about whether to
-       * follow the request or do something else (though not smart enough
-       * and is also too stupid to handle the sibling stuff).
-       */
-      switch (event->xclient.data.l[2])
-        {
-        case Above:
-          meta_window_raise (window);
-          break;
-        case Below:
-          meta_window_lower (window);
-          break;
-        case TopIf:
-        case BottomIf:
-        case Opposite:
-          break;          
-        }
-    }
-}
-#endif
-
 void
 meta_display_sync_wayland_input_focus (MetaDisplay *display)
 {
   MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
   MetaWindow *focus_window = NULL;
 
-  if (meta_grab_op_is_wayland (display->grab_op))
+  if (meta_grab_op_should_block_wayland (display->grab_op))
     focus_window = NULL;
   else if (meta_display_xwindow_is_a_no_focus_window (display, display->focus_xwindow))
     focus_window = NULL;
@@ -1543,10 +1413,7 @@ meta_display_sync_wayland_input_focus (MetaDisplay *display)
 
   meta_wayland_compositor_set_input_focus (compositor, focus_window);
 
-  if (meta_grab_op_is_wayland (display->grab_op))
-    meta_wayland_pointer_set_focus (&compositor->seat->pointer, NULL);
-  else
-    meta_wayland_seat_repick (compositor->seat, NULL);
+  meta_wayland_seat_repick (compositor->seat);
 }
 
 void
@@ -1724,7 +1591,6 @@ meta_display_unregister_wayland_window (MetaDisplay *display,
   g_hash_table_remove (display->wayland_windows, window);
 }
 
-#ifdef HAVE_XSYNC
 /* We store sync alarms in the window ID hash table, because they are
  * just more types of XIDs in the same global space, but we have
  * typesafe functions to register/unregister for readability.
@@ -1755,7 +1621,6 @@ meta_display_unregister_sync_alarm (MetaDisplay *display,
 
   g_hash_table_remove (display->xids, &alarm);
 }
-#endif /* HAVE_XSYNC */
 
 void
 meta_display_notify_window_created (MetaDisplay  *display,
@@ -1831,51 +1696,34 @@ meta_cursor_for_grab_op (MetaGrabOp op)
 
 void
 meta_display_set_grab_op_cursor (MetaDisplay *display,
-                                 MetaScreen  *screen,
                                  MetaGrabOp   op,
-                                 Window       grab_xwindow,
                                  guint32      timestamp)
 {
-  unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
-  XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+  /* Set root cursor */
+  MetaBackend *backend = meta_get_backend ();
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (display->screen);
   MetaCursor cursor = meta_cursor_for_grab_op (op);
   MetaCursorReference *cursor_ref;
 
-  XISetMask (mask.mask, XI_ButtonPress);
-  XISetMask (mask.mask, XI_ButtonRelease);
-  XISetMask (mask.mask, XI_Enter);
-  XISetMask (mask.mask, XI_Leave);
-  XISetMask (mask.mask, XI_Motion);
+  cursor_ref = meta_cursor_reference_from_theme (cursor);
+  meta_cursor_tracker_set_grab_cursor (tracker, cursor_ref);
+  if (cursor_ref)
+    meta_cursor_reference_unref (cursor_ref);
 
-  g_assert (screen != NULL);
+  if (meta_backend_grab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp))
+    display->grab_have_pointer = TRUE;
+}
 
-  meta_error_trap_push (display);
-  if (XIGrabDevice (display->xdisplay,
-                    META_VIRTUAL_CORE_POINTER_ID,
-                    grab_xwindow,
-                    timestamp,
-                    meta_display_create_x_cursor (display, cursor),
-                    XIGrabModeAsync, XIGrabModeAsync,
-                    False, /* owner_events */
-                    &mask) == Success)
+static MetaWindow *
+get_toplevel_transient_for (MetaWindow *window)
+{
+  while (TRUE)
     {
-      display->grab_have_pointer = TRUE;
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "XIGrabDevice() returned GrabSuccess time %u\n",
-                  timestamp);
+      MetaWindow *parent = meta_window_get_transient_for (window);
+      if (parent == NULL)
+        return window;
+      window = parent;
     }
-  else
-    {
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "XIGrabDevice() failed time %u\n",
-                  timestamp);
-    }
-
-  meta_error_trap_pop (display);
-
-  cursor_ref = meta_cursor_reference_from_theme (screen->cursor_tracker, cursor);
-  meta_cursor_tracker_set_grab_cursor (screen->cursor_tracker, cursor_ref);
-  meta_cursor_reference_unref (cursor_ref);
 }
 
 gboolean
@@ -1886,19 +1734,18 @@ meta_display_begin_grab_op (MetaDisplay *display,
                             gboolean     pointer_already_grabbed,
                             gboolean     frame_action,
                             int          button,
-                            gulong       modmask,
+                            gulong       modmask, /* XXX - ignored */
                             guint32      timestamp,
                             int          root_x,
                             int          root_y)
 {
   MetaWindow *grab_window = NULL;
-  Window grab_xwindow;
-  
+
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Doing grab op %u on window %s button %d pointer already grabbed: %d pointer pos %d,%d\n",
               op, window ? window->desc : "none", button, pointer_already_grabbed,
               root_x, root_y);
-  
+
   if (display->grab_op != META_GRAB_OP_NONE)
     {
       if (window)
@@ -1921,87 +1768,66 @@ meta_display_begin_grab_op (MetaDisplay *display,
         }
     }
 
+  grab_window = window;
+
   /* If window is a modal dialog attached to its parent,
    * grab the parent instead for moving.
    */
-  if (window && meta_window_is_attached_dialog (window) &&
-      meta_grab_op_is_moving (op))
-    grab_window = meta_window_get_transient_for (window);
+  if (meta_grab_op_is_moving (op))
+    grab_window = get_toplevel_transient_for (window);
 
-  if (grab_window == NULL)
-    grab_window = window;
-
-  /* FIXME:
-   *   If we have no MetaWindow we do our best
-   *   and try to do the grab on the RootWindow.
-   *   This will fail if anyone else has any
-   *   key grab on the RootWindow.
-   */
-  if (grab_window)
-    grab_xwindow = meta_window_get_toplevel_xwindow (grab_window);
-  else
-    grab_xwindow = screen->xroot;
+  g_assert (grab_window != NULL);
+  g_assert (op != META_GRAB_OP_NONE);
 
   display->grab_have_pointer = FALSE;
-  
+
   if (pointer_already_grabbed)
     display->grab_have_pointer = TRUE;
-  
-  meta_display_set_grab_op_cursor (display, screen, op, grab_xwindow, timestamp);
+
+  /* Since grab operations often happen as a result of implicit
+   * pointer operations on the display X11 connection, we need
+   * to ungrab here to ensure that the backend's X11 can take
+   * the device grab. */
+  XIUngrabDevice (display->xdisplay,
+                  META_VIRTUAL_CORE_POINTER_ID,
+                  timestamp);
+  XSync (display->xdisplay, False);
+
+  meta_display_set_grab_op_cursor (display, op, timestamp);
 
   if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
     {
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "XIGrabDevice() failed\n");
+      meta_topic (META_DEBUG_WINDOW_OPS, "XIGrabDevice() failed\n");
       return FALSE;
     }
 
   /* Grab keys for keyboard ops and mouse move/resizes; see #126497 */
-  if (meta_grab_op_is_keyboard (op) || grab_op_is_mouse_only (op))
+  if (meta_grab_op_is_moving_or_resizing (op))
     {
-      if (grab_window)
-        display->grab_have_keyboard =
-                     meta_window_grab_all_keys (grab_window, timestamp);
+      display->grab_have_keyboard = meta_window_grab_all_keys (grab_window, timestamp);
 
-      else
-        display->grab_have_keyboard =
-                     meta_screen_grab_all_keys (screen, timestamp);
-      
       if (!display->grab_have_keyboard)
         {
-          meta_topic (META_DEBUG_WINDOW_OPS,
-                      "grabbing all keys failed, ungrabbing pointer\n");
-          XIUngrabDevice (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+          MetaBackend *backend = meta_get_backend ();
+          meta_topic (META_DEBUG_WINDOW_OPS, "grabbing all keys failed, ungrabbing pointer\n");
+          meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
           display->grab_have_pointer = FALSE;
           return FALSE;
         }
     }
-  
+
   display->grab_op = op;
   display->grab_window = grab_window;
-  display->grab_xwindow = grab_xwindow;
   display->grab_button = button;
-  display->grab_mask = modmask;
-  if (window)
-    {
-      display->grab_tile_mode = window->tile_mode;
-      display->grab_tile_monitor_number = window->tile_monitor_number;
-    }
-  else
-    {
-      display->grab_tile_mode = META_TILE_NONE;
-      display->grab_tile_monitor_number = -1;
-    }
+  display->grab_tile_mode = grab_window->tile_mode;
+  display->grab_tile_monitor_number = grab_window->tile_monitor_number;
   display->grab_anchor_root_x = root_x;
   display->grab_anchor_root_y = root_y;
   display->grab_latest_motion_x = root_x;
   display->grab_latest_motion_y = root_y;
   display->grab_last_moveresize_time.tv_sec = 0;
   display->grab_last_moveresize_time.tv_usec = 0;
-  display->grab_old_window_stacking = NULL;
-#ifdef HAVE_XSYNC
   display->grab_last_user_action_was_snap = FALSE;
-#endif
   display->grab_frame_action = frame_action;
   display->grab_resize_unmaximize = 0;
   display->grab_timestamp = timestamp;
@@ -2011,40 +1837,23 @@ meta_display_begin_grab_op (MetaDisplay *display,
       g_source_remove (display->grab_resize_timeout_id);
       display->grab_resize_timeout_id = 0;
     }
-	
-  if (display->grab_window)
-    {
-      meta_window_get_client_root_coords (display->grab_window,
-                                          &display->grab_initial_window_pos);
-      display->grab_anchor_window_pos = display->grab_initial_window_pos;
 
-#ifdef HAVE_XSYNC
-      if ( meta_grab_op_is_resizing (display->grab_op) &&
-           display->grab_window->sync_request_counter != None)
-        {
-          meta_window_create_sync_request_alarm (display->grab_window);
-        }
-#endif
-    }
-  
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Grab op %u on window %s successful\n",
               display->grab_op, window ? window->desc : "(null)");
 
-  g_assert (display->grab_window != NULL);
-  g_assert (display->grab_op != META_GRAB_OP_NONE);
-
-  if (display->grab_window)
-    {
-      meta_window_refresh_resize_popup (display->grab_window);
-    }
+  meta_window_get_client_root_coords (display->grab_window,
+                                      &display->grab_initial_window_pos);
+  display->grab_anchor_window_pos = display->grab_initial_window_pos;
 
   if (meta_is_wayland_compositor ())
     meta_display_sync_wayland_input_focus (display);
 
   g_signal_emit (display, display_signals[GRAB_OP_BEGIN], 0,
                  screen, display->grab_window, display->grab_op);
-  
+
+  meta_window_grab_op_began (display->grab_window, display->grab_op);
+
   return TRUE;
 }
 
@@ -2052,83 +1861,57 @@ void
 meta_display_end_grab_op (MetaDisplay *display,
                           guint32      timestamp)
 {
+  MetaCursorTracker *tracker;
+
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Ending grab op %u at time %u\n", display->grab_op, timestamp);
-  
+
   if (display->grab_op == META_GRAB_OP_NONE)
     return;
 
   g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                  display->screen, display->grab_window, display->grab_op);
 
-  if (display->grab_window != NULL)
-    display->grab_window->shaken_loose = FALSE;
-  
-  if (display->grab_window != NULL &&
-      !meta_prefs_get_raise_on_click () &&
-      (meta_grab_op_is_moving (display->grab_op) ||
-       meta_grab_op_is_resizing (display->grab_op)))
+  meta_window_grab_op_ended (display->grab_window, display->grab_op);
+
+  if (meta_grab_op_is_moving_or_resizing (display->grab_op))
     {
+      /* Clear out the edge cache */
+      meta_display_cleanup_edges (display);
+
       /* Only raise the window in orthogonal raise
        * ('do-not-raise-on-click') mode if the user didn't try to move
        * or resize the given window by at least a threshold amount.
        * For raise on click mode, the window was raised at the
        * beginning of the grab_op.
        */
-      if (!display->grab_threshold_movement_reached)
+      if (!meta_prefs_get_raise_on_click () &&
+          display->grab_threshold_movement_reached)
         meta_window_raise (display->grab_window);
     }
-  
-  /* If this was a move or resize clear out the edge cache */
-  if (meta_grab_op_is_resizing (display->grab_op) || 
-      meta_grab_op_is_moving (display->grab_op))
-    {
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "Clearing out the edges for resistance/snapping");
-      meta_display_cleanup_edges (display);
-    }
-
-  if (display->grab_old_window_stacking != NULL)
-    {
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "Clearing out the old stack position, which was %p.\n",
-                  display->grab_old_window_stacking);
-      g_list_free (display->grab_old_window_stacking);
-      display->grab_old_window_stacking = NULL;
-    }
 
   if (display->grab_have_pointer)
     {
-      meta_topic (META_DEBUG_WINDOW_OPS,
-                  "Ungrabbing pointer with timestamp %u\n", timestamp);
-      XIUngrabDevice (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+      MetaBackend *backend = meta_get_backend ();
+      meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
     }
 
   if (display->grab_have_keyboard)
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "Ungrabbing all keys timestamp %u\n", timestamp);
-      if (display->grab_window)
-        meta_window_ungrab_all_keys (display->grab_window, timestamp);
-      else
-        meta_screen_ungrab_all_keys (display->screen, timestamp);
+      meta_window_ungrab_all_keys (display->grab_window, timestamp);
     }
 
-  meta_cursor_tracker_set_grab_cursor (display->screen->cursor_tracker, NULL);
+  tracker = meta_cursor_tracker_get_for_screen (display->screen);
+  meta_cursor_tracker_set_grab_cursor (tracker, NULL);
 
   display->grab_timestamp = 0;
   display->grab_window = NULL;
-  display->grab_xwindow = None;
   display->grab_tile_mode = META_TILE_NONE;
   display->grab_tile_monitor_number = -1;
   display->grab_op = META_GRAB_OP_NONE;
 
-  if (display->grab_resize_popup)
-    {
-      meta_ui_resize_popup_free (display->grab_resize_popup);
-      display->grab_resize_popup = NULL;
-    }
-
   if (display->grab_resize_timeout_id)
     {
       g_source_remove (display->grab_resize_timeout_id);
@@ -2179,8 +1962,10 @@ meta_change_button_grab (MetaDisplay *display,
                          int          button,
                          int          modmask)
 {
-  unsigned int ignored_mask;
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
 
+  unsigned int ignored_mask;
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
 
@@ -2188,13 +1973,6 @@ meta_change_button_grab (MetaDisplay *display,
   XISetMask (mask.mask, XI_ButtonRelease);
   XISetMask (mask.mask, XI_Motion);
 
-  meta_verbose ("%s 0x%lx sync = %d button = %d modmask 0x%x\n",
-                grab ? "Grabbing" : "Ungrabbing",
-                xwindow,
-                sync, button, modmask);
-  
-  meta_error_trap_push (display);
-  
   ignored_mask = 0;
   while (ignored_mask <= display->ignored_modifier_mask)
     {
@@ -2211,45 +1989,34 @@ meta_change_button_grab (MetaDisplay *display,
 
       mods = (XIGrabModifiers) { modmask | ignored_mask, 0 };
 
-      if (meta_is_debugging ())
-        meta_error_trap_push_with_return (display);
-
       /* GrabModeSync means freeze until XAllowEvents */
       
       if (grab)
-        XIGrabButton (display->xdisplay,
+        XIGrabButton (xdisplay,
                       META_VIRTUAL_CORE_POINTER_ID,
                       button, xwindow, None,
                       sync ? XIGrabModeSync : XIGrabModeAsync,
                       XIGrabModeAsync, False,
                       &mask, 1, &mods);
       else
-        XIUngrabButton (display->xdisplay,
+        XIUngrabButton (xdisplay,
                         META_VIRTUAL_CORE_POINTER_ID,
                         button, xwindow, 1, &mods);
 
-      if (meta_is_debugging ())
-        {
-          int result;
-          
-          result = meta_error_trap_pop_with_return (display);
-          
-          if (result != Success)
-            meta_verbose ("Failed to %s button %d with mask 0x%x for window 0x%lx error code %d\n",
-                          grab ? "grab" : "ungrab",
-                          button, modmask | ignored_mask, xwindow, result);
-        }
-      
       ++ignored_mask;
     }
-
-  meta_error_trap_pop (display);
 }
 
 void
 meta_display_grab_window_buttons (MetaDisplay *display,
                                   Window       xwindow)
 {  
+  MetaBackend *backend = meta_get_backend ();
+
+  /* Do nothing under non-X11 backends */
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
   /* Grab Alt + button1 for moving window.
    * Grab Alt + button2 for resizing window.
    * Grab Alt + button3 for popping up window menu.
@@ -2300,6 +2067,12 @@ void
 meta_display_ungrab_window_buttons  (MetaDisplay *display,
                                      Window       xwindow)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  /* Do nothing under non-X11 backends */
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
   gboolean debug;
   int i;
 
@@ -2328,6 +2101,12 @@ void
 meta_display_grab_focus_window_button (MetaDisplay *display,
                                        MetaWindow  *window)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  /* Do nothing under non-X11 backends */
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
   /* Grab button 1 for activating unfocused windows */
   meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc);
 
@@ -2377,6 +2156,12 @@ void
 meta_display_ungrab_focus_window_button (MetaDisplay *display,
                                          MetaWindow  *window)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  /* Do nothing under non-X11 backends */
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
   meta_verbose ("Ungrabbing unfocused window buttons for %s\n", window->desc);
 
   if (!window->have_focus_click_grab)
@@ -2453,16 +2238,32 @@ meta_display_retheme_all (void)
   meta_display_queue_retheme_all_windows (meta_get_display ());
 }
 
-void 
-meta_display_set_cursor_theme (const char *theme, 
-			       int         size)
+static void
+set_cursor_theme (Display *xdisplay)
 {
-  MetaDisplay *display = meta_get_display ();
+  XcursorSetTheme (xdisplay, meta_prefs_get_cursor_theme ());
+  XcursorSetDefaultSize (xdisplay, meta_prefs_get_cursor_size ());
+}
 
-  XcursorSetTheme (display->xdisplay, theme);
-  XcursorSetDefaultSize (display->xdisplay, size);
+static void
+update_cursor_theme (void)
+{
+  {
+    MetaDisplay *display = meta_get_display ();
+    set_cursor_theme (display->xdisplay);
 
-  meta_screen_update_cursor (display->screen);
+    if (display->screen)
+      meta_screen_update_cursor (display->screen);
+  }
+
+  {
+    MetaBackend *backend = meta_get_backend ();
+    if (META_IS_BACKEND_X11 (backend))
+      {
+        Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+        set_cursor_theme (xdisplay);
+      }
+  }
 }
 
 /*
@@ -2600,6 +2401,7 @@ meta_display_ping_window (MetaWindow        *window,
   ping_data->ping_timeout_id = g_timeout_add (PING_TIMEOUT_DELAY,
 					      meta_display_ping_timeout,
 					      ping_data);
+  g_source_set_name_by_id (ping_data->ping_timeout_id, "[mutter] meta_display_ping_timeout");
 
   display->pending_pings = g_slist_prepend (display->pending_pings, ping_data);
 
@@ -3081,7 +2883,6 @@ meta_display_devirtualize_modifiers (MetaDisplay        *display,
 
 static void
 update_window_grab_modifiers (MetaDisplay *display)
-     
 {
   MetaVirtualModifier virtual_mods;
   unsigned int mods;
@@ -3145,6 +2946,11 @@ prefs_changed_callback (MetaPreference pref,
     {
       meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
     }
+  else if (pref == META_PREF_CURSOR_THEME ||
+           pref == META_PREF_CURSOR_SIZE)
+    {
+      update_cursor_theme ();
+    }
 }
 
 void
@@ -3387,13 +3193,11 @@ meta_display_get_damage_event_base (MetaDisplay *display)
   return display->damage_event_base;
 }
 
-#ifdef HAVE_SHAPE
 int
 meta_display_get_shape_event_base (MetaDisplay *display)
 {
   return display->shape_event_base;
 }
-#endif
 
 /**
  * meta_display_clear_mouse_mode:
@@ -3409,3 +3213,10 @@ meta_display_clear_mouse_mode (MetaDisplay *display)
 {
   display->mouse_mode = FALSE;
 }
+
+Cursor
+meta_display_create_x_cursor (MetaDisplay *display,
+                              MetaCursor   cursor)
+{
+  return meta_cursor_create_x_cursor (display->xdisplay, cursor);
+}

src/core/edge-resistance.c

@@ -437,6 +437,8 @@ apply_edge_resistance (MetaWindow                *window,
                     g_timeout_add (timeout_length_ms,
                                    edge_resistance_timeout,
                                    resistance_data);
+                  g_source_set_name_by_id (resistance_data->timeout_id,
+                                           "[mutter] edge_resistance_timeout");
                   resistance_data->timeout_setup = TRUE;
                   resistance_data->timeout_edge_pos = compare;
                   resistance_data->timeout_over = FALSE;

src/core/errors.c

@@ -55,12 +55,6 @@ meta_error_trap_pop (MetaDisplay *display)
   gdk_error_trap_pop_ignored ();
 }
 
-void
-meta_error_trap_push_with_return (MetaDisplay *display)
-{
-  gdk_error_trap_push ();
-}
-
 int
 meta_error_trap_pop_with_return  (MetaDisplay *display)
 {

src/core/events.c

@@ -25,20 +25,20 @@
 
 #include <X11/Xatom.h>
 #include <X11/extensions/Xdamage.h>
-#ifdef HAVE_SHAPE
 #include <X11/extensions/shape.h>
-#endif
 
 #include <meta/errors.h>
 #include "display-private.h"
 #include "window-private.h"
 #include "bell.h"
 #include "workspace-private.h"
-#include "backends/x11/meta-idle-monitor-xsync.h"
+#include "backends/meta-backend.h"
 #include "backends/native/meta-idle-monitor-native.h"
+#include "backends/x11/meta-backend-x11.h"
 
 #include "x11/window-x11.h"
 #include "x11/xprops.h"
+#include "wayland/meta-xwayland.h"
 #include "wayland/meta-wayland-private.h"
 #include "meta-surface-actor-wayland.h"
 
@@ -213,14 +213,12 @@ event_get_modified_window (MetaDisplay *display,
       return None;
 
     default:
-#ifdef HAVE_SHAPE
       if (META_DISPLAY_HAS_SHAPE (display) &&
           event->type == (display->shape_event_base + ShapeNotify))
         {
           XShapeEvent *sev = (XShapeEvent*) event;
           return sev->window;
         }
-#endif
 
       return None;
     }
@@ -350,7 +348,6 @@ stack_mode_to_string (int mode)
   return "Unknown";
 }
 
-#ifdef HAVE_XSYNC
 G_GNUC_UNUSED static gint64
 sync_value_to_64 (const XSyncValue *value)
 {
@@ -377,7 +374,6 @@ alarm_state_to_string (XSyncAlarmState state)
       return "(unknown)";
     }
 }
-#endif /* HAVE_XSYNC */
 
 G_GNUC_UNUSED static void
 meta_spew_xi2_event (MetaDisplay *display,
@@ -611,7 +607,6 @@ meta_spew_core_event (MetaDisplay *display,
       name = "MappingNotify";
       break;
     default:
-#ifdef HAVE_XSYNC
       if (META_DISPLAY_HAS_XSYNC (display) &&
           event->type == (display->xsync_event_base + XSyncAlarmNotify))
         {
@@ -630,8 +625,6 @@ meta_spew_core_event (MetaDisplay *display,
                              alarm_state_to_string (aevent->state));
         }
       else
-#endif /* HAVE_XSYNC */
-#ifdef HAVE_SHAPE
         if (META_DISPLAY_HAS_SHAPE (display) &&
             event->type == (display->shape_event_base + ShapeNotify))
           {
@@ -651,7 +644,6 @@ meta_spew_core_event (MetaDisplay *display,
                                sev->shaped);
           }
         else
-#endif /* HAVE_SHAPE */
           {
             name = "(Unknown event)";
             extra = g_strdup_printf ("type: %d", event->xany.type);
@@ -859,9 +851,24 @@ handle_input_xevent (MetaDisplay *display,
   if (input_event == NULL)
     return FALSE;
 
+  switch (input_event->evtype)
+    {
+    case XI_Enter:
+    case XI_Leave:
+    case XI_FocusIn:
+    case XI_FocusOut:
+      break;
+    default:
+      return FALSE;
+    }
+
   modified = xievent_get_modified_window (display, input_event);
   window = modified != None ? meta_display_lookup_x_window (display, modified) : NULL;
 
+  /* If this is an event for a GTK+ widget, let GTK+ handle it. */
+  if (meta_ui_window_is_widget (display->screen->ui, modified))
+    return FALSE;
+
   switch (input_event->evtype)
     {
     case XI_Enter:
@@ -933,12 +940,15 @@ handle_input_xevent (MetaDisplay *display,
             }
 
         }
-
-      /* Don't send FocusIn / FocusOut to Clutter */
-      return TRUE;
+      break;
     }
 
-  return FALSE;
+  /* Don't eat events for GTK frames (we need to update the :hover state on buttons) */
+  if (window && window->frame && modified == window->frame->xwindow)
+    return FALSE;
+
+  /* Don't pass these events through to Clutter / GTK+ */
+  return TRUE;
 }
 
 static void
@@ -1040,7 +1050,7 @@ convert_property (MetaDisplay *display,
   conversion_targets[2] = display->atom_TIMESTAMP;
   conversion_targets[3] = display->atom_VERSION;
 
-  meta_error_trap_push_with_return (display);
+  meta_error_trap_push (display);
   if (target == display->atom_TARGETS)
     XChangeProperty (display->xdisplay, w, property,
 		     XA_ATOM, 32, PropModeReplace,
@@ -1115,7 +1125,7 @@ process_selection_request (MetaDisplay   *display,
           unsigned long num, rest;
           unsigned char *data;
 
-          meta_error_trap_push_with_return (display);
+          meta_error_trap_push (display);
           if (XGetWindowProperty (display->xdisplay,
                                   event->xselectionrequest.requestor,
                                   event->xselectionrequest.property, 0, 256, False,
@@ -1229,7 +1239,6 @@ handle_other_xevent (MetaDisplay *display,
       window = NULL;
     }
 
-#ifdef HAVE_XSYNC
   if (META_DISPLAY_HAS_XSYNC (display) &&
       event->type == (display->xsync_event_base + XSyncAlarmNotify))
     {
@@ -1241,17 +1250,13 @@ handle_other_xevent (MetaDisplay *display,
           XSyncValue value = ((XSyncAlarmNotifyEvent*)event)->counter_value;
           gint64 new_counter_value;
           new_counter_value = XSyncValueLow32 (value) + ((gint64)XSyncValueHigh32 (value) << 32);
-          meta_window_update_sync_request_counter (alarm_window, new_counter_value);
+          meta_window_x11_update_sync_request_counter (alarm_window, new_counter_value);
           bypass_gtk = TRUE; /* GTK doesn't want to see this really */
         }
-      else
-        meta_idle_monitor_xsync_handle_xevent_all (event);
 
       goto out;
     }
-#endif /* HAVE_XSYNC */
 
-#ifdef HAVE_SHAPE
   if (META_DISPLAY_HAS_SHAPE (display) &&
       event->type == (display->shape_event_base + ShapeNotify))
     {
@@ -1276,7 +1281,6 @@ handle_other_xevent (MetaDisplay *display,
 
       goto out;
     }
-#endif /* HAVE_SHAPE */
 
   switch (event->type)
     {
@@ -1493,11 +1497,6 @@ handle_other_xevent (MetaDisplay *display,
                      event->xproperty.atom ==
                      display->atom__XKB_RULES_NAMES)
               reload_xkb_rules (display->screen);
-#if 0
-            else if (event->xproperty.atom ==
-                     display->atom__NET_RESTACK_WINDOW)
-              handle_net_restack_window (display, event);
-#endif
 
             /* we just use this property as a sentinel to avoid
              * certain race conditions.  See the comment for the
@@ -1511,21 +1510,6 @@ handle_other_xevent (MetaDisplay *display,
           }
       }
       break;
-    case SelectionClear:
-      /* do this here instead of at end of function
-       * so we can return
-       */
-
-      /* FIXME: Clearing display->current_time here makes no sense to
-       * me; who put this here and why?
-       */
-      display->current_time = CurrentTime;
-
-      process_selection_clear (display, event);
-      /* Note that processing that may have resulted in
-       * closing the display... so return right away.
-       */
-      return FALSE;
     case SelectionRequest:
       process_selection_request (display, event);
       break;
@@ -1536,7 +1520,12 @@ handle_other_xevent (MetaDisplay *display,
     case ClientMessage:
       if (window)
         {
-          if (!frame_was_receiver)
+          if (event->xclient.message_type == display->atom_WL_SURFACE_ID)
+            {
+              guint32 surface_id = event->xclient.data.l[0];
+              meta_xwayland_handle_wl_surface_id (window, surface_id);
+            }
+          else if (!frame_was_receiver)
             meta_window_x11_client_message (window, event);
         }
       else
@@ -1699,7 +1688,7 @@ grab_op_should_block_mouse_events (MetaGrabOp op)
 {
   switch (op)
     {
-    case META_GRAB_OP_WAYLAND_CLIENT:
+    case META_GRAB_OP_WAYLAND_POPUP:
     case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
@@ -1741,28 +1730,19 @@ meta_display_handle_xevent (MetaDisplay *display,
   Window modified;
   gboolean bypass_compositor = FALSE, bypass_gtk = FALSE;
   XIEvent *input_event;
-  MetaMonitorManager *monitor;
 
 #if 0
   meta_spew_event (display, event);
 #endif
 
 #ifdef HAVE_STARTUP_NOTIFICATION
-  sn_display_process_event (display->sn_display, event);
-#endif
-
-  /* Intercept XRandR events early and don't attempt any
-     processing for them. We still let them through to Gdk though,
-     so it can update its own internal state.
-  */
-  monitor = meta_monitor_manager_get ();
-  if (meta_monitor_manager_handle_xevent (monitor, event))
+  if (sn_display_process_event (display->sn_display, event))
     {
-      bypass_compositor = TRUE;
+      bypass_gtk = bypass_compositor = TRUE;
       goto out;
     }
+#endif
 
-  display->current_time = event_get_time (display, event);
   display->monitor_cache_invalidated = TRUE;
 
   if (display->focused_by_us &&
@@ -1838,6 +1818,17 @@ meta_display_handle_xevent (MetaDisplay *display,
       goto out;
     }
 
+  if (event->type == SelectionClear)
+    {
+      /* Do this here so we can return without any further
+       * processing. */
+      process_selection_clear (display, event);
+      /* Note that processing that may have resulted in
+       * closing the display... */
+      bypass_gtk = bypass_compositor = TRUE;
+      goto out;
+    }
+
  out:
   if (!bypass_compositor)
     {
@@ -1847,7 +1838,7 @@ meta_display_handle_xevent (MetaDisplay *display,
         bypass_gtk = TRUE;
     }
 
-  display->current_time = CurrentTime;
+  display->current_time = event_get_time (display, event);
   return bypass_gtk;
 }
 
@@ -1859,8 +1850,10 @@ handle_idletime_for_event (const ClutterEvent *event)
   int device_id;
 
   /* This is handled by XSync under X11. */
-  if (!meta_is_wayland_compositor ())
+#if defined(CLUTTER_WINDOWING_X11)
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
     return;
+#endif
 
   device = clutter_event_get_device (event);
   if (device == NULL)
@@ -1923,6 +1916,17 @@ meta_display_handle_event (MetaDisplay        *display,
         }
     }
 
+  if (display->grab_window == window &&
+      meta_grab_op_is_moving_or_resizing (display->grab_op))
+    {
+      if (meta_window_handle_mouse_grab_op_event (window, event))
+        {
+          bypass_clutter = TRUE;
+          bypass_wayland = TRUE;
+          goto out;
+        }
+    }
+
   switch (event->type)
     {
     case CLUTTER_BUTTON_PRESS:
@@ -1931,24 +1935,7 @@ meta_display_handle_event (MetaDisplay        *display,
 
       display->overlay_key_only_pressed = FALSE;
 
-      if ((window &&
-           meta_grab_op_is_mouse (display->grab_op) &&
-           (event->button.modifier_state & display->window_grab_modifiers) &&
-           display->grab_button != (int) event->button.button &&
-           display->grab_window == window) ||
-          meta_grab_op_is_keyboard (display->grab_op))
-        {
-          meta_topic (META_DEBUG_WINDOW_OPS,
-                      "Ending grab op %u on window %s due to button press\n",
-                      display->grab_op,
-                      (display->grab_window ?
-                       display->grab_window->desc :
-                       "none"));
-          meta_display_end_grab_op (display, event->any.time);
-          bypass_clutter = TRUE;
-          bypass_wayland = TRUE;
-        }
-      else if (window && display->grab_op == META_GRAB_OP_NONE)
+      if (window && display->grab_op == META_GRAB_OP_NONE)
         {
           ClutterModifierType grab_mask;
           gboolean unmodified;
@@ -2009,8 +1996,16 @@ meta_display_handle_event (MetaDisplay        *display,
               meta_verbose ("Allowing events time %u\n",
                             (unsigned int)event->button.time);
 
-              XIAllowEvents (display->xdisplay, clutter_input_device_get_device_id (event->button.device),
-                             XIReplayDevice, event->button.time);
+              {
+                MetaBackend *backend = meta_get_backend ();
+                if (META_IS_BACKEND_X11 (backend))
+                  {
+                    Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+                    XIAllowEvents (xdisplay, clutter_input_device_get_device_id (event->button.device),
+                                   XIReplayDevice, event->button.time);
+                  }
+              }
+
               bypass_clutter = TRUE;
             }
           else if (fully_modified && (int) event->button.button == meta_prefs_get_mouse_button_resize ())
@@ -2097,31 +2092,12 @@ meta_display_handle_event (MetaDisplay        *display,
             }
         }
       break;
+
     case CLUTTER_BUTTON_RELEASE:
       if (grab_op_should_block_mouse_events (display->grab_op))
         break;
 
       display->overlay_key_only_pressed = FALSE;
-
-      if (display->grab_window == window &&
-          meta_grab_op_is_mouse (display->grab_op))
-        {
-          meta_window_handle_mouse_grab_op_event (window, event);
-          bypass_clutter = TRUE;
-          bypass_wayland = TRUE;
-        }
-      break;
-    case CLUTTER_MOTION:
-      if (grab_op_should_block_mouse_events (display->grab_op))
-        break;
-
-      if (display->grab_window == window &&
-          meta_grab_op_is_mouse (display->grab_op))
-        {
-          meta_window_handle_mouse_grab_op_event (window, event);
-          bypass_clutter = TRUE;
-          bypass_wayland = TRUE;
-        }
       break;
 
     case CLUTTER_KEY_PRESS:
@@ -2137,17 +2113,19 @@ meta_display_handle_event (MetaDisplay        *display,
           bypass_clutter = TRUE;
           bypass_wayland = TRUE;
         }
+      break;
 
     default:
       break;
     }
 
+ out:
   /* If the compositor has a grab, don't pass that through to Wayland */
   if (display->grab_op == META_GRAB_OP_COMPOSITOR)
     bypass_wayland = TRUE;
 
   /* If a Wayland client has a grab, don't pass that through to Clutter */
-  if (display->grab_op == META_GRAB_OP_WAYLAND_CLIENT)
+  if (display->grab_op == META_GRAB_OP_WAYLAND_POPUP)
     bypass_clutter = TRUE;
 
   if (compositor && !bypass_wayland)

src/core/frame.c

@@ -27,8 +27,6 @@
 #include <meta/errors.h>
 #include "keybindings-private.h"
 
-#include <X11/extensions/Xrender.h>
-
 #define EVENT_MASK (SubstructureRedirectMask |                     \
                     StructureNotifyMask | SubstructureNotifyMask | \
                     ExposureMask |                                 \

src/core/keybindings-private.h

@@ -94,10 +94,6 @@ void     meta_display_init_keys             (MetaDisplay *display);
 void     meta_display_shutdown_keys         (MetaDisplay *display);
 void     meta_screen_grab_keys              (MetaScreen  *screen);
 void     meta_screen_ungrab_keys            (MetaScreen  *screen);
-gboolean meta_screen_grab_all_keys          (MetaScreen  *screen,
-                                             guint32      timestamp);
-void     meta_screen_ungrab_all_keys        (MetaScreen  *screen, 
-                                             guint32      timestamp);
 void     meta_window_grab_keys              (MetaWindow  *window);
 void     meta_window_ungrab_keys            (MetaWindow  *window);
 gboolean meta_window_grab_all_keys          (MetaWindow  *window,

src/core/keybindings.c

@@ -41,18 +41,23 @@
 #include "screen-private.h"
 #include <meta/prefs.h>
 #include "util-private.h"
+#include "meta-accel-parse.h"
 
-#include <X11/keysym.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <linux/input.h>
+
+#include <xkbcommon/xkbcommon.h>
+
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
 
 #include "wayland/meta-wayland.h"
-#include "meta-backend.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "backends/native/meta-backend-native.h"
 
 #define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
 #define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
@@ -182,10 +187,6 @@ reload_keymap (MetaDisplay *display)
   if (display->keymap)
     meta_XFree (display->keymap);
 
-  /* This is expensive to compute, so we'll lazily load if and when we first
-   * need it */
-  display->above_tab_keycode = 0;
-
   display->keymap = XGetKeyboardMapping (display->xdisplay,
                                          display->min_keycode,
                                          display->max_keycode -
@@ -193,24 +194,27 @@ reload_keymap (MetaDisplay *display)
                                          &display->keysyms_per_keycode);
 }
 
+static const char *
+keysym_name (xkb_keysym_t keysym)
+{
+  static char name[32] = "";
+  xkb_keysym_get_name (keysym, name, sizeof (name));
+  return name;
+}
+
 static void
 reload_modmap (MetaDisplay *display)
 {
   XModifierKeymap *modmap;
   int map_size;
   int i;
-
-  if (display->modmap)
-    XFreeModifiermap (display->modmap);
+  int num_lock_mask = 0;
+  int scroll_lock_mask = 0;
 
   modmap = XGetModifierMapping (display->xdisplay);
-  display->modmap = modmap;
-
   display->ignored_modifier_mask = 0;
 
   /* Multiple bits may get set in each of these */
-  display->num_lock_mask = 0;
-  display->scroll_lock_mask = 0;
   display->meta_mask = 0;
   display->hyper_mask = 0;
   display->super_mask = 0;
@@ -238,40 +242,37 @@ reload_modmap (MetaDisplay *display)
             {
               if (syms[j] != 0)
                 {
-                  const char *str;
-
-                  str = XKeysymToString (syms[j]);
                   meta_topic (META_DEBUG_KEYBINDINGS,
                               "Keysym %s bound to modifier 0x%x\n",
-                              str ? str : "none",
+                              keysym_name (syms[j]),
                               (1 << ( i / modmap->max_keypermod)));
                 }
 
-              if (syms[j] == XK_Num_Lock)
+              if (syms[j] == XKB_KEY_Num_Lock)
                 {
                   /* Mod1Mask is 1 << 3 for example, i.e. the
                    * fourth modifier, i / keyspermod is the modifier
                    * index
                    */
 
-                  display->num_lock_mask |= (1 << ( i / modmap->max_keypermod));
+                  num_lock_mask |= (1 << ( i / modmap->max_keypermod));
                 }
-              else if (syms[j] == XK_Scroll_Lock)
+              else if (syms[j] == XKB_KEY_Scroll_Lock)
                 {
-                  display->scroll_lock_mask |= (1 << ( i / modmap->max_keypermod));
+                  scroll_lock_mask |= (1 << ( i / modmap->max_keypermod));
                 }
-              else if (syms[j] == XK_Super_L ||
-                       syms[j] == XK_Super_R)
+              else if (syms[j] == XKB_KEY_Super_L ||
+                       syms[j] == XKB_KEY_Super_R)
                 {
                   display->super_mask |= (1 << ( i / modmap->max_keypermod));
                 }
-              else if (syms[j] == XK_Hyper_L ||
-                       syms[j] == XK_Hyper_R)
+              else if (syms[j] == XKB_KEY_Hyper_L ||
+                       syms[j] == XKB_KEY_Hyper_R)
                 {
                   display->hyper_mask |= (1 << ( i / modmap->max_keypermod));
                 }
-              else if (syms[j] == XK_Meta_L ||
-                       syms[j] == XK_Meta_R)
+              else if (syms[j] == XKB_KEY_Meta_L ||
+                       syms[j] == XKB_KEY_Meta_R)
                 {
                   display->meta_mask |= (1 << ( i / modmap->max_keypermod));
                 }
@@ -283,18 +284,20 @@ reload_modmap (MetaDisplay *display)
       ++i;
     }
 
-  display->ignored_modifier_mask = (display->num_lock_mask |
-                                    display->scroll_lock_mask |
+  display->ignored_modifier_mask = (num_lock_mask |
+                                    scroll_lock_mask |
                                     LockMask);
 
   meta_topic (META_DEBUG_KEYBINDINGS,
               "Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x\n",
               display->ignored_modifier_mask,
-              display->num_lock_mask,
-              display->scroll_lock_mask,
+              num_lock_mask,
+              scroll_lock_mask,
               display->hyper_mask,
               display->super_mask,
               display->meta_mask);
+
+  XFreeModifiermap (modmap);
 }
 
 /* Original code from gdk_x11_keymap_get_entries_for_keyval() in
@@ -310,6 +313,14 @@ get_keycodes_for_keysym (MetaDisplay  *display,
 
   retval = g_array_new (FALSE, FALSE, sizeof (int));
 
+  /* Special-case: Fake mutter keysym */
+  if (keysym == META_KEY_ABOVE_TAB)
+    {
+      keycode = KEY_GRAVE + 8;
+      g_array_append_val (retval, keycode);
+      goto out;
+    }
+
   keycode = display->min_keycode;
   while (keycode <= display->max_keycode)
     {
@@ -327,12 +338,31 @@ get_keycodes_for_keysym (MetaDisplay  *display,
       ++keycode;
     }
 
+ out:
   n_keycodes = retval->len;
   *keycodes = (int*) g_array_free (retval, n_keycodes == 0 ? TRUE : FALSE);
-
   return n_keycodes;
 }
 
+static guint
+get_first_keycode_for_keysym (MetaDisplay *display,
+                              guint        keysym)
+{
+  int *keycodes;
+  int n_keycodes;
+  int keycode;
+
+  n_keycodes = get_keycodes_for_keysym (display, keysym, &keycodes);
+
+  if (n_keycodes > 0)
+    keycode = keycodes[0];
+  else
+    keycode = 0;
+
+  g_free (keycodes);
+  return keycode;
+}
+
 static void
 reload_iso_next_group_combos (MetaDisplay *display)
 {
@@ -350,7 +380,7 @@ reload_iso_next_group_combos (MetaDisplay *display)
   if (iso_next_group_option == NULL)
     return;
 
-  n_keycodes = get_keycodes_for_keysym (display, XK_ISO_Next_Group, &keycodes);
+  n_keycodes = get_keycodes_for_keysym (display, XKB_KEY_ISO_Next_Group, &keycodes);
 
   if (g_str_equal (iso_next_group_option, "toggle") ||
       g_str_equal (iso_next_group_option, "lalt_toggle") ||
@@ -369,7 +399,7 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = 0;
         }
@@ -382,7 +412,7 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = ShiftMask;
         }
@@ -395,7 +425,7 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = Mod1Mask;
         }
@@ -409,11 +439,11 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = ShiftMask;
 
-          combos[i + n_keycodes].keysym = XK_ISO_Next_Group;
+          combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
           combos[i + n_keycodes].keycode = keycodes[i];
           combos[i + n_keycodes].modifiers = ControlMask;
         }
@@ -425,11 +455,11 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = Mod1Mask;
 
-          combos[i + n_keycodes].keysym = XK_ISO_Next_Group;
+          combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
           combos[i + n_keycodes].keycode = keycodes[i];
           combos[i + n_keycodes].modifiers = ControlMask;
         }
@@ -442,11 +472,11 @@ reload_iso_next_group_combos (MetaDisplay *display)
 
       for (i = 0; i < n_keycodes; ++i)
         {
-          combos[i].keysym = XK_ISO_Next_Group;
+          combos[i].keysym = XKB_KEY_ISO_Next_Group;
           combos[i].keycode = keycodes[i];
           combos[i].modifiers = Mod1Mask;
 
-          combos[i + n_keycodes].keysym = XK_ISO_Next_Group;
+          combos[i + n_keycodes].keysym = XKB_KEY_ISO_Next_Group;
           combos[i + n_keycodes].keycode = keycodes[i];
           combos[i + n_keycodes].modifiers = ShiftMask;
         }
@@ -463,16 +493,6 @@ reload_iso_next_group_combos (MetaDisplay *display)
   display->iso_next_group_combos = combos;
 }
 
-static guint
-keysym_to_keycode (MetaDisplay *display,
-                   guint        keysym)
-{
-  if (keysym == META_KEY_ABOVE_TAB)
-    return meta_display_get_above_tab_keycode (display);
-  else
-    return XKeysymToKeycode (display->xdisplay, keysym);
-}
-
 static void
 binding_reload_keycode_foreach (gpointer key,
                                 gpointer value,
@@ -482,7 +502,7 @@ binding_reload_keycode_foreach (gpointer key,
   MetaKeyBinding *binding = value;
 
   if (binding->keysym)
-    binding->keycode = keysym_to_keycode (display, binding->keysym);
+    binding->keycode = get_first_keycode_for_keysym (display, binding->keysym);
 }
 
 static void
@@ -494,7 +514,7 @@ reload_keycodes (MetaDisplay *display)
   if (display->overlay_key_combo.keysym != 0)
     {
       display->overlay_key_combo.keycode =
-        keysym_to_keycode (display, display->overlay_key_combo.keysym);
+        get_first_keycode_for_keysym (display, display->overlay_key_combo.keysym);
     }
   else
     {
@@ -684,8 +704,6 @@ ungrab_key_bindings (MetaDisplay *display)
   GSList *tmp;
   GSList *windows;
 
-  meta_error_trap_push (display); /* for efficiency push outer trap */
-
   meta_screen_ungrab_keys (display->screen);
 
   windows = meta_display_list_windows (display, META_LIST_DEFAULT);
@@ -698,7 +716,6 @@ ungrab_key_bindings (MetaDisplay *display)
 
       tmp = tmp->next;
     }
-  meta_error_trap_pop (display);
 
   g_slist_free (windows);
 }
@@ -709,8 +726,6 @@ grab_key_bindings (MetaDisplay *display)
   GSList *tmp;
   GSList *windows;
 
-  meta_error_trap_push (display); /* for efficiency push outer trap */
-
   meta_screen_grab_keys (display->screen);
 
   windows = meta_display_list_windows (display, META_LIST_DEFAULT);
@@ -723,7 +738,6 @@ grab_key_bindings (MetaDisplay *display)
 
       tmp = tmp->next;
     }
-  meta_error_trap_pop (display);
 
   g_slist_free (windows);
 }
@@ -742,7 +756,8 @@ display_get_keybinding (MetaDisplay  *display,
 }
 
 static guint
-next_dynamic_keybinding_action () {
+next_dynamic_keybinding_action (void)
+{
   static guint num_dynamic_bindings = 0;
   return META_KEYBINDING_ACTION_LAST + (++num_dynamic_bindings);
 }
@@ -991,32 +1006,15 @@ bindings_changed_callback (MetaPreference pref,
 void
 meta_display_shutdown_keys (MetaDisplay *display)
 {
-  /* Note that display->xdisplay is invalid in this function */
-
   meta_prefs_remove_listener (bindings_changed_callback, display);
 
   if (display->keymap)
     meta_XFree (display->keymap);
 
-  if (display->modmap)
-    XFreeModifiermap (display->modmap);
-
   g_hash_table_destroy (display->key_bindings_index);
   g_hash_table_destroy (display->key_bindings);
 }
 
-static const char*
-keysym_name (int keysym)
-{
-  const char *name;
-
-  name = XKeysymToString (keysym);
-  if (name == NULL)
-    name = "(unknown)";
-
-  return name;
-}
-
 /* Grab/ungrab, ignoring all annoying modifiers like NumLock etc. */
 static void
 meta_change_keygrab (MetaDisplay *display,
@@ -1034,6 +1032,9 @@ meta_change_keygrab (MetaDisplay *display,
   XISetMask (mask.mask, XI_KeyPress);
   XISetMask (mask.mask, XI_KeyRelease);
 
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
+
   /* Grab keycode/modmask, together with
    * all combinations of ignored modifiers.
    * X provides no better way to do this.
@@ -1045,9 +1046,6 @@ meta_change_keygrab (MetaDisplay *display,
               keysym_name (keysym), keycode,
               modmask, xwindow);
 
-  /* efficiency, avoid so many XSync() */
-  meta_error_trap_push (display);
-
   ignored_mask = 0;
   while (ignored_mask <= display->ignored_modifier_mask)
     {
@@ -1064,40 +1062,19 @@ meta_change_keygrab (MetaDisplay *display,
 
       mods = (XIGrabModifiers) { modmask | ignored_mask, 0 };
 
-      if (meta_is_debugging ())
-        meta_error_trap_push_with_return (display);
       if (grab)
-        XIGrabKeycode (display->xdisplay,
+        XIGrabKeycode (xdisplay,
                        META_VIRTUAL_CORE_KEYBOARD_ID,
                        keycode, xwindow,
                        XIGrabModeSync, XIGrabModeAsync,
                        False, &mask, 1, &mods);
       else
-        XIUngrabKeycode (display->xdisplay,
+        XIUngrabKeycode (xdisplay,
                          META_VIRTUAL_CORE_KEYBOARD_ID,
                          keycode, xwindow, 1, &mods);
 
-      if (meta_is_debugging ())
-        {
-          int result;
-
-          result = meta_error_trap_pop_with_return (display);
-
-          if (grab && result != Success)
-            {
-              if (result == BadAccess)
-                meta_warning ("Some other program is already using the key %s with modifiers %x as a binding\n", keysym_name (keysym), modmask | ignored_mask);
-              else
-                meta_topic (META_DEBUG_KEYBINDINGS,
-                            "Failed to grab key %s with modifiers %x\n",
-                            keysym_name (keysym), modmask | ignored_mask);
-            }
-        }
-
       ++ignored_mask;
     }
-
-  meta_error_trap_pop (display);
 }
 
 typedef struct
@@ -1140,9 +1117,7 @@ change_binding_keygrabs (MetaDisplay    *display,
   data.binding_per_window = binding_per_window;
   data.grab = grab;
 
-  meta_error_trap_push (display);
   g_hash_table_foreach (display->key_bindings, change_keygrab_foreach, &data);
-  meta_error_trap_pop (display);
 }
 
 static void
@@ -1179,7 +1154,9 @@ meta_screen_change_keygrabs (MetaScreen *screen,
 void
 meta_screen_grab_keys (MetaScreen *screen)
 {
-  if (screen->all_keys_grabbed)
+  MetaBackend *backend = meta_get_backend ();
+
+  if (!META_IS_BACKEND_X11 (backend))
     return;
 
   if (screen->keys_grabbed)
@@ -1212,6 +1189,11 @@ meta_window_change_keygrabs (MetaWindow *window,
 void
 meta_window_grab_keys (MetaWindow  *window)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
   if (window->all_keys_grabbed)
     return;
 
@@ -1284,7 +1266,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
   guint mask = 0;
   MetaVirtualModifier modifiers = 0;
 
-  if (!meta_ui_parse_accelerator (accelerator, &keysym, &keycode, &modifiers))
+  if (!meta_parse_accelerator (accelerator, &keysym, &keycode, &modifiers))
     {
       meta_topic (META_DEBUG_KEYBINDINGS,
                   "Failed to parse accelerator\n");
@@ -1294,7 +1276,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
     }
 
   meta_display_devirtualize_modifiers (display, modifiers, &mask);
-  keycode = keysym_to_keycode (display, keysym);
+  keycode = get_first_keycode_for_keysym (display, keysym);
 
   if (keycode == 0)
     return META_KEYBINDING_ACTION_NONE;
@@ -1346,7 +1328,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
     return FALSE;
 
   meta_display_devirtualize_modifiers (display, grab->combo->modifiers, &mask);
-  keycode = keysym_to_keycode (display, grab->combo->keysym);
+  keycode = get_first_keycode_for_keysym (display, grab->combo->keysym);
 
   binding = display_get_keybinding (display, keycode, mask);
   if (binding)
@@ -1370,35 +1352,12 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
   return TRUE;
 }
 
-#ifdef WITH_VERBOSE_MODE
-static const char*
-grab_status_to_string (int status)
-{
-  switch (status)
-    {
-    case AlreadyGrabbed:
-      return "AlreadyGrabbed";
-    case GrabSuccess:
-      return "GrabSuccess";
-    case GrabNotViewable:
-      return "GrabNotViewable";
-    case GrabFrozen:
-      return "GrabFrozen";
-    case GrabInvalidTime:
-      return "GrabInvalidTime";
-    default:
-      return "(unknown)";
-    }
-}
-#endif /* WITH_VERBOSE_MODE */
-
 static gboolean
 grab_keyboard (MetaDisplay *display,
                Window       xwindow,
                guint32      timestamp,
                int          grab_mode)
 {
-  int result;
   int grab_status;
 
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
@@ -1410,7 +1369,9 @@ grab_keyboard (MetaDisplay *display,
   /* Grab the keyboard, so we get key releases and all key
    * presses
    */
-  meta_error_trap_push_with_return (display);
+
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
 
   /* Strictly, we only need to set grab_mode on the keyboard device
    * while the pointer should always be XIGrabModeAsync. Unfortunately
@@ -1421,7 +1382,7 @@ grab_keyboard (MetaDisplay *display,
    *
    * http://cgit.freedesktop.org/xorg/xserver/commit/?id=9003399708936481083424b4ff8f18a16b88b7b3
    */
-  grab_status = XIGrabDevice (display->xdisplay,
+  grab_status = XIGrabDevice (xdisplay,
                               META_VIRTUAL_CORE_KEYBOARD_ID,
                               xwindow,
                               timestamp,
@@ -1430,82 +1391,16 @@ grab_keyboard (MetaDisplay *display,
                               False, /* owner_events */
                               &mask);
 
-  if (grab_status != Success)
-    {
-      meta_error_trap_pop_with_return (display);
-      meta_topic (META_DEBUG_KEYBINDINGS,
-                  "XIGrabDevice() returned failure status %s time %u\n",
-                  grab_status_to_string (grab_status),
-                  timestamp);
-      return FALSE;
-    }
-  else
-    {
-      result = meta_error_trap_pop_with_return (display);
-      if (result != Success)
-        {
-          meta_topic (META_DEBUG_KEYBINDINGS,
-                      "XIGrabDevice() resulted in an error\n");
-          return FALSE;
-        }
-    }
-
-  meta_topic (META_DEBUG_KEYBINDINGS, "Grabbed all keys\n");
-
-  return TRUE;
+  return (grab_status == Success);
 }
 
 static void
 ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
 {
-  meta_error_trap_push (display);
+  MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
+  Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
 
-  meta_topic (META_DEBUG_KEYBINDINGS,
-              "Ungrabbing keyboard with timestamp %u\n",
-              timestamp);
-  XIUngrabDevice (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
-  meta_error_trap_pop (display);
-}
-
-gboolean
-meta_screen_grab_all_keys (MetaScreen *screen, guint32 timestamp)
-{
-  gboolean retval;
-
-  if (screen->all_keys_grabbed)
-    return FALSE;
-
-  if (screen->keys_grabbed)
-    meta_screen_ungrab_keys (screen);
-
-  meta_topic (META_DEBUG_KEYBINDINGS,
-              "Grabbing all keys on RootWindow\n");
-  retval = grab_keyboard (screen->display, screen->xroot, timestamp, XIGrabModeAsync);
-  if (retval)
-    {
-      screen->all_keys_grabbed = TRUE;
-      g_object_notify (G_OBJECT (screen), "keyboard-grabbed");
-    }
-  else
-    meta_screen_grab_keys (screen);
-
-  return retval;
-}
-
-void
-meta_screen_ungrab_all_keys (MetaScreen *screen, guint32 timestamp)
-{
-  if (screen->all_keys_grabbed)
-    {
-      ungrab_keyboard (screen->display, timestamp);
-
-      screen->all_keys_grabbed = FALSE;
-      screen->keys_grabbed = FALSE;
-
-      /* Re-establish our standard bindings */
-      meta_screen_grab_keys (screen);
-      g_object_notify (G_OBJECT (screen), "keyboard-grabbed");
-    }
+  XIUngrabDevice (xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
 }
 
 gboolean
@@ -1514,9 +1409,9 @@ meta_window_grab_all_keys (MetaWindow  *window,
 {
   Window grabwindow;
   gboolean retval;
+  MetaBackend *backend = meta_get_backend ();
 
-  /* We don't need to grab Wayland clients */
-  if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
+  if (!META_IS_BACKEND_X11 (backend))
     return TRUE;
 
   if (window->all_keys_grabbed)
@@ -1579,40 +1474,45 @@ meta_display_ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
 void
 meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
 {
-  meta_error_trap_push (display);
-  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
+  MetaBackend *backend = meta_get_backend ();
+
+  if (!META_IS_BACKEND_X11 (backend))
+    return;
+
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+
+  XIAllowEvents (xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
                  XIAsyncDevice, timestamp);
   /* We shouldn't need to unfreeze the pointer device here, however we
    * have to, due to the workaround we do in grab_keyboard().
    */
-  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
+  XIAllowEvents (xdisplay, META_VIRTUAL_CORE_POINTER_ID,
                  XIAsyncDevice, timestamp);
-  meta_error_trap_pop (display);
 }
 
 static gboolean
-is_modifier (MetaDisplay *display,
-             unsigned int keycode)
+is_modifier (xkb_keysym_t keysym)
 {
-  int i;
-  int map_size;
-  gboolean retval = FALSE;
-
-  g_assert (display->modmap);
-
-  map_size = 8 * display->modmap->max_keypermod;
-  i = 0;
-  while (i < map_size)
+  switch (keysym)
     {
-      if (keycode == display->modmap->modifiermap[i])
-        {
-          retval = TRUE;
-          break;
-        }
-      ++i;
+    case XKB_KEY_Shift_L:
+    case XKB_KEY_Shift_R:
+    case XKB_KEY_Control_L:
+    case XKB_KEY_Control_R:
+    case XKB_KEY_Caps_Lock:
+    case XKB_KEY_Shift_Lock:
+    case XKB_KEY_Meta_L:
+    case XKB_KEY_Meta_R:
+    case XKB_KEY_Alt_L:
+    case XKB_KEY_Alt_R:
+    case XKB_KEY_Super_L:
+    case XKB_KEY_Super_R:
+    case XKB_KEY_Hyper_L:
+    case XKB_KEY_Hyper_R:
+      return TRUE;
+    default:
+      return FALSE;
     }
-
-  return retval;
 }
 
 static void
@@ -1693,6 +1593,13 @@ process_overlay_key (MetaDisplay *display,
                      ClutterKeyEvent *event,
                      MetaWindow *window)
 {
+  MetaBackend *backend = meta_get_backend ();
+
+  if (!META_IS_BACKEND_X11 (backend))
+    return FALSE;
+
+  Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+
   if (display->overlay_key_only_pressed)
     {
       if (event->hardware_keycode != (int)display->overlay_key_combo.keycode)
@@ -1717,7 +1624,7 @@ process_overlay_key (MetaDisplay *display,
                * binding, we unfreeze the keyboard but keep the grab
                * (this is important for something like cycling
                * windows */
-              XIAllowEvents (display->xdisplay,
+              XIAllowEvents (xdisplay,
                              clutter_input_device_get_device_id (event->device),
                              XIAsyncDevice, event->time);
             }
@@ -1725,7 +1632,7 @@ process_overlay_key (MetaDisplay *display,
             {
               /* Replay the event so it gets delivered to our
                * per-window key bindings or to the application */
-              XIAllowEvents (display->xdisplay,
+              XIAllowEvents (xdisplay,
                              clutter_input_device_get_device_id (event->device),
                              XIReplayDevice, event->time);
             }
@@ -1738,13 +1645,13 @@ process_overlay_key (MetaDisplay *display,
 
           /* We want to unfreeze events, but keep the grab so that if the user
            * starts typing into the overlay we get all the keys */
-          XIAllowEvents (display->xdisplay,
+          XIAllowEvents (xdisplay,
                          clutter_input_device_get_device_id (event->device),
                          XIAsyncDevice, event->time);
 
           binding = display_get_keybinding (display,
                                             display->overlay_key_combo.keycode,
-                                            display->grab_mask);
+                                            0);
           if (binding &&
               meta_compositor_filter_keybinding (display->compositor, binding))
             return TRUE;
@@ -1764,7 +1671,7 @@ process_overlay_key (MetaDisplay *display,
            *
            * https://bugzilla.gnome.org/show_bug.cgi?id=666101
            */
-          XIAllowEvents (display->xdisplay,
+          XIAllowEvents (xdisplay,
                          clutter_input_device_get_device_id (event->device),
                          XIAsyncDevice, event->time);
         }
@@ -1777,7 +1684,7 @@ process_overlay_key (MetaDisplay *display,
       display->overlay_key_only_pressed = TRUE;
       /* We keep the keyboard frozen - this allows us to use ReplayKeyboard
        * on the next event if it's not the release of the overlay key */
-      XIAllowEvents (display->xdisplay,
+      XIAllowEvents (xdisplay,
                      clutter_input_device_get_device_id (event->device),
                      XISyncDevice, event->time);
 
@@ -1809,9 +1716,7 @@ process_iso_next_group (MetaDisplay *display,
              remain frozen. It's the signal handler's responsibility
              to unfreeze it. */
           if (!meta_display_modifiers_accelerator_activate (display))
-            XIAllowEvents (display->xdisplay,
-                           clutter_input_device_get_device_id (event->device),
-                           XIAsyncDevice, event->time);
+            meta_display_unfreeze_keyboard (display, event->time);
           activate = TRUE;
           break;
         }
@@ -1848,7 +1753,7 @@ meta_display_process_key_event (MetaDisplay     *display,
 
   screen = display->screen;
 
-  all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed;
+  all_keys_grabbed = window ? window->all_keys_grabbed : FALSE;
   if (!all_keys_grabbed)
     {
       handled = process_overlay_key (display, screen, event, window);
@@ -1860,9 +1765,16 @@ meta_display_process_key_event (MetaDisplay     *display,
         return TRUE;
     }
 
-  XIAllowEvents (display->xdisplay,
-                 clutter_input_device_get_device_id (event->device),
-                 XIAsyncDevice, event->time);
+  {
+    MetaBackend *backend = meta_get_backend ();
+    if (META_IS_BACKEND_X11 (backend))
+      {
+        Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
+        XIAllowEvents (xdisplay,
+                       clutter_input_device_get_device_id (event->device),
+                       XIAsyncDevice, event->time);
+      }
+  }
 
   keep_grab = TRUE;
   if (all_keys_grabbed)
@@ -1990,7 +1902,7 @@ process_keyboard_move_grab (MetaDisplay     *display,
     return TRUE;
 
   /* don't end grab on modifier key presses */
-  if (is_modifier (display, event->hardware_keycode))
+  if (is_modifier (event->keyval))
     return TRUE;
 
   meta_window_get_position (window, &x, &y);
@@ -2232,7 +2144,7 @@ process_keyboard_resize_grab (MetaDisplay     *display,
     return TRUE;
 
   /* don't end grab on modifier key presses */
-  if (is_modifier (display, event->hardware_keycode))
+  if (is_modifier (event->keyval))
     return TRUE;
 
   if (event->keyval == CLUTTER_KEY_Escape)
@@ -2446,6 +2358,19 @@ process_keyboard_resize_grab (MetaDisplay     *display,
   return handled;
 }
 
+static void
+handle_switch_to_last_workspace (MetaDisplay     *display,
+                                 MetaScreen      *screen,
+                                 MetaWindow      *event_window,
+                                 ClutterKeyEvent *event,
+                                 MetaKeyBinding *binding,
+                                 gpointer        dummy)
+{
+    gint target = meta_screen_get_n_workspaces(screen) - 1;
+    MetaWorkspace *workspace = meta_screen_get_workspace_by_index (screen, target);
+    meta_workspace_activate (workspace, event->time);
+}
+
 static void
 handle_switch_to_workspace (MetaDisplay     *display,
                             MetaScreen      *screen,
@@ -2457,7 +2382,19 @@ handle_switch_to_workspace (MetaDisplay     *display,
   gint which = binding->handler->data;
   MetaWorkspace *workspace;
 
-  workspace = meta_screen_get_workspace_by_index (screen, which);
+  if (which < 0)
+    {
+      /* Negative workspace numbers are directions with respect to the
+       * current workspace.
+       */
+
+      workspace = meta_workspace_get_neighbor (screen->active_workspace,
+                                               which);
+    }
+  else
+    {
+      workspace = meta_screen_get_workspace_by_index (screen, which);
+    }
 
   if (workspace)
     {
@@ -3018,6 +2955,26 @@ handle_toggle_on_all_workspaces (MetaDisplay     *display,
     meta_window_stick (window);
 }
 
+static void
+handle_move_to_workspace_last (MetaDisplay     *display,
+                               MetaScreen      *screen,
+                               MetaWindow      *window,
+                               ClutterKeyEvent *event,
+                               MetaKeyBinding  *binding,
+                               gpointer         dummy)
+{
+  gint which;
+  MetaWorkspace *workspace;
+
+  if (window->always_sticky)
+    return;
+
+  which = meta_screen_get_n_workspaces (screen) - 1;
+  workspace = meta_screen_get_workspace_by_index (screen, which);
+  meta_window_change_workspace (window, workspace);
+}
+
+
 static void
 handle_move_to_workspace  (MetaDisplay     *display,
                            MetaScreen      *screen,
@@ -3312,28 +3269,36 @@ init_builtin_key_bindings (MetaDisplay *display)
                           common_keybindings,
                           META_KEY_BINDING_NONE,
                           META_KEYBINDING_ACTION_WORKSPACE_LEFT,
-                          NULL, 0);
+                          handle_switch_to_workspace, META_MOTION_LEFT);
 
   add_builtin_keybinding (display,
                           "switch-to-workspace-right",
                           common_keybindings,
                           META_KEY_BINDING_NONE,
                           META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
-                          NULL, 0);
+                          handle_switch_to_workspace, META_MOTION_RIGHT);
 
   add_builtin_keybinding (display,
                           "switch-to-workspace-up",
                           common_keybindings,
                           META_KEY_BINDING_NONE,
                           META_KEYBINDING_ACTION_WORKSPACE_UP,
-                          NULL, 0);
+                          handle_switch_to_workspace, META_MOTION_UP);
 
   add_builtin_keybinding (display,
                           "switch-to-workspace-down",
                           common_keybindings,
                           META_KEY_BINDING_NONE,
                           META_KEYBINDING_ACTION_WORKSPACE_DOWN,
-                          NULL, 0);
+                          handle_switch_to_workspace, META_MOTION_DOWN);
+
+  add_builtin_keybinding (display,
+                          "switch-to-workspace-last",
+                          common_keybindings,
+                          META_KEY_BINDING_NONE,
+                          META_KEYBINDING_ACTION_WORKSPACE_LAST,
+                          handle_switch_to_last_workspace, 0);
+
 
 
   /* The ones which have inverses.  These can't be bound to any keystroke
@@ -3716,6 +3681,13 @@ init_builtin_key_bindings (MetaDisplay *display)
                           META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_12,
                           handle_move_to_workspace, 11);
 
+  add_builtin_keybinding (display,
+                          "move-to-workspace-last",
+                          common_keybindings,
+                          META_KEY_BINDING_PER_WINDOW,
+                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_LAST,
+                          handle_move_to_workspace_last, 0);
+
   add_builtin_keybinding (display,
                           "move-to-workspace-left",
                           common_keybindings,
@@ -3890,12 +3862,9 @@ meta_display_init_keys (MetaDisplay *display)
   /* Keybindings */
   display->keymap = NULL;
   display->keysyms_per_keycode = 0;
-  display->modmap = NULL;
   display->min_keycode = 0;
   display->max_keycode = 0;
   display->ignored_modifier_mask = 0;
-  display->num_lock_mask = 0;
-  display->scroll_lock_mask = 0;
   display->hyper_mask = 0;
   display->super_mask = 0;
   display->meta_mask = 0;

src/core/main.c

@@ -125,16 +125,6 @@ log_handler (const gchar   *log_domain,
 static void
 meta_print_compilation_info (void)
 {
-#ifdef HAVE_SHAPE
-  meta_verbose ("Compiled with shape extension\n");
-#else
-  meta_verbose ("Compiled without shape extension\n");
-#endif
-#ifdef HAVE_XSYNC
-  meta_verbose ("Compiled with sync extension\n");
-#else
-  meta_verbose ("Compiled without sync extension\n");
-#endif
 #ifdef HAVE_RANDR
   meta_verbose ("Compiled with randr extension\n");
 #else
@@ -554,11 +544,6 @@ prefs_changed_callback (MetaPreference pref,
       meta_display_retheme_all ();
       break;
 
-    case META_PREF_CURSOR_THEME:
-    case META_PREF_CURSOR_SIZE:
-      meta_display_set_cursor_theme (meta_prefs_get_cursor_theme (),
-				     meta_prefs_get_cursor_size ());
-      break;
     default:
       /* handled elsewhere or otherwise */
       break;

src/core/meta-accel-parse.c

@@ -0,0 +1,356 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#include "config.h"
+
+#include "meta-accel-parse.h"
+
+#include <xkbcommon/xkbcommon.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* This is copied from GTK+ and modified to work with mutter's
+ * internal structures. Originating code comes from gtk/gtkaccelgroup.c
+ */
+
+static inline gboolean
+is_alt (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'a' || string[1] == 'A') &&
+          (string[2] == 'l' || string[2] == 'L') &&
+          (string[3] == 't' || string[3] == 'T') &&
+          (string[4] == '>'));
+}
+
+static inline gboolean
+is_ctl (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'c' || string[1] == 'C') &&
+          (string[2] == 't' || string[2] == 'T') &&
+          (string[3] == 'l' || string[3] == 'L') &&
+          (string[4] == '>'));
+}
+
+static inline gboolean
+is_modx (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'm' || string[1] == 'M') &&
+          (string[2] == 'o' || string[2] == 'O') &&
+          (string[3] == 'd' || string[3] == 'D') &&
+          (string[4] >= '1' && string[4] <= '5') &&
+          (string[5] == '>'));
+}
+
+static inline gboolean
+is_ctrl (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'c' || string[1] == 'C') &&
+          (string[2] == 't' || string[2] == 'T') &&
+          (string[3] == 'r' || string[3] == 'R') &&
+          (string[4] == 'l' || string[4] == 'L') &&
+          (string[5] == '>'));
+}
+
+static inline gboolean
+is_shft (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 's' || string[1] == 'S') &&
+          (string[2] == 'h' || string[2] == 'H') &&
+          (string[3] == 'f' || string[3] == 'F') &&
+          (string[4] == 't' || string[4] == 'T') &&
+          (string[5] == '>'));
+}
+
+static inline gboolean
+is_shift (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 's' || string[1] == 'S') &&
+          (string[2] == 'h' || string[2] == 'H') &&
+          (string[3] == 'i' || string[3] == 'I') &&
+          (string[4] == 'f' || string[4] == 'F') &&
+          (string[5] == 't' || string[5] == 'T') &&
+          (string[6] == '>'));
+}
+
+static inline gboolean
+is_control (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'c' || string[1] == 'C') &&
+          (string[2] == 'o' || string[2] == 'O') &&
+          (string[3] == 'n' || string[3] == 'N') &&
+          (string[4] == 't' || string[4] == 'T') &&
+          (string[5] == 'r' || string[5] == 'R') &&
+          (string[6] == 'o' || string[6] == 'O') &&
+          (string[7] == 'l' || string[7] == 'L') &&
+          (string[8] == '>'));
+}
+
+static inline gboolean
+is_meta (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'm' || string[1] == 'M') &&
+          (string[2] == 'e' || string[2] == 'E') &&
+          (string[3] == 't' || string[3] == 'T') &&
+          (string[4] == 'a' || string[4] == 'A') &&
+          (string[5] == '>'));
+}
+
+static inline gboolean
+is_super (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 's' || string[1] == 'S') &&
+          (string[2] == 'u' || string[2] == 'U') &&
+          (string[3] == 'p' || string[3] == 'P') &&
+          (string[4] == 'e' || string[4] == 'E') &&
+          (string[5] == 'r' || string[5] == 'R') &&
+          (string[6] == '>'));
+}
+
+static inline gboolean
+is_hyper (const gchar *string)
+{
+  return ((string[0] == '<') &&
+          (string[1] == 'h' || string[1] == 'H') &&
+          (string[2] == 'y' || string[2] == 'Y') &&
+          (string[3] == 'p' || string[3] == 'P') &&
+          (string[4] == 'e' || string[4] == 'E') &&
+          (string[5] == 'r' || string[5] == 'R') &&
+          (string[6] == '>'));
+}
+
+static inline gboolean
+is_primary (const gchar *string)
+{
+  return ((string[0] == '<') &&
+	  (string[1] == 'p' || string[1] == 'P') &&
+	  (string[2] == 'r' || string[2] == 'R') &&
+	  (string[3] == 'i' || string[3] == 'I') &&
+	  (string[4] == 'm' || string[4] == 'M') &&
+	  (string[5] == 'a' || string[5] == 'A') &&
+	  (string[6] == 'r' || string[6] == 'R') &&
+	  (string[7] == 'y' || string[7] == 'Y') &&
+	  (string[8] == '>'));
+}
+
+static inline gboolean
+is_keycode (const gchar *string)
+{
+  return (string[0] == '0' &&
+          string[1] == 'x' &&
+          g_ascii_isxdigit (string[2]) &&
+          g_ascii_isxdigit (string[3]));
+}
+
+static gboolean
+accelerator_parse (const gchar         *accelerator,
+                   guint               *accelerator_key,
+                   guint               *accelerator_keycode,
+                   MetaVirtualModifier *accelerator_mods)
+{
+  gboolean error = FALSE;
+  guint keyval, keycode;
+  MetaVirtualModifier mods;
+  gint len;
+
+  if (accelerator_key)
+    *accelerator_key = 0;
+  if (accelerator_keycode)
+    *accelerator_keycode = 0;
+  if (accelerator_mods)
+    *accelerator_mods = 0;
+
+  if (accelerator == NULL)
+    {
+      error = TRUE;
+      goto out;
+    }
+
+  keyval = 0;
+  keycode = 0;
+  mods = 0;
+  len = strlen (accelerator);
+  while (len)
+    {
+      if (*accelerator == '<')
+        {
+          if (len >= 9 && is_primary (accelerator))
+            {
+              /* Primary is treated the same as Control */
+              accelerator += 9;
+              len -= 9;
+              mods |= META_VIRTUAL_CONTROL_MASK;
+            }
+          else if (len >= 9 && is_control (accelerator))
+            {
+              accelerator += 9;
+              len -= 9;
+              mods |= META_VIRTUAL_CONTROL_MASK;
+            }
+          else if (len >= 7 && is_shift (accelerator))
+            {
+              accelerator += 7;
+              len -= 7;
+              mods |= META_VIRTUAL_SHIFT_MASK;
+            }
+          else if (len >= 6 && is_shft (accelerator))
+            {
+              accelerator += 6;
+              len -= 6;
+              mods |= META_VIRTUAL_SHIFT_MASK;
+            }
+          else if (len >= 6 && is_ctrl (accelerator))
+            {
+              accelerator += 6;
+              len -= 6;
+              mods |= META_VIRTUAL_CONTROL_MASK;
+            }
+          else if (len >= 6 && is_modx (accelerator))
+            {
+              static const guint mod_vals[] = {
+                META_VIRTUAL_ALT_MASK,
+                META_VIRTUAL_MOD2_MASK,
+                META_VIRTUAL_MOD3_MASK,
+                META_VIRTUAL_MOD4_MASK,
+                META_VIRTUAL_MOD5_MASK,
+              };
+
+              len -= 6;
+              accelerator += 4;
+              mods |= mod_vals[*accelerator - '1'];
+              accelerator += 2;
+            }
+          else if (len >= 5 && is_ctl (accelerator))
+            {
+              accelerator += 5;
+              len -= 5;
+              mods |= META_VIRTUAL_CONTROL_MASK;
+            }
+          else if (len >= 5 && is_alt (accelerator))
+            {
+              accelerator += 5;
+              len -= 5;
+              mods |= META_VIRTUAL_ALT_MASK;
+            }
+          else if (len >= 6 && is_meta (accelerator))
+            {
+              accelerator += 6;
+              len -= 6;
+              mods |= META_VIRTUAL_META_MASK;
+            }
+          else if (len >= 7 && is_hyper (accelerator))
+            {
+              accelerator += 7;
+              len -= 7;
+              mods |= META_VIRTUAL_HYPER_MASK;
+            }
+          else if (len >= 7 && is_super (accelerator))
+            {
+              accelerator += 7;
+              len -= 7;
+              mods |= META_VIRTUAL_SUPER_MASK;
+            }
+          else
+            {
+              gchar last_ch;
+
+              last_ch = *accelerator;
+              while (last_ch && last_ch != '>')
+                {
+                  last_ch = *accelerator;
+                  accelerator += 1;
+                  len -= 1;
+                }
+            }
+        }
+      else
+        {
+          if (len >= 4 && is_keycode (accelerator))
+            {
+              keycode = strtoul (accelerator, NULL, 16);
+              goto out;
+            }
+	  else if (strcmp (accelerator, "Above_Tab") == 0)
+            {
+              keyval = META_KEY_ABOVE_TAB;
+              goto out;
+            }
+          else
+	    {
+              keyval = xkb_keysym_from_name (accelerator, XKB_KEYSYM_CASE_INSENSITIVE);
+	      if (keyval == XKB_KEY_NoSymbol)
+	        {
+	          error = TRUE;
+	          goto out;
+		}
+	    }
+
+          accelerator += len;
+          len -= len;
+        }
+    }
+
+out:
+  if (error)
+    return FALSE;
+
+  if (accelerator_key)
+    *accelerator_key = keyval;
+  if (accelerator_keycode)
+    *accelerator_keycode = keycode;
+  if (accelerator_mods)
+    *accelerator_mods = mods;
+
+  return TRUE;
+}
+
+gboolean
+meta_parse_accelerator (const char          *accel,
+                        unsigned int        *keysym,
+                        unsigned int        *keycode,
+                        MetaVirtualModifier *mask)
+{
+  if (!accel[0] || strcmp (accel, "disabled") == 0)
+    return TRUE;
+
+  return accelerator_parse (accel, keysym, keycode, mask);
+}
+
+gboolean
+meta_parse_modifier (const char          *accel,
+                     MetaVirtualModifier *mask)
+{
+  if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
+    return TRUE;
+
+  return accelerator_parse (accel, NULL, NULL, mask);
+}

src/core/meta-accel-parse.h

@@ -0,0 +1,43 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ *     Jasper St. Pierre <jstpierre@mecheye.net>
+ */
+
+#ifndef META_ACCEL_PARSE_H
+#define META_ACCEL_PARSE_H
+
+#include <glib.h>
+#include <meta/common.h>
+
+/* Not a real key symbol but means "key above the tab key"; this is
+ * used as the default keybinding for cycle_group.
+ * 0x2xxxxxxx is a range not used by GDK or X. the remaining digits are
+ * randomly chosen */
+#define META_KEY_ABOVE_TAB 0x2f7259c9
+
+gboolean meta_parse_accelerator (const char          *accel,
+                                 unsigned int        *keysym,
+                                 unsigned int        *keycode,
+                                 MetaVirtualModifier *mask);
+gboolean meta_parse_modifier    (const char          *accel,
+                                 MetaVirtualModifier *mask);
+
+#endif /* META_ACCEL_PARSE_H */

src/core/place.c

@@ -318,6 +318,19 @@ window_overlaps_focus_window (MetaWindow *window)
                                    &overlap);
 }
 
+static gboolean
+window_place_centered (MetaWindow *window)
+{
+  MetaWindowType type;
+
+  type = window->type;
+
+  return (type == META_WINDOW_DIALOG ||
+    type == META_WINDOW_MODAL_DIALOG ||
+    type == META_WINDOW_SPLASHSCREEN ||
+    (type == META_WINDOW_NORMAL && meta_prefs_get_center_new_windows ()));
+}
+
 static void
 avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
                                              int        *x,
@@ -737,9 +750,7 @@ meta_window_place (MetaWindow        *window,
    * on the sides of the parent window or something.
    */
   
-  if (window->type == META_WINDOW_DIALOG ||
-      window->type == META_WINDOW_MODAL_DIALOG ||
-      window->type == META_WINDOW_SPLASHSCREEN)
+  if (window_place_centered (window))
     {
       /* Center on current monitor */
       int w, h;

src/core/prefs.c

@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "keybindings-private.h"
+#include "meta-accel-parse.h"
 
 /* If you add a key, it needs updating in init() and in the gsettings
  * notify listener and of course in the .schemas file.
@@ -79,6 +80,7 @@ static MetaKeyCombo overlay_key_combo = { 0, 0, 0 };
 static GDesktopFocusMode focus_mode = G_DESKTOP_FOCUS_MODE_CLICK;
 static GDesktopFocusNewWindows focus_new_windows = G_DESKTOP_FOCUS_NEW_WINDOWS_SMART;
 static gboolean raise_on_click = TRUE;
+static gboolean center_new_windows = FALSE;
 static gboolean attach_modal_dialogs = FALSE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
@@ -271,6 +273,13 @@ static MetaBoolPreference preferences_bool[] =
       },
       &attach_modal_dialogs,
     },
+    {
+      { "center-new-windows",
+        SCHEMA_MUTTER,
+        META_PREF_CENTER_NEW_WINDOWS,
+      },
+      &center_new_windows,
+    },
     {
       { "raise-on-click",
         SCHEMA_GENERAL,
@@ -915,8 +924,11 @@ queue_changed (MetaPreference pref)
                 meta_preference_to_string (pref));
 
   if (changed_idle == 0)
-    changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY,
-                                    changed_idle_handler, NULL, NULL);
+    {
+      changed_idle = g_idle_add_full (META_PRIORITY_PREFS_NOTIFY,
+                                      changed_idle_handler, NULL, NULL);
+      g_source_set_name_by_id (changed_idle, "[mutter] changed_idle_handler");
+    }
 }
 
 
@@ -1210,6 +1222,12 @@ meta_prefs_get_focus_new_windows (void)
   return focus_new_windows;
 }
 
+gboolean
+meta_prefs_get_center_new_windows (void)
+{
+  return center_new_windows;
+}
+
 gboolean
 meta_prefs_get_attach_modal_dialogs (void)
 {
@@ -1323,7 +1341,7 @@ mouse_button_mods_handler (GVariant *value,
   *result = NULL; /* ignored */
   string_value = g_variant_get_string (value, NULL);
 
-  if (!string_value || !meta_ui_parse_modifier (string_value, &mods))
+  if (!string_value || !meta_parse_modifier (string_value, &mods))
     {
       meta_topic (META_DEBUG_KEYBINDINGS,
                   "Failed to parse new GSettings value\n");
@@ -1627,9 +1645,9 @@ overlay_key_handler (GVariant *value,
   *result = NULL; /* ignored */
   string_value = g_variant_get_string (value, NULL);
 
-  if (string_value && meta_ui_parse_accelerator (string_value, &combo.keysym,
-                                                 &combo.keycode,
-                                                 &combo.modifiers))
+  if (string_value && meta_parse_accelerator (string_value, &combo.keysym,
+                                              &combo.keycode,
+                                              &combo.modifiers))
     ;
   else
     {
@@ -1725,6 +1743,9 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_FOCUS_NEW_WINDOWS:
       return "FOCUS_NEW_WINDOWS";
 
+    case META_PREF_CENTER_NEW_WINDOWS:
+      return "CENTER_NEW_WINDOWS";
+
     case META_PREF_ATTACH_MODAL_DIALOGS:
       return "ATTACH_MODAL_DIALOGS";
 
@@ -1887,7 +1908,7 @@ update_binding (MetaKeyPref *binding,
       keycode = 0;
       mods = 0;
 
-      if (!meta_ui_parse_accelerator (strokes[i], &keysym, &keycode, &mods))
+      if (!meta_parse_accelerator (strokes[i], &keysym, &keycode, &mods))
         {
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Failed to parse new GSettings value\n");

src/core/screen-private.h

@@ -79,7 +79,6 @@ struct _MetaScreen
   MetaStack *stack;
   MetaStackTracker *stack_tracker;
 
-  MetaCursorTracker *cursor_tracker;
   MetaCursor current_cursor;
 
   Window wm_sn_selection_window;
@@ -113,7 +112,6 @@ struct _MetaScreen
   guint workspace_layout_overridden : 1;
   
   guint keys_grabbed : 1;
-  guint all_keys_grabbed : 1;
   
   int closing;
   

src/core/screen.c

@@ -78,7 +78,6 @@ static void on_monitors_changed (MetaMonitorManager *manager,
 enum
 {
   PROP_N_WORKSPACES = 1,
-  PROP_KEYBOARD_GRABBED,
 };
 
 enum
@@ -132,9 +131,6 @@ meta_screen_get_property (GObject      *object,
     case PROP_N_WORKSPACES:
       g_value_set_int (value, meta_screen_get_n_workspaces (screen));
       break;
-    case PROP_KEYBOARD_GRABBED:
-      g_value_set_boolean (value, screen->all_keys_grabbed ? TRUE : FALSE);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -258,16 +254,6 @@ meta_screen_class_init (MetaScreenClass *klass)
   g_object_class_install_property (object_class,
                                    PROP_N_WORKSPACES,
                                    pspec);
-
-  pspec = g_param_spec_boolean ("keyboard-grabbed",
-                                "Keyboard grabbed",
-                                "Whether the keyboard is grabbed",
-                                FALSE,
-                                G_PARAM_READABLE);
-
-  g_object_class_install_property (object_class,
-                                   PROP_KEYBOARD_GRABBED,
-                                   pspec);
 }
 
 static void
@@ -477,6 +463,9 @@ create_guard_window (Display *xdisplay, MetaScreen *screen)
 		   CWEventMask|CWOverrideRedirect,
 		   &attributes);
 
+  /* https://bugzilla.gnome.org/show_bug.cgi?id=710346 */
+  XStoreName (xdisplay, guard_window, "mutter guard window");
+
   {
     unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
     XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
@@ -560,7 +549,7 @@ meta_screen_new (MetaDisplay *display,
         }
 
       /* We want to find out when the current selection owner dies */
-      meta_error_trap_push_with_return (display);
+      meta_error_trap_push (display);
       attrs.event_mask = StructureNotifyMask;
       XChangeWindowAttributes (xdisplay,
                                current_wm_sn_owner, CWEventMask, &attrs);
@@ -619,7 +608,7 @@ meta_screen_new (MetaDisplay *display,
     }
   
   /* select our root window events */
-  meta_error_trap_push_with_return (display);
+  meta_error_trap_push (display);
 
   /* We need to or with the existing event mask since
    * gtk+ may be interested in other events.
@@ -676,9 +665,6 @@ meta_screen_new (MetaDisplay *display,
   screen->xroot = xroot;
   screen->rect.x = screen->rect.y = 0;
 
-  if (!meta_is_wayland_compositor ())
-    meta_monitor_manager_initialize ();
-
   manager = meta_monitor_manager_get ();
   g_signal_connect (manager, "monitors-changed",
                     G_CALLBACK (on_monitors_changed), screen);
@@ -711,7 +697,6 @@ meta_screen_new (MetaDisplay *display,
 
   reload_monitor_infos (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 */  
@@ -753,7 +738,6 @@ meta_screen_new (MetaDisplay *display,
   
   set_workspace_names (screen);
 
-  screen->all_keys_grabbed = FALSE;
   screen->keys_grabbed = FALSE;
   meta_screen_grab_keys (screen);
 
@@ -838,7 +822,7 @@ meta_screen_free (MetaScreen *screen,
   meta_stack_free (screen->stack);
   meta_stack_tracker_free (screen->stack_tracker);
 
-  meta_error_trap_push_with_return (screen->display);
+  meta_error_trap_push (screen->display);
   XSelectInput (screen->display->xdisplay, screen->xroot, 0);
   if (meta_error_trap_pop_with_return (screen->display) != Success)
     meta_warning ("Could not release screen %d on display \"%s\"\n",
@@ -1388,10 +1372,12 @@ meta_screen_update_cursor (MetaScreen *screen)
   MetaCursor cursor = screen->current_cursor;
   Cursor xcursor;
   MetaCursorReference *cursor_ref;
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
 
-  cursor_ref = meta_cursor_reference_from_theme (screen->cursor_tracker, cursor);
-  meta_cursor_tracker_set_root_cursor (screen->cursor_tracker, cursor_ref);
-  meta_cursor_reference_unref (cursor_ref);
+  cursor_ref = meta_cursor_reference_from_theme (cursor);
+  meta_cursor_tracker_set_root_cursor (tracker, cursor_ref);
+  if (cursor_ref)
+    meta_cursor_reference_unref (cursor_ref);
 
   /* Set a cursor for X11 applications that don't specify their own */
   xcursor = meta_display_create_x_cursor (display, cursor);
@@ -1473,6 +1459,8 @@ meta_screen_update_tile_preview (MetaScreen *screen,
         g_timeout_add (TILE_PREVIEW_TIMEOUT_MS,
                        meta_screen_update_tile_preview_timeout,
                        screen);
+      g_source_set_name_by_id (screen->tile_preview_timeout_id,
+                               "[mutter] meta_screen_update_tile_preview_timeout");
     }
   else
     {
@@ -1496,6 +1484,7 @@ MetaWindow*
 meta_screen_get_mouse_window (MetaScreen  *screen,
                               MetaWindow  *not_this_one)
 {
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
   MetaWindow *window;
   int x, y;
 
@@ -1503,8 +1492,7 @@ meta_screen_get_mouse_window (MetaScreen  *screen,
     meta_topic (META_DEBUG_FOCUS,
                 "Focusing mouse window excluding %s\n", not_this_one->desc);
 
-  meta_cursor_tracker_get_pointer (screen->cursor_tracker,
-                                   &x, &y, NULL);
+  meta_cursor_tracker_get_pointer (tracker, &x, &y, NULL);
 
   window = meta_stack_get_default_focus_window_at_point (screen->stack,
                                                          screen->active_workspace,
@@ -1783,6 +1771,8 @@ meta_screen_get_current_monitor_for_pos (MetaScreen *screen,
 int
 meta_screen_get_current_monitor (MetaScreen *screen)
 {
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
+
   if (screen->n_monitor_infos == 1)
     return 0;
   
@@ -1793,8 +1783,7 @@ meta_screen_get_current_monitor (MetaScreen *screen)
     {
       int x, y;
 
-      meta_cursor_tracker_get_pointer (screen->cursor_tracker,
-                                       &x, &y, NULL);
+      meta_cursor_tracker_get_pointer (tracker, &x, &y, NULL);
       meta_screen_get_current_monitor_for_pos (screen, x, y);
     }
 
@@ -2678,9 +2667,13 @@ add_sequence (MetaScreen        *screen,
    * to compute exactly when we may next time out
    */
   if (screen->startup_sequence_timeout == 0)
-    screen->startup_sequence_timeout = g_timeout_add_seconds (1,
-                                                              startup_sequence_timeout,
-                                                              screen);
+    {
+      screen->startup_sequence_timeout = g_timeout_add_seconds (1,
+                                                                startup_sequence_timeout,
+                                                                screen);
+      g_source_set_name_by_id (screen->startup_sequence_timeout,
+                               "[mutter] startup_sequence_timeout");
+    }
 
   update_startup_feedback (screen);
 }
@@ -3305,7 +3298,9 @@ gboolean
 meta_screen_handle_xevent (MetaScreen *screen,
                            XEvent     *xevent)
 {
-  if (meta_cursor_tracker_handle_xevent (screen->cursor_tracker, xevent))
+  MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
+
+  if (meta_cursor_tracker_handle_xevent (tracker, xevent))
     return TRUE;
 
   return FALSE;

src/core/stack-tracker.c

@@ -862,7 +862,7 @@ resync_verified_stack_with_xserver_stack (MetaStackTracker *tracker)
   GList *l;
   unsigned int i, j;
   MetaStackWindow *expected_xwindow;
-  gboolean modified_stack;
+  gboolean modified_stack = FALSE;
 
   /* Overview of the algorithm:
    *

src/core/stack.c

@@ -1459,17 +1459,17 @@ stack_sync_to_xserver (MetaStack *stack)
 
                   if (newp->any.type == META_WINDOW_CLIENT_TYPE_X11)
                     {
-                  XWindowChanges changes;
+                      XWindowChanges changes;
                       serial = XNextRequest (stack->screen->display->xdisplay);
 
                       changes.sibling = last_xwindow;
-                  changes.stack_mode = Below;
+                      changes.stack_mode = Below;
 
-                  XConfigureWindow (stack->screen->display->xdisplay,
+                      XConfigureWindow (stack->screen->display->xdisplay,
                                         newp->x11.xwindow,
-                                    CWSibling | CWStackMode,
-                                    &changes);
-                }
+                                        CWSibling | CWStackMode,
+                                        &changes);
+                    }
 
                   meta_stack_tracker_record_lower_below (stack->screen->stack_tracker,
                                                          newp, last_window,
@@ -1508,7 +1508,7 @@ stack_sync_to_xserver (MetaStack *stack)
           if (x_ref->any.type != META_WINDOW_CLIENT_TYPE_X11)
             {
               for (x_ref = newp;
-                   x_ref->any.type != META_WINDOW_CLIENT_TYPE_X11 && x_ref > new_stack;
+                   x_ref->any.type != META_WINDOW_CLIENT_TYPE_X11 && x_ref < new_end;
                    x_ref++)
                 ;
             }