Bump version to 3.12.1

Update NEWS.
po: Update POTFILES after file got renamed
2014-04-15 22:46:38 +02:00 · 2014-04-15 22:46:37 +02:00 · 2014-04-15 22:31:11 +02:00
347 changed files with 130367 additions and 86338 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,35 @@
+Makefile
+Makefile.in
+aclocal.m4
+confdefs.h
+config.cache
+config.guess
+config.h
+config.log
+config.status
+config.sub
+configure
+configure.scan
+libtool
+ltconfig
+ltmain.sh
+stamp-h
+stamp-h.in
+stamp-h1
+stamp.h
+version.h
+config.h.in
+install-sh
+missing
+mkinstalldirs
+INSTALL
+intl
+ABOUT-NLS
+COPYING
+intltool-*
+metacity.spec
+autom4te.cache
+compile
+depcomp
+omf.make
+xmldocs.make
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ Makefile.in
 Makefile.in.in
 aclocal.m4
 autom4te.cache
-build-aux
 compile
 config.guess
 config.h
@@ -20,11 +19,11 @@ libtool
 ltmain.sh
 missing
 .deps
-50-mutter-navigation.xml
-50-mutter-system.xml
-50-mutter-windows.xml
-mutter.desktop
-mutter-wayland.desktop
+src/50-mutter-navigation.xml
+src/50-mutter-system.xml
+src/50-mutter-windows.xml
+src/mutter-wm.desktop
+src/mutter-wayland.desktop
 *.o
 *.a
 *.lo
@@ -33,6 +32,10 @@ mutter-wayland.desktop
 *.swp
 *.gir
 *.typelib
+tidy-enum-types.[ch]
+tidy-marshal.[ch]
+stamp-tidy-enum-types.h
+stamp-tidy-marshal.h
 stamp-h1
 *.gmo
 *.make
@@ -41,12 +44,11 @@ stamp-it
 .intltool-merge-cache
 POTFILES
 po/*.pot
-libmutter.pc
-mutter
-mutter-restart-helper
-mutter-test-client
-mutter-test-runner
-mutter-all.test
+50-metacity-desktop-key.xml
+50-metacity-key.xml
+libmutter-wayland.pc
+mutter-wayland
+mutter-launch
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
 org.gnome.mutter.wayland.gschema.valid
@@ -54,21 +56,34 @@ org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
-m4/*
+mutter-grayscale
+mutter-mag
+mutter-message
+mutter-window-demo
+focus-window
+test-attached
+test-focus
+test-gravity
+test-resizing
+test-size-hints
+# We can't say just "wm-tester" here or it will ignore the directory
+# rather than the binary
+src/wm-tester/wm-tester
 INSTALL
 mkinstalldirs
-meta-enum-types.[ch]
-src/stamp-meta-enum-types.h
+src/mutter-enum-types.[ch]
+src/stamp-mutter-enum-types.h
+src/mutter-marshal.[ch]
+src/stamp-mutter-marshal.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
-src/meta-dbus-login1.[ch]
+src/mutter-plugins.pc
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
-src/xdg-shell-unstable-v*-protocol.c
-src/xdg-shell-unstable-v*-server-protocol.h
-src/pointer-gestures-unstable-v*-protocol.c
-src/pointer-gestures-unstable-v*-server-protocol.h
-src/meta/meta-version.h
+src/xdg-shell-protocol.c
+src/xdg-shell-server-protocol.h
+src/xserver-protocol.c
+src/xserver-server-protocol.h
 doc/reference/*.args
 doc/reference/*.bak
 doc/reference/*.hierarchy
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,8 @@

-SUBDIRS = data src po doc
+SUBDIRS=src po doc
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge \
-	intltool-update \
-	po/stamp-it \
-	po/.intltool-merge-cache
--- a/482
+++ b/482
@@ -1,485 +1,9 @@
-3.19.3
+3.12.1
 ======
-* Correct refresh rate units on KMS/Wayland [Daniel; #758653]
-* Fix crash when initial cursor position is not on a monitor [Marek; #756698]
-* Fix crash when more CRTs are enabled than outputs connected [Rui; #751638]
-* Fix touch pointer emulation on wayland [Carlos; #756754]
-* Allow minimizing windows that don't advertise supporting it [Jasper; #758186]
-* Force 2-finger scroll by default if available [Bastien; #759304]
-* Fix crash during XWayland initialization [Marek; #751845]
-* Ensure to send a ConfigureNotify to just mapped windows [Rui; #759492]
-* Misc. bug fixes and cleanups [Carlos, Jonas, Lionel; #758239, #758633,
-  #755503, #759374]
+* Fix crash when running as X11 compositor [Adel; #727115]

 Contributors:
-  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Lionel Landwerlin, Rui Matos,
-  Bastien Nocera, Daniel Stone, Jasper St. Pierre
-
-3.19.2
-======
-* Fix crash on monitor unplug [Rui; #756796]
-* Exit cleanly on initialization errors [Owen; #757311]
-* Allow to determine backend setting from session type [Ray; #741666]
-* Fix DRM device detection for non-PCI devices [Alban; #754911]
-* Don't force placement of windows without buffer on wayland [Marek; #751887]
-* Fix initialization of bypass compositor hint [Rui; #758544]
-
-Contributors:
-  Alban Browaeys, Marek Chalupa, Rui Matos, Florian Müllner, Ray Strode,
-  Owen W. Taylor
-
-3.19.1
-======
-* wayland: Allow to trigger popups through keyboard/touch [Carlos; #756296]
-* Fix modifiers-only input source switching on Ubuntu [Alberts; #756543]
-* Misc. bug fixes [Jonas, Rui, Giovanni, Florian; #756675, #756660, #746420,
-  #756548, #756796, #757101, #757148]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Florian Müllner
-
-Translations:
-  Daniel Șerbănescu [ro]
-
-3.18.1
-======
-* Misc. crash fixes [Jonas, Rui, Carlos, Owen, Florian; #755096, #754979,
-  #755490, #754357, #745785, #756642]
-* Improve HiDPI support on wayland [Jonas; #755097]
-* Fix doubly-scaled cursor on XWayland HiDPI [Jonas; #755099]
-* Stop hiding titlebar buttons in dialogs [Florian; #641630]
-* Add support for fullscreen/unfullscreen animations [Cosimo; #707248]
-* Misc. bug fixes [Rui, Colin, Florian; #743339, #752047, #756074, #756649]
-
-Contributors:
-  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Colin Walters, Owen W. Taylor
-
-3.18.0
-======
-* Misc. fixes [Florian, Jonas; #753434]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-Translations:
-  Rūdolfs Mazurs [lv]
-
-3.17.92
-=======
-* Don't omit the background color for backgrounds that don't fill the screen
-  [Ray; #754476]
-* Fix up key state on FocusIn when running nested [Owen; #753948]
-* Find the right DRM device instead of hardcoding card0 [Marek; #753434]
-* Scale cursor on HiDPI screens [Jonas; #744932]
-* Misc. fixes and cleanups [Lan, Jonas, Javier, Olivier; #754545, #754215,
-  #754621, #754715]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Olivier Fourdan, Javier Jardón, Ting-Wei Lan,
-  Ray Strode, Owen W. Taylor
-
-3.17.91
-=======
-* Send error on pointer-gesture protocol version mismatch [Jonas; #753855]
-* Misc. cleanups [Jonas; #744932]
-
-Contributors:
-  Jonas Ådahl
-
-Translations:
-  Chao-Hsiung Liao [zh_TW], Piotr Drąg [pl]
-
-3.17.90
-=======
-* Fix glitch with some fullscreen apps [Rui; #753020]
-* Fix screen update issue with NVidia driver [Aaron, Rui; #728464]
-* Only call frame callbacks for surfaces that get drawn [Adel; #739163]
-* Misc. bug fixes and cleanups [Jonas, Rui, Ting-Wei; #753222, #752753, #753237,
-  #753380, #744104, #744932]
-
-Contributors:
-  Jonas Ådahl, Adel Gadllah, Carlos Garnacho, Ting-Wei Lan, Rui Matos,
-  Florian Müllner, Aaron Plattner, Jasper St. Pierre
-
-Translations:
-  Akom Chotiphantawanon [th]
-
-3.17.4
-======
-* nested: Allow basic configuration of dummy outputs [Jonas; #747089]
-* Send wl_surface.enter and wl_surface.leave on output changes [Jonas; #744453]
-* Improve HiDPI handling on wayland [Jonas; #745655, #744934]
-* Implement compositor-side animated cursors [Carlos; #752342]
-* Misc. bug fixes [Peter, Marek, Carlos, Matthias, Rui; #750816, #751884,
-  #752248, #752551, #752552, #752673, #752674]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Matthias Clasen, Carlos Garnacho, Peter Hutterer,
-  Rui Matos, Florian Müllner, Jasper St. Pierre
-
-3.17.3
-======
-* Add X11/wayland clipboard interaction [Carlos; #738312]
-* Support VM monitor layout hints on wayland [Thomas; #750363]
-* Misc. bug fixes [Rui, Jonas, Olivier, Carlos, Ting-Wei, Peter, Florian;
-  #749994, #750256, #749716, #748705, #750552, #751036, #750007, #751136,
-  #750552, #751471, #751715, #750680]
-
-Contributors:
-  Jonas Ådahl, Dave Airlie, Cosimo Cecchi, Olivier Fourdan, Carlos Garnacho,
-  Thomas Hellstrom, Peter Hutterer, Ting-Wei Lan, Jasper Lievisse Adriaanse,
-  Rui Matos, Florian Müllner, Jasper St. Pierre
-
-Translations:
-  Marek Černocký [cs], Christian Kirbach [de], Pedro Albuquerque [pt]
-
-3.17.2
-======
-* Honor default value for click method setting [Rui; #746290]
-* Add X11/wayland clipboard interoperation [Carlos; #738312]
-* Misc. bug fixes [Rui; #749076, #749711]
-
-Contributors:
-  Carlos Garnacho, Rui Matos, Jasper St. Pierre
-
-3.17.1
-======
-* Add public method to get neighboring monitor [Florian; #633994]
-* Apply the right settings to the right input devices [Carlos; #747886]
-* Fix scroll button setting [Ondrej; #747967]
-* Add support for modal hint on wayland [Jonas; #745720]
-* Don't reset idle time for non-hardware events [Rui; #748541]
-* Misc. bug fixes [Ray, Rui; #748380, #748478]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Ondrej Holy, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Ray Strode, Tomeu Vizoso
-
-3.16.1
-======
-* Add function to refresh all background instances [Rui; #739178]
-* Fix swapped scroll methods on wayland [Ondrej; #746870]
-* Manually activate stage to fix accessibility on wayland [Ray, Rui; #746670]
-* Center pointer on primary monitor on startup [Carlos; #746896]
-* wayland: Reword synchronized state application semantics [Jonas; #743617]
-* Ensure input settings are applied on startup [Rui; #747434]
-* Misc. bug fixes [Jonas, Giovanni, Calvin, Ray, Rui; #744932, #746509, #746692,
-  #746510, #746545, #747263]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Ondrej Holy, Rui Matos,
-  Jasper St. Pierre, Ray Strode, Calvin Walton
-
-Translations:
-  Khaled Hosny [ar], Marek Černocký [cs]
-
-3.16.0
-======
-* wayland: Don't skip notifying about initial maximized state [Jonas; #745303]
-
-Contributors:
-  Jonas Ådahl
-
-Translations:
-  Kjartan Maraas [nb], Jiri Grönroos [fi], Andika Triwidada [id],
-  Inaki Larranaga Murgoitio [eu], Ask H. Larsen [da], Muhammet Kara [tr]
-
-3.15.92
-=======
-* Ensure pointer visibility on monitor changes [Rui, Marek; #745121, #745752]
-* Fix geometry of shaded windows [Florian; #746145]
-* Take over cursor visibility handling from gsd [Carlos; #712775]
-* Fix touch interaction on window decorations [Carlos; #745335]
-* Add options for libinput_config_click_method [Carlos; #746290]
-* Scale window decorations on HiDPI displays [Florian; #744354]
-* Misc. bug fixes [Carlos, Ray, Rui; #745163, #746295, #746098, #745734]
-
-Contributors:
-  Marek Chalupa, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Ray Strode
-
-Translations:
-  Piotr Drąg [pl], Milo Casagrande [it], Changwoo Ryu [ko],
-  Daniel Korostil [uk], Baurzhan Muftakhidinov [kk], Trần Ngọc Quân [vi],
-  Alexander Shopov [bg], Jordi Mas [ca], Samir Ribic [bs], A S Alam [pa],
-  Matej Urbančič [sl]
-
-3.15.91
-=======
-* wayland: Fix nested compositor mode [Jonas; #745401]
-* wayland: Fix pointer constraining [Marek; #727337]
-* wayland: Fix input region on HiDPI [Jonas; #744933]
-* Allow themes to style buttons differently based on function [Horst; #745108]
-* Misc. bug fixes and cleanups [Ray, Rui, Alban; #745141, #745118, #745476,
-  #745442]
-
-Contributors:
-  Jonas Ådahl, Alban Browaeys, Marek Chalupa, Horst, Rui Matos,
-  Jasper St. Pierre, Ray Strode
-
-Translations:
-  Chao-Hsiung Liao [zh_TW], Efstathios Iosifidis [el], Dušan Kazik [sk],
-  Balázs Úr [hu], Daniel Mustieles [es], Claude Paroz [fr], Stas Solovey [ru],
-  Yosef Or Boczko [he], Rafael Ferreira [pt_BR], Aurimas Černius [lt],
-  Fran Dieguez [gl], Anders Jonsson [sv], Мирослав Николић [sr, sr@latin]
-
-3.15.90
-=======
-* Initialize MetaOutput even when we can't get the EDID [Rui; #743412]
-* Expose MetaMonitorManager to introspection [Rui; #743745]
-* Fix flash on unredirection [Chris; #743858]
-* Update xdg-shell implementation to v5 [Jonas; #744452]
-* Do not try to use seat devices that aren't (yet) present [Ray; #744640]
-* Add keybindings for switching to VT8-VT12 [Ray; #744800]
-* Misc bug fixes [Jonas, Cosimo; #743678, #744500]
-
-Contributors:
-  Jonas Ådahl, Cosimo Cecchi, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
-  Ray Strode, Chris Wilson
-
-Translations:
-  Yosef Or Boczko [he], Yuri Myasoedov [ru], Kristjan SCHMIDT [eo],
-  Matej Urbančič [sl], Dušan Kazik [sk]
-
-3.15.4
-======
-* Use GTK+ theme for window decorations instead of metacity [Florian; #741917]
-* Export the same EDID information on X11 and wayland [Carlos; #742882]
-* Apply input device configuration on wayland [Carlos; #739397]
-* Implement pointer barriers on wayland [Jonas; #706655]
-* Misc. bug fixes (Ting-Wei, Rui, Ikey, Florian, Marek, Jonas; #741829,
-  #738630, #737463, #698995, #727893, #742825, #742824, #742841, #743173,
-  #743189, #743217, #743254]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Marek Chalupa, Ikey Doherty, Adel Gadllah,
-  Carlos Garnacho, Ting-Wei Lan, Rui Matos, Florian Müllner, Jasper St. Pierre,
-  Rico Tzschichholz
-
-Translations:
-  Matej Urbančič [sl], Balázs Úr [hu], Marek Černocký [cs],
-  Inaki Larranaga Murgoitio [eu], Rafael Ferreira [pt_BR],
-  Daniel Mustieles [es], Fran Dieguez [gl]
-
-3.15.3
-======
-* Don't leave left-over frames queued [Owen; #738686]
-* Set CRTC configuration even if it might be redundant [Rui; #740838]
-
-Contributors:
-  Rui Matos, Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
-
-Translations:
-  Trần Ngọc Quân [vi], Muhammet Kara [tr]
-
-3.15.2
-======
-* Don't enable hiDPI on monitors with broken EDID [Bastien; #734839]
-* Prevent crash applying monitor config for a closed lid [Rui; #739450]
-* Fix "flicker" during startup transition [Ray; #740377]
-* Misc. bug fixes [Lan, Florian, Carlos; #731521, #740133, #738890]
-
-Contributors:
-  Emmanuele Bassi, Carlos Garnacho, Jonathon Jongsma, Ting-Wei Lan, Rui Matos,
-  Florian Müllner, Bastien Nocera, Jasper St. Pierre, Ray Strode
-
-Translations:
-  Kjartan Maraas [nb]
-
-3.15.1
-======
-* Use GResources for theme loading [Cosimo; #736936]
-* Fix headerbar drag getting stuck on xwayland [Carlos; #738411]
-* Fix wayland hiDPI regressions [Adel; #739161]
-* Misc bug fixes and cleanups [Jasper, Rui, Carlos; #662962, #738630, #738888,
-  #738890]
-
-Contributors:
-  Cosimo Cecchi, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Jasper St. Pierre
-
-3.14.1
-======
-* Fix move-titlebar-onscreen function [Florian; #736915]
-* Fix stacking of the guard window [Owen; #737233]
-* Fix keycode lookup for non-default layouts [Rui; #737134]
-* Fix workspaces-only-on-primary handling [Florian; #737178]
-* Don't unstick sticky windows on workspace removal [Florian; #737625]
-* Do not auto-minimize fullscreen windows [Jasper; #705177]
-* Upload keymap to newly added keyboard devices [Rui; #737673]
-* Apply keyboard repeat settings [Rui; #728055]
-* Don't send pressed keys on enter [Rui; #727178]
-* Fix build without wayland/native [Rico; #738225]
-* Send modifiers after the key event [Rui; #738238]
-* Fix unredirect heuristic [Adel; #738271]
-* Do not show system chrome over fullscreen windows [Florian; #693991]
-* Misc. bug fixes [Florian, Adel, Tom; #737135, #737581, #738146, #738384]
-
-Contributors:
-  Tom Beckmann, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor
-
-Translations:
-  Krishnababu Krothapalli [te], Мирослав Николић [sr, sr@latin],
-  Alexander Shopov [bg], Saibal Ray [bn_IN], Milo Casagrande [it],
-  Rūdolfs Mazurs [lv]
-
-3.14.0
-======
-* Fix placement of popup windows on wayland [Jasper; #736812]
-* Only increment serial once per event [Jasper; #736840]
-* Fix window positioning regression with non-GTK+ toolkits [Owen; #736719]
-
-Contributors:
-  Jasper St. Pierre, Owen W. Taylor
-
-Translations:
-  Saibal Ray [bn_IN], Dušan Kazik [sk], Manoj Kumar Giri [or],
-  Christian Kirbach [de], Ask H. Larsen [da], YunQiang Su [zh_CN],
-  Bernd Homuth [de], Shankar Prasad [kn], Petr Kovar [cs], Rajesh Ranjan [hi]
-
-3.13.92
-=======
-* Rewrite background code [Owen; #735637, #736568]
-* Fix size in nested mode [Owen; #736279]
-* Fix destroy animation of background windows [Florian; #735927]
-* Wire keymap changes up to the wayland frontend [Rui; #736433]
-* Add a test framework and stacking tests [Owen; #736505]
-* Simplify handling of the merged X and wayland stack [Owen; #736559]
-* Fix cursor size on HiDPI [Adel; #729337]
-* Misc. bug fixes [Owen; #735632, #736589, #736694]
-
-Contributors:
-  Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre, Owen W. Taylor
-
-Translations:
-  Andika Triwidada [id], Piotr Drąg [pl], Changwoo Ryu [ko],
-  Kjartan Maraas [nb], Ville-Pekka Vainio [fi], Yuri Myasoedov [ru],
-  Aurimas Černius [lt], Balázs Úr [hu], Sweta Kothari [gu], A S Alam [pa],
-  Sandeep Sheshrao Shedmake [mr], Shantha kumar [ta], Gil Forcada [ca],
-  Carles Ferrando [ca@valencia], Mattias Eriksson [sv]
-
-3.13.91
-=======
-* Misc. bug fixes [Carlos; #735452]
-
-Contributors:
-  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre,
-  Rico Tzschichholz
-
-Translations:
-  Chao-Hsiung Liao po/zh_HK, zh_TW.po, Enrico Nicoletto [pt_BR],
-  Kjartan Maraas [nb], Fran Diéguez [gl], Yosef Or Boczko [he],
-  Maria  Mavridou [el], Claude Paroz [fr]
-
-3.13.90
-=======
-* Only call XSync() once per frame [Rui; #728464]
-* Update capabilities on device list changes [Carlos; #733563]
-* Make use of GLSL optional [Adel; #733623]
-* Handle gestures and touch events on wayland [Carlos; #733631]
-* Add support for unminimize compositor effects [Cosimo; #733789]
-* Always set the frame background to None [Giovanni; #734054]
-* Add backend methods to handle keymaps [Rui; #734301]
-* Actually mark revalidated MetaTextureTower levels as valid [Owen; #734400]
-* Rely on explicit -backward switcher keybindings instead of <shift>-magic
-  [Christophe; #732295, #732385]
-* Misc. bug fixes and cleanups [Rui, Adel, Christophe; #727178, #734852,
-  #734960]
-
-Contributors:
-  Emmanuele Bassi, Giovanni Campagna, Cosimo Cecchi, Piotr Drąg,
-  Christophe Fergeau, Adel Gadllah, Carlos Garnacho, Rui Matos,
-  Florian Müllner, Jasper St. Pierre, Rico Tzschichholz, Olav Vitters,
-  Owen W. Taylor
-
-Translations:
-  Kjartan Maraas [nb], Inaki Larranaga Murgoitio [eu], Lasse Liehu [fi],
-  ngoswami [as], Daniel Mustieles [es]
-
-3.13.4
-======
-* Fix move/resize operations for wayland clients [Marek; #731237]
-* Add ::first-frame signal to MetaWindowActor [Owen; #732343]
-* Handle keysyms without the XF86 prefix [Owen; #727993]
-* Add touch gesture support [Carlos]
-* Fix a deadlock when exiting [Owen; #733068]
-* Add framework for restarting the compositor with nice visuals
-  [Owen; #733026]
-* Toggle seat capabilities on VT switch [Carlos; #733563]
-* Misc bug fixes [Florian, Owen; #732695, #732350]
-
-Contributors:
-  Tom Beckmann, Giovanni Campagna, Marek Chalupa, Adel Gadllah,
-  Carlos Garnacho, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz,
-  Owen W. Taylor
-
-Translations:
-  Yuri Myasoedov [ru], Fran Diéguez [gl], Aurimas Černius [lt], MarMav [el],
-  Enrico Nicoletto [pt_BR]
-
-3.13.3
-======
-* Improve behavior of window buttons with compositor menus [Florian; #731058]
-* Implement touch support on wayland [Carlos; #724442]
-* Update window shadows [Nikita; #731866]
-* Keep windows on the preferred output [Florian; #731760]
-* Misc bug fixes [Jonas, Florian, Jasper; #729601, #730681, #731353, #731332,
-  #730527, #662962]
-
-Contributors:
-  Jonas Ådahl, Nikita Churaev, Carlos Garnacho, Florian Müllner,
-  Jasper St. Pierre, Rico Tzschichholz
-
-3.13.2
-======
-* Add basic HiDPI support on wayland [Adel; #728902]
-* Fix crash when monitors change during suspend [Giovanni; #725637]
-* Replace mutter-launch with logind integration [Jasper; #724604]
-* Move window menu into the compositor [Jasper; #726352]
-* Fix delayed focus-follows-mouse support [Florian; #730541]
-* Support fallback app menu in window decorations [Florian; #730752]
-* Misc. bug fixes and cleanups [Giovanni, Jonas, Jasper; #729732, #729602,
-  #726714]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Adel Gadllah, Florian Müllner,
-  Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
-  Pau Iranzo [ca], Daniel Mustieles [es]
-
-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]
+  Matthias Clasen, Adel Gadllah, Florian Müllner, Jasper St. Pierre

 3.12.0
 ======
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,8 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

-REQUIRED_AUTOMAKE_VERSION=1.11
+PKG_NAME="mutter"
+REQUIRED_AUTOMAKE_VERSION=1.10

 (test -f $srcdir/configure.ac \
  && test -d $srcdir/src) || {
@@ -18,4 +19,4 @@ which gnome-autogen.sh || {
    echo "your distribution's package manager)."
    exit 1
 }
-. gnome-autogen.sh
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,9 @@
-AC_PREREQ(2.62)
+AC_PREREQ(2.50)
+AC_CONFIG_MACRO_DIR([m4])

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [19])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_minor_version], [12])
+m4_define([mutter_micro_version], [1])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -12,8 +13,6 @@ 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_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)

@@ -21,6 +20,10 @@ 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
@@ -36,51 +39,49 @@ AC_SUBST(MUTTER_PLUGIN_DIR)
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")

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

-LT_PREREQ([2.2.6])
-LT_INIT([disable-static])
-IT_PROG_INTLTOOL([0.41])
+IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
-AC_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_SED
+AC_ISC_POSIX
 AC_HEADER_STDC
-PKG_PROG_PKG_CONFIG([0.21])
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL

 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()

+#### Integer sizes
+
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(__int64)
+
+## byte order
+AC_C_BIGENDIAN
+
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26

 CLUTTER_PACKAGE=clutter-1.0

 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.19.1
-   gio-unix-2.0 >= 2.35.1
+   gtk+-3.0 >= 3.3.7
+   gio-2.0 >= 2.25.10
   pango >= 1.2.0
   cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.19.3
-   $CLUTTER_PACKAGE >= 1.25.1
+   gsettings-desktop-schemas >= 3.7.3
+   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
+   $CLUTTER_PACKAGE >= 1.17.5
   cogl-1.0 >= 1.17.1
   upower-glib >= 0.99.0
   gnome-desktop-3.0
-   xcomposite >= 0.2
-   xcursor
-   xdamage
-   xext
-   xfixes
-   xi >= 1.6.0
-   xkbfile
-   xkeyboard-config
-   xkbcommon >= 0.4.3
-   xkbcommon-x11
-   xrender
-   x11-xcb
-   xcb-randr
 "

 GLIB_GSETTINGS
@@ -109,18 +110,37 @@ AC_ARG_WITH(libcanberra,
                 [disable the use of libcanberra for playing sounds]),,
  with_libcanberra=auto)

+AC_ARG_ENABLE(xsync,
+  AC_HELP_STRING([--disable-xsync],
+                 [disable mutter's use of the XSync extension]),,
+  enable_xsync=auto)
+
+AC_ARG_ENABLE(shape,
+  AC_HELP_STRING([--disable-shape],
+                 [disable mutter's use of the shaped window extension]),,
+  enable_shape=auto)
+
+## Wayland support requires the xserver.xml protocol extension found in the weston
+## repository but since there aren't currently established conventions for
+## installing and discovering these we simply require a location to be given
+## explicitly...
+AC_ARG_WITH([wayland-protocols],
+            [AS_HELP_STRING([--with-wayland-protocols], [Location for wayland extension protocol specs])],
+            [
+            ],
+            [])
+
 AC_ARG_WITH([xwayland-path],
            [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
            [XWAYLAND_PATH="$withval"],
-            [XWAYLAND_PATH="$bindir/Xwayland"])
+            [XWAYLAND_PATH="$bindir/Xorg"])

-AC_ARG_ENABLE(installed_tests,
-              AS_HELP_STRING([--enable-installed-tests],
-                             [Install test programs (default: no)]),,
-              [enable_installed_tests=no])
-AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
+AM_GLIB_GNU_GETTEXT

 ## here we get the flags we'll actually use
+# GRegex requires Glib-2.14.0
+PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
+PKG_CHECK_MODULES(MUTTER_LAUNCH, libdrm libsystemd-login)

 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -185,48 +205,17 @@ if test x$found_introspection != xno; then
  AC_SUBST(META_GIR)
 fi

+MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
+
+AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
+AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
+  AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
+AC_SUBST([WAYLAND_SCANNER])
 AC_SUBST(XWAYLAND_PATH)

+MUTTER_PC_MODULES="$MUTTER_PC_MODULES clutter-wayland-1.0 clutter-wayland-compositor-1.0 clutter-egl-1.0 wayland-server libdrm"
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

-MUTTER_NATIVE_BACKEND_MODULES="clutter-egl-1.0 libdrm libsystemd libinput gudev-1.0 gbm >= 10.3"
-
-AC_ARG_ENABLE(native-backend,
-  AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
-  enable_native_backend=auto
-)
-AS_IF([test "$enable_native_backend" = "yes"], [have_native_backend=yes],
-      [test "$enable_native_backend" = "auto"], PKG_CHECK_EXISTS([$MUTTER_NATIVE_BACKEND_MODULES], [have_native_backend=yes]))
-
-AS_IF([test "$have_native_backend" = "yes"], [
-  PKG_CHECK_MODULES([MUTTER_NATIVE_BACKEND], [$MUTTER_NATIVE_BACKEND_MODULES])
-  AC_DEFINE([HAVE_NATIVE_BACKEND],[1], [Define if you want to enable the native (KMS) backend based on systemd])
-])
-AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
-
-MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90"
-
-AC_ARG_ENABLE(wayland,
-  AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
-  enable_wayland=auto
-)
-AS_IF([test "$enable_wayland" = "yes"], [have_wayland=yes],
-      [test "$enable_wayland" = "auto"], PKG_CHECK_EXISTS([$MUTTER_WAYLAND_MODULES], [have_wayland=yes]))
-
-AS_IF([test "$have_wayland" = "yes"], [
-  PKG_CHECK_MODULES([MUTTER_WAYLAND], [$MUTTER_WAYLAND_MODULES])
-  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-  AS_IF([test $WAYLAND_SCANNER = "no"],
-    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
-  AC_SUBST([WAYLAND_SCANNER])
-  AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
-
-  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
-		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
-])
-AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])
-
 PKG_CHECK_EXISTS([xi >= 1.6.99.1],
                 AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))

@@ -263,8 +252,38 @@ if test x$have_xinerama = xno; then
   AC_MSG_ERROR([Xinerama extension was not found])
 fi

-AC_DEFINE_UNQUOTED([XKB_BASE], ["`$PKG_CONFIG --variable xkb_base xkeyboard-config`"],
-                               [XKB base dir])
+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,
+                                found_xkb=yes)],
+	, $ALL_X_LIBS)
+
+if test "x$found_xkb" = "xyes"; then
+   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
+fi
+

 RANDR_LIBS=
 found_randr=no
@@ -272,15 +291,37 @@ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
               [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                RANDR_LIBS=-lXrandr found_randr=yes,,
 				[#include <X11/Xlib.h>])],
-               , -lXext $ALL_X_LIBS)
+               , -lXrender -lXext $ALL_X_LIBS)

 if test "x$found_randr" = "xyes"; then
   AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
-   PKG_CHECK_EXISTS([xrandr >= 1.5.0],
-                 AC_DEFINE([HAVE_XRANDR15],[1],[Define if you have support for XRandR 1.5 or greater]))
 fi

-MUTTER_LIBS="$MUTTER_LIBS $RANDR_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+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"

 found_sm=no
 case "$MUTTER_LIBS" in
@@ -312,6 +353,17 @@ fi

 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")

+HOST_ALIAS=$host_alias
+AC_SUBST(HOST_ALIAS)
+
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+
+if test x"$GDK_PIXBUF_CSOURCE" = xno; then
+  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
+fi
+
+AC_SUBST(GDK_PIXBUF_CSOURCE)
+
 AC_PATH_PROG(ZENITY, zenity, no)
 if test x"$ZENITY" = xno; then
  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
@@ -324,10 +376,7 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi

-AC_CHECK_DECL([GL_EXT_x11_sync_object],
-              [],
-              [AC_MSG_ERROR([GL_EXT_x11_sync_object definition not found, please update your GL headers])],
-              [#include <GL/glx.h>])
+GTK_DOC_CHECK([1.15], [--flavour no-tmpl])

 #### Warnings (last since -Werror can disturb other tests)

@@ -397,13 +446,13 @@ changequote([,])dnl

 AC_CONFIG_FILES([
 Makefile
-data/Makefile
 doc/Makefile
 doc/man/Makefile
+doc/reference/Makefile
+doc/reference/meta-docs.sgml
 src/Makefile
-src/libmutter.pc
+src/libmutter-wayland.pc
 src/compositor/plugins/Makefile
-src/meta/meta-version.h
 po/Makefile.in
 ])

@@ -419,7 +468,7 @@ fi

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

 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
@@ -429,8 +478,8 @@ mutter-$VERSION
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
-	Wayland:                  ${have_wayland}
-	Native (KMS) backend:     ${have_native_backend}
+	Shape extension:          ${found_shape}
+	Xsync:                    ${found_xsync}
 "


--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,35 +0,0 @@
-desktopfiles_in_files = \
-	mutter.desktop.in
-desktopfilesdir = $(datadir)/applications
-desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-xml_in_files = \
-        50-mutter-navigation.xml.in \
-        50-mutter-system.xml.in \
-        50-mutter-windows.xml.in
-xmldir = $(GNOME_KEYBINDINGS_KEYSDIR)
-xml_DATA = $(xml_in_files:.xml.in=.xml)
-
-gschema_in_files = \
-	org.gnome.mutter.gschema.xml.in	\
-	org.gnome.mutter.wayland.gschema.xml.in
-gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = mutter-schemas.convert
-
-CLEANFILES = \
-	$(desktopfiles_DATA) \
-	$(gsettings_SCHEMAS) \
-	$(xml_DATA)
-
-EXTRA_DIST = \
-	$(convert_DATA) \
-	$(desktopfiles_in_files) \
-	$(gschema_in_files) \
-	$(xml_in_files)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man
+SUBDIRS = man reference

-EXTRA_DIST = dialogs.txt code-overview.txt \
+EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt rationales.txt
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -0,0 +1,166 @@
+## Process this file with automake to produce Makefile.in
+
+# We require automake 1.6 at least.
+AUTOMAKE_OPTIONS = 1.6
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=meta
+
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+#DOC_MODULE_VERSION=2
+
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+
+# Directories containing the source code, relative to $(srcdir).
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=../../src/
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--rebuild-types
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=$(top_srcdir)/src/*/*.h
+CFILE_GLOB=$(top_srcdir)/src/*/*.c
+
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+EXTRA_HFILES=
+
+# Header files or dirs to ignore when scanning. Use base file/dir names
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
+IGNORE_HFILES= \
+	async-getprop.h \
+	atoms.h \
+	bell.h \
+	boxes-private.h \
+	clutter-utils.h \
+	cogl-utils.h \
+	compositor-private.h \
+	constraints.h \
+	core.h \
+	display-private.h \
+	draw-workspace.h \
+	edge-resistance.h \
+	eventqueue.h \
+	frame.h \
+	frames.h \
+	group-private.h \
+	group-props.h \
+	iconcache.h \
+	inlinepixbufs.h \
+	keybindings-private.h \
+	menu.h \
+	metaaccellabel.h \
+	meta-background-actor-private.h \
+	meta-background-group-private.h \
+	meta-module.h \
+	meta-plugin-manager.h \
+	meta-shadow-factory-private.h \
+	meta-texture-rectangle.h \
+	meta-texture-tower.h \
+	meta-window-actor-private.h \
+	meta-window-group.h \
+	meta-window-shape.h \
+	mutter-enum-types.h \
+	mutter-Xatomtype.h \
+	place.h \
+	preview-widget.h \
+	region-utils.h \
+	resizepopup.h \
+	screen-private.h \
+	session.h \
+	stack.h \
+	stack-tracker.h \
+	stamp-mutter-enum-types.h \
+	tabpopup.h \
+	theme.h \
+	theme-private.h \
+	tile-preview.h \
+	ui.h \
+	window-private.h \
+	window-props.h \
+	workspace-private.h \
+	xprops.h \
+	$(NULL)
+
+MKDB_OPTIONS+=--ignore-files="$(IGNORE_HFILES)"
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files= \
+	mutter-overview.xml \
+	running-mutter.xml \
+	$(NULL)
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files= \
+	mutter-overview.xml \
+	running-mutter.xml \
+	$(NULL)
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# 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
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST +=
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+DISTCLEANFILES = $(DOC_MODULES).types
+
+# Comment this out if you want 'make check' to test you doc status
+# and run some sanity checks
+if ENABLE_GTK_DOC
+TESTS_ENVIRONMENT = cd $(srcdir) && \
+  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+#TESTS = $(GTKDOC_CHECK)
+endif
+
+-include $(top_srcdir)/git.mk
--- a/doc/reference/meta-docs.sgml.in
+++ b/doc/reference/meta-docs.sgml.in
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+  <!ENTITY version "@VERSION@">
+]>
+<book id="index">
+  <bookinfo>
+    <title>Mutter Reference Manual</title>
+    <releaseinfo>
+      This document is for Mutter &version;.
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="http://developer.gnome.org/meta/">http://developer.gnome.org/meta/</ulink>.
+    </releaseinfo>
+  </bookinfo>
+
+  <xi:include href="xml/mutter-overview.xml"/>
+  <xi:include href="xml/running-mutter.xml"/>
+
+  <part id="core-reference">
+    <title>Mutter Core Reference</title>
+    <xi:include href="xml/main.xml"/>
+    <xi:include href="xml/common.xml"/>
+    <xi:include href="xml/gradient.xml"/>
+    <xi:include href="xml/prefs.xml"/>
+    <xi:include href="xml/util.xml"/>
+    <xi:include href="xml/errors.xml"/>
+    <xi:include href="xml/meta-plugin.xml"/>
+    <xi:include href="xml/barrier.xml"/>
+    <xi:include href="xml/boxes.xml"/>
+    <xi:include href="xml/compositor.xml"/>
+    <xi:include href="xml/display.xml"/>
+    <xi:include href="xml/group.xml"/>
+    <xi:include href="xml/keybindings.xml"/>
+    <xi:include href="xml/meta-background-actor.xml"/>
+    <xi:include href="xml/meta-shadow-factory.xml"/>
+    <xi:include href="xml/meta-shaped-texture.xml"/>
+    <xi:include href="xml/meta-window-actor.xml"/>
+    <xi:include href="xml/screen.xml"/>
+    <xi:include href="xml/window.xml"/>
+    <xi:include href="xml/workspace.xml"/>
+  </part>
+
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+     <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+  <index id="api-index-full">
+    <title>API Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="deprecated-api-index" role="deprecated">
+    <title>Index of deprecated API</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+</book>
--- a/doc/reference/meta-sections.txt
+++ b/doc/reference/meta-sections.txt
@@ -0,0 +1,683 @@
+<SECTION>
+<FILE>barrier</FILE>
+<TITLE>MetaBarrier</TITLE>
+MetaBarrier
+MetaBarrierClass
+meta_barrier_is_active
+meta_barrier_destroy
+meta_barrier_release
+MetaBarrierDirection
+MetaBarrierEvent
+<SUBSECTION Standard>
+META_BARRIER
+META_BARRIER_CLASS
+META_BARRIER_GET_CLASS
+META_IS_BARRIER
+META_IS_BARRIER_CLASS
+META_TYPE_BARRIER
+META_TYPE_BARRIER_EVENT
+MetaBarrierPrivate
+meta_barrier_event_get_type
+meta_barrier_get_type
+</SECTION>
+
+<SECTION>
+<FILE>boxes</FILE>
+MetaRectangle
+MetaStrut
+MetaEdgeType
+MetaEdge
+meta_rectangle_copy
+meta_rectangle_free
+meta_rect
+meta_rectangle_area
+meta_rectangle_intersect
+meta_rectangle_equal
+meta_rectangle_union
+meta_rectangle_overlap
+meta_rectangle_vert_overlap
+meta_rectangle_horiz_overlap
+meta_rectangle_could_fit_rect
+meta_rectangle_contains_rect
+<SUBSECTION Standard>
+META_TYPE_RECTANGLE
+meta_rectangle_get_type
+</SECTION>
+
+<SECTION>
+<FILE>common</FILE>
+META_VIRTUAL_CORE_POINTER_ID
+META_VIRTUAL_CORE_KEYBOARD_ID
+MetaFrameFlags
+MetaMenuOp
+MetaWindowMenuFunc
+MetaGrabOp
+MetaCursor
+MetaFrameType
+MetaVirtualModifier
+MetaDirection
+MetaMotionDirection
+MetaSide
+MetaButtonFunction
+MAX_BUTTONS_PER_CORNER
+MetaButtonLayout
+MetaFrameBorders
+meta_frame_borders_clear
+META_ICON_WIDTH
+META_ICON_HEIGHT
+META_MINI_ICON_WIDTH
+META_MINI_ICON_HEIGHT
+META_DEFAULT_ICON_NAME
+META_PRIORITY_RESIZE
+META_PRIORITY_BEFORE_REDRAW
+META_PRIORITY_REDRAW
+META_PRIORITY_PREFS_NOTIFY
+POINT_IN_RECT
+MetaStackLayer
+MetaWindowMenu
+MetaResizePopup
+</SECTION>
+
+<SECTION>
+<FILE>compositor</FILE>
+MetaCompEffect
+MetaCompositor
+meta_compositor_new
+meta_compositor_destroy
+meta_compositor_manage_screen
+meta_compositor_unmanage_screen
+meta_compositor_window_shape_changed
+meta_compositor_process_event
+meta_compositor_filter_keybinding
+meta_compositor_add_window
+meta_compositor_remove_window
+meta_compositor_show_window
+meta_compositor_hide_window
+meta_compositor_switch_workspace
+meta_compositor_maximize_window
+meta_compositor_unmaximize_window
+meta_compositor_sync_window_geometry
+meta_compositor_set_updates_frozen
+meta_compositor_queue_frame_drawn
+meta_compositor_sync_stack
+meta_compositor_sync_screen_size
+meta_compositor_flash_screen
+meta_get_stage_for_screen
+meta_get_overlay_group_for_screen
+meta_get_overlay_window
+meta_get_window_actors
+meta_get_window_group_for_screen
+meta_get_top_window_group_for_screen
+meta_disable_unredirect_for_screen
+meta_enable_unredirect_for_screen
+meta_set_stage_input_region
+meta_empty_stage_input_region
+</SECTION>
+
+<SECTION>
+<FILE>display</FILE>
+MetaTabList
+MetaTabShowType
+meta_XFree
+meta_display_get_compositor_version
+meta_display_get_xinput_opcode
+meta_display_supports_extended_barriers
+meta_display_get_xdisplay
+meta_display_get_compositor
+meta_display_get_screens
+meta_display_has_shape
+meta_display_screen_for_root
+meta_display_get_focus_window
+meta_display_xwindow_is_a_no_focus_window
+meta_display_get_damage_event_base
+meta_display_get_shape_event_base
+meta_display_xserver_time_is_before
+meta_display_get_last_user_time
+meta_display_get_current_time
+meta_display_get_current_time_roundtrip
+meta_display_get_ignored_modifier_mask
+meta_display_get_tab_list
+meta_display_get_tab_next
+meta_display_get_tab_current
+meta_display_begin_grab_op
+meta_display_end_grab_op
+meta_display_get_grab_op
+meta_display_add_keybinding
+meta_display_remove_keybinding
+meta_display_get_keybinding_action
+meta_display_set_input_focus_window
+meta_display_focus_the_no_focus_window
+meta_display_sort_windows_by_stacking
+meta_display_get_leader_window
+meta_display_add_ignored_crossing_serial
+meta_display_unmanage_screen
+meta_display_clear_mouse_mode
+MetaDisplay
+MetaDisplayClass
+<SUBSECTION Standard>
+META_DISPLAY
+META_DISPLAY_CLASS
+META_DISPLAY_GET_CLASS
+META_IS_DISPLAY
+META_IS_DISPLAY_CLASS
+META_TYPE_DISPLAY
+meta_display_get_type
+</SECTION>
+
+<SECTION>
+<FILE>errors</FILE>
+meta_error_trap_push
+meta_error_trap_pop
+meta_error_trap_push_with_return
+meta_error_trap_pop_with_return
+</SECTION>
+
+<SECTION>
+<FILE>gradient</FILE>
+MetaGradientType
+meta_gradient_create_simple
+meta_gradient_create_multi
+meta_gradient_create_interwoven
+meta_gradient_add_alpha
+</SECTION>
+
+<SECTION>
+<FILE>group</FILE>
+MetaGroup
+meta_window_get_group
+meta_window_compute_group
+meta_window_shutdown_group
+meta_window_group_leader_changed
+meta_display_lookup_group
+meta_group_list_windows
+meta_group_update_layers
+meta_group_get_startup_id
+meta_group_get_size
+meta_group_property_notify
+</SECTION>
+
+<SECTION>
+<FILE>keybindings</FILE>
+MetaKeyBinding
+META_TYPE_KEY_BINDING
+meta_key_binding_get_name
+meta_key_binding_get_modifiers
+meta_key_binding_get_mask
+meta_key_binding_is_builtin
+meta_keybindings_set_custom_handler
+meta_screen_ungrab_all_keys
+meta_screen_grab_all_keys
+</SECTION>
+
+<SECTION>
+<FILE>main</FILE>
+meta_get_option_context
+meta_init
+meta_run
+meta_get_replace_current_wm
+meta_set_wm_name
+meta_set_gnome_wm_keybindings
+MetaExitCode
+meta_exit
+meta_quit
+</SECTION>
+
+<SECTION>
+<FILE>meta-background</FILE>
+<TITLE>MetaBackground</TITLE>
+MetaBackgroundEffects
+MetaBackground
+MetaBackgroundClass
+meta_background_new
+meta_background_copy
+meta_background_load_gradient
+meta_background_load_color
+meta_background_load_still_frame
+meta_background_load_file_async
+meta_background_load_file_finish
+meta_background_get_filename
+meta_background_get_style
+meta_background_get_shading
+meta_background_get_color
+meta_background_get_second_color
+<SUBSECTION Standard>
+META_BACKGROUND
+META_BACKGROUND_CLASS
+META_BACKGROUND_GET_CLASS
+META_IS_BACKGROUND
+META_IS_BACKGROUND_CLASS
+META_TYPE_BACKGROUND
+MetaBackgroundPrivate
+meta_background_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-background-actor</FILE>
+<TITLE>MetaBackgroundActor</TITLE>
+MetaBackgroundActor
+MetaBackgroundActorClass
+meta_background_actor_new_for_screen
+MetaSnippetHook
+meta_background_actor_add_glsl_snippet
+meta_background_actor_set_uniform_float
+<SUBSECTION Standard>
+META_BACKGROUND_ACTOR
+META_BACKGROUND_ACTOR_CLASS
+META_BACKGROUND_ACTOR_GET_CLASS
+META_IS_BACKGROUND_ACTOR
+META_IS_BACKGROUND_ACTOR_CLASS
+META_TYPE_BACKGROUND_ACTOR
+MetaBackgroundActorPrivate
+meta_background_actor_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-background-group</FILE>
+<TITLE>MetaBackgroundGroup</TITLE>
+MetaBackgroundGroupClass
+meta_background_group_new
+<SUBSECTION Standard>
+META_BACKGROUND_GROUP
+META_BACKGROUND_GROUP_CLASS
+META_BACKGROUND_GROUP_GET_CLASS
+META_IS_BACKGROUND_GROUP
+META_IS_BACKGROUND_GROUP_CLASS
+META_TYPE_BACKGROUND_GROUP
+MetaBackgroundGroupPrivate
+meta_background_group_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-plugin</FILE>
+<TITLE>MetaPlugin</TITLE>
+MetaPlugin
+MetaPluginClass
+MetaPluginInfo
+meta_plugin_running
+meta_plugin_debug_mode
+meta_plugin_get_info
+MetaPluginVersion
+META_PLUGIN_DECLARE
+meta_plugin_switch_workspace_completed
+meta_plugin_minimize_completed
+meta_plugin_maximize_completed
+meta_plugin_unmaximize_completed
+meta_plugin_map_completed
+meta_plugin_destroy_completed
+MetaModalOptions
+meta_plugin_begin_modal
+meta_plugin_end_modal
+meta_plugin_get_screen
+meta_plugin_manager_set_plugin_type
+<SUBSECTION Standard>
+META_IS_PLUGIN
+META_IS_PLUGIN_CLASS
+META_PLUGIN
+META_PLUGIN_CLASS
+META_PLUGIN_GET_CLASS
+META_TYPE_PLUGIN
+MetaPluginPrivate
+meta_plugin_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-shadow-factory</FILE>
+MetaShadowParams
+meta_shadow_factory_get_default
+meta_shadow_factory_set_params
+meta_shadow_factory_get_params
+MetaShadowFactory
+MetaShadowFactoryClass
+<SUBSECTION Standard>
+META_IS_SHADOW_FACTORY
+META_IS_SHADOW_FACTORY_CLASS
+META_SHADOW_FACTORY
+META_SHADOW_FACTORY_CLASS
+META_SHADOW_FACTORY_GET_CLASS
+META_TYPE_SHADOW_FACTORY
+meta_shadow_factory_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-shaped-texture</FILE>
+<TITLE>MetaShapedTexture</TITLE>
+MetaShapedTexture
+MetaShapedTextureClass
+meta_shaped_texture_new
+meta_shaped_texture_set_create_mipmaps
+meta_shaped_texture_update_area
+meta_shaped_texture_set_pixmap
+meta_shaped_texture_get_texture
+meta_shaped_texture_set_mask_texture
+meta_shaped_texture_set_clip_region
+meta_shaped_texture_get_image
+<SUBSECTION Standard>
+META_IS_SHAPED_TEXTURE
+META_IS_SHAPED_TEXTURE_CLASS
+META_SHAPED_TEXTURE
+META_SHAPED_TEXTURE_CLASS
+META_SHAPED_TEXTURE_GET_CLASS
+META_TYPE_SHAPED_TEXTURE
+MetaShapedTexturePrivate
+meta_shaped_texture_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-window-actor</FILE>
+<TITLE>MetaWindowActor</TITLE>
+MetaWindowActor
+MetaWindowActorClass
+meta_window_actor_get_x_window
+meta_window_actor_get_workspace
+meta_window_actor_get_meta_window
+meta_window_actor_get_texture
+meta_window_actor_is_override_redirect
+meta_window_actor_get_description
+meta_window_actor_showing_on_its_workspace
+meta_window_actor_is_destroyed
+<SUBSECTION Standard>
+META_IS_WINDOW_ACTOR
+META_IS_WINDOW_ACTOR_CLASS
+META_TYPE_WINDOW_ACTOR
+META_WINDOW_ACTOR
+META_WINDOW_ACTOR_CLASS
+META_WINDOW_ACTOR_GET_CLASS
+MetaWindowActorPrivate
+meta_window_actor_get_type
+</SECTION>
+
+<SECTION>
+<FILE>meta-cullable</FILE>
+<TITLE>MetaCullable</TITLE>
+MetaCullable
+MetaCullableInterface
+meta_cullable_cull_out
+meta_cullable_reset_culling
+meta_cullable_cull_out_children
+meta_cullable_reset_culling_children
+<SUBSECTION Standard>
+META_TYPE_CULLABLE
+META_CULLABLE
+META_IS_CULLABLE
+META_CULLABLE_GET_IFACE
+meta_cullable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>prefs</FILE>
+MetaPreference
+MetaPrefsChangedFunc
+meta_prefs_add_listener
+meta_prefs_remove_listener
+meta_prefs_init
+meta_prefs_override_preference_schema
+meta_preference_to_string
+meta_prefs_get_mouse_button_mods
+meta_prefs_get_mouse_button_resize
+meta_prefs_get_mouse_button_menu
+meta_prefs_get_focus_mode
+meta_prefs_get_focus_new_windows
+meta_prefs_get_attach_modal_dialogs
+meta_prefs_get_raise_on_click
+meta_prefs_get_theme
+meta_prefs_get_titlebar_font
+meta_prefs_get_num_workspaces
+meta_prefs_get_dynamic_workspaces
+meta_prefs_get_disable_workarounds
+meta_prefs_get_auto_raise
+meta_prefs_get_auto_raise_delay
+meta_prefs_get_focus_change_on_pointer_rest
+meta_prefs_get_gnome_accessibility
+meta_prefs_get_gnome_animations
+meta_prefs_get_edge_tiling
+meta_prefs_get_auto_maximize
+meta_prefs_get_button_layout
+meta_prefs_get_action_double_click_titlebar
+meta_prefs_get_action_middle_click_titlebar
+meta_prefs_get_action_right_click_titlebar
+meta_prefs_set_num_workspaces
+meta_prefs_get_workspace_name
+meta_prefs_change_workspace_name
+meta_prefs_get_cursor_theme
+meta_prefs_get_cursor_size
+meta_prefs_get_compositing_manager
+meta_prefs_get_force_fullscreen
+meta_prefs_set_force_fullscreen
+meta_prefs_get_workspaces_only_on_primary
+meta_prefs_get_no_tab_popup
+meta_prefs_set_no_tab_popup
+meta_prefs_get_draggable_border_width
+meta_prefs_get_ignore_request_hide_titlebar
+meta_prefs_set_ignore_request_hide_titlebar
+MetaKeyBindingAction
+MetaKeyBindingFlags
+MetaKeyCombo
+MetaKeyHandlerFunc
+meta_prefs_get_keybindings
+meta_prefs_get_keybinding_action
+meta_prefs_get_window_binding
+meta_prefs_get_overlay_binding
+meta_prefs_get_visual_bell
+meta_prefs_bell_is_audible
+meta_prefs_get_visual_bell_type
+MetaKeyHandler
+<SUBSECTION Standard>
+meta_key_binding_get_type
+</SECTION>
+
+<SECTION>
+<FILE>screen</FILE>
+MetaScreen
+MetaScreenClass
+meta_screen_get_screen_number
+meta_screen_get_display
+meta_screen_get_xroot
+meta_screen_get_size
+meta_screen_get_compositor_data
+meta_screen_set_compositor_data
+meta_screen_for_x_screen
+meta_screen_set_cm_selection
+meta_screen_unset_cm_selection
+meta_screen_get_startup_sequences
+meta_screen_get_workspaces
+meta_screen_get_n_workspaces
+meta_screen_get_workspace_by_index
+meta_screen_remove_workspace
+meta_screen_append_new_workspace
+meta_screen_get_active_workspace_index
+meta_screen_get_active_workspace
+meta_screen_get_n_monitors
+meta_screen_get_primary_monitor
+meta_screen_get_current_monitor
+meta_screen_get_monitor_geometry
+meta_screen_get_monitor_index_for_rect
+meta_screen_focus_default_window
+MetaScreenCorner
+meta_screen_override_workspace_layout
+<SUBSECTION Standard>
+META_IS_SCREEN
+META_IS_SCREEN_CLASS
+META_SCREEN
+META_SCREEN_CLASS
+META_SCREEN_GET_CLASS
+META_TYPE_SCREEN
+meta_screen_get_type
+</SECTION>
+
+<SECTION>
+<FILE>util</FILE>
+meta_is_verbose
+meta_set_verbose
+meta_is_debugging
+meta_set_debugging
+meta_is_syncing
+meta_set_syncing
+meta_set_replace_current_wm
+meta_debug_spew_real
+meta_verbose_real
+meta_bug
+meta_warning
+meta_fatal
+MetaDebugTopic
+meta_topic_real
+meta_add_verbose_topic
+meta_remove_verbose_topic
+meta_push_no_msg_prefix
+meta_pop_no_msg_prefix
+meta_unsigned_long_equal
+meta_unsigned_long_hash
+meta_frame_type_to_string
+meta_gravity_to_string
+_
+N_
+meta_g_utf8_strndup
+meta_free_gslist_and_elements
+meta_show_dialog
+meta_debug_spew
+meta_verbose
+meta_topic
+MetaLaterType
+meta_later_add
+meta_later_remove
+</SECTION>
+
+<SECTION>
+<FILE>window</FILE>
+MetaWindow
+MetaWindowClass
+MetaWindowType
+MetaMaximizeFlags
+meta_window_get_frame
+meta_window_has_focus
+meta_window_appears_focused
+meta_window_is_shaded
+meta_window_is_monitor_sized
+meta_window_is_override_redirect
+meta_window_is_skip_taskbar
+meta_window_get_rect
+meta_window_get_input_rect
+meta_window_get_frame_rect
+meta_window_get_outer_rect
+meta_window_client_rect_to_frame_rect
+meta_window_frame_rect_to_client_rect
+meta_window_get_screen
+meta_window_get_display
+meta_window_get_xwindow
+meta_window_get_window_type
+meta_window_get_window_type_atom
+meta_window_get_workspace
+meta_window_get_monitor
+meta_window_is_on_all_workspaces
+meta_window_located_on_workspace
+meta_window_is_hidden
+meta_window_activate
+meta_window_activate_with_workspace
+meta_window_get_description
+meta_window_get_wm_class
+meta_window_get_wm_class_instance
+meta_window_showing_on_its_workspace
+meta_window_get_gtk_application_id
+meta_window_get_gtk_unique_bus_name
+meta_window_get_gtk_application_object_path
+meta_window_get_gtk_window_object_path
+meta_window_get_gtk_app_menu_object_path
+meta_window_get_gtk_menubar_object_path
+meta_window_move
+meta_window_move_frame
+meta_window_move_resize_frame
+meta_window_move_to_monitor
+meta_window_resize
+meta_window_set_demands_attention
+meta_window_unset_demands_attention
+meta_window_get_startup_id
+meta_window_change_workspace_by_index
+meta_window_change_workspace
+meta_window_get_compositor_private
+meta_window_set_compositor_private
+meta_window_configure_notify
+meta_window_get_role
+meta_window_get_layer
+meta_window_find_root_ancestor
+meta_window_is_ancestor_of_transient
+MetaWindowForeachFunc
+meta_window_foreach_transient
+meta_window_foreach_ancestor
+meta_window_get_maximized
+meta_window_is_fullscreen
+meta_window_is_on_primary_monitor
+meta_window_requested_bypass_compositor
+meta_window_requested_dont_bypass_compositor
+meta_window_is_mapped
+meta_window_toplevel_is_mapped
+meta_window_get_icon_geometry
+meta_window_set_icon_geometry
+meta_window_maximize
+meta_window_unmaximize
+meta_window_minimize
+meta_window_unminimize
+meta_window_raise
+meta_window_lower
+meta_window_get_title
+meta_window_get_transient_for
+meta_window_get_transient_for_as_xid
+meta_window_delete
+meta_window_get_stable_sequence
+meta_window_get_user_time
+meta_window_get_pid
+meta_window_get_client_machine
+meta_window_is_remote
+meta_window_is_modal
+meta_window_is_attached_dialog
+meta_window_get_mutter_hints
+meta_window_get_frame_type
+meta_window_get_frame_bounds
+meta_window_get_tile_match
+meta_window_make_fullscreen
+meta_window_unmake_fullscreen
+meta_window_make_above
+meta_window_unmake_above
+meta_window_shade
+meta_window_unshade
+meta_window_stick
+meta_window_unstick
+meta_window_kill
+meta_window_focus
+meta_window_check_alive
+meta_window_get_work_area_current_monitor
+meta_window_get_work_area_for_monitor
+meta_window_get_work_area_all_monitors
+meta_window_begin_grab_op
+<SUBSECTION Standard>
+META_IS_WINDOW
+META_IS_WINDOW_CLASS
+META_TYPE_WINDOW
+META_WINDOW
+META_WINDOW_CLASS
+META_WINDOW_GET_CLASS
+meta_window_get_type
+</SECTION>
+
+<SECTION>
+<FILE>workspace</FILE>
+MetaWorkspace
+MetaWorkspaceClass
+meta_workspace_index
+meta_workspace_get_screen
+meta_workspace_list_windows
+meta_workspace_get_work_area_for_monitor
+meta_workspace_get_work_area_all_monitors
+meta_workspace_activate
+meta_workspace_activate_with_focus
+meta_workspace_update_window_hints
+meta_workspace_set_builtin_struts
+meta_workspace_get_neighbor
+<SUBSECTION Standard>
+META_IS_WORKSPACE
+META_IS_WORKSPACE_CLASS
+META_TYPE_WORKSPACE
+META_WORKSPACE
+META_WORKSPACE_CLASS
+META_WORKSPACE_GET_CLASS
+meta_workspace_get_type
+</SECTION>
+
--- a/doc/reference/mutter-overview.xml
+++ b/doc/reference/mutter-overview.xml
@@ -0,0 +1,15 @@
+<part id="mutter-overview">
+
+  <title>Overview</title>
+
+  <partintro>
+
+    <para>Mutter is a GObject-based library for creating compositing window managers.</para>
+
+    <para>Compositors that wish to use Mutter must implement a subclass of #MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().</para>
+
+    <para>#MetaPlugin provides virtual functions that allow to override default behavior in the window management code, such as the effect to perform when a window is created or when switching workspaces.</para>
+
+  </partintro>
+
+</part>
--- a/doc/reference/running-mutter.xml
+++ b/doc/reference/running-mutter.xml
@@ -0,0 +1,100 @@
+<part id="running-mutter">
+
+  <title>Running Mutter</title>
+
+  <partintro>
+
+    <section id="environment-variables">
+      <title>Environment Variables</title>
+
+      <para>
+        Mutter automatically checks environment variables during
+        its initialization. These environment variables are meant
+        as debug tools or overrides for default behaviours:
+      </para>
+
+      <variablelist>
+        <varlistentry>
+          <term>MUTTER_VERBOSE</term>
+          <listitem>
+            <para>Enable verbose mode, in which more information is printed to the console. Mutter needs to be built with the --enable-verbose-mode option (enabled by default). For more fine-grained control of the output, see meta_add_verbose_topic().</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DEBUG</term>
+          <listitem>
+            <para>Traps and prints X errors to the console.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_G_FATAL_WARNINGS</term>
+          <listitem>
+            <para>Causes any logging from the domains Mutter, Gtk, Gdk, Pango or GLib to terminate the process (only when using the log functions in GLib).</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_USE_LOGFILE</term>
+          <listitem>
+            <para>Log all messages to a temporary file.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DEBUG_XINERAMA</term>
+          <listitem>
+            <para>Log extra information about support of the XINERAMA extension.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DEBUG_SM</term>
+          <listitem>
+            <para>Log extra information about session management.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DEBUG_BUTTON_GRABS</term>
+          <listitem>
+            <para>Log extra information about button grabs.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_SYNC</term>
+          <listitem>
+            <para>Call XSync after each X call.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DISPLAY</term>
+          <listitem>
+            <para>Name of the X11 display to use.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>META_DISABLE_MIPMAPS</term>
+          <listitem>
+            <para>Disable use of mipmaps for the textures that back window pixmaps.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_USE_STATIC_GRAVITY</term>
+          <listitem>
+            <para>Enable support for clients with static bit-gravity.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_WM_CLASS_FILTER</term>
+          <listitem>
+            <para>Comma-separated list of WM_CLASS names to which to restrict Mutter to.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>MUTTER_DISABLE_FALLBACK_COLOR</term>
+          <listitem>
+            <para>Disable fallback for themed colors, for easier detection of typographical errors.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+    </section>
+
+  </partintro>
+</part>
--- a/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -0,0 +1,396 @@
+Themes are in a simple XML-subset format. There are multiple versions
+of the theme format, and a given theme can support more than one format.
+
+Version 1:     THEMEDIR/metacity-1/metacity-theme-1.xml
+  (original metacity format)
+Version 2:     THEMEDIR/metacity-1/metacity-theme-2.xml
+Version 3:     THEMEDIR/metacity-1/metacity-theme-3.xml
+
+The subdirectory name is "metacity-1" in all versions.
+
+As you might expect, older versions of metacity will not understand
+newer theme formats. However, newer versions will use old themes.
+Metacity will always use the newest theme format it understands that
+the X server supports. Some format versions are only supported if you
+have the right X server features.
+
+Each format *requires* the corresponding filename. If you put version
+2 format features in the metacity-1/metacity-theme-1.xml file, then
+metacity will get angry.
+
+This document has separate sections for each format version. You may
+want to read the document in reverse order, since the base features
+are discussed under version 1.
+
+New Features in Theme Format Version 3.4
+========================================
+
+An additional color type is added to pick up custom colors defined
+in the GTK+ theme's CSS:
+
+  gtk:custom(name,fallback)
+
+where <name> refers to a custom color defined with @define-color in
+the GTK+ theme, and <fallback> provides an alternative color definition
+in case the color referenced by <name> is not found.
+
+New Features in Theme Format Version 3.3
+========================================
+
+Add two additional button background functions - left_single_background and
+right_single_background - for button groups with just a single button.
+
+There are now additional frame states to style left/right tiled windows
+differently ("tiled_left", "tiled_right", "tiled_left_and_shaded",
+"tiled_right_and_shaded").
+
+New Features in Theme Format Version 3.2
+========================================
+
+A new window type 'attached' is added for modal dialogs which are
+attached to their parent window. (When the attach_modal_dialogs preference
+is turned on.) If no style is defined for the 'attached' window type,
+the 'border' window type will be used instead.
+
+New Features in Theme Format Version 3.1
+========================================
+
+Additional predefined variables are added for positioning expressions:
+
+ frame_x_center: the X center of the entire frame, with respect to the
+     piece currently being drawn.
+ frame_y_center: the Y center of the entire frame, with respect to the
+     piece currently being drawn.
+
+The <title/> element now supports an "ellipsize_width" attribute. When
+specified, this gives a width at which to ellipsize the title. If not
+specified, the title will simply be clipped to the title area.
+
+New Features in Theme Format Version 3
+======================================
+
+Format version 3 has exactly one new feature; any element in the file
+can now have a version attribute:
+
+  version="[<|<=|=>|>] MAJOR.MINOR"
+
+(< and > should be to be entity escaped as &lt; and &gt;). If this
+version check is not met, then the element and its children will be
+ignored. This allows having alternate sections of the theme file for
+older and newer version of the Metacity theme format.
+
+When placed on the toplevel <metacity_theme> element, an unsatisfied
+version check will not just cause the contents of the file to be
+ignored, it will also cause the lookup of a theme file to proceed on
+and look for an older format 2 or format 1 file. This allows making a
+metacity-theme-3.xml file that is only used the format version 3.2 or
+newer is supported, and using metacity-theme-1.xml for older window
+managers.
+
+New Features in Theme Format Version 2
+======================================
+
+The optional attributes rounded_top_left, rounded_top_right,
+rounded_bottom_left and rounded_bottom_right on <frame_geometry>
+should now be the radius of the corner in pixels. You may still use
+the values "false" for 0 and "true" for 5, which means v1 values will
+still work just fine.
+
+<frame_geometry> has a new optional attribute, hide_buttons. If this
+is true, no buttons will be displayed on the titlebar.
+
+Anywhere you can use a positive integer, you can use an integer constant.
+
+As well as constant integers and reals, you may define constant colours,
+thus:
+  <constant name="RevoltingPink" value="#FF00FF"/>
+  <constant name="Background" value="gtk:bg[NORMAL]"/>
+
+<frame_style> has two new optional attributes, background and alpha.
+If you specify alpha, you must specify background. background is a
+colour used for the background of the frame. alpha is the transparency
+as a real between 0.0 and 1.0. If the current X server does not support
+alpha channels, the value is ignored.
+
+The filename attribute of <image> may begin with "theme:". If so, the
+rest of the string is the name of a theme icon. The 64x64 version of the
+icon is used, except for fallback mini_icons, which use the 16x16 version.
+This does not affect ordinary resizing. For example:
+  <button function="close" state="normal">
+    <draw_ops>
+      <include name="active_button"/>
+      <image filename="theme:gnome-logout" x="2" y="2"
+          width="width-4" height="height-4"/>
+      <!-- Note: not "theme:gnome-logout.png" or similar. -->
+    </draw_ops>
+  </button>
+
+<menu_icon>s are parsed but ignored.
+
+Fallback icons can be specified using <fallback>. There are two
+optional arguments, icon and mini_icon. The values of these arguments
+are identical to that of the filename attribute of <image>. Fallback
+icons are used when a window does not supply its own icon. If a fallback
+icon is not specified with <fallback>, Metacity will use a built-in
+icon, as in metacity-theme-1.
+
+The <arc> element, as well as the original start_angle and end_angle
+attributes, may be given from and to attributes. The values of these
+attributes are given in degrees clockwise, with 0 being straight up.
+For example:
+  <arc from="0.0" to="90.0" filled="true" color="#FF00FF"
+      x="0" y="5" width="15" height="15"/>
+
+<frame state="shaded"> may now take an optional resize attribute, with
+the same interpretation as the resize attribute on <frame state="normal">.
+If this attribute is omitted for state="shaded", it defaults to "both".
+(If it is omitted for state="normal", it remains an error.)
+
+In addition to the four <button> functions which are required in
+metacity-theme-1, there are six new functions in metacity-theme-2:
+shade, unshade, above, unabove, stick and unstick.
+      
+Overview of Theme Format Version 1
+==================================
+
+<?xml version="1.0"?>
+<metacity_theme>
+<!-- Only one info section is allowed -->
+<info>
+  <name>Foo</name>
+  <author>Foo P. Bar</author>
+  <copyright>whoever, 2002</copyright>
+  <date>Jan 31 2005</date>
+  <description>A sentence about the theme.</description>
+</info>
+
+<!-- define a frame geometry to be referenced later -->
+<!-- frame_geometry has an optional has_title attribute which 
+     determines whether the title text height is included in the 
+     height calculation. if not specified, defaults to true.
+     It also has an optional text_size="medium" attribute
+     (same sizes as with Pango markup, xx-small thru medium thru
+     xx-large) 
+
+     Finally it has optional args rounded_top_left=true, 
+     rounded_top_right=true, rounded_bottom_left=true,
+     rounded_bottom_right=true.
+
+     -->
+<frame_geometry name="normal" has_title="true" title_scale="medium">
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <distance name="bottom_height" value="7"/>
+  <distance name="left_titlebar_edge" value="6"/>
+  <distance name="right_titlebar_edge" value="6"/>
+  <distance name="button_width" value="17"/>
+  <distance name="button_height" value="17"/>
+  <!-- alternative to button_width button_height distances -->
+  <aspect_ratio name="button" value="1.0"/>
+  <distance name="title_vertical_pad" value="4"/>
+  <border name="title_border" left="3" right="12" top="4" bottom="3"/>
+  <border name="button_border" left="0" right="0" top="1" bottom="1"/>
+</frame_geometry>
+
+<!-- inheritance is allowed; simply overwrites values from parent -->
+<frame_geometry name="borderless" parent="normal">
+  <distance name="left_width" value="0"/>
+  <distance name="right_width" value="0"/>
+  <distance name="bottom_height" value="0"/>
+  <distance name="left_titlebar_edge" value="0"/>
+  <distance name="right_titlebar_edge" value="0"/>
+</frame_geometry>
+
+<!-- define a constant to use in positions/sizes of draw operations;
+     constant names must start with a capital letter.
+  -->
+<constant name="LineOffset" value="3"/>
+
+<!-- define drawing operations to be referenced later; 
+     these draw-op lists can also be placed inline. 
+
+     Positions/lengths are given as expressions.
+     Operators are: +,-,*,/,%,`max`,`min`
+     All operators are infix including `max` and `min`, 
+      i.e. "2 `max` 5"
+     
+     Some variables are predefined, and constants can also 
+     be used. Variables are:
+
+       width - width of target area
+       height - height of target area
+       object_width - natural width of object being drawn
+       object_height - natural height of object being drawn
+       left_width - distance from left of frame to client window
+       right_width - distance from right of frame to client window
+       top_height - distance from top of frame to client window
+       bottom_height - distance from bottom of frame to client window
+       mini_icon_width - width of mini icon for window
+       mini_icon_height - height of mini icon
+       icon_width - width of large icon
+       icon_height - height of large icon
+       title_width - width of title text
+       title_height - height of title text
+
+    All these are always defined, except object_width/object_height 
+    which only exists for <image> right now.
+
+  -->
+
+<draw_ops name="demo_all_ops">
+  <line color="#00FF00" x1="LineOffset" y1="0" x2="0" y2="height"/>
+  <line color="gtk:fg[NORMAL]" 
+        x1="width - 1" y1="0" x2="width - 1" y2="height" 
+        width="3" dash_on_length="2" dash_off_length="3"/>
+  <rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7"
+             x="0" y="0" width="width - 1" height="height - 1" filled="true"/>
+  <arc color="dark gray" x="0" y="0" width="width - 1" height="height - 1" 
+       filled="false" start_angle="30" extent_angle="180"/>
+  <tint color="orange" alpha="0.5" x="0" y="0" width="width" height="height"/>
+ <!-- may be vertical, horizontal, diagonal -->
+  <gradient type="diagonal" 
+            x="10" y="30" width="width / 3" height="height / 4">
+    <!-- any number of colors allowed here. A color can be 
+         a color name like "blue" (look at gcolorsel), a hex color
+         as in HTML (#FFBB99), or a color from the gtk theme 
+         given as "gtk:base[NORMAL]", "gtk:fg[ACTIVE]", etc.
+       -->
+    <color value="gtk:fg[SELECTED]"/>
+    <!-- color obtained by a 0.5 alpha composite of the second color onto the first -->
+    <color value="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.5"/>
+  </gradient>
+  <!-- image has an optional colorize="#color" attribute to give the
+       image a certain color -->
+  <image filename="foo.png" alpha="0.7"
+         x="10" y="30" width="width / 3" height="height / 4"/>
+  <gtk_arrow state="normal" shadow="in" arrow="up"
+             filled="true"
+             x="2" y="2" width="width - 4" height="height - 4"/>
+  <gtk_box state="normal" shadow="out"
+           x="2" y="2" width="width - 4" height="height - 4"/>
+  <gtk_vline state="normal" x="2" y1="0" y2="height"/>
+  <!-- window's icon -->
+  <icon alpha="0.7"
+        x="10" y="30" width="width / 3" height="height / 4"/>
+  <!-- window's title -->
+  <title color="gtk:text[NORMAL]" x="20" y="30"/>
+  <!-- include another draw ops list; has optional x/y/width/height attrs -->
+  <include name="some_other_draw_ops"/>
+  <!-- tile another draw ops list; has optional
+       x/y/width/height/tile_xoffset/tile_yoffset -->
+  <tile name="some_other_draw_ops" tile_width="10" tile_height="10"/>
+</draw_ops>
+
+<frame_style name="normal" geometry="normal">
+  <!-- How to draw each piece of the frame.
+       For each piece, a draw_ops can be given inline or referenced 
+       by name. If a piece is omitted, then nothing will be drawn 
+       for that piece.
+
+       For each piece, the "width" and "height" variables in 
+       coordinate expressions refers to the dimensions of the piece, 
+       the origin is at the top left of the piece.
+  
+       So <rectangle x="0" y="0" width="width-1" height="height-1"/>
+       will outline a piece.
+    -->
+
+  <piece position="entire_background" draw_ops="demo_all_ops"/>
+  <piece position="left_titlebar_edge">
+    <draw_ops>
+      <line color="#00FF00" x1="0" y1="0" x2="0" y2="height"/>
+    </draw_ops>
+  </piece>
+
+  <!-- The complete list of frame pieces:
+
+       entire_background: whole frame
+       titlebar: entire area above the app's window 
+       titlebar_middle: area of titlebar_background not considered
+                        part of an edge
+       left_titlebar_edge: left side of titlebar background
+       right_titlebar_edge: right side of titlebar background
+       top_titlebar_edge: top side of titlebar background
+       bottom_titlebar_edge: bottom side of titlebar background 
+       title: the title area (doesn't include buttons)
+       left_edge: left edge of the frame
+       right_edge: right edge of the frame
+       bottom_edge: bottom edge of the frame
+       overlay: same area as entire_background, but drawn after 
+                drawing all sub-pieces instead of before
+
+   -->
+
+  <!-- For buttons, drawing methods have to be provided for 
+       each of three states: 
+          normal, pressed, prelight
+       and the button function or position must be provided:
+          close, maximize, minimize, menu, 
+          left_left_background, left_middle_background,
+          left_right_background, right_left_background, 
+          right_middle_background, right_right_background
+       So a working theme needs 3*4 = 12 button declarations
+       and a theme may have up to 3*10 = 30 button declarations
+       in order to handle button-rearrangement preferences.
+ 
+       (The name "function" for the attribute is from before the 
+        background values existed.)
+    -->
+
+  <button function="close" state="normal" draw_ops="previously_named"/>
+  <button function="menu" state="normal">
+    <draw_ops>
+      <icon alpha="0.7"
+            x="0" y="0" width="object_width" height="object_height"/>
+    </draw_ops>
+  </button>
+
+</frame_style>
+
+<!-- styles can inherit from each other with the parent="" attribute. 
+     In a subclass anything can be re-specified to override 
+     the parent style. -->
+<frame_style name="focused" parent="normal">
+  <piece position="title">
+    <draw_ops>
+      <rectangle color="gtk:bg[SELECTED]"
+                 x="0" y="0" width="width-1" height="height-1"/>
+      <title color="gtk:fg[SELECTED]" x="(width - title_width) / 2"
+                                      y="(height - title_height) / 2"/>
+    </draw_ops>
+  </piece>
+</frame_style>
+
+<!-- Maps styles to states of frame. 
+
+     Focus: yes (focused), no (not focused)
+     Window states: normal, maximized, shaded, maximized_and_shaded
+     Window resizability: none, vertical, horizontal, both
+
+     Everything unspecified just does the same as
+     unfocused/normal/both.
+
+     only state="normal" needs a resize="" attribute.
+ -->
+<frame_style_set name="normal">
+<frame focus="yes" state="normal" resize="both" style="focused"/>
+<frame focus="no" state="normal" resize="both" style="normal"/>
+</frame_style_set>
+
+<!-- Each window type needs a style set 
+     Types: normal, dialog, modal_dialog, menu, utility, border
+  -->
+<window type="normal" style_set="normal"/>
+
+
+<!-- For menu icons, drawing methods are needed for the same 
+     four types as the buttons, and GTK states
+     (insensitive,prelight,normal,etc.)
+  -->
+
+<menu_icon function="close" state="normal" draw_ops="previously_named"/>
+
+
+</metacity_theme>
+
+
--- a/mutter.doap
+++ b/mutter.doap
@@ -21,10 +21,10 @@ 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#core" />
-  <programming-language>C</programming-language>
+  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />

  <maintainer>
    <foaf:Person>
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/50-mutter-navigation.xml.in
-data/50-mutter-system.xml.in
-data/50-mutter-windows.xml.in
-data/mutter.desktop.in
-data/org.gnome.mutter.gschema.xml.in
-data/org.gnome.mutter.wayland.gschema.xml.in
+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
@@ -19,10 +16,17 @@ src/core/main.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/ui/frames.c
-src/ui/theme.c
-src/x11/session.c
 src/x11/window-props.c
 src/x11/xprops.c
+src/mutter-wayland.desktop.in
+src/org.gnome.mutter.gschema.xml.in
+src/org.gnome.mutter.wayland.gschema.xml.in
+src/ui/frames.c
+src/ui/menu.c
+src/ui/metaaccellabel.c
+src/ui/resizepopup.c
+src/ui/theme.c
+src/ui/theme-parser.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,2 @@
-# List of source files that should NOT be translated.
-# Please keep this file sorted alphabetically.
+src/metacity.schemas.in
+
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
--- a/po/bs.po
+++ b/po/bs.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/mr.po
+++ b/po/mr.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/data/50-mutter-navigation.xml.in
+++ b/data/50-mutter-navigation.xml.in
@@ -17,9 +17,6 @@
 	<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" />

@@ -45,68 +42,26 @@
 	              _description="Move window one monitor down" />

 	<KeyListEntry name="switch-applications"
-	              reverse-entry="switch-applications-backward"
 	              _description="Switch applications"/>

-	<KeyListEntry name="switch-applications-backward"
-	              reverse-entry="switch-applications"
-	              hidden="true"
-	              _description="Switch to previous application"/>
-
 	<KeyListEntry name="switch-windows"
-	              reverse-entry="switch-windows-backward"
 	              _description="Switch windows"/>

-	<KeyListEntry name="switch-windows-backward"
-	              reverse-entry="switch-windows"
-	              hidden="true"
-	              _description="Switch to previous window"/>
-
 	<KeyListEntry name="switch-group"
-	              reverse-entry="switch-group-backward"
 	              _description="Switch windows of an application"/>

-	<KeyListEntry name="switch-group-backward"
-	              reverse-entry="switch-group"
-	              hidden="true"
-	              _description="Switch to previous window of an application"/>
-
 	<KeyListEntry name="switch-panels"
-	              reverse-entry="switch-panels-backward"
 	              _description="Switch system controls"/>

-	<KeyListEntry name="switch-panels-backward"
-	              reverse-entry="switch-panels"
-	              hidden="true"
-	              _description="Switch to previous system control"/>
-
 	<KeyListEntry name="cycle-windows"
-	              reverse-entry="cycle-windows-backward"
 	              _description="Switch windows directly"/>

-	<KeyListEntry name="cycle-windows-backward"
-	              reverse-entry="cycle-windows"
-	              hidden="true"
-	              _description="Switch directly to previous window"/>
-
 	<KeyListEntry name="cycle-group"
-	              reverse-entry="cycle-group-backward"
 	              _description="Switch windows of an app directly"/>

-	<KeyListEntry name="cycle-group-backward"
-	              reverse-entry="cycle-group"
-	              hidden="true"
-	              _description="Switch directly to previous window of an app"/>
-
 	<KeyListEntry name="cycle-panels"
-	              reverse-entry="cycle-panels-backward"
 	              _description="Switch system controls directly"/>

-	<KeyListEntry name="cycle-panels-backward"
-	              reverse-entry="cycle-panels"
-	              hidden="true"
-	              _description="Switch directly to previous system control"/>
-
 	<KeyListEntry name="show-desktop"
 	              _description="Hide all normal windows"/>

@@ -122,9 +77,6 @@
 	<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" />

--- a/data/50-mutter-system.xml.in
+++ b/data/50-mutter-system.xml.in
--- a/data/50-mutter-windows.xml.in
+++ b/data/50-mutter-windows.xml.in
--- a/src/Makefile-tests.am
+++ b/src/Makefile-tests.am
@@ -1,46 +0,0 @@
-# A framework for running scripted tests
-
-if HAVE_WAYLAND
-
-if BUILDOPT_INSTALL_TESTS
-stackingdir = $(pkgdatadir)/tests/stacking
-dist_stacking_DATA =				\
-	tests/stacking/basic-x11.metatest	\
-	tests/stacking/basic-wayland.metatest	\
-	tests/stacking/minimized.metatest   	\
-	tests/stacking/mixed-windows.metatest   \
-	tests/stacking/override-redirect.metatest
-
-mutter-all.test: tests/mutter-all.test.in
-	$(AM_V_GEN) sed  -e "s|@libexecdir[@]|$(libexecdir)|g"  $< > $@.tmp && mv $@.tmp $@
-
-installedtestsdir = $(datadir)/installed-tests/mutter
-installedtests_DATA = mutter-all.test
-
-installedtestsbindir = $(libexecdir)/installed-tests/mutter
-installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner
-else
-noinst_PROGRAMS += mutter-test-client mutter-test-runner
-endif
-
-EXTRA_DIST += tests/mutter-all.test.in
-
-mutter_test_client_SOURCES = tests/test-client.c
-mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter.la
-
-mutter_test_runner_SOURCES = tests/test-runner.c
-mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter.la
-
-.PHONY: run-tests
-
-run-tests: mutter-test-client mutter-test-runner
-	./mutter-test-runner $(dist_stacking_DATA)
-
-endif
-
-# Some random test programs for bits of the code
-
-testboxes_SOURCES = core/testboxes.c
-testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
-
-noinst_PROGRAMS += testboxes
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,109 +1,88 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:

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

 SUBDIRS=compositor/plugins

-EXTRA_DIST =
-NULL =
-
-AM_CPPFLAGS = \
+INCLUDES=								\
 	-DCLUTTER_ENABLE_COMPOSITOR_API					\
 	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
 	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS				\
-	-DCOGL_DISABLE_DEPRECATION_WARNINGS				\
 	$(MUTTER_CFLAGS)						\
-	$(MUTTER_NATIVE_BACKEND_CFLAGS)					\
-	-I$(builddir)							\
+	-I$(top_builddir)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/backends						\
 	-I$(srcdir)/core						\
 	-I$(srcdir)/ui							\
 	-I$(srcdir)/compositor						\
 	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\
-	-DMUTTER_LOCALEDIR=\"$(localedir)\"				\
+	-DHOST_ALIAS=\"@HOST_ALIAS@\"					\
+	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"		\
 	-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\"				\
 	-DMUTTER_DATADIR=\"$(datadir)\"					\
 	-DG_LOG_DOMAIN=\"mutter\"					\
 	-DSN_API_NOT_YET_FROZEN=1					\
+	-DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION)			\
+	-DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION)			\
+	-DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION)			\
+	-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION)	\
 	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\
-	-DMUTTER_PLUGIN_DIR=\"$(MUTTER_PLUGIN_DIR)\"			\
+	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
-	-DXWAYLAND_PATH=\"$(XWAYLAND_PATH)\"				\
-	$(NULL)
+	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'

 mutter_built_sources = \
 	$(dbus_idle_built_sources)		\
 	$(dbus_display_config_built_sources)	\
-	$(dbus_login1_built_sources)		\
-	meta/meta-enum-types.h			\
-	meta-enum-types.c			\
-	$(NULL)
-
-if HAVE_WAYLAND
-mutter_built_sources += \
-	pointer-gestures-unstable-v1-protocol.c				\
-	pointer-gestures-unstable-v1-server-protocol.h			\
+	mutter-enum-types.h 			\
+	mutter-enum-types.c			\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
-	xdg-shell-unstable-v5-protocol.c				\
-	xdg-shell-unstable-v5-server-protocol.h				\
-	$(NULL)
-endif
+	xdg-shell-protocol.c			\
+	xdg-shell-server-protocol.h		\
+	xserver-protocol.c			\
+	xserver-server-protocol.h

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

-libmutter_la_SOURCES =				\
+libmutter_wayland_la_SOURCES =			\
 	backends/meta-backend.c			\
-	meta/meta-backend.h			\
-	backends/meta-backend-private.h		\
-	backends/meta-barrier.c			\
-	backends/meta-barrier-private.h		\
+	backends/meta-backend.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	\
 	backends/meta-idle-monitor-dbus.h	\
-	backends/meta-input-settings.c		\
-	backends/meta-input-settings-private.h	\
 	backends/meta-monitor-config.c		\
 	backends/meta-monitor-config.h		\
 	backends/meta-monitor-manager.c		\
-	meta/meta-monitor-manager.h		\
-	backends/meta-monitor-manager-private.h	\
+	backends/meta-monitor-manager.h		\
 	backends/meta-monitor-manager-dummy.c	\
 	backends/meta-monitor-manager-dummy.h	\
-	backends/meta-stage.h			\
-	backends/meta-stage.c			\
 	backends/edid-parse.c			\
 	backends/edid.h				\
-	backends/x11/meta-backend-x11.c			\
-	backends/x11/meta-backend-x11.h			\
-	backends/x11/meta-barrier-x11.c			\
-	backends/x11/meta-barrier-x11.h			\
-	backends/x11/meta-cursor-renderer-x11.c		\
-	backends/x11/meta-cursor-renderer-x11.h		\
-	backends/x11/nested/meta-cursor-renderer-x11-nested.c		\
-	backends/x11/nested/meta-cursor-renderer-x11-nested.h		\
+	backends/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/x11/meta-idle-monitor-xsync.c		\
 	backends/x11/meta-idle-monitor-xsync.h		\
-	backends/x11/meta-input-settings-x11.c		\
-	backends/x11/meta-input-settings-x11.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
 	backends/x11/meta-monitor-manager-xrandr.h	\
-	core/meta-accel-parse.c			\
-	core/meta-accel-parse.h			\
+	core/above-tab-keycode.c		\
+	core/barrier.c				\
 	meta/barrier.h				\
 	core/bell.c				\
 	core/bell.h				\
@@ -117,31 +96,26 @@ libmutter_la_SOURCES =				\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
 	compositor/meta-background.c		\
-	compositor/meta-background-private.h	\
 	compositor/meta-background-actor.c	\
 	compositor/meta-background-actor-private.h	\
-	compositor/meta-background-image.c	\
 	compositor/meta-background-group.c	\
 	compositor/meta-cullable.c		\
 	compositor/meta-cullable.h		\
-	compositor/meta-dnd-actor.c		\
-	compositor/meta-dnd-actor-private.h	\
-	compositor/meta-feedback-actor.c	\
-	compositor/meta-feedback-actor-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
 	compositor/meta-plugin-manager.c	\
 	compositor/meta-plugin-manager.h	\
 	compositor/meta-shadow-factory.c	\
+	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
 	compositor/meta-shaped-texture-private.h 	\
 	compositor/meta-surface-actor.c		\
 	compositor/meta-surface-actor.h		\
 	compositor/meta-surface-actor-x11.c	\
 	compositor/meta-surface-actor-x11.h	\
-	compositor/meta-sync-ring.c		\
-	compositor/meta-sync-ring.h		\
+	compositor/meta-surface-actor-wayland.c	\
+	compositor/meta-surface-actor-wayland.h	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@@ -151,17 +125,16 @@ libmutter_la_SOURCES =				\
 	compositor/meta-window-group.c		\
 	compositor/meta-window-group.h		\
 	compositor/meta-window-shape.c		\
+	compositor/meta-window-shape.h		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
 	meta/compositor.h			\
 	meta/meta-background.h			\
 	meta/meta-background-actor.h		\
-	meta/meta-background-image.h		\
 	meta/meta-background-group.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
-	meta/meta-window-shape.h		\
 	meta/compositor-mutter.h 		\
 	core/constraints.c			\
 	core/constraints.h			\
@@ -178,8 +151,8 @@ libmutter_la_SOURCES =				\
 	meta/errors.h				\
 	core/frame.c				\
 	core/frame.h				\
-	core/meta-gesture-tracker.c		\
-	core/meta-gesture-tracker-private.h	\
+	ui/gradient.c				\
+	meta/gradient.h				\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
@@ -191,7 +164,6 @@ libmutter_la_SOURCES =				\
 	core/screen-private.h			\
 	meta/screen.h				\
 	meta/types.h				\
-	core/restart.c				\
 	core/stack.c				\
 	core/stack.h				\
 	core/stack-tracker.c			\
@@ -209,20 +181,26 @@ libmutter_la_SOURCES =				\
 	ui/ui.h					\
 	ui/frames.c				\
 	ui/frames.h				\
+	ui/menu.c				\
+	ui/menu.h				\
+	ui/metaaccellabel.c			\
+	ui/metaaccellabel.h			\
+	ui/resizepopup.c			\
+	ui/resizepopup.h			\
+	ui/theme-parser.c			\
 	ui/theme.c				\
 	meta/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
-	x11/atomnames.h				\
-	x11/events.c				\
-	x11/events.h				\
+	x11/iconcache.c				\
+	x11/iconcache.h				\
+	x11/async-getprop.c			\
+	x11/async-getprop.h			\
 	x11/group-private.h			\
 	x11/group-props.c			\
 	x11/group-props.h			\
 	x11/group.c				\
 	meta/group.h				\
-	x11/iconcache.c				\
-	x11/iconcache.h				\
 	x11/session.c				\
 	x11/session.h				\
 	x11/window-props.c			\
@@ -233,84 +211,37 @@ libmutter_la_SOURCES =				\
 	x11/xprops.c				\
 	x11/xprops.h				\
 	x11/mutter-Xatomtype.h			\
-	$(NULL)
-
-if HAVE_WAYLAND
-libmutter_la_SOURCES +=				\
-	compositor/meta-surface-actor-wayland.c	\
-	compositor/meta-surface-actor-wayland.h	\
 	wayland/meta-wayland.c			\
 	wayland/meta-wayland.h			\
 	wayland/meta-wayland-private.h		\
-	wayland/meta-xwayland.c			\
-	wayland/meta-xwayland.h			\
-	wayland/meta-xwayland-selection.c	\
-	wayland/meta-xwayland-selection-private.h	\
 	wayland/meta-xwayland-private.h		\
-	wayland/meta-wayland-buffer.c      	\
-	wayland/meta-wayland-buffer.h      	\
-	wayland/meta-wayland-region.c      	\
-	wayland/meta-wayland-region.h      	\
+	wayland/meta-xwayland.c			\
 	wayland/meta-wayland-data-device.c      \
 	wayland/meta-wayland-data-device.h      \
-	wayland/meta-wayland-data-device-private.h	\
-	wayland/meta-wayland-pointer-gestures.c	\
-	wayland/meta-wayland-pointer-gestures.h	\
-	wayland/meta-wayland-pointer-gesture-swipe.c	\
-	wayland/meta-wayland-pointer-gesture-swipe.h	\
-	wayland/meta-wayland-pointer-gesture-pinch.c	\
-	wayland/meta-wayland-pointer-gesture-pinch.h	\
 	wayland/meta-wayland-keyboard.c		\
 	wayland/meta-wayland-keyboard.h		\
 	wayland/meta-wayland-pointer.c		\
 	wayland/meta-wayland-pointer.h		\
-	wayland/meta-wayland-popup.c		\
-	wayland/meta-wayland-popup.h		\
 	wayland/meta-wayland-seat.c		\
 	wayland/meta-wayland-seat.h		\
-	wayland/meta-wayland-touch.c		\
-	wayland/meta-wayland-touch.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/meta-window-wayland.c		\
-	wayland/meta-window-wayland.h		\
-	$(NULL)
-endif
+	wayland/window-wayland.c		\
+	wayland/window-wayland.h

-if HAVE_NATIVE_BACKEND
-libmutter_la_SOURCES +=					\
-	backends/native/meta-backend-native.c		\
-	backends/native/meta-backend-native.h		\
-	backends/native/meta-backend-native-private.h	\
-	backends/native/meta-barrier-native.c		\
-	backends/native/meta-barrier-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-input-settings-native.c	\
-	backends/native/meta-input-settings-native.h	\
-	backends/native/meta-monitor-manager-kms.c	\
-	backends/native/meta-monitor-manager-kms.h	\
-	backends/native/meta-launcher.c			\
-	backends/native/meta-launcher.h			\
-	backends/native/dbus-utils.c			\
-	backends/native/dbus-utils.h			\
-	$(NULL)
-endif
+nodist_libmutter_wayland_la_SOURCES =		\
+	$(mutter_built_sources)

-nodist_libmutter_la_SOURCES = $(mutter_built_sources)
-
-libmutter_la_LDFLAGS = -no-undefined -export-symbols-regex "^(meta|ag)_.*"
-libmutter_la_LIBADD  = $(MUTTER_LIBS) $(MUTTER_NATIVE_BACKEND_LIBS)
+libmutter_wayland_la_LDFLAGS = -no-undefined
+libmutter_wayland_la_LIBADD  = $(MUTTER_LIBS)

 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
-libmutterinclude_headers =			\
+libmutterinclude_base_headers =		\
 	meta/barrier.h				\
 	meta/boxes.h				\
 	meta/common.h				\
@@ -318,59 +249,55 @@ libmutterinclude_headers =			\
 	meta/compositor.h			\
 	meta/display.h				\
 	meta/errors.h				\
+	meta/gradient.h				\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
-	meta/meta-backend.h			\
-	meta/meta-background.h			\
 	meta/meta-background-actor.h		\
-	meta/meta-background-image.h		\
 	meta/meta-background-group.h		\
+	meta/meta-background.h			\
 	meta/meta-cursor-tracker.h		\
 	meta/meta-idle-monitor.h		\
 	meta/meta-plugin.h			\
-	meta/meta-monitor-manager.h		\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
-	meta/meta-window-shape.h		\
 	meta/prefs.h				\
 	meta/screen.h				\
 	meta/theme.h				\
 	meta/types.h				\
 	meta/util.h				\
 	meta/window.h				\
-	meta/workspace.h			\
-	$(NULL)
+	meta/workspace.h

-libmutterinclude_built_headers =		\
-	meta/meta-version.h			\
-	meta/meta-enum-types.h			\
-	$(NULL)
+# Excluded from scanning for introspection but installed
+# atomnames.h: macros cause problems for scanning process
+libmutterinclude_extra_headers =		\
+	meta/atomnames.h

-libmutterinclude_base_headers =			\
-	$(libmutterinclude_headers)		\
-	$(libmutterinclude_built_headers)
-
-libmutterincludedir = $(includedir)/mutter/meta
+libmutterincludedir = $(includedir)/mutter-wayland/meta

 libmutterinclude_HEADERS =			\
-	$(libmutterinclude_headers)
+	$(libmutterinclude_base_headers)	\
+	$(libmutterinclude_extra_headers)

-nodist_libmutterinclude_HEADERS =		\
-	$(libmutterinclude_built_headers)
+bin_PROGRAMS=mutter-wayland

-bin_PROGRAMS=mutter
-noinst_PROGRAMS=
+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

-libexec_PROGRAMS = mutter-restart-helper
-mutter_restart_helper_SOURCES = core/restart-helper.c
-mutter_restart_helper_LDADD = $(MUTTER_LIBS)
+mutter_launch_SOURCES = 			\
+	backends/native/weston-launch.c 	\
+	backends/native/weston-launch.h

-include Makefile-tests.am
+mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\"
+mutter_launch_LDFLAGS = $(MUTTER_LAUNCH_LIBS) -lpam
+
+install-exec-hook:
+	-chown root $(DESTDIR)$(bindir)/mutter-launch
+	-chmod u+s $(DESTDIR)$(bindir)/mutter-launch

 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
@@ -392,65 +319,103 @@ typelib_DATA = Meta-$(api_version).typelib

 INTROSPECTION_GIRS = Meta-$(api_version).gir

-Meta-$(api_version).gir: libmutter.la
+Meta-$(api_version).gir: libmutter-wayland.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
-@META_GIR@_CFLAGS = $(AM_CPPFLAGS)
-@META_GIR@_LIBS = libmutter.la
+@META_GIR@_EXPORT_PACKAGES = libmutter-wayland
+@META_GIR@_CFLAGS = $(INCLUDES)
+@META_GIR@_LIBS = libmutter-wayland.la
@META_GIR@_FILES =				\
+	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
+	$(filter %.c,$(libmutter_wayland_la_SOURCES) $(nodist_libmutter_wayland_la_SOURCES))
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error

 endif

+testboxes_SOURCES = core/testboxes.c
+testgradient_SOURCES = ui/testgradient.c
+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
+
+@INTLTOOL_DESKTOP_RULE@
+
+desktopfilesdir=$(datadir)/applications
+desktopfiles_in_files=mutter-wayland.desktop.in
+desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+desktopfiles_DATA = $(desktopfiles_files)
+
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
+xml_in_files = \
+        50-mutter-navigation.xml.in	\
+        50-mutter-system.xml.in		\
+        50-mutter-windows.xml.in
+xml_DATA     = $(xml_in_files:.xml.in=.xml)
+
 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h

+gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = mutter-schemas.convert
+
 CLEANFILES =					\
+	mutter-wayland.desktop			\
+	mutter-wm.desktop			\
+	org.gnome.mutter.gschema.xml		\
+	org.gnome.mutter.wayland.gschema.xml	\
+	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)

-DISTCLEANFILES = 				\
-	$(libmutterinclude_built_headers)
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmutter.pc

-EXTRA_DIST +=					\
-	$(wayland_protocols)			\
-	libmutter.pc.in				\
-	meta-enum-types.h.in			\
-	meta-enum-types.c.in			\
-	org.freedesktop.login1.xml		\
+pkgconfig_DATA = libmutter-wayland.pc
+
+EXTRA_DIST=$(desktopfiles_files) 	\
+	$(wmproperties_files)		\
+	$(IMAGES) 			\
+	$(desktopfiles_in_files)	\
+	$(wmproperties_in_files)	\
+	$(xml_in_files)			\
+	$(wayland_protocols)		\
+	org.gnome.mutter.gschema.xml.in \
+	org.gnome.mutter.wayland.gschema.xml.in \
+	mutter-schemas.convert \
+	libmutter-wayland.pc.in \
+	mutter-enum-types.h.in \
+	mutter-enum-types.c.in \
 	org.gnome.Mutter.DisplayConfig.xml	\
-	org.gnome.Mutter.IdleMonitor.xml	\
-	$(NULL)
+	org.gnome.Mutter.IdleMonitor.xml

-BUILT_SOURCES =					\
-	$(mutter_built_sources)			\
-	$(libmutterinclude_built_headers)
-
-MUTTER_STAMP_FILES = stamp-meta-enum-types.h
+BUILT_SOURCES = $(mutter_built_sources)
+MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)

-meta/meta-enum-types.h: stamp-meta-enum-types.h Makefile
+mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
-stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in
+stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template meta-enum-types.h.in \
+	    --template mutter-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
-	(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
+	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
 	rm -f xgen-teth && \
 	echo timestamp > $(@F)

-meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in
+mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template meta-enum-types.c.in \
+	    --template mutter-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
-	cp xgen-tetc meta-enum-types.c && \
+	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc

 dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h
@@ -470,29 +435,6 @@ $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml
 		--c-generate-object-manager						\
 		$(srcdir)/org.gnome.Mutter.IdleMonitor.xml

-dbus_login1_built_sources = meta-dbus-login1.c meta-dbus-login1.h
-
-$(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.freedesktop.login1				\
-		--c-namespace Login1							\
-		--generate-c-code meta-dbus-login1					\
-		$(srcdir)/org.freedesktop.login1.xml
-
-.SECONDEXPANSION:
-
-define protostability
-$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
-endef
-
-define protoname
-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
-endef
-
-%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-%-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
 %-protocol.c : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
--- a/src/backends/edid-parse.c
+++ b/src/backends/edid-parse.c
@@ -179,7 +179,7 @@ decode_display_parameters (const uchar *edid, MonitorInfo *info)
  else if (edid[0x16] == 0)
    {
      info->width_mm = -1;
-      info->height_mm = -1;
+      info->height_mm = -1; 
      info->aspect_ratio = 100.0 / (edid[0x15] + 99);
    }
  else if (edid[0x15] == 0)
@@ -267,7 +267,7 @@ decode_color_characteristics (const uchar *edid, MonitorInfo *info)
 static int
 decode_established_timings (const uchar *edid, MonitorInfo *info)
 {
-  static const Timing established[][8] =
+  static const Timing established[][8] = 
    {
      {
        { 800, 600, 60 },
--- a/src/backends/edid.h
+++ b/src/backends/edid.h
@@ -1,9 +1,9 @@
 /* edid.h
 *
 * Copyright 2007, 2008, Red Hat, Inc.
- *
+ * 
 * This file is part of the Gnome Library.
- *
+ * 
 * The Gnome Library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -13,12 +13,12 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Library General Public License for more details.
- *
+ * 
 * You should have received a copy of the GNU Library General Public
 * License along with the Gnome Library; see the file COPYING.LIB.  If not,
 * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301, USA.
- *
+ * 
 * Author: Soren Sandmann <sandmann@redhat.com>
 */

@@ -177,7 +177,7 @@ struct MonitorInfo
  DetailedTiming detailed_timings[4];	/* If monitor has a preferred
                                         * mode, it is the first one
                                         * (whether it has, is
-                                         * determined by the
+                                         * determined by the 
                                         * preferred_timing_includes
                                         * bit.
                                         */
@@ -189,5 +189,7 @@ struct MonitorInfo
 };

 MonitorInfo *decode_edid (const uchar *data);
+char *make_display_name (const MonitorInfo *info);
+char *make_display_size_string (int width_mm, int height_mm);

 #endif
--- a/src/backends/meta-backend-private.h
+++ b/src/backends/meta-backend-private.h
@@ -1,113 +0,0 @@
-/* -*- 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 <xkbcommon/xkbcommon.h>
-
-#include <meta/meta-backend.h>
-#include <meta/meta-idle-monitor.h>
-#include "meta-cursor-renderer.h"
-#include "meta-monitor-manager-private.h"
-
-#define DEFAULT_XKB_RULES_FILE "evdev"
-#define DEFAULT_XKB_MODEL "pc105+inet"
-
-#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;
-
-  GHashTable *device_monitors;
-  gint current_device_id;
-};
-
-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);
-
-  void (* warp_pointer) (MetaBackend *backend,
-                         int          x,
-                         int          y);
-
-  void (* set_keymap) (MetaBackend *backend,
-                       const char  *layouts,
-                       const char  *variants,
-                       const char  *options);
-
-  struct xkb_keymap * (* get_keymap) (MetaBackend *backend);
-
-  void (* lock_layout_group) (MetaBackend *backend,
-                              guint        idx);
-
-  void (* update_screen_size) (MetaBackend *backend, int width, int height);
-  void (* select_stage_events) (MetaBackend *backend);
-};
-
-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_backend_warp_pointer (MetaBackend *backend,
-                                int          x,
-                                int          y);
-
-struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
-
-void meta_backend_update_last_device (MetaBackend *backend,
-                                      int          device_id);
-
-#endif /* META_BACKEND_PRIVATE_H */
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -24,549 +24,15 @@

 #include "config.h"

-#include <stdlib.h>
+#include "meta-backend.h"
+#include <meta/main.h>

-#include <meta/meta-backend.h>
-#include "meta-backend-private.h"
-#include "meta-input-settings-private.h"
+#include <gdk/gdkx.h>
+#include <clutter/clutter.h>
+#include <clutter/x11/clutter-x11.h>

-#include "backends/x11/meta-backend-x11.h"
-#include "meta-cursor-tracker-private.h"
-#include "meta-stage.h"
-
-#ifdef HAVE_NATIVE_BACKEND
-#include "backends/native/meta-backend-native.h"
-#endif
-
-#include "backends/meta-idle-monitor-private.h"
-
-#include "backends/meta-monitor-manager-dummy.h"
-
-static MetaBackend *_backend;
-
-/**
- * meta_get_backend:
- *
- * Accessor for the singleton MetaBackend.
- *
- * Returns: (transfer none): The only #MetaBackend there is.
- */
-MetaBackend *
-meta_get_backend (void)
-{
-  return _backend;
-}
-
-struct _MetaBackendPrivate
-{
-  MetaMonitorManager *monitor_manager;
-  MetaCursorRenderer *cursor_renderer;
-  MetaInputSettings *input_settings;
-
-  ClutterActor *stage;
-};
-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);
-
-  g_clear_object (&priv->monitor_manager);
-  g_clear_object (&priv->input_settings);
-
-  g_hash_table_destroy (backend->device_monitors);
-
-  G_OBJECT_CLASS (meta_backend_parent_class)->finalize (object);
-}
-
-static void
-meta_backend_sync_screen_size (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  int width, height;
-
-  meta_monitor_manager_get_screen_size (priv->monitor_manager, &width, &height);
-
-  META_BACKEND_GET_CLASS (backend)->update_screen_size (backend, width, height);
-}
-
-static void
-center_pointer (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  MetaMonitorInfo *monitors, *primary;
-  guint n_monitors;
-
-  monitors = meta_monitor_manager_get_monitor_infos (priv->monitor_manager, &n_monitors);
-  primary = &monitors[meta_monitor_manager_get_primary_index (priv->monitor_manager)];
-  meta_backend_warp_pointer (backend,
-                             primary->rect.x + primary->rect.width / 2,
-                             primary->rect.y + primary->rect.height / 2);
-}
-
-static void
-on_monitors_changed (MetaMonitorManager *monitors,
-                     gpointer user_data)
-{
-  MetaBackend *backend = META_BACKEND (user_data);
-  ClutterDeviceManager *manager = clutter_device_manager_get_default ();
-  ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);
-  ClutterPoint point;
-
-  meta_backend_sync_screen_size (backend);
-
-  if (clutter_input_device_get_coords (device, NULL, &point))
-    {
-      /* If we're outside all monitors, warp the pointer back inside */
-      if (meta_monitor_manager_get_monitor_at_point (monitors, point.x, point.y) < 0)
-        center_pointer (backend);
-    }
-}
-
-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
-create_device_monitor (MetaBackend *backend,
-                       int          device_id)
-{
-  MetaIdleMonitor *idle_monitor;
-
-  g_assert (g_hash_table_lookup (backend->device_monitors, &device_id) == NULL);
-
-  idle_monitor = meta_backend_create_idle_monitor (backend, device_id);
-  g_hash_table_insert (backend->device_monitors, &idle_monitor->device_id, idle_monitor);
-}
-
-static void
-destroy_device_monitor (MetaBackend *backend,
-                        int          device_id)
-{
-  g_hash_table_remove (backend->device_monitors, &device_id);
-}
-
-static void
-on_device_added (ClutterDeviceManager *device_manager,
-                 ClutterInputDevice   *device,
-                 gpointer              user_data)
-{
-  MetaBackend *backend = META_BACKEND (user_data);
-  int device_id = clutter_input_device_get_device_id (device);
-
-  create_device_monitor (backend, device_id);
-}
-
-static inline gboolean
-device_is_slave_touchscreen (ClutterInputDevice *device)
-{
-  return (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
-          clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE);
-}
-
-static inline gboolean
-check_has_pointing_device (ClutterDeviceManager *manager)
-{
-  const GSList *devices;
-
-  devices = clutter_device_manager_peek_devices (manager);
-
-  for (; devices; devices = devices->next)
-    {
-      ClutterInputDevice *device = devices->data;
-
-      if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
-        continue;
-      if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
-          clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
-        continue;
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static inline gboolean
-check_has_slave_touchscreen (ClutterDeviceManager *manager)
-{
-  const GSList *devices;
-
-  devices = clutter_device_manager_peek_devices (manager);
-
-  for (; devices; devices = devices->next)
-    {
-      ClutterInputDevice *device = devices->data;
-
-      if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER &&
-          clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE)
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-on_device_removed (ClutterDeviceManager *device_manager,
-                   ClutterInputDevice   *device,
-                   gpointer              user_data)
-{
-  MetaBackend *backend = META_BACKEND (user_data);
-  int device_id = clutter_input_device_get_device_id (device);
-
-  destroy_device_monitor (backend, device_id);
-
-  /* If the device the user last interacted goes away, check again pointer
-   * visibility.
-   */
-  if (backend->current_device_id == device_id)
-    {
-      MetaCursorTracker *cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-      gboolean has_touchscreen, has_pointing_device;
-      ClutterInputDeviceType device_type;
-
-      device_type = clutter_input_device_get_device_type (device);
-      has_touchscreen = check_has_slave_touchscreen (device_manager);
-
-      if (device_type == CLUTTER_TOUCHSCREEN_DEVICE && has_touchscreen)
-        {
-          /* There's more touchscreens left, keep the pointer hidden */
-          meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
-        }
-      else if (device_type != CLUTTER_KEYBOARD_DEVICE)
-        {
-          has_pointing_device = check_has_pointing_device (device_manager);
-          meta_cursor_tracker_set_pointer_visible (cursor_tracker,
-                                                   has_pointing_device &&
-                                                   !has_touchscreen);
-        }
-    }
-}
-
-static MetaMonitorManager *
-create_monitor_manager (MetaBackend *backend)
-{
-  if (g_getenv ("META_DUMMY_MONITORS"))
-    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
-
-  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
-}
-
-static void
-meta_backend_real_post_init (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  priv->stage = meta_stage_new ();
-  clutter_actor_realize (priv->stage);
-  META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
-
-  priv->monitor_manager = create_monitor_manager (backend);
-
-  g_signal_connect (priv->monitor_manager, "monitors-changed",
-                    G_CALLBACK (on_monitors_changed), backend);
-  meta_backend_sync_screen_size (backend);
-
-  priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
-
-  backend->device_monitors = g_hash_table_new_full (g_int_hash, g_int_equal,
-                                                    NULL, (GDestroyNotify) g_object_unref);
-
-  {
-    MetaCursorTracker *cursor_tracker;
-    ClutterDeviceManager *manager;
-    gboolean has_touchscreen = FALSE;
-    GSList *devices, *l;
-
-    /* Create the core device monitor. */
-    create_device_monitor (backend, 0);
-
-    manager = clutter_device_manager_get_default ();
-    g_signal_connect_object (manager, "device-added",
-                             G_CALLBACK (on_device_added), backend, 0);
-    g_signal_connect_object (manager, "device-removed",
-                             G_CALLBACK (on_device_removed), backend, 0);
-
-    devices = clutter_device_manager_list_devices (manager);
-
-    for (l = devices; l != NULL; l = l->next)
-      {
-        ClutterInputDevice *device = l->data;
-        on_device_added (manager, device, backend);
-        has_touchscreen |= device_is_slave_touchscreen (device);
-      }
-
-    cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-    meta_cursor_tracker_set_pointer_visible (cursor_tracker, !has_touchscreen);
-
-    g_slist_free (devices);
-  }
-
-  priv->input_settings = meta_input_settings_create ();
-
-  center_pointer (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_real_update_screen_size (MetaBackend *backend,
-                                      int width, int height)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  clutter_actor_set_size (priv->stage, width, height);
-}
-
-static void
-meta_backend_real_select_stage_events (MetaBackend *backend)
-{
-  /* Do nothing */
-}
-
-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;
-  klass->update_screen_size = meta_backend_real_update_screen_size;
-  klass->select_stage_events = meta_backend_real_select_stage_events;
-
-  g_signal_new ("keymap-changed",
-                G_TYPE_FROM_CLASS (object_class),
-                G_SIGNAL_RUN_LAST,
-                0,
-                NULL, NULL, NULL,
-                G_TYPE_NONE, 0);
-  g_signal_new ("keymap-layout-group-changed",
-                G_TYPE_FROM_CLASS (object_class),
-                G_SIGNAL_RUN_LAST,
-                0,
-                NULL, NULL, NULL,
-                G_TYPE_NONE, 1, G_TYPE_UINT);
-  g_signal_new ("last-device-changed",
-                G_TYPE_FROM_CLASS (object_class),
-                G_SIGNAL_RUN_LAST,
-                0,
-                NULL, NULL, NULL,
-                G_TYPE_NONE, 1, G_TYPE_INT);
-}
-
-static void
-meta_backend_init (MetaBackend *backend)
-{
-  _backend = backend;
-}
-
-static void
-meta_backend_post_init (MetaBackend *backend)
-{
-  META_BACKEND_GET_CLASS (backend)->post_init (backend);
-}
-
-/**
- * meta_backend_get_idle_monitor: (skip)
- */
-MetaIdleMonitor *
-meta_backend_get_idle_monitor (MetaBackend *backend,
-                               int          device_id)
-{
-  return g_hash_table_lookup (backend->device_monitors, &device_id);
-}
-
-/**
- * meta_backend_get_monitor_manager: (skip)
- */
-MetaMonitorManager *
-meta_backend_get_monitor_manager (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->monitor_manager;
-}
-
-/**
- * meta_backend_get_cursor_renderer: (skip)
- */
-MetaCursorRenderer *
-meta_backend_get_cursor_renderer (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->cursor_renderer;
-}
-
-/**
- * meta_backend_grab_device: (skip)
- */
-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);
-}
-
-/**
- * meta_backend_ungrab_device: (skip)
- */
-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);
-}
-
-/**
- * meta_backend_warp_pointer: (skip)
- */
-void
-meta_backend_warp_pointer (MetaBackend *backend,
-                           int          x,
-                           int          y)
-{
-  META_BACKEND_GET_CLASS (backend)->warp_pointer (backend, x, y);
-}
-
-void
-meta_backend_set_keymap (MetaBackend *backend,
-                         const char  *layouts,
-                         const char  *variants,
-                         const char  *options)
-{
-  META_BACKEND_GET_CLASS (backend)->set_keymap (backend, layouts, variants, options);
-}
-
-/**
- * meta_backend_get_keymap: (skip)
- */
-struct xkb_keymap *
-meta_backend_get_keymap (MetaBackend *backend)
-
-{
-  return META_BACKEND_GET_CLASS (backend)->get_keymap (backend);
-}
-
-void
-meta_backend_lock_layout_group (MetaBackend *backend,
-                                guint idx)
-{
-  META_BACKEND_GET_CLASS (backend)->lock_layout_group (backend, idx);
-}
-
-/**
- * meta_backend_get_stage:
- * @backend: A #MetaBackend
- *
- * Gets the global #ClutterStage that's managed by this backend.
- *
- * Returns: (transfer none): the #ClutterStage
- */
-ClutterActor *
-meta_backend_get_stage (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  return priv->stage;
-}
-
-void
-meta_backend_update_last_device (MetaBackend *backend,
-                                 int          device_id)
-{
-  ClutterInputDeviceType device_type;
-  MetaCursorTracker *cursor_tracker;
-  ClutterDeviceManager *manager;
-  ClutterInputDevice *device;
-
-  if (backend->current_device_id == device_id)
-    return;
-
-  manager = clutter_device_manager_get_default ();
-  device = clutter_device_manager_get_device (manager, device_id);
-
-  if (!device ||
-      clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
-    return;
-
-  device_type = clutter_input_device_get_device_type (device);
-
-  cursor_tracker = meta_cursor_tracker_get_for_screen (NULL);
-  backend->current_device_id = device_id;
-  g_signal_emit_by_name (backend, "last-device-changed", device_id);
-
-  if (device_type == CLUTTER_KEYBOARD_DEVICE)
-    return;
-
-  switch (device_type)
-    {
-    case CLUTTER_TOUCHSCREEN_DEVICE:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
-      break;
-    default:
-      meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
-      break;
-    }
-}
-
-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) && defined(HAVE_NATIVE_BACKEND)
-  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);
-}
+#include "backends/native/meta-weston-launch.h"
+#include <meta/util.h>

 /* 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
@@ -616,33 +82,76 @@ static GSourceFuncs event_funcs = {
  event_dispatch
 };

-/**
- * meta_clutter_init: (skip)
- */
+static MetaLauncher *launcher;
+
 void
 meta_clutter_init (void)
 {
-  ClutterSettings *clutter_settings;
  GSource *source;

-  meta_create_backend ();
-
-  if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+  /* 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 ())
    {
-      g_warning ("Unable to initialize Clutter.\n");
-      exit (1);
+      clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+      clutter_x11_disable_event_retrieval ();
    }

-  /*
-   * XXX: We cannot handle high dpi scaling yet, so fix the scale to 1
-   * for now.
-   */
-  clutter_settings = clutter_settings_get_default ();
-  g_object_set (clutter_settings, "window-scaling-factor", 1, NULL);
+  /* 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
+
+  if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+    g_error ("Unable to initialize Clutter.\n");

  source = g_source_new (&event_funcs, sizeof (GSource));
  g_source_attach (source, NULL);
  g_source_unref (source);
-
-  meta_backend_post_init (_backend);
+}
+
+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;
 }
--- a/src/backends/native/dbus-utils.h
+++ b/src/backends/native/dbus-utils.h
@@ -22,11 +22,13 @@
 *     Jasper St. Pierre <jstpierre@mecheye.net>
 */

-#ifndef DBUS_UTILS_H
-#define DBUS_UTILS_H
+#ifndef META_BACKEND_H
+#define META_BACKEND_H

-char *
-get_escaped_dbus_path (const char *prefix,
-                       const char *component);
+#include <glib-object.h>

-#endif /* DBUS_UTILS_H */
+void meta_clutter_init (void);
+
+gboolean meta_activate_vt (int vt, GError **error);
+
+#endif /* META_BACKEND_H */
--- a/src/backends/meta-barrier-private.h
+++ b/src/backends/meta-barrier-private.h
@@ -1,81 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2014-2015 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- *     Jonas Ådahl <jadahl@gmail.com>
- */
-
-#ifndef META_BARRIER_PRIVATE_H
-#define META_BARRIER_PRIVATE_H
-
-G_BEGIN_DECLS
-
-#define META_TYPE_BARRIER_IMPL            (meta_barrier_impl_get_type ())
-#define META_BARRIER_IMPL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_BARRIER_IMPL, MetaBarrierImpl))
-#define META_BARRIER_IMPL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
-#define META_IS_BARRIER_IMPL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_BARRIER_IMPL))
-#define META_IS_BARRIER_IMPL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_BARRIER_IMPL))
-#define META_BARRIER_IMPL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_BARRIER_IMPL, MetaBarrierImplClass))
-
-typedef struct _MetaBarrierImpl        MetaBarrierImpl;
-typedef struct _MetaBarrierImplClass   MetaBarrierImplClass;
-
-struct _MetaBarrierImpl
-{
-  GObject parent;
-};
-
-struct _MetaBarrierImplClass
-{
-  GObjectClass parent_class;
-
-  gboolean (*is_active) (MetaBarrierImpl *barrier);
-  void (*release) (MetaBarrierImpl  *barrier,
-                   MetaBarrierEvent *event);
-  void (*destroy) (MetaBarrierImpl *barrier);
-};
-
-GType meta_barrier_impl_get_type (void) G_GNUC_CONST;
-
-void _meta_barrier_emit_hit_signal (MetaBarrier      *barrier,
-                                    MetaBarrierEvent *event);
-void _meta_barrier_emit_left_signal (MetaBarrier      *barrier,
-                                     MetaBarrierEvent *event);
-
-void meta_barrier_event_unref (MetaBarrierEvent *event);
-
-G_END_DECLS
-
-struct _MetaBarrierPrivate
-{
-  MetaDisplay *display;
-
-  int x1;
-  int y1;
-  int x2;
-  int y2;
-
-  MetaBarrierDirection directions;
-
-  MetaBarrierImpl *impl;
-};
-
-#endif /* META_BARRIER_PRIVATE_H */
--- a/src/backends/meta-cursor-private.h
+++ b/src/backends/meta-cursor-private.h
@@ -0,0 +1,50 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright 2013 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Giovanni Campagna <gcampagn@redhat.com>
+ */
+
+#ifndef META_CURSOR_PRIVATE_H
+#define META_CURSOR_PRIVATE_H
+
+#include "meta-cursor.h"
+
+#include <cogl/cogl.h>
+#include <gbm.h>
+
+typedef struct {
+  CoglTexture2D *texture;
+  struct gbm_bo *bo;
+  int hot_x, hot_y;
+} MetaCursorImage;
+
+struct _MetaCursorReference {
+  int ref_count;
+
+  MetaCursorImage image;
+};
+
+CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
+                                                     int                 *hot_x,
+                                                     int                 *hot_y);
+
+struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
+                                                 int                 *hot_x,
+                                                 int                 *hot_y);
+
+#endif /* META_CURSOR_PRIVATE_H */
--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@@ -1,236 +0,0 @@
-/* -*- 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/meta-backend.h>
-#include <backends/meta-backend-private.h>
-#include <backends/meta-monitor-manager-private.h>
-#include <meta/util.h>
-
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-
-#include "meta-stage.h"
-
-struct _MetaCursorRendererPrivate
-{
-  int current_x, current_y;
-
-  MetaCursorSprite *displayed_cursor;
-  gboolean handled_by_backend;
-};
-typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);
-
-static void
-queue_redraw (MetaCursorRenderer *renderer,
-              MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
-  MetaBackend *backend = meta_get_backend ();
-  ClutterActor *stage = meta_backend_get_stage (backend);
-  CoglTexture *texture;
-  MetaRectangle rect = { 0 };
-
-  if (cursor_sprite)
-    rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
-
-  /* During early initialization, we can have no stage */
-  if (!stage)
-    return;
-
-  if (cursor_sprite && !priv->handled_by_backend)
-    texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
-  else
-    texture = NULL;
-
-  meta_stage_set_cursor (META_STAGE (stage), texture, &rect);
-}
-
-static gboolean
-meta_cursor_renderer_real_update_cursor (MetaCursorRenderer *renderer,
-                                         MetaCursorSprite   *cursor_sprite)
-{
-  return FALSE;
-}
-
-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)
-{
-}
-
-MetaRectangle
-meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
-                                     MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererPrivate *priv =
-    meta_cursor_renderer_get_instance_private (renderer);
-  CoglTexture *texture;
-  int hot_x, hot_y;
-  int width, height;
-  float texture_scale;
-
-  texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
-  if (!texture)
-    return (MetaRectangle) { 0 };
-
-  meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
-  texture_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
-  width = cogl_texture_get_width (texture);
-  height = cogl_texture_get_height (texture);
-
-  return (MetaRectangle) {
-    .x = (int)roundf (priv->current_x - (hot_x * texture_scale)),
-    .y = (int)roundf (priv->current_y - (hot_y * texture_scale)),
-    .width = (int)roundf (width * texture_scale),
-    .height = (int)roundf (height * texture_scale),
-  };
-}
-
-static gboolean
-is_cursor_in_monitors_area (int x, int y)
-{
-  MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
-  return meta_monitor_manager_get_monitor_at_point (monitor_manager,
-                                                    (gfloat) x, (gfloat) y) >= 0;
-}
-
-static void
-update_cursor (MetaCursorRenderer *renderer,
-               MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
-  gboolean handled_by_backend;
-  gboolean should_redraw = FALSE;
-
-  /* do not render cursor if it is not on any monitor. Such situation
-   * can occur e. g. after monitor hot-plug */
-  if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
-    return;
-
-  if (cursor_sprite)
-    meta_cursor_sprite_prepare_at (cursor_sprite,
-                                   priv->current_x,
-                                   priv->current_y);
-
-  handled_by_backend =
-    META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer,
-                                                              cursor_sprite);
-  if (handled_by_backend != priv->handled_by_backend)
-    {
-      priv->handled_by_backend = handled_by_backend;
-      should_redraw = TRUE;
-    }
-
-  if (!handled_by_backend)
-    should_redraw = TRUE;
-
-  if (should_redraw)
-    queue_redraw (renderer, cursor_sprite);
-}
-
-MetaCursorRenderer *
-meta_cursor_renderer_new (void)
-{
-  return g_object_new (META_TYPE_CURSOR_RENDERER, NULL);
-}
-
-void
-meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
-                                 MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
-
-  if (priv->displayed_cursor == cursor_sprite)
-    return;
-  priv->displayed_cursor = cursor_sprite;
-
-  update_cursor (renderer, cursor_sprite);
-}
-
-void
-meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
-{
-  MetaCursorRendererPrivate *priv =
-    meta_cursor_renderer_get_instance_private (renderer);
-
-  update_cursor (renderer, priv->displayed_cursor);
-}
-
-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, priv->displayed_cursor);
-}
-
-MetaCursorSprite *
-meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
-{
-  MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
-
-  return priv->displayed_cursor;
-}
-
-#ifdef HAVE_WAYLAND
-void
-meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                    MetaCursorSprite   *cursor_sprite,
-                                                    struct wl_resource *buffer)
-{
-
-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
-
-  if (renderer_class->realize_cursor_from_wl_buffer)
-    renderer_class->realize_cursor_from_wl_buffer (renderer, cursor_sprite, buffer);
-}
-#endif
-
-void
-meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                  MetaCursorSprite   *cursor_sprite,
-                                                  XcursorImage       *xc_image)
-{
-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
-
-  if (renderer_class->realize_cursor_from_xcursor)
-    renderer_class->realize_cursor_from_xcursor (renderer, cursor_sprite, xc_image);
-}
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@@ -1,81 +0,0 @@
-/* -*- 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 <X11/Xcursor/Xcursor.h>
-#ifdef HAVE_WAYLAND
-#include <wayland-server.h>
-#endif
-
-#include <meta/screen.h>
-#include "meta-cursor.h"
-
-#define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
-G_DECLARE_DERIVABLE_TYPE (MetaCursorRenderer, meta_cursor_renderer,
-                          META, CURSOR_RENDERER, GObject);
-
-struct _MetaCursorRendererClass
-{
-  GObjectClass parent_class;
-
-  gboolean (* update_cursor) (MetaCursorRenderer *renderer,
-                              MetaCursorSprite   *cursor_sprite);
-#ifdef HAVE_WAYLAND
-  void (* realize_cursor_from_wl_buffer) (MetaCursorRenderer *renderer,
-                                          MetaCursorSprite *cursor_sprite,
-                                          struct wl_resource *buffer);
-#endif
-  void (* realize_cursor_from_xcursor) (MetaCursorRenderer *renderer,
-                                        MetaCursorSprite *cursor_sprite,
-                                        XcursorImage *xc_image);
-};
-
-MetaCursorRenderer * meta_cursor_renderer_new (void);
-
-void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
-                                      MetaCursorSprite   *cursor_sprite);
-
-void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
-                                        int x, int y);
-void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer);
-
-MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
-
-MetaRectangle meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
-                                                   MetaCursorSprite   *cursor_sprite);
-
-#ifdef HAVE_WAYLAND
-void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                         MetaCursorSprite   *cursor_sprite,
-                                                         struct wl_resource *buffer);
-#endif
-
-void meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                       MetaCursorSprite   *cursor_sprite,
-                                                       XcursorImage       *xc_image);
-
-#endif /* META_CURSOR_RENDERER_H */
--- a/src/backends/meta-cursor-tracker-private.h
+++ b/src/backends/meta-cursor-tracker-private.h
@@ -23,31 +23,54 @@
 #define META_CURSOR_TRACKER_PRIVATE_H

 #include <meta/meta-cursor-tracker.h>
+#include <wayland-server.h>

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

 struct _MetaCursorTracker {
  GObject parent_instance;

-  MetaCursorRenderer *renderer;
+  MetaScreen *screen;

  gboolean is_showing;
+  gboolean has_hw_cursor;

-  MetaCursorSprite *displayed_cursor;
+  /* The cursor tracker stores the cursor for the current grab
+   * operation, the cursor for the window with pointer focus, and
+   * the cursor for the root window, which contains either the
+   * default arrow cursor or the 'busy' hourglass if we're launching
+   * an app.
+   *
+   * We choose the first one available -- if there's a grab cursor,
+   * we choose that cursor, if there's window cursor, we choose that,
+   * otherwise we choose the root cursor.
+   *
+   * The displayed_cursor contains the chosen cursor.
+   */
+  MetaCursorReference *displayed_cursor;

-  /* Wayland clients can set a NULL buffer as their cursor
+  MetaCursorReference *grab_cursor;
+
+  /* Wayland clients can set a NULL buffer as their cursor 
   * explicitly, which means that we shouldn't display anything.
   * So, we can't simply store a NULL in window_cursor to
   * determine an unset window cursor; we need an extra boolean.
   */
  gboolean has_window_cursor;
-  MetaCursorSprite *window_cursor;
+  MetaCursorReference *window_cursor;

-  MetaCursorSprite *root_cursor;
+  MetaCursorReference *root_cursor;

-  /* The cursor from the X11 server. */
-  MetaCursorSprite *xfixes_cursor;
+  MetaCursorReference *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 {
@@ -57,16 +80,19 @@ struct _MetaCursorTrackerClass {
 gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
 					    XEvent            *xevent);

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

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

-MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
+void     meta_cursor_tracker_force_update (MetaCursorTracker *tracker);

 #endif
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/*
+/* 
 * Copyright 2013 Red Hat, Inc.
- *
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -12,7 +12,7 @@
 * 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/>.
 *
@@ -27,77 +27,49 @@
 *                     pointer abstraction"
 */

-#include "config.h"
-#include "meta-cursor-tracker-private.h"
-
+#include <config.h>
 #include <string.h>
 #include <meta/main.h>
 #include <meta/util.h>
 #include <meta/errors.h>

 #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 <X11/extensions/Xfixes.h>

-#include "meta-backend-private.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"

 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);

 enum {
-  CURSOR_CHANGED,
-  LAST_SIGNAL
+    CURSOR_CHANGED,
+    LAST_SIGNAL
 };

 static guint signals[LAST_SIGNAL];

-static MetaCursorSprite *
-get_displayed_cursor (MetaCursorTracker *tracker)
-{
-  MetaDisplay *display = meta_get_display ();
-
-  if (!tracker->is_showing)
-    return NULL;
-
-  if (meta_display_windows_are_interactable (display))
-    {
-      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)
-{
-  MetaCursorSprite *displayed_cursor = get_displayed_cursor (tracker);
-
-  if (tracker->displayed_cursor == displayed_cursor)
-    return;
-
-  g_clear_object (&tracker->displayed_cursor);
-  if (displayed_cursor)
-    tracker->displayed_cursor = g_object_ref (displayed_cursor);
-
-  update_displayed_cursor (tracker);
-  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
-}
+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 void
 meta_cursor_tracker_init (MetaCursorTracker *self)
 {
-  MetaBackend *backend = meta_get_backend ();
+  /* (JS) Best (?) that can be assumed since XFixes doesn't provide a way of
+     detecting if the system mouse cursor is showing or not.

-  self->renderer = meta_backend_get_cursor_renderer (backend);
+     On wayland we start with the cursor showing
+  */
  self->is_showing = TRUE;
 }

@@ -105,11 +77,21 @@ static void
 meta_cursor_tracker_finalize (GObject *object)
 {
  MetaCursorTracker *self = META_CURSOR_TRACKER (object);
+  int i;

  if (self->displayed_cursor)
-    g_object_unref (self->displayed_cursor);
+    meta_cursor_reference_unref (self->displayed_cursor);
  if (self->root_cursor)
-    g_object_unref (self->root_cursor);
+    meta_cursor_reference_unref (self->root_cursor);
+
+  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);
 }
@@ -129,13 +111,80 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
                                          G_TYPE_NONE, 0);
 }

-static MetaCursorTracker *
-meta_cursor_tracker_new (void)
+static void
+on_monitors_changed (MetaMonitorManager *monitors,
+                     MetaCursorTracker  *tracker)
 {
-  return g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
+  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 *_cursor_tracker;
+static MetaCursorTracker *
+make_wayland_cursor_tracker (MetaScreen *screen)
+{
+  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);
+
+  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);
+
+  return self;
+}
+
+static MetaCursorTracker *
+make_x11_cursor_tracker (MetaScreen *screen)
+{
+  MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
+  self->screen = screen;
+
+  XFixesSelectCursorInput (screen->display->xdisplay,
+                           screen->xroot,
+                           XFixesDisplayCursorNotifyMask);
+
+  return self;
+}

 /**
 * meta_cursor_tracker_get_for_screen:
@@ -148,20 +197,28 @@ static MetaCursorTracker *_cursor_tracker;
 MetaCursorTracker *
 meta_cursor_tracker_get_for_screen (MetaScreen *screen)
 {
-  if (!_cursor_tracker)
-    _cursor_tracker = meta_cursor_tracker_new ();
+  MetaCursorTracker *self;

-  return _cursor_tracker;
+  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;
 }

 static void
-set_window_cursor (MetaCursorTracker *tracker,
-                   gboolean           has_cursor,
-                   MetaCursorSprite  *cursor_sprite)
+set_window_cursor (MetaCursorTracker   *tracker,
+                   gboolean             has_cursor,
+                   MetaCursorReference *cursor)
 {
-  g_clear_object (&tracker->window_cursor);
-  if (cursor_sprite)
-    tracker->window_cursor = g_object_ref (cursor_sprite);
+  g_clear_pointer (&tracker->window_cursor, meta_cursor_reference_unref);
+  if (cursor)
+    tracker->window_cursor = meta_cursor_reference_ref (cursor);
  tracker->has_window_cursor = has_cursor;
  sync_cursor (tracker);
 }
@@ -170,39 +227,52 @@ gboolean
 meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
                                   XEvent            *xevent)
 {
-  MetaDisplay *display = meta_get_display ();
  XFixesCursorNotifyEvent *notify_event;

  if (meta_is_wayland_compositor ())
    return FALSE;

-  if (xevent->xany.type != display->xfixes_event_base + XFixesCursorNotify)
+  if (xevent->xany.type != tracker->screen->display->xfixes_event_base + XFixesCursorNotify)
    return FALSE;

  notify_event = (XFixesCursorNotifyEvent *)xevent;
  if (notify_event->subtype != XFixesDisplayCursorNotify)
    return FALSE;

-  g_clear_object (&tracker->xfixes_cursor);
-  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
+  set_window_cursor (tracker, FALSE, NULL);

  return TRUE;
 }

+static MetaCursorReference *
+meta_cursor_reference_take_texture (CoglTexture2D *texture,
+                                    int            hot_x,
+                                    int            hot_y)
+{
+  MetaCursorReference *self;
+
+  self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
+  self->image.texture = texture;
+  self->image.hot_x = hot_x;
+  self->image.hot_y = hot_y;
+
+  return self;
+}
+
 static void
 ensure_xfixes_cursor (MetaCursorTracker *tracker)
 {
-  MetaDisplay *display = meta_get_display ();
  XFixesCursorImage *cursor_image;
  CoglTexture2D *sprite;
  guint8 *cursor_data;
  gboolean free_cursor_data;
  CoglContext *ctx;

-  if (tracker->xfixes_cursor)
+  if (tracker->has_window_cursor)
    return;

-  cursor_image = XFixesGetCursorImage (display->xdisplay);
+  cursor_image = XFixesGetCursorImage (tracker->screen->display->xdisplay);
  if (!cursor_image)
    return;

@@ -246,13 +316,10 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)

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

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

-  if (cursor_sprite)
-    return meta_cursor_sprite_get_cogl_texture (cursor_sprite);
+  if (tracker->displayed_cursor)
+    return meta_cursor_reference_get_cogl_texture (tracker->displayed_cursor, NULL, NULL);
  else
    return NULL;
 }
@@ -297,22 +355,13 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
                             int               *x,
                             int               *y)
 {
-  MetaCursorSprite *cursor_sprite;
-
  g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));

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

-  if (cursor_sprite)
-    meta_cursor_sprite_get_hotspot (cursor_sprite, x, y);
+  if (tracker->displayed_cursor)
+    meta_cursor_reference_get_cogl_texture (tracker->displayed_cursor, x, y);
  else
    {
      if (x)
@@ -323,10 +372,21 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
 }

 void
-meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
-                                       MetaCursorSprite  *cursor_sprite)
+meta_cursor_tracker_set_grab_cursor (MetaCursorTracker   *tracker,
+                                     MetaCursorReference *cursor)
 {
-  set_window_cursor (tracker, TRUE, cursor_sprite);
+  g_clear_pointer (&tracker->grab_cursor, meta_cursor_reference_unref);
+  if (cursor)
+    tracker->grab_cursor = meta_cursor_reference_ref (cursor);
+
+  sync_cursor (tracker);
+}
+
+void
+meta_cursor_tracker_set_window_cursor (MetaCursorTracker   *tracker,
+                                       MetaCursorReference *cursor)
+{
+  set_window_cursor (tracker, TRUE, cursor);
 }

 void
@@ -336,16 +396,194 @@ meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker)
 }

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

  sync_cursor (tracker);
 }

+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,
@@ -353,7 +591,61 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
 {
  g_assert (meta_is_wayland_compositor ());

-  meta_cursor_renderer_set_position (tracker->renderer, new_x, new_y);
+  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;
+    }
 }

 static void
@@ -421,11 +713,26 @@ meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
    return;
  tracker->is_showing = visible;

-  sync_cursor (tracker);
+  if (meta_is_wayland_compositor ())
+    {
+      sync_cursor (tracker);
+    }
+  else
+    {
+      if (visible)
+        XFixesShowCursor (tracker->screen->display->xdisplay,
+                          tracker->screen->xroot);
+      else
+        XFixesHideCursor (tracker->screen->display->xdisplay,
+                          tracker->screen->xroot);
+    }
 }

-MetaCursorSprite *
-meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker)
+void
+meta_cursor_tracker_force_update (MetaCursorTracker *tracker)
 {
-  return tracker->displayed_cursor;
+  g_assert (meta_is_wayland_compositor ());
+
+  update_hw_cursor (tracker);
+  sync_cursor (tracker);
 }
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -21,13 +21,13 @@

 #include "config.h"

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

 #include <meta/errors.h>

 #include "display-private.h"
 #include "screen-private.h"
-#include "meta-backend-private.h"
+#include "meta-cursor-tracker-private.h" /* for tracker->gbm */

 #include <string.h>

@@ -35,324 +35,378 @@
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xcursor/Xcursor.h>

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

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

-  MetaCursor cursor;
-
-  CoglTexture2D *texture;
-  float texture_scale;
-  int hot_x, hot_y;
-
-  int current_frame;
-  XcursorImages *xcursor_images;
-
-  int theme_scale;
-  gboolean theme_dirty;
-};
-
-G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)
-
-static const char *
-translate_meta_cursor (MetaCursor cursor)
-{
-  switch (cursor)
-    {
-    case META_CURSOR_DEFAULT:
-      return "left_ptr";
-    case META_CURSOR_NORTH_RESIZE:
-      return "top_side";
-    case META_CURSOR_SOUTH_RESIZE:
-      return "bottom_side";
-    case META_CURSOR_WEST_RESIZE:
-      return "left_side";
-    case META_CURSOR_EAST_RESIZE:
-      return "right_side";
-    case META_CURSOR_SE_RESIZE:
-      return "bottom_right_corner";
-    case META_CURSOR_SW_RESIZE:
-      return "bottom_left_corner";
-    case META_CURSOR_NE_RESIZE:
-      return "top_right_corner";
-    case META_CURSOR_NW_RESIZE:
-      return "top_left_corner";
-    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
-      return "fleur";
-    case META_CURSOR_BUSY:
-      return "watch";
-    case META_CURSOR_DND_IN_DRAG:
-      return "dnd-none";
-    case META_CURSOR_DND_MOVE:
-      return "dnd-move";
-    case META_CURSOR_DND_COPY:
-      return "dnd-copy";
-    case META_CURSOR_DND_UNSUPPORTED_TARGET:
-      return "dnd-none";
-    case META_CURSOR_POINTING_HAND:
-      return "hand2";
-    case META_CURSOR_CROSSHAIR:
-      return "crosshair";
-    case META_CURSOR_IBEAM:
-      return "xterm";
-    default:
-      break;
-    }
-
-  g_assert_not_reached ();
-}
-
-Cursor
-meta_cursor_create_x_cursor (Display    *xdisplay,
-                             MetaCursor  cursor)
-{
-  return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
-}
-
-static XcursorImages *
-load_cursor_on_client (MetaCursor cursor, int scale)
-{
-  return XcursorLibraryLoadImages (translate_meta_cursor (cursor),
-                                   meta_prefs_get_cursor_theme (),
-                                   meta_prefs_get_cursor_size () * scale);
+  return self;
 }

 static void
-meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
-                                            XcursorImage     *xc_image)
+meta_cursor_image_free (MetaCursorImage *image)
 {
-  MetaBackend *meta_backend = meta_get_backend ();
-  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
-  uint width, height, rowstride;
+  cogl_object_unref (image->texture);
+  if (image->bo)
+    gbm_bo_destroy (image->bo);
+}
+
+static void
+meta_cursor_reference_free (MetaCursorReference *self)
+{
+  meta_cursor_image_free (&self->image);
+  g_slice_free (MetaCursorReference, self);
+}
+
+void
+meta_cursor_reference_unref (MetaCursorReference *self)
+{
+  self->ref_count--;
+
+  if (self->ref_count == 0)
+    meta_cursor_reference_free (self);
+}
+
+static void
+translate_meta_cursor (MetaCursor   cursor,
+                       guint       *glyph_out,
+                       const char **name_out)
+{
+  guint glyph = XC_num_glyphs;
+  const char *name = NULL;
+
+  switch (cursor)
+    {
+    case META_CURSOR_DEFAULT:
+      glyph = XC_left_ptr;
+      break;
+    case META_CURSOR_NORTH_RESIZE:
+      glyph = XC_top_side;
+      break;
+    case META_CURSOR_SOUTH_RESIZE:
+      glyph = XC_bottom_side;
+      break;
+    case META_CURSOR_WEST_RESIZE:
+      glyph = XC_left_side;
+      break;
+    case META_CURSOR_EAST_RESIZE:
+      glyph = XC_right_side;
+      break;
+    case META_CURSOR_SE_RESIZE:
+      glyph = XC_bottom_right_corner;
+      break;
+    case META_CURSOR_SW_RESIZE:
+      glyph = XC_bottom_left_corner;
+      break;
+    case META_CURSOR_NE_RESIZE:
+      glyph = XC_top_right_corner;
+      break;
+    case META_CURSOR_NW_RESIZE:
+      glyph = XC_top_left_corner;
+      break;
+    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
+      glyph = XC_fleur;
+      break;
+    case META_CURSOR_BUSY:
+      glyph = XC_watch;
+      break;
+    case META_CURSOR_DND_IN_DRAG:
+      name = "dnd-none";
+      break;
+    case META_CURSOR_DND_MOVE:
+      name = "dnd-move";
+      break;
+    case META_CURSOR_DND_COPY:
+      name = "dnd-copy";
+      break;
+    case META_CURSOR_DND_UNSUPPORTED_TARGET:
+      name = "dnd-none";
+      break;
+    case META_CURSOR_POINTING_HAND:
+      glyph = XC_hand2;
+      break;
+    case META_CURSOR_CROSSHAIR:
+      glyph = XC_crosshair;
+      break;
+    case META_CURSOR_IBEAM:
+      glyph = XC_xterm;
+      break;
+
+    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;
+}
+
+Cursor
+meta_display_create_x_cursor (MetaDisplay *display,
+                              MetaCursor cursor)
+{
+  return load_cursor_on_server (display, cursor);
+}
+
+static XcursorImage *
+load_cursor_on_client (MetaDisplay *display,
+                       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;
+}
+
+static void
+meta_cursor_image_load_gbm_buffer (struct gbm_device *gbm,
+                                   MetaCursorImage   *image,
+                                   uint8_t           *pixels,
+                                   int                width,
+                                   int                height,
+                                   int                rowstride,
+                                   uint32_t           gbm_format)
+{
+  if (width > 64 || height > 64)
+    {
+      meta_warning ("Invalid theme cursor size (must be at most 64x64)\n");
+      return;
+    }
+
+  if (gbm_device_is_format_supported (gbm, gbm_format,
+                                      GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE))
+    {
+      uint8_t buf[4 * 64 * 64];
+      int i;
+
+      image->bo = gbm_bo_create (gbm, 64, 64,
+                                 gbm_format, GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE);
+
+      memset (buf, 0, sizeof(buf));
+      for (i = 0; i < height; i++)
+        memcpy (buf + i * 4 * 64, pixels + i * rowstride, width * 4);
+
+      gbm_bo_write (image->bo, buf, 64 * 64 * 4);
+    }
+  else
+    meta_warning ("HW cursor for format %d not supported\n", gbm_format);
+}
+
+static void
+meta_cursor_image_load_from_xcursor_image (MetaCursorTracker *tracker,
+                                           MetaCursorImage   *image,
+                                           XcursorImage      *xc_image)
+{
+  int width, height, rowstride;
  CoglPixelFormat cogl_format;
+  uint32_t gbm_format;
  ClutterBackend *clutter_backend;
  CoglContext *cogl_context;
-  CoglTexture *texture;
-
-  g_assert (self->texture == NULL);

  width           = xc_image->width;
  height          = xc_image->height;
  rowstride       = width * 4;

+  gbm_format = GBM_FORMAT_ARGB8888;
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
  cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
 #else
  cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
 #endif

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

-  meta_cursor_renderer_realize_cursor_from_xcursor (renderer, self, xc_image);
+  if (tracker->gbm)
+    meta_cursor_image_load_gbm_buffer (tracker->gbm,
+                                       image,
+                                       (uint8_t *) xc_image->pixels,
+                                       width, height, rowstride,
+                                       gbm_format);
 }

-static XcursorImage *
-meta_cursor_sprite_get_current_frame_image (MetaCursorSprite *self)
-{
-  return self->xcursor_images->images[self->current_frame];
-}
-
-void
-meta_cursor_sprite_tick_frame (MetaCursorSprite *self)
+MetaCursorReference *
+meta_cursor_reference_from_theme (MetaCursorTracker  *tracker,
+                                  MetaCursor          cursor)
 {
+  MetaCursorReference *self;
  XcursorImage *image;

-  if (!meta_cursor_sprite_is_animated (self))
-    return;
+  if (tracker->theme_cursors[cursor])
+    return meta_cursor_reference_ref (tracker->theme_cursors[cursor]);

-  self->current_frame++;
+  image = load_cursor_on_client (tracker->screen->display, cursor);
+  if (!image)
+    return NULL;

-  if (self->current_frame >= self->xcursor_images->nimage)
-    self->current_frame = 0;
+  self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
+  meta_cursor_image_load_from_xcursor_image (tracker, &self->image, image);

-  image = meta_cursor_sprite_get_current_frame_image (self);
-
-  g_clear_pointer (&self->texture, cogl_object_unref);
-  meta_cursor_sprite_load_from_xcursor_image (self, image);
-}
-
-guint
-meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self)
-{
-  if (!meta_cursor_sprite_is_animated (self))
-    return 0;
-
-  return self->xcursor_images->images[self->current_frame]->delay;
-}
-
-gboolean
-meta_cursor_sprite_is_animated (MetaCursorSprite *self)
-{
-  return (self->xcursor_images &&
-          self->xcursor_images->nimage > 1);
-}
-
-MetaCursorSprite *
-meta_cursor_sprite_new (void)
-{
-  return g_object_new (META_TYPE_CURSOR_SPRITE, NULL);
+  XcursorImageDestroy (image);
+  return self;
 }

 static void
-meta_cursor_sprite_load_from_theme (MetaCursorSprite *self)
+meta_cursor_image_load_from_buffer (MetaCursorTracker  *tracker,
+                                    MetaCursorImage    *image,
+                                    struct wl_resource *buffer,
+                                    int                 hot_x,
+                                    int                 hot_y)
 {
-  XcursorImage *image;
+  ClutterBackend *backend;
+  CoglContext *cogl_context;
+  struct wl_shm_buffer *shm_buffer;
+  uint32_t gbm_format;
+  int width, height;

-  g_assert (self->cursor != META_CURSOR_NONE);
+  image->hot_x = hot_x;
+  image->hot_y = hot_y;

-  /* We might be reloading with a different scale. If so clear the old data. */
-  if (self->xcursor_images)
+  backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (backend);
+
+  image->texture = cogl_wayland_texture_2d_new_from_buffer (cogl_context, buffer, NULL);
+
+  width = cogl_texture_get_width (COGL_TEXTURE (image->texture));
+  height = cogl_texture_get_height (COGL_TEXTURE (image->texture));
+
+  shm_buffer = wl_shm_buffer_get (buffer);
+  if (shm_buffer)
    {
-      g_clear_pointer (&self->texture, cogl_object_unref);
-      XcursorImagesDestroy (self->xcursor_images);
+      if (tracker->gbm)
+        {
+          int rowstride = wl_shm_buffer_get_stride (shm_buffer);
+
+          switch (wl_shm_buffer_get_format (shm_buffer))
+            {
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+            case WL_SHM_FORMAT_ARGB8888:
+              gbm_format = GBM_FORMAT_ARGB8888;
+              break;
+            case WL_SHM_FORMAT_XRGB8888:
+              gbm_format = GBM_FORMAT_XRGB8888;
+              break;
+#else
+            case WL_SHM_FORMAT_ARGB8888:
+              gbm_format = GBM_FORMAT_ARGB8888;
+              break;
+            case WL_SHM_FORMAT_XRGB8888:
+              gbm_format = GBM_FORMAT_XRGB8888;
+              break;
+#endif
+            default:
+              g_warn_if_reached ();
+              gbm_format = GBM_FORMAT_ARGB8888;
+            }
+
+          meta_cursor_image_load_gbm_buffer (tracker->gbm,
+                                             image,
+                                             (uint8_t *) wl_shm_buffer_get_data (shm_buffer),
+                                             width, height, rowstride,
+                                             gbm_format);
+        }
    }
+  else
+    {
+      /* HW cursors must be 64x64, but 64x64 is huge, and no cursor theme actually uses
+         that, so themed cursors must be padded with transparent pixels to fill the
+         overlay. This is trivial if we have CPU access to the data, but it's not
+         possible if the buffer is in GPU memory (and possibly tiled too), so if we
+         don't get the right size, we fallback to GL.
+      */
+      if (width != 64 || height != 64)
+        {
+          meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n");
+          return;
+        }

-  self->current_frame = 0;
-  self->xcursor_images = load_cursor_on_client (self->cursor,
-                                                self->theme_scale);
-  if (!self->xcursor_images)
-    meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
-
-  image = meta_cursor_sprite_get_current_frame_image (self);
-  meta_cursor_sprite_load_from_xcursor_image (self, image);
-
-  self->theme_dirty = FALSE;
+      if (tracker->gbm)
+        {
+          image->bo = gbm_bo_import (tracker->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");
+        }
+    }
 }

-MetaCursorSprite *
-meta_cursor_sprite_from_theme (MetaCursor cursor)
+MetaCursorReference *
+meta_cursor_reference_from_buffer (MetaCursorTracker  *tracker,
+                                   struct wl_resource *buffer,
+                                   int                 hot_x,
+                                   int                 hot_y)
 {
-  MetaCursorSprite *self;
+  MetaCursorReference *self;

-  self = meta_cursor_sprite_new ();
-
-  self->cursor = cursor;
-  self->theme_dirty = TRUE;
+  self = g_slice_new0 (MetaCursorReference);
+  self->ref_count = 1;
+  meta_cursor_image_load_from_buffer (tracker, &self->image, buffer, hot_x, hot_y);

  return self;
 }

-void
-meta_cursor_sprite_set_texture (MetaCursorSprite *self,
-                                CoglTexture      *texture,
-                                int               hot_x,
-                                int               hot_y)
-{
-  g_clear_pointer (&self->texture, cogl_object_unref);
-  if (texture)
-    self->texture = cogl_object_ref (texture);
-  self->hot_x = hot_x;
-  self->hot_y = hot_y;
-}
-
-void
-meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
-                                      float             scale)
-{
-  self->texture_scale = scale;
-}
-
-void
-meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
-                                    int               theme_scale)
-{
-  if (self->theme_scale != theme_scale)
-    self->theme_dirty = TRUE;
-  self->theme_scale = theme_scale;
-}
-
 CoglTexture *
-meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self)
+meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
+                                        int                 *hot_x,
+                                        int                 *hot_y)
 {
-  return COGL_TEXTURE (self->texture);
+  if (hot_x)
+    *hot_x = cursor->image.hot_x;
+  if (hot_y)
+    *hot_y = cursor->image.hot_y;
+  return COGL_TEXTURE (cursor->image.texture);
 }

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

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

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

-#define META_TYPE_CURSOR_SPRITE (meta_cursor_sprite_get_type ())
-G_DECLARE_FINAL_TYPE (MetaCursorSprite,
-                      meta_cursor_sprite,
-                      META, CURSOR_SPRITE,
-                      GObject);
-
-MetaCursorSprite * meta_cursor_sprite_new (void);
-
-MetaCursorSprite * meta_cursor_sprite_from_theme  (MetaCursor cursor);
-
-
-void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
-                                         int               scale);
-
-MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self);
-
-Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
-                                    MetaCursor  cursor);
-
-void meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
-                                    int               x,
-                                    int               y);
-
-void meta_cursor_sprite_realize_texture (MetaCursorSprite *self);
-
-void meta_cursor_sprite_set_texture (MetaCursorSprite *self,
-                                     CoglTexture      *texture,
-                                     int               hot_x,
-                                     int               hot_y);
-
-void meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
-                                           float             scale);
-
-CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self);
-
-void meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
-                                     int              *hot_x,
-                                     int              *hot_y);
-
-float meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self);
-
-gboolean meta_cursor_sprite_is_animated            (MetaCursorSprite *self);
-void     meta_cursor_sprite_tick_frame             (MetaCursorSprite *self);
-guint    meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self);
+MetaCursorReference * meta_cursor_reference_from_buffer (MetaCursorTracker  *tracker,
+                                                         struct wl_resource *buffer,
+                                                         int                 hot_x,
+                                                         int                 hot_y);

 #endif /* META_CURSOR_H */
--- a/src/backends/meta-display-config-shared.h
+++ b/src/backends/meta-display-config-shared.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
+/* 
 * Copyright (C) 2013 Red Hat Inc.
- *
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -11,7 +11,7 @@
 * 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/>.
 */
--- a/src/backends/meta-idle-monitor-dbus.c
+++ b/src/backends/meta-idle-monitor-dbus.c
@@ -180,9 +180,6 @@ create_monitor_skeleton (GDBusObjectManagerServer *manager,
  meta_dbus_object_skeleton_set_idle_monitor (object, skeleton);

  g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
-
-  g_object_unref (skeleton);
-  g_object_unref (object);
 }

 static void
--- a/src/backends/meta-idle-monitor-private.h
+++ b/src/backends/meta-idle-monitor-private.h
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/*
+/* 
 * Copyright 2013 Red Hat, Inc.
- *
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -12,7 +12,7 @@
 * 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/>.
 *
--- a/src/backends/meta-idle-monitor.c
+++ b/src/backends/meta-idle-monitor.c
@@ -1,8 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/*
+/* 
 * Copyright 2013 Red Hat, Inc.
- *
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -12,7 +12,7 @@
 * 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/>.
 *
@@ -38,7 +38,8 @@
 #include <meta/meta-idle-monitor.h>
 #include "meta-idle-monitor-private.h"
 #include "meta-idle-monitor-dbus.h"
-#include "meta-backend-private.h"
+#include "backends/x11/meta-idle-monitor-xsync.h"
+#include "backends/native/meta-idle-monitor-native.h"

 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));

@@ -53,6 +54,9 @@ 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)
 {
@@ -156,6 +160,36 @@ 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:
 *
@@ -166,8 +200,8 @@ meta_idle_monitor_init (MetaIdleMonitor *monitor)
 MetaIdleMonitor *
 meta_idle_monitor_get_core (void)
 {
-  MetaBackend *backend = meta_get_backend ();
-  return meta_backend_get_idle_monitor (backend, 0);
+  ensure_device_monitor (0);
+  return device_monitors[0];
 }

 /**
@@ -181,8 +215,10 @@ meta_idle_monitor_get_core (void)
 MetaIdleMonitor *
 meta_idle_monitor_get_for_device (int device_id)
 {
-  MetaBackend *backend = meta_get_backend ();
-  return meta_backend_get_idle_monitor (backend, device_id);
+  g_return_val_if_fail (device_id > 0 && device_id < 256, NULL);
+
+  ensure_device_monitor (device_id);
+  return device_monitors[device_id];
 }

 static MetaIdleMonitorWatch *
@@ -210,9 +246,9 @@ make_watch (MetaIdleMonitor           *monitor,
 * meta_idle_monitor_add_idle_watch:
 * @monitor: A #MetaIdleMonitor
 * @interval_msec: The idletime interval, in milliseconds
- * @callback: (nullable): The callback to call when the user has
+ * @callback: (allow-none): The callback to call when the user has
 *     accumulated @interval_msec milliseconds of idle time.
- * @user_data: (nullable): The user data to pass to the callback
+ * @user_data: (allow-none): The user data to pass to the callback
 * @notify: A #GDestroyNotify
 *
 * Returns: a watch id
@@ -252,9 +288,9 @@ meta_idle_monitor_add_idle_watch (MetaIdleMonitor	       *monitor,
 /**
 * meta_idle_monitor_add_user_active_watch:
 * @monitor: A #MetaIdleMonitor
- * @callback: (nullable): The callback to call when the user is
+ * @callback: (allow-none): The callback to call when the user is
 *     active again.
- * @user_data: (nullable): The user data to pass to the callback
+ * @user_data: (allow-none): The user data to pass to the callback
 * @notify: A #GDestroyNotify
 *
 * Returns: a watch id
@@ -316,3 +352,16 @@ 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);
+}
--- a/src/backends/meta-input-settings-private.h
+++ b/src/backends/meta-input-settings-private.h
@@ -1,87 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright 2014 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef META_INPUT_SETTINGS_PRIVATE_H
-#define META_INPUT_SETTINGS_PRIVATE_H
-
-#include "display-private.h"
-
-#include <clutter/clutter.h>
-
-#define META_TYPE_INPUT_SETTINGS             (meta_input_settings_get_type ())
-#define META_INPUT_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS, MetaInputSettings))
-#define META_INPUT_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
-#define META_IS_INPUT_SETTINGS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_INPUT_SETTINGS))
-#define META_IS_INPUT_SETTINGS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_INPUT_SETTINGS))
-#define META_INPUT_SETTINGS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_INPUT_SETTINGS, MetaInputSettingsClass))
-
-typedef struct _MetaInputSettings MetaInputSettings;
-typedef struct _MetaInputSettingsClass MetaInputSettingsClass;
-
-struct _MetaInputSettings
-{
-  GObject parent_instance;
-};
-
-struct _MetaInputSettingsClass
-{
-  GObjectClass parent_class;
-
-  void (* set_send_events)   (MetaInputSettings        *settings,
-                              ClutterInputDevice       *device,
-                              GDesktopDeviceSendEvents  mode);
-  void (* set_matrix)        (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gfloat              matrix[6]);
-  void (* set_speed)         (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gdouble             speed);
-  void (* set_left_handed)   (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            enabled);
-  void (* set_tap_enabled)   (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            enabled);
-  void (* set_invert_scroll) (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            inverted);
-  void (* set_edge_scroll)   (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            enabled);
-  void (* set_scroll_button) (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              guint               button);
-
-  void (* set_click_method)  (MetaInputSettings            *settings,
-                              ClutterInputDevice           *device,
-                              GDesktopTouchpadClickMethod   mode);
-
-  void (* set_keyboard_repeat) (MetaInputSettings *settings,
-                                gboolean           repeat,
-                                guint              delay,
-                                guint              interval);
-};
-
-GType meta_input_settings_get_type (void) G_GNUC_CONST;
-
-MetaInputSettings * meta_input_settings_create (void);
-
-#endif /* META_INPUT_SETTINGS_PRIVATE_H */
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -1,893 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright 2014 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-/**
- * SECTION:input-settings
- * @title: MetaInputSettings
- * @short_description: Mutter input device configuration
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include "meta-backend-private.h"
-#include "meta-input-settings-private.h"
-#include "x11/meta-input-settings-x11.h"
-
-#ifdef HAVE_NATIVE_BACKEND
-#include "native/meta-backend-native.h"
-#include "native/meta-input-settings-native.h"
-#endif
-
-#include <meta/util.h>
-
-typedef struct _MetaInputSettingsPrivate MetaInputSettingsPrivate;
-typedef struct _DeviceMappingInfo DeviceMappingInfo;
-
-struct _DeviceMappingInfo
-{
-  MetaInputSettings *input_settings;
-  ClutterInputDevice *device;
-  GSettings *settings;
-};
-
-struct _MetaInputSettingsPrivate
-{
-  ClutterDeviceManager *device_manager;
-  MetaMonitorManager *monitor_manager;
-  guint monitors_changed_id;
-
-  GSettings *mouse_settings;
-  GSettings *touchpad_settings;
-  GSettings *trackball_settings;
-  GSettings *keyboard_settings;
-
-  GHashTable *mappable_devices;
-};
-
-typedef void (*ConfigBoolFunc)   (MetaInputSettings  *input_settings,
-                                  ClutterInputDevice *device,
-                                  gboolean            setting);
-typedef void (*ConfigDoubleFunc) (MetaInputSettings  *input_settings,
-                                  ClutterInputDevice *device,
-                                  gdouble             value);
-typedef void (*ConfigUintFunc)   (MetaInputSettings  *input_settings,
-                                  ClutterInputDevice *device,
-                                  guint               value);
-
-G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettings, meta_input_settings, G_TYPE_OBJECT)
-
-static GSList *
-meta_input_settings_get_devices (MetaInputSettings      *settings,
-                                 ClutterInputDeviceType  type)
-{
-  MetaInputSettingsPrivate *priv;
-  const GSList *devices;
-  GSList *list = NULL;
-
-  priv = meta_input_settings_get_instance_private (settings);
-  devices = clutter_device_manager_peek_devices (priv->device_manager);
-
-  while (devices)
-    {
-      ClutterInputDevice *device = devices->data;
-
-      if (clutter_input_device_get_device_type (device) == type &&
-          clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER)
-        list = g_slist_prepend (list, device);
-
-      devices = devices->next;
-    }
-
-  return list;
-}
-
-static void
-meta_input_settings_dispose (GObject *object)
-{
-  MetaInputSettings *settings = META_INPUT_SETTINGS (object);
-  MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (settings);
-
-  g_clear_object (&priv->mouse_settings);
-  g_clear_object (&priv->touchpad_settings);
-  g_clear_object (&priv->trackball_settings);
-  g_clear_object (&priv->keyboard_settings);
-  g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
-
-  if (priv->monitors_changed_id && priv->monitor_manager)
-    {
-      g_signal_handler_disconnect (priv->monitor_manager,
-                                   priv->monitors_changed_id);
-      priv->monitors_changed_id = 0;
-    }
-
-  g_clear_object (&priv->monitor_manager);
-
-  G_OBJECT_CLASS (meta_input_settings_parent_class)->dispose (object);
-}
-
-static void
-settings_device_set_bool_setting (MetaInputSettings  *input_settings,
-                                  ClutterInputDevice *device,
-                                  ConfigBoolFunc      func,
-                                  gboolean            enabled)
-{
-  func (input_settings, device, enabled);
-}
-
-static void
-settings_set_bool_setting (MetaInputSettings      *input_settings,
-                           ClutterInputDeviceType  type,
-                           ConfigBoolFunc          func,
-                           gboolean                enabled)
-{
-  GSList *devices, *d;
-
-  devices = meta_input_settings_get_devices (input_settings, type);
-
-  for (d = devices; d; d = d->next)
-    settings_device_set_bool_setting (input_settings, d->data, func, enabled);
-
-  g_slist_free (devices);
-}
-
-static void
-settings_device_set_double_setting (MetaInputSettings  *input_settings,
-                                    ClutterInputDevice *device,
-                                    ConfigDoubleFunc    func,
-                                    gdouble             value)
-{
-  func (input_settings, device, value);
-}
-
-static void
-settings_set_double_setting (MetaInputSettings      *input_settings,
-                             ClutterInputDeviceType  type,
-                             ConfigDoubleFunc        func,
-                             gdouble                 value)
-{
-  GSList *devices, *d;
-
-  devices = meta_input_settings_get_devices (input_settings, type);
-
-  for (d = devices; d; d = d->next)
-    settings_device_set_double_setting (input_settings, d->data, func, value);
-
-  g_slist_free (devices);
-}
-
-static void
-settings_device_set_uint_setting (MetaInputSettings  *input_settings,
-                                  ClutterInputDevice *device,
-                                  ConfigUintFunc      func,
-                                  guint               value)
-{
-  (func) (input_settings, device, value);
-}
-
-static void
-settings_set_uint_setting (MetaInputSettings      *input_settings,
-                           ClutterInputDeviceType  type,
-                           ConfigUintFunc          func,
-                           guint                   value)
-{
-  GSList *devices, *d;
-
-  devices = meta_input_settings_get_devices (input_settings, type);
-
-  for (d = devices; d; d = d->next)
-    settings_device_set_uint_setting (input_settings, d->data, func, value);
-
-  g_slist_free (devices);
-}
-
-static void
-update_touchpad_left_handed (MetaInputSettings  *input_settings,
-                             ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  GDesktopTouchpadHandedness handedness;
-  MetaInputSettingsPrivate *priv;
-  gboolean enabled = FALSE;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  handedness = g_settings_get_enum (priv->touchpad_settings, "left-handed");
-
-  switch (handedness)
-    {
-    case G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT:
-      enabled = FALSE;
-      break;
-    case G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT:
-      enabled = TRUE;
-      break;
-    case G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE:
-      enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  if (device)
-    {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_left_handed,
-                                        enabled);
-    }
-  else
-    {
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 input_settings_class->set_left_handed,
-                                 enabled);
-    }
-}
-
-static void
-update_mouse_left_handed (MetaInputSettings  *input_settings,
-                          ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  gboolean enabled;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_POINTER_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
-
-  if (device)
-    {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_left_handed,
-                                        enabled);
-    }
-  else
-    {
-      GDesktopTouchpadHandedness touchpad_handedness;
-
-      settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE,
-                                 input_settings_class->set_left_handed,
-                                 enabled);
-
-      touchpad_handedness = g_settings_get_enum (priv->touchpad_settings,
-                                                 "left-handed");
-
-      /* Also update touchpads if they're following mouse settings */
-      if (touchpad_handedness == G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE)
-        update_touchpad_left_handed (input_settings, NULL);
-    }
-}
-
-static GSettings *
-get_settings_for_device_type (MetaInputSettings      *input_settings,
-                              ClutterInputDeviceType  type)
-{
-  MetaInputSettingsPrivate *priv;
-  priv = meta_input_settings_get_instance_private (input_settings);
-  switch (type)
-    {
-    case CLUTTER_POINTER_DEVICE:
-      return priv->mouse_settings;
-    case CLUTTER_TOUCHPAD_DEVICE:
-      return priv->touchpad_settings;
-    default:
-      return NULL;
-    }
-}
-
-static void
-update_device_speed (MetaInputSettings      *input_settings,
-                     ClutterInputDevice     *device)
-{
-  GSettings *settings;
-  ConfigDoubleFunc func;
-  const gchar *key = "speed";
-
-  func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_speed;
-
-  if (device)
-    {
-      settings = get_settings_for_device_type (input_settings,
-                                               clutter_input_device_get_device_type (device));
-      if (!settings)
-        return;
-
-      settings_device_set_double_setting (input_settings, device, func,
-                                          g_settings_get_double (settings, key));
-    }
-  else
-    {
-      settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
-      settings_set_double_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
-                                   g_settings_get_double (settings, key));
-      settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
-      settings_set_double_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
-                                   g_settings_get_double (settings, key));
-    }
-}
-
-static void
-update_device_natural_scroll (MetaInputSettings      *input_settings,
-                              ClutterInputDevice     *device)
-{
-  GSettings *settings;
-  ConfigBoolFunc func;
-  const gchar *key = "natural-scroll";
-
-  func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_invert_scroll;
-
-  if (device)
-    {
-      settings = get_settings_for_device_type (input_settings,
-                                               clutter_input_device_get_device_type (device));
-      if (!settings)
-        return;
-
-      settings_device_set_bool_setting (input_settings, device, func,
-                                        g_settings_get_boolean (settings, key));
-    }
-  else
-    {
-      settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
-      settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
-                                 g_settings_get_boolean (settings, key));
-      settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
-                                 g_settings_get_boolean (settings, key));
-    }
-}
-
-static void
-update_touchpad_tap_enabled (MetaInputSettings  *input_settings,
-                             ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  gboolean enabled;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
-
-  if (device)
-    {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_tap_enabled,
-                                        enabled);
-    }
-  else
-    {
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 input_settings_class->set_tap_enabled,
-                                 enabled);
-    }
-}
-
-static void
-update_touchpad_edge_scroll (MetaInputSettings *input_settings,
-                             ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  gboolean edge_scroll_enabled;
-  MetaInputSettingsPrivate *priv;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  edge_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "edge-scrolling-enabled");
-
-  if (device)
-    {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_edge_scroll,
-                                        edge_scroll_enabled);
-    }
-  else
-    {
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 (ConfigBoolFunc) input_settings_class->set_edge_scroll,
-                                 edge_scroll_enabled);
-    }
-}
-
-static void
-update_touchpad_click_method (MetaInputSettings *input_settings,
-                              ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  GDesktopTouchpadClickMethod method;
-  MetaInputSettingsPrivate *priv;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  method = g_settings_get_enum (priv->touchpad_settings, "click-method");
-
-  if (device)
-    {
-      settings_device_set_uint_setting (input_settings, device,
-                                        input_settings_class->set_click_method,
-                                        method);
-    }
-  else
-    {
-      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 (ConfigUintFunc) input_settings_class->set_click_method,
-                                 method);
-    }
-}
-
-static void
-update_touchpad_send_events (MetaInputSettings  *input_settings,
-                             ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  GDesktopDeviceSendEvents mode;
-
-  if (device &&
-      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  mode = g_settings_get_enum (priv->touchpad_settings, "send-events");
-
-  if (device)
-    {
-      settings_device_set_uint_setting (input_settings, device,
-                                        input_settings_class->set_send_events,
-                                        mode);
-    }
-  else
-    {
-      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 input_settings_class->set_send_events,
-                                 mode);
-    }
-}
-
-static gboolean
-device_is_trackball (ClutterInputDevice *device)
-{
-  gboolean is_trackball;
-  char *name;
-
-  if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
-    return FALSE;
-
-  name = g_ascii_strdown (clutter_input_device_get_device_name (device), -1);
-  is_trackball = strstr (name, "trackball") != NULL;
-  g_free (name);
-
-  return is_trackball;
-}
-
-static void
-update_trackball_scroll_button (MetaInputSettings  *input_settings,
-                                ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  guint button;
-
-  if (device && !device_is_trackball (device))
-    return;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  /* This key is 'i' in the schema but it also specifies a minimum
-   * range of 0 so the cast here is safe. */
-  button = (guint) g_settings_get_int (priv->trackball_settings, "scroll-wheel-emulation-button");
-
-  if (device)
-    {
-      input_settings_class->set_scroll_button (input_settings, device, button);
-    }
-  else if (!device)
-    {
-      const GSList *devices;
-
-      devices = clutter_device_manager_peek_devices (priv->device_manager);
-
-      while (devices)
-        {
-          device = devices->data;
-
-          if (device_is_trackball (device))
-            input_settings_class->set_scroll_button (input_settings, device, button);
-
-          devices = devices->next;
-        }
-    }
-}
-
-static void
-update_keyboard_repeat (MetaInputSettings *input_settings)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  guint delay, interval;
-  gboolean repeat;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  repeat = g_settings_get_boolean (priv->keyboard_settings, "repeat");
-  delay = g_settings_get_uint (priv->keyboard_settings, "delay");
-  interval = g_settings_get_uint (priv->keyboard_settings, "repeat-interval");
-
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  input_settings_class->set_keyboard_repeat (input_settings,
-                                             repeat, delay, interval);
-}
-
-static MetaOutput *
-meta_input_settings_find_output (MetaInputSettings  *input_settings,
-                                 GSettings          *settings,
-                                 ClutterInputDevice *device)
-{
-  MetaInputSettingsPrivate *priv;
-  guint n_values, n_outputs, i;
-  MetaOutput *outputs;
-  gchar **edid;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  edid = g_settings_get_strv (settings, "display");
-  n_values = g_strv_length (edid);
-
-  if (n_values != 3)
-    {
-      g_warning ("EDID configuration for device '%s' "
-                 "is incorrect, must have 3 values",
-                 clutter_input_device_get_device_name (device));
-      return NULL;
-    }
-
-  if (!*edid[0] && !*edid[1] && !*edid[2])
-    return NULL;
-
-  outputs = meta_monitor_manager_get_outputs (priv->monitor_manager,
-                                              &n_outputs);
-  for (i = 0; i < n_outputs; i++)
-    {
-      if (g_strcmp0 (outputs[i].vendor, edid[0]) == 0 &&
-          g_strcmp0 (outputs[i].product, edid[1]) == 0 &&
-          g_strcmp0 (outputs[i].serial, edid[2]) == 0)
-        return &outputs[i];
-    }
-
-  return NULL;
-}
-
-static void
-update_device_display (MetaInputSettings  *input_settings,
-                       GSettings          *settings,
-                       ClutterInputDevice *device)
-{
-  MetaInputSettingsClass *input_settings_class;
-  MetaInputSettingsPrivate *priv;
-  gfloat matrix[6] = { 1, 0, 0, 0, 1, 0 };
-  MetaOutput *output;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  output = meta_input_settings_find_output (input_settings, settings, device);
-
-  if (output)
-    meta_monitor_manager_get_monitor_matrix (priv->monitor_manager,
-                                             output, matrix);
-
-  input_settings_class->set_matrix (input_settings, device, matrix);
-}
-
-static void
-meta_input_settings_changed_cb (GSettings  *settings,
-                                const char *key,
-                                gpointer    user_data)
-{
-  MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
-  MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
-
-  if (settings == priv->mouse_settings)
-    {
-      if (strcmp (key, "left-handed") == 0)
-        update_mouse_left_handed (input_settings, NULL);
-      else if (strcmp (key, "speed") == 0)
-        update_device_speed (input_settings, NULL);
-      else if (strcmp (key, "natural-scroll") == 0)
-        update_device_natural_scroll (input_settings, NULL);
-    }
-  else if (settings == priv->touchpad_settings)
-    {
-      if (strcmp (key, "left-handed") == 0)
-        update_touchpad_left_handed (input_settings, NULL);
-      else if (strcmp (key, "speed") == 0)
-        update_device_speed (input_settings, NULL);
-      else if (strcmp (key, "natural-scroll") == 0)
-        update_device_natural_scroll (input_settings, NULL);
-      else if (strcmp (key, "tap-to-click") == 0)
-        update_touchpad_tap_enabled (input_settings, NULL);
-      else if (strcmp (key, "send-events") == 0)
-        update_touchpad_send_events (input_settings, NULL);
-      else if (strcmp (key, "edge-scrolling-enabled") == 0)
-        update_touchpad_edge_scroll (input_settings, NULL);
-      else if (strcmp (key, "click-method") == 0)
-        update_touchpad_click_method (input_settings, NULL);
-    }
-  else if (settings == priv->trackball_settings)
-    {
-      if (strcmp (key, "scroll-wheel-emulation-button") == 0)
-        update_trackball_scroll_button (input_settings, NULL);
-    }
-  else if (settings == priv->keyboard_settings)
-    {
-      if (strcmp (key, "repeat") == 0 ||
-          strcmp (key, "repeat-interval") == 0 ||
-          strcmp (key, "delay") == 0)
-        update_keyboard_repeat (input_settings);
-    }
-}
-
-static void
-mapped_device_changed_cb (GSettings         *settings,
-                          const gchar       *key,
-                          DeviceMappingInfo *info)
-{
-  if (strcmp (key, "display") == 0)
-    update_device_display (info->input_settings, settings, info->device);
-}
-
-static GSettings *
-lookup_device_settings (ClutterInputDevice *device)
-{
-  const gchar *group, *schema, *vendor, *product;
-  ClutterInputDeviceType type;
-  GSettings *settings;
-  gchar *path;
-
-  type = clutter_input_device_get_device_type (device);
-
-  if (type == CLUTTER_TOUCHSCREEN_DEVICE)
-    {
-      group = "touchscreens";
-      schema = "org.gnome.desktop.peripherals.touchscreen";
-    }
-  else if (type == CLUTTER_TABLET_DEVICE ||
-           type == CLUTTER_PEN_DEVICE ||
-           type == CLUTTER_ERASER_DEVICE ||
-           type == CLUTTER_CURSOR_DEVICE)
-    {
-      group = "tablets";
-      schema = "org.gnome.desktop.peripherals.tablet";
-    }
-  else
-    return NULL;
-
-  vendor = clutter_input_device_get_vendor_id (device);
-  product = clutter_input_device_get_product_id (device);
-  path = g_strdup_printf ("/org/gnome/desktop/peripherals/%s/%s:%s/",
-                          group, vendor, product);
-
-  settings = g_settings_new_with_path (schema, path);
-  g_free (path);
-
-  return settings;
-}
-
-static void
-monitors_changed_cb (MetaMonitorManager *monitor_manager,
-                     MetaInputSettings  *input_settings)
-{
-  MetaInputSettingsPrivate *priv;
-  ClutterInputDevice *device;
-  GSettings *settings;
-  GHashTableIter iter;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  g_hash_table_iter_init (&iter, priv->mappable_devices);
-
-  while (g_hash_table_iter_next (&iter, (gpointer *) &device,
-                                 (gpointer *) &settings))
-    update_device_display (input_settings, settings, device);
-}
-
-static gboolean
-check_add_mappable_device (MetaInputSettings  *input_settings,
-                           ClutterInputDevice *device)
-{
-  MetaInputSettingsPrivate *priv;
-  DeviceMappingInfo *info;
-  GSettings *settings;
-
-  settings = lookup_device_settings (device);
-
-  if (!settings)
-    return FALSE;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-
-  info = g_new0 (DeviceMappingInfo, 1);
-  info->input_settings = input_settings;
-  info->device = device;
-  info->settings = settings;
-
-  g_signal_connect_data (settings, "changed",
-                         G_CALLBACK (mapped_device_changed_cb),
-                         info, (GClosureNotify) g_free, 0);
-
-  g_hash_table_insert (priv->mappable_devices, device, settings);
-
-  update_device_display (input_settings, settings, device);
-
-  return TRUE;
-}
-
-static void
-apply_device_settings (MetaInputSettings  *input_settings,
-                       ClutterInputDevice *device)
-{
-  update_mouse_left_handed (input_settings, device);
-  update_device_speed (input_settings, device);
-  update_device_natural_scroll (input_settings, device);
-
-  update_touchpad_left_handed (input_settings, device);
-  update_device_speed (input_settings, device);
-  update_device_natural_scroll (input_settings, device);
-  update_touchpad_tap_enabled (input_settings, device);
-  update_touchpad_send_events (input_settings, device);
-  update_touchpad_edge_scroll (input_settings, device);
-  update_touchpad_click_method (input_settings, device);
-
-  update_trackball_scroll_button (input_settings, device);
-}
-
-static void
-meta_input_settings_device_added (ClutterDeviceManager *device_manager,
-                                  ClutterInputDevice   *device,
-                                  MetaInputSettings    *input_settings)
-{
-  if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
-    return;
-
-  apply_device_settings (input_settings, device);
-  check_add_mappable_device (input_settings, device);
-}
-
-static void
-meta_input_settings_device_removed (ClutterDeviceManager *device_manager,
-                                    ClutterInputDevice   *device,
-                                    MetaInputSettings    *input_settings)
-{
-  MetaInputSettingsPrivate *priv;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  g_hash_table_remove (priv->mappable_devices, device);
-}
-
-static void
-check_mappable_devices (MetaInputSettings *input_settings)
-{
-  MetaInputSettingsPrivate *priv;
-  const GSList *devices, *l;
-
-  priv = meta_input_settings_get_instance_private (input_settings);
-  devices = clutter_device_manager_peek_devices (priv->device_manager);
-
-  for (l = devices; l; l = l->next)
-    {
-      ClutterInputDevice *device = l->data;
-
-      if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
-        continue;
-
-      check_add_mappable_device (input_settings, device);
-    }
-}
-
-static void
-meta_input_settings_constructed (GObject *object)
-{
-  MetaInputSettings *input_settings = META_INPUT_SETTINGS (object);
-
-  apply_device_settings (input_settings, NULL);
-  update_keyboard_repeat (input_settings);
-  check_mappable_devices (input_settings);
-}
-
-static void
-meta_input_settings_class_init (MetaInputSettingsClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = meta_input_settings_dispose;
-  object_class->constructed = meta_input_settings_constructed;
-}
-
-static void
-meta_input_settings_init (MetaInputSettings *settings)
-{
-  MetaInputSettingsPrivate *priv;
-
-  priv = meta_input_settings_get_instance_private (settings);
-  priv->device_manager = clutter_device_manager_get_default ();
-  g_signal_connect (priv->device_manager, "device-added",
-                    G_CALLBACK (meta_input_settings_device_added), settings);
-  g_signal_connect (priv->device_manager, "device-removed",
-                    G_CALLBACK (meta_input_settings_device_removed), settings);
-
-  priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
-  g_signal_connect (priv->mouse_settings, "changed",
-                    G_CALLBACK (meta_input_settings_changed_cb), settings);
-
-  priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
-  g_signal_connect (priv->touchpad_settings, "changed",
-                    G_CALLBACK (meta_input_settings_changed_cb), settings);
-
-  priv->trackball_settings = g_settings_new ("org.gnome.desktop.peripherals.trackball");
-  g_signal_connect (priv->trackball_settings, "changed",
-                    G_CALLBACK (meta_input_settings_changed_cb), settings);
-
-  priv->keyboard_settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
-  g_signal_connect (priv->keyboard_settings, "changed",
-                    G_CALLBACK (meta_input_settings_changed_cb), settings);
-
-  priv->mappable_devices =
-    g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref);
-
-  priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
-  g_signal_connect (priv->monitor_manager, "monitors-changed",
-                    G_CALLBACK (monitors_changed_cb), settings);
-}
-
-MetaInputSettings *
-meta_input_settings_create (void)
-{
-#ifdef HAVE_NATIVE_BACKEND
-  MetaBackend *backend;
-
-  backend = meta_get_backend ();
-
-  if (META_IS_BACKEND_NATIVE (backend))
-    return g_object_new (META_TYPE_INPUT_SETTINGS_NATIVE, NULL);
-#endif
-  if (!meta_is_wayland_compositor ())
-    return g_object_new (META_TYPE_INPUT_SETTINGS_X11, NULL);
-
-  return NULL;
-}
--- a/src/backends/meta-monitor-config.c
+++ b/src/backends/meta-monitor-config.c
--- a/src/backends/meta-monitor-config.h
+++ b/src/backends/meta-monitor-config.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_CONFIG_H
 #define META_MONITOR_CONFIG_H

-#include "meta-monitor-manager-private.h"
+#include "meta-monitor-manager.h"

 #define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
 #define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
@@ -36,6 +36,9 @@ GType meta_monitor_config_get_type (void) G_GNUC_CONST;

 MetaMonitorConfig *meta_monitor_config_new (void);

+gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config,
+                                                      MetaMonitorManager *manager);
+
 gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
                                                     MetaMonitorManager *manager);

--- a/src/backends/meta-monitor-manager-dummy.c
+++ b/src/backends/meta-monitor-manager-dummy.c
@@ -27,11 +27,7 @@

 #include "meta-monitor-manager-dummy.h"

-#include <stdlib.h>
-
-#include <meta/util.h>
-
-#define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
+#define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)

 struct _MetaMonitorManagerDummy
 {
@@ -48,69 +44,9 @@ G_DEFINE_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, META_TYPE_MO
 static void
 meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
 {
-  unsigned int num_monitors = 1;
-  int *monitor_scales = NULL;
-  const char *num_monitors_str;
-  const char *monitor_scales_str;
-  unsigned int i;
-  int current_x = 0;
-
-  /* To control what monitor configuration is generated, there are two available
-   * environmental variables that can be used:
-   *
-   * MUTTER_DEBUG_NUM_DUMMY_MONITORS
-   *
-   * Specifies the number of dummy monitors to include in the stage. Every
-   * monitor is 1024x786 pixels and they are placed on a horizontal row.
-   *
-   * MUTTER_DEBUG_DUMMY_MONITOR_SCALES
-   *
-   * A comma separated list that specifies the scales of the dummy monitors.
-   *
-   * For example the following configuration results in two monitors, where the
-   * first one has the monitor scale 1, and the other the monitor scale 2.
-   *
-   * MUTTER_DEBUG_NUM_DUMMY_MONITORS=2
-   * MUTTER_DEBUG_DUMMY_MONITOR_SCALES=1,2
-   */
-  num_monitors_str = getenv ("MUTTER_DEBUG_NUM_DUMMY_MONITORS");
-  if (num_monitors_str)
-    {
-      num_monitors = g_ascii_strtoll (num_monitors_str, NULL, 10);
-      if (num_monitors <= 0)
-        {
-          meta_warning ("Invalid number of dummy monitors");
-          num_monitors = 1;
-        }
-    }
-
-  monitor_scales = g_newa (int, num_monitors);
-  for (i = 0; i < num_monitors; i++)
-    monitor_scales[i] = 1;
-
-  monitor_scales_str = getenv ("MUTTER_DEBUG_DUMMY_MONITOR_SCALES");
-  if (monitor_scales_str)
-    {
-      gchar **scales_str_list;
-
-      scales_str_list = g_strsplit (monitor_scales_str, ",", -1);
-      if (g_strv_length (scales_str_list) != num_monitors)
-        meta_warning ("Number of specified monitor scales differ from number "
-                      "of monitors (defaults to 1).\n");
-      for (i = 0; i < num_monitors && scales_str_list[i]; i++)
-        {
-          int scale = g_ascii_strtoll (scales_str_list[i], NULL, 10);
-          if (scale == 1 || scale == 2)
-            monitor_scales[i] = scale;
-          else
-            meta_warning ("Invalid dummy monitor scale");
-        }
-      g_strfreev (scales_str_list);
-    }
-
  manager->max_screen_width = 65535;
  manager->max_screen_height = 65535;
-  manager->screen_width = 1024 * num_monitors;
+  manager->screen_width = 1024;
  manager->screen_height = 768;

  manager->modes = g_new0 (MetaMonitorMode, 1);
@@ -121,52 +57,44 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
  manager->modes[0].height = 768;
  manager->modes[0].refresh_rate = 60.0;

-  manager->crtcs = g_new0 (MetaCRTC, num_monitors);
-  manager->n_crtcs = num_monitors;
-  manager->outputs = g_new0 (MetaOutput, num_monitors);
-  manager->n_outputs = num_monitors;
+  manager->crtcs = g_new0 (MetaCRTC, 1);
+  manager->n_crtcs = 1;

-  for (i = 0; i < num_monitors; i++)
-    {
-      manager->crtcs[i].crtc_id = i + 1;
-      manager->crtcs[i].rect.x = current_x;
-      manager->crtcs[i].rect.y = 0;
-      manager->crtcs[i].rect.width = manager->modes[0].width;
-      manager->crtcs[i].rect.height = manager->modes[0].height;
-      manager->crtcs[i].current_mode = &manager->modes[0];
-      manager->crtcs[i].transform = META_MONITOR_TRANSFORM_NORMAL;
-      manager->crtcs[i].all_transforms = ALL_TRANSFORMS;
-      manager->crtcs[i].is_dirty = FALSE;
-      manager->crtcs[i].logical_monitor = NULL;
+  manager->crtcs[0].crtc_id = 1;
+  manager->crtcs[0].rect.x = 0;
+  manager->crtcs[0].rect.y = 0;
+  manager->crtcs[0].rect.width = manager->modes[0].width;
+  manager->crtcs[0].rect.height = manager->modes[0].height;
+  manager->crtcs[0].current_mode = &manager->modes[0];
+  manager->crtcs[0].transform = WL_OUTPUT_TRANSFORM_NORMAL;
+  manager->crtcs[0].all_transforms = ALL_WL_TRANSFORMS;
+  manager->crtcs[0].is_dirty = FALSE;
+  manager->crtcs[0].logical_monitor = NULL;

-      current_x += manager->crtcs[i].rect.width;
+  manager->outputs = g_new0 (MetaOutput, 1);
+  manager->n_outputs = 1;

-      manager->outputs[i].crtc = &manager->crtcs[i];
-      manager->outputs[i].winsys_id = i + 1;
-      manager->outputs[i].name = g_strdup_printf ("LVDS%d", i + 1);
-      manager->outputs[i].vendor = g_strdup ("MetaProducts Inc.");
-      manager->outputs[i].product = g_strdup ("unknown");
-      manager->outputs[i].serial = g_strdup ("0xC0FFEE");
-      manager->outputs[i].suggested_x = -1;
-      manager->outputs[i].suggested_y = -1;
-      manager->outputs[i].width_mm = 222;
-      manager->outputs[i].height_mm = 125;
-      manager->outputs[i].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
-      manager->outputs[i].preferred_mode = &manager->modes[0];
-      manager->outputs[i].n_modes = 1;
-      manager->outputs[i].modes = g_new0 (MetaMonitorMode *, 1);
-      manager->outputs[i].modes[0] = &manager->modes[0];
-      manager->outputs[i].n_possible_crtcs = 1;
-      manager->outputs[i].possible_crtcs = g_new0 (MetaCRTC *, 1);
-      manager->outputs[i].possible_crtcs[0] = &manager->crtcs[i];
-      manager->outputs[i].n_possible_clones = 0;
-      manager->outputs[i].possible_clones = g_new0 (MetaOutput *, 0);
-      manager->outputs[i].backlight = -1;
-      manager->outputs[i].backlight_min = 0;
-      manager->outputs[i].backlight_max = 0;
-      manager->outputs[i].connector_type = META_CONNECTOR_TYPE_LVDS;
-      manager->outputs[i].scale = monitor_scales[i];
-    }
+  manager->outputs[0].crtc = &manager->crtcs[0];
+  manager->outputs[0].output_id = 1;
+  manager->outputs[0].name = g_strdup ("LVDS");
+  manager->outputs[0].vendor = g_strdup ("MetaProducts Inc.");
+  manager->outputs[0].product = g_strdup ("unknown");
+  manager->outputs[0].serial = g_strdup ("0xC0FFEE");
+  manager->outputs[0].width_mm = 222;
+  manager->outputs[0].height_mm = 125;
+  manager->outputs[0].subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+  manager->outputs[0].preferred_mode = &manager->modes[0];
+  manager->outputs[0].n_modes = 1;
+  manager->outputs[0].modes = g_new0 (MetaMonitorMode *, 1);
+  manager->outputs[0].modes[0] = &manager->modes[0];
+  manager->outputs[0].n_possible_crtcs = 1;
+  manager->outputs[0].possible_crtcs = g_new0 (MetaCRTC *, 1);
+  manager->outputs[0].possible_crtcs[0] = &manager->crtcs[0];
+  manager->outputs[0].n_possible_clones = 0;
+  manager->outputs[0].possible_clones = g_new0 (MetaOutput *, 0);
+  manager->outputs[0].backlight = -1;
+  manager->outputs[0].backlight_min = 0;
+  manager->outputs[0].backlight_max = 0;
 }

 static void
@@ -197,7 +125,7 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
        {
          MetaMonitorMode *mode;
          MetaOutput *output;
-          unsigned int j;
+          int i, n_outputs;
          int width, height;

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

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

              output->is_dirty = TRUE;
              output->crtc = crtc;
--- a/src/backends/meta-monitor-manager-dummy.h
+++ b/src/backends/meta-monitor-manager-dummy.h
@@ -23,7 +23,7 @@
 #ifndef META_MONITOR_MANAGER_DUMMY_H
 #define META_MONITOR_MANAGER_DUMMY_H

-#include "meta-monitor-manager-private.h"
+#include "meta-monitor-manager.h"

 #define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ())
 #define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -12,12 +12,12 @@
 * at MetaScreen instead.
 */

-/*
+/* 
 * Copyright (C) 2001 Havoc Pennington
 * Copyright (C) 2003 Rob Adams
 * Copyright (C) 2004-2006 Elijah Newren
 * Copyright (C) 2013 Red Hat Inc.
- *
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@@ -27,7 +27,7 @@
 * 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/>.
 */
@@ -41,72 +41,30 @@
 #include "display-private.h"
 #include <meta/screen.h>
 #include "stack-tracker.h"
-#include <meta/meta-monitor-manager.h>
+#include "ui.h"
+#include <wayland-server.h>

 #include "meta-display-config-shared.h"
 #include "meta-dbus-display-config.h"
-#include "meta-cursor.h"

+typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;
+typedef struct _MetaMonitorManager         MetaMonitorManager;
 typedef struct _MetaMonitorConfigClass    MetaMonitorConfigClass;
 typedef struct _MetaMonitorConfig         MetaMonitorConfig;

-typedef struct _MetaCRTC MetaCRTC;
 typedef struct _MetaOutput MetaOutput;
+typedef struct _MetaCRTC MetaCRTC;
 typedef struct _MetaMonitorMode MetaMonitorMode;
 typedef struct _MetaMonitorInfo MetaMonitorInfo;
 typedef struct _MetaCRTCInfo MetaCRTCInfo;
 typedef struct _MetaOutputInfo MetaOutputInfo;
-typedef struct _MetaTileInfo MetaTileInfo;
-
-typedef enum {
-  META_MONITOR_TRANSFORM_NORMAL,
-  META_MONITOR_TRANSFORM_90,
-  META_MONITOR_TRANSFORM_180,
-  META_MONITOR_TRANSFORM_270,
-  META_MONITOR_TRANSFORM_FLIPPED,
-  META_MONITOR_TRANSFORM_FLIPPED_90,
-  META_MONITOR_TRANSFORM_FLIPPED_180,
-  META_MONITOR_TRANSFORM_FLIPPED_270,
-} MetaMonitorTransform;
-
-/* This matches the values in drm_mode.h */
-typedef enum {
-  META_CONNECTOR_TYPE_Unknown = 0,
-  META_CONNECTOR_TYPE_VGA = 1,
-  META_CONNECTOR_TYPE_DVII = 2,
-  META_CONNECTOR_TYPE_DVID = 3,
-  META_CONNECTOR_TYPE_DVIA = 4,
-  META_CONNECTOR_TYPE_Composite = 5,
-  META_CONNECTOR_TYPE_SVIDEO = 6,
-  META_CONNECTOR_TYPE_LVDS = 7,
-  META_CONNECTOR_TYPE_Component = 8,
-  META_CONNECTOR_TYPE_9PinDIN = 9,
-  META_CONNECTOR_TYPE_DisplayPort = 10,
-  META_CONNECTOR_TYPE_HDMIA = 11,
-  META_CONNECTOR_TYPE_HDMIB = 12,
-  META_CONNECTOR_TYPE_TV = 13,
-  META_CONNECTOR_TYPE_eDP = 14,
-  META_CONNECTOR_TYPE_VIRTUAL = 15,
-  META_CONNECTOR_TYPE_DSI = 16,
-} MetaConnectorType;
-
-struct _MetaTileInfo {
-  guint32 group_id;
-  guint32 flags;
-  guint32 max_h_tiles;
-  guint32 max_v_tiles;
-  guint32 loc_h_tile;
-  guint32 loc_v_tile;
-  guint32 tile_w;
-  guint32 tile_h;
-};

 struct _MetaOutput
 {
  /* The CRTC driving this output, NULL if the output is not enabled */
  MetaCRTC *crtc;
  /* The low-level ID of this output, used to apply back configuration */
-  glong winsys_id;
+  glong output_id;
  char *name;
  char *vendor;
  char *product;
@@ -114,9 +72,6 @@ struct _MetaOutput
  int width_mm;
  int height_mm;
  CoglSubpixelOrder subpixel_order;
-  int scale;
-
-  MetaConnectorType connector_type;

  MetaMonitorMode *preferred_mode;
  MetaMonitorMode **modes;
@@ -144,18 +99,12 @@ struct _MetaOutput
  */
  gboolean is_primary;
  gboolean is_presentation;
-  gboolean is_underscanning;
-  gboolean supports_underscanning;

  gpointer driver_private;
  GDestroyNotify driver_notify;

  /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
  gboolean hotplug_mode_update;
-  gint suggested_x;
-  gint suggested_y;
-
-  MetaTileInfo tile_info;
 };

 struct _MetaCRTC
@@ -163,7 +112,7 @@ struct _MetaCRTC
  glong crtc_id;
  MetaRectangle rect;
  MetaMonitorMode *current_mode;
-  MetaMonitorTransform transform;
+  enum wl_output_transform transform;
  unsigned int all_transforms;

  /* Only used to build the logical configuration
@@ -174,11 +123,8 @@ struct _MetaCRTC
  /* Used when changing configuration */
  gboolean is_dirty;

-  /* Used by cursor renderer backend */
-  void *cursor_renderer_private;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
+  /* Updated by MetaCursorTracker */
+  gboolean has_hw_cursor;
 };

 struct _MetaMonitorMode
@@ -195,7 +141,6 @@ struct _MetaMonitorMode
  GDestroyNotify driver_notify;
 };

-#define META_MAX_OUTPUTS_PER_MONITOR 4
 /**
 * MetaMonitorInfo:
 *
@@ -211,30 +156,19 @@ struct _MetaMonitorInfo
  int number;
  int xinerama_index;
  MetaRectangle rect;
-  /* for tiled monitors these are calculated, from untiled just copied */
-  float refresh_rate;
-  int width_mm;
-  int height_mm;
  gboolean is_primary;
  gboolean is_presentation; /* XXX: not yet used */
  gboolean in_fullscreen;
-  int scale;

  /* The primary or first output for this monitor, 0 if we can't figure out.
-     It can be matched to a winsys_id of a MetaOutput.
+     It can be matched to an output_id of a MetaOutput.

     This is used as an opaque token on reconfiguration when switching from
     clone to extened, to decide on what output the windows should go next
     (it's an attempt to keep windows on the same monitor, and preferably on
     the primary one).
  */
-  glong winsys_id;
-
-  guint32 tile_group_id;
-
-  int monitor_winsys_xid;
-  int n_outputs;
-  MetaOutput *outputs[META_MAX_OUTPUTS_PER_MONITOR];
+  glong output_id;
 };

 /*
@@ -250,19 +184,18 @@ struct _MetaCRTCInfo {
  MetaMonitorMode          *mode;
  int                       x;
  int                       y;
-  MetaMonitorTransform      transform;
+  enum wl_output_transform  transform;
  GPtrArray                *outputs;
 };

 /*
 * MetaOutputInfo:
- * this is the same as MetaCRTCInfo, but for outputs
+ * this is the same as MetaOutputInfo, but for CRTCs
 */
 struct _MetaOutputInfo {
  MetaOutput  *output;
  gboolean     is_primary;
  gboolean     is_presentation;
-  gboolean     is_underscanning;
 };

 #define META_TYPE_MONITOR_MANAGER            (meta_monitor_manager_get_type ())
@@ -353,14 +286,15 @@ struct _MetaMonitorManagerClass
                          unsigned short     *,
                          unsigned short     *);

-  void (*add_monitor) (MetaMonitorManager *,
-                       MetaMonitorInfo *);
-
-  void (*delete_monitor) (MetaMonitorManager *,
-                          int monitor_winsys_xid);
-
+  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);

 MetaMonitorInfo    *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
@@ -379,6 +313,9 @@ 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);
@@ -396,32 +333,19 @@ void                meta_monitor_manager_apply_configuration (MetaMonitorManager
 void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
                                                                gboolean            ok);

-void               meta_output_parse_edid (MetaOutput *output,
-                                           GBytes     *edid);
-
 void               meta_crtc_info_free   (MetaCRTCInfo   *info);
 void               meta_output_info_free (MetaOutputInfo *info);

+void               meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
+                                                           int         n_old_outputs);
+void               meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
+                                                         int              n_old_modes);
 gboolean           meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
-void               meta_monitor_manager_read_current_config (MetaMonitorManager *manager);
-void               meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
-
-gboolean           meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
-                                                            MetaOutput         *output,
-                                                            gfloat              matrix[6]);
-
-gint               meta_monitor_manager_get_monitor_at_point (MetaMonitorManager *manager,
-                                                              gfloat              x,
-                                                              gfloat              y);
-
-void meta_monitor_manager_clear_output (MetaOutput *output);
-void meta_monitor_manager_clear_mode (MetaMonitorMode *mode);
-void meta_monitor_manager_clear_crtc (MetaCRTC *crtc);

 /* Returns true if transform causes width and height to be inverted
   This is true for the odd transforms in the enum */
 static inline gboolean
-meta_monitor_transform_is_rotated (MetaMonitorTransform transform)
+meta_monitor_transform_is_rotated (enum wl_output_transform transform)
 {
  return (transform % 2);
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Florian Müllner	e947d2f544	Bump version to 3.12.1 Update NEWS.	2014-04-15 22:46:38 +02:00
Florian Müllner	12e8d04c16	po: Update POTFILES after file got renamed	2014-04-15 22:46:37 +02:00
Florian Müllner	783dbf9390	build: Complete rename of header file Fallout from commit `d5552cc372`.	2014-04-15 22:31:11 +02:00