Bump version to 3.11.4

Update NEWS.

.gitignore

@@ -19,8 +19,11 @@ libtool
 ltmain.sh
 missing
 .deps
+src/50-mutter-navigation.xml
+src/50-mutter-system.xml
+src/50-mutter-windows.xml
 src/mutter-wm.desktop
-src/mutter.desktop
+src/mutter-wayland.desktop
 *.o
 *.a
 *.lo
@@ -40,14 +43,16 @@ stamp-h1
 stamp-it
 .intltool-merge-cache
 POTFILES
+po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
-inlinepixbufs.h
+libmutter-wayland.pc
-libmutter.pc
+mutter-wayland
-mutter
+mutter-launch
-mutter-theme-viewer
+org.gnome.mutter.gschema.valid
-mutter.desktop
+org.gnome.mutter.gschema.xml
-mutter.schemas
+org.gnome.mutter.wayland.gschema.valid
+org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
@@ -56,14 +61,46 @@ mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
+test-attached
+test-focus
 test-gravity
 test-resizing
 test-size-hints
-wm-tester
+# 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
 src/mutter-enum-types.[ch]
 src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
+src/meta-dbus-xrandr.[ch]
+src/meta-dbus-idle-monitor.[ch]
 src/mutter-plugins.pc
+src/wayland/gtk-shell-protocol.c
+src/wayland/gtk-shell-client-protocol.h
+src/wayland/gtk-shell-server-protocol.h
+src/wayland/xdg-shell-protocol.c
+src/wayland/xdg-shell-client-protocol.h
+src/wayland/xdg-shell-server-protocol.h
+src/wayland/xserver-protocol.c
+src/wayland/xserver-client-protocol.h
+src/wayland/xserver-server-protocol.h
+doc/reference/*.args
+doc/reference/*.bak
+doc/reference/*.hierarchy
+doc/reference/*.interfaces
+doc/reference/*.prerequisites
+doc/reference/*.signals
+doc/reference/*.stamp
+doc/reference/html/
+doc/reference/xml/
+doc/reference/meta-decl-list.txt
+doc/reference/meta-decl.txt
+doc/reference/meta-overrides.txt
+doc/reference/meta-undeclared.txt
+doc/reference/meta-undocumented.txt
+doc/reference/meta-unused.txt
+doc/reference/meta-docs.sgml
+doc/reference/meta.types

COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
-
+
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     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
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

HACKING

@@ -42,10 +42,10 @@ Minimal Building/Testing Environment
   build a development version of Metacity -- odds are, you may be able
   to build metacity from CVS without building any other modules.
 
-  As long as you have gtk+ >= 2.10 and GConf with your distro (gtk+ >=
+  As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro
-  2.6 if you manually revert the change from bug 348633), you should
+  (gtk+ >= 2.6 if you manually revert the change from bug 348633), you
-  be able to install your distro's development packages
+  should be able to install your distro's development packages
-  (e.g. gtk2-devel, GConf2-devel, startup-notification-devel on
+  (e.g. gtk2-devel, glib-devel, startup-notification-devel on
   Fedora; also, remember to install the gnome-common package which is
   needed for building cvs versions of Gnome modules like Metacity) as
   well as the standard development tools (gcc, autoconf, automake,

Makefile.am

@@ -1,6 +1,10 @@
 
-SUBDIRS=src po doc
+SUBDIRS=src protocol po doc
 
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt
 
 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}

NEWS

@@ -1,3 +1,879 @@
+3.11.4
+======
+* Don't leave focus on windows that are being unmanaged [Owen; #711618]
+* Reduce server grabs [Daniel Drake; #721345, #721709]
+* Improve heuristic to determine display output name [Cosimo Cecchi; #721674]
+* Atomically unmaximize both directions [Jasper; #722108]
+* Misc bug fixes [Debarshi, Andika, Florian; #721517, #721674, #722347]
+
+Contributors:
+  Cosimo Cecchi, Daniel Drake, Florian Müllner, Debarshi Ray, Jasper St. Pierre,
+  Andika Triwidada, Owen W. Taylor
+
+3.11.3
+======
+* Fix focus issues with external OSKs[Jasper; #715030]
+* Add a MetaCullable interface [Jasper; #714706]
+* Fix window keybindings [Rui; #719724]
+* Fix settings keyboard/pointer focus for new clients [Rui; #719725]
+* Fix window group paint volume [Owen; #719669]
+* Fix frame extents problems [Owen; #714707]
+* Add shortcut to move windows between monitors [Florian; #671054]
+* Fix problems with focus tracking [Owen; #720558]
+* Misc. bug fixes and cleanups: [Rui, Colin, Lionel, Jasper, Owen; #712833,
+  #719557, #719695, #719833, #678989, #720417, #720630]
+
+Contributors:
+  Lionel Landwerlin, Rui Matos, Alberto Milone, Florian Müllner,
+  Jasper St. Pierre, Rico Tzschichholz, Owen W. Taylor, Colin Walters
+
+3.11.2
+======
+* Support setting a NULL opaque region [Andreas; #711518]
+* Sync keymap from X to wayland [Giovanni; #707446]
+* Implement support for subsurfaces [Jonas; #705502]
+* Don't focus the no-focus-window for globally active windows [Jasper; #710296]
+* Support "hotplug_mode_update" property [Marc-André; #711216]
+* Fix resize operations using mouse-button-modifier [Lionel; #710251]
+* Fix position of attached modals for CSD windows [Giovanni, Owen; #707194]
+* Misc. bug fixes [Rui, Jasper, Neil, Florian; #712247, #711731]
+
+Contributors:
+  Giovanni Campagna, Andreas Heider, Lionel Landwerlin, Marc-André Lureau,
+  Rui Matos, Florian Müllner, Neil Roberts, Sindhu S, Jasper St. Pierre,
+  Rico Tzschichholz, Owen W. Taylor, Jonas Ådahl
+
+3.11.1
+======
+* Fix tile previews getting stuck on right click during drags [Lionel; #704759]
+* Use new UPower API [Bastien]
+* Set hot spot when cursor set from wl_buffer [Jonas; #709593]
+* Expose min-backlight-step [Asad; #710380]
+* Misc. bug fixes and cleanups [Jasper, Olav, Magdalen; #709776]
+
+Contributors:
+  Magdalen Berns, Lionel Landwerlin, Asad Mehmood, Bastien Nocera,
+  Jasper St. Pierre, Olav Vitters, Jonas Ådahl
+
+3.10.1
+======
+* Don't apply fullscreen workarounds to CSD windows [Giovanni; #708718]
+* Fix hangs during DND operations [Adel; #709340]
+* Misc bug fixes [Dan, Giovanni, Jasper; #708813, #708420]
+
+Contributors:
+  Giovanni Campagna, Adel Gadllah, Dan Horák, Hans Petter Jansson,
+  Jasper St. Pierre
+
+3.10.0.1
+========
+* Fix bug when a window changed size twice in a single frame - this
+  can happen with GTK+ client-side decorations [Giovanni, Owen; #708367]
+
+Contributors:
+  Giovanni Campagna, Owen Taylor
+
+3.10.0
+======
+* Update dependencies [Giovanni; #708210]
+
+3.9.92
+======
+* Constrain the pointer position onto visible monitors [Giovanni; #706655]
+* Fix keyboard state handling in face of event compression [Giovanni; #706963]
+* Extend the MetaCursorTracker API with query pointer and cursor visibility [Giovanni; #707474]
+* Be stricter in checking and exposing the wayland protocol version [#707851]
+* Don't require plugins to pass event to Clutter [Giovanni; #707482]
+* Move the --wayland option from the binary to the library [Giovanni; #707897]
+* Implement running from gnome-session (environment variable setting, process group
+  handling, Clutter backend variables) [Giovanni; #706421]
+* Add support for more cursor types [Giovanni; #707919]
+* Drop man pages for removed utilities [Kalev; #706579]
+* Implement monitor configuration on KMS [Giovanni; #706308]
+* Implement HW cursors [Giovanni; #707573]
+* Implement minimal support for resizing and maximizing wayland clients [Giovanni; #707401]
+* Implement transient hints for wayland clients [Giovanni; #707401]
+* Implement popup menu surfaces and grabs [Giovanni; #707863]
+* Immediately fire idle watches that are already expired [Giovanni; #707302]
+* Remove holes generated by disabling the laptop lid [Giovanni; #707473]
+* Misc bug fixes [Giovanni, Pavel, Adel; #707649, #706124, #707584, #707851, #707929,
+  #708070]
+
+Contributors:
+  Adel Gadllah, Giovanni Campagna, Kalev Lember, Pavel Vasin
+
+Translations:
+  Мирослав Николић po/sr, sr@latin.po, Мирослав Николић [sr, sr@latin],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Yuri Myasoedov [ru],
+  Ville-Pekka Vainio [fi], Changwoo Ryu [ko], A S Alam [pa],
+  Mattias Põldaru [et], Rūdolfs Mazurs [lv], Ihar Hrachyshka [be],
+  Nilamdyuti Goswami [as], Andika Triwidada [id], Baurzhan Muftakhidinov [kk],
+  Benjamin Steinwender [de]
+
+3.9.91
+======
+* Drop man pages for removed utilities [Kalev; #706579]
+* Add support for idle tracking [Giovanni, Cosimo; #706005, #707250]
+* Skip CRTC reconfigurations that have no effect [Giovanni; #706672]
+* Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399]
+* Don't save pixbuf data in user data [Tim; #706777]
+* Don't queue redraws for obscured regions [Adel; #703332]
+* Suppor the opaque region hints for wayland clients [Jasper; #707019]
+* Turn blending off when drawing entirely opaque regions [Jasper; #707019]
+* Check event timestamps before reconfiguring [Giovanni; #706735]
+* Merge the DBus API for display configuration in the wayland branch [Giovanni]
+* Install an X IO error handler for XWayland [Giovanni; #706962]
+* Use the clutter xkbcommon integration for the wayland keyboard [Giovanni; #705862]
+* Add a setuid helper for running on KMS+evdev [Giovanni, Colin; #705861]
+* Add keybindings for switching VT [Giovanni; #705861]
+* Implement plugin modality when running as a wayland compositor [Giovanni; #705917]
+* Add support for the application menu for wayland clients [Giovanni; #707128]
+* Several Coverity spotted fixes [Jasper]
+* Don't create a dummy texture for the texture template [Neil; #707458]
+* Use a more conservative paint volume for obscured windows [Adel]
+* Misc bug fixes [Giovanni, Colin, Seán, Jasper, Cosimo; #706582, #706598,
+  #706787, #706729, #706825, #707081, #707090, #707267, #706982, #706289]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Colin Guthrie, Kalev Lember,
+  Tim Lunn, Jasper St. Pierre, Neil Roberts, Rico Tzschichholz, Seán de Búrca
+
+Translations:
+  Piotr Drąg [pl], Alexandre Franke [fr], Kjartan Maraas [nb],
+  Milo Casagrande [it], Balázs Úr [hu], Seán de Búrca [ga], Fran Diéguez [gl],
+  Daniel Mustieles [es], Aurimas Černius [lt], Gil Forcada [ca]
+
+3.9.90
+======
+* First release from the wayland branch, includes basic support for running
+  as a wayland compositor [Robert, Neil, Giovanni]
+* Add support for _GTK_FRAME_EXTENTS [Jasper; #705766]
+* Fix quick consecutive <super> presses breaking keyboard input [Alban; #666101]
+* Work towards running as wayland compositor [Giovanni]
+ - Add DBus API for display configuration
+   [#705670, #706231, #706233, #706322, #706382]
+ - Add abstraction layer for cursor tracking [#705911]
+ - Add support for plugin modality under wayland [#705917]
+* Disable GTK+ scaling [Alexander; #706388]
+* Disable blending while updating tower [Robert]
+* Misc bug fixes and cleanups [Adel, Jasper, Giovanni, Colin, Rico, Florian;
+  #703332, #704437, #706207]
+
+Contributors:
+  Robert Bragg, Giovanni Campagna, Alban Crequy, Adel Gadllah,
+  Alexander Larsson, Florian Müllner, Jasper St. Pierre, Neil Roberts,
+  Rico Tzschichholz, Colin Walters
+
+Translations:
+  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Matej Urbančič [sl],
+  Marek Černocký [cs], Daniel Mustieles [es], Rafael Ferreira [pt_BR],
+  Yaron Shahrabani [he], Ján Kyselica [sk]
+
+3.9.5
+=====
+* Don't select for touch events on the stage [Jasper; #697192]
+* Don't queue redraws for obscured regions [Adel; #703332]
+* Export timestamp of global keybinding events [Bastien; #704858]
+* Misc bug fixes and cleanups [Jasper, Rico; #703970]
+
+Contributors:
+  Adel Gadllah, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz
+
+3.9.4
+=====
+* Tweak window shadows [Allan; #702141]
+* Ignore our own focus events for focus prediction [Jasper; #701017]
+* Add API to query if the stage is focused [Jasper; #700735]
+* Add API to query the monitor for a given position [Adel]
+* Don't force attached dialogs to be border-only [Florian; #702764]
+* Allow slicing of backgrounds to avoid texture size limits [Ray; #702283]
+* Miscellaneous bug fixes and cleanups [Adel; #701224, #702564]
+
+Contributors:
+  Allan Day, Adel Gadllah, Florian Müllner, Jasper St. Pierre, Ray Strode
+
+3.9.3
+=====
+* Ensure events are always reported to the grab window [Rui; #701219]
+* Use new clutter_stage_set_paint_callback() function to prevent dropping
+  frames with frame synced toolkits [Owen; #698794]
+
+Contributors:
+  Rui Matos, Owen W. Taylor
+
+3.9.2
+=====
+* Add meta_window_can_close() function [Jasper; #699269]
+* Add support for string-array preferences [Florian; #700223]
+* Fix a potential race condition with _NET_WM_MOVERESIZE [Jasper; #699777]
+* Fix shade window action [Stef; #693714]
+* Remove overlay_group [Giovanni; #700735]
+* Improve tracking of the focus window [Dan, Jasper; #647706]
+* Add API to freeze/unfreeze the keyboard [Rui; #697001]
+* Grab and emit a signal when XK_ISO_Next_Group is pressed [Rui; #697002]
+* Misc bug fixes and cleanups [Dieter, Jasper, Rui; #699636, #700735, #697000]
+
+Contributors:
+  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
+  Dieter Verfaillie, Stef Walter, Dan Winship
+
+Translations:
+  Kjartan Maraas [nb], Ján Kyselica [sk]
+
+3.9.1
+=====
+* Fix miscellaneous memory leaks [Pavel; #698710]
+* Misc fixes and cleanups [Stef, Simon; #698179, #697758]
+
+Contributors:
+  Simon McVittie, Pavel Vasin, Stef Walter
+
+3.8.1
+=====
+* Fix crash when getting default font [Bastien; #696814]
+* Fix ungrabbing of keybindings [Rui; #697003]
+* Misc fixes and cleanups [Jasper, Simon; #697758]
+
+Contributors:
+  Jasper Lievisse Adriaanse, Rui Matos, Simon McVittie, Bastien Nocera
+
+Translations:
+  Guillaume Desmottes [fr], Shankar Prasad [kn], Bruce Cowan [en_GB],
+  Andika Triwidada [id], Yaron Shahrabani [he], Kjartan Maraas [nb],
+  Gheyret Kenji [ug]
+
+3.8.0
+=====
+* Address major memory leak when changing backgrounds [Ray; #696157]
+
+Contributors:
+  Ray Strode
+
+Translations:
+  Sandeep Sheshrao Shedmake [mr], Victor Ibragimov [tg], Gabor Kelemen [hu],
+  Ville-Pekka Vainio [fi], Rajesh Ranjan [hi], Dr.T.Vasudevan [ta],
+  ManojKumar Giri [or], Yuri Myasoedov [ru], Petr Kovar [cs],
+  Jiro Matsuzawa [ja], Krishnababu Krothapalli [te], Ani Peter [ml],
+  Inaki Larranaga Murgoitio [eu]
+
+3.7.92
+======
+* Build and improve reference docs [Tomeu; #676856, #695641, #695935]
+* Add tracking of whether there are fullscreen windows [Owen; 649748]
+* Misc bug fixes and cleanups [Adel, Giovanni, Owen, Jasper, Florian; #695269,
+  #695711, #694046, #695813, #695881, #676856, #696053, #682779, #696089,
+  #696091, #696087]
+
+Contributors:
+  Giovanni Campagna, Adel Gadllah, Florian Müllner, Jasper St. Pierre,
+  Tomeu Vizoso, Owen W. Taylor
+
+Translations:
+  Chao-Hsiung Liao [zh_HK, zh_TW], Rafael Ferreira [pt_BR],
+  Ihar Hrachyshka [be], Nilamdyuti Goswami [as], Matej Urbančič [sl],
+  Dimitris Spingos [el], Jan Kyselica [sk], Khaled Hosny [ar],
+  Мирослав Николић [sr, sr@latin], Duarte Loreto [pt], Sweta Kothari [gu],
+  Milo Casagrande [it], Changwoo Ryu [ko], Gil Forcada [ca],
+  Carles Ferrando [ca@valencia], Mattias Põldaru [et], Alexandre Franke [fr],
+  Ask H. Larsen [da], Rūdolfs Mazurs [lv], Nguyễn Thái Ngọc Duy [vi]
+
+3.7.91
+======
+* Fix windows being treated as remote after hostname changes [Ray; #688716]
+* Add meta_window_get_all_monitors() method [Adel; #646861]
+* Add grab API for externally defined accelerators [Florian; #643111]
+* Make session registration an explicit step [Ray; #694876]
+* Avoid unnecessary stage redraws [Adel; #694988, #695006]
+* Misc fixes [Giovanni, Ray, Jasper, Rui, Pavel, Owen; #694801, #694725,
+  #694641, #694393, #678917, #695093, #694837, #695135, #694771, #694321]
+
+Contributors:
+  Giovanni Campagna, Adel Gadllah, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Ray Strode, Owen Taylor, Pavel Vasin
+
+Translations:
+  Daniel Mustieles [es], Yaron Shahrabani [he], A S Alam [pa], Piotr Drąg [pl],
+  Gheyret Kenji [ug], Alexandre Franke [fr], Milo Casagrande [it],
+  Fran Diéguez [gl], Dimitris Spingos [el], Мирослав Николић [sr, sr@latin],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Nguyễn Thái Ngọc Duy [vi],
+  Aurimas Černius [lt], Mario Blättermann [de], Kjartan Maraas [nb]
+
+3.7.90
+======
+* Support _NET_WM_OPAQUE_REGION [Jasper, Adel; #679901]
+* Add wrapper for XI2.3 pointer barriers [Jasper; #677215]
+* Update style of resize popups [Cosimo; #692741]
+* Implement compositor <-> application frame synchronization [Owen; #685463]
+* Handle animated backgrounds [Ray; #682427]
+* Add a new window group for override-redirect windows [Gayan; #633620]
+* Pass on pointer events on guard window to Clutter [Jasper; #681540]
+* Show correct shortcut in window menus [Giovanni; #694045]
+* Don't put minimized windows at the back of alt-tab [Jasper; #693991]
+* Misc bug fixes and cleanups [Jasper, Rico, Adel, Florian, Rui, Giovanni,
+  Owen; #692679, #693354, #690581, #693439, #692718, #693475, #693482, #693540,
+  #690580, #680990, #693833, #693922, #693854, #694224]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Rui Matos, Florian Müllner,
+  Gayan Perera, Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz
+
+Translations:
+  Fran Diéguez [gl], A S Alam [pa], Alexandre Franke [fr], Aurimas Černius [lt],
+  Мирослав Николић [sr, sr@latin], Fran Diéguez [gl], Piotr Drąg [pl],
+  Luca Ferretti [it], Daniel Mustieles [es]
+
+3.7.5
+=====
+* Don't allow multiline window titles [Jon; #683056]
+* Make meta_window_located_on_workspace() public [Jasper; #691744]
+* Request XI2.3 [Colin; #692877]
+* Add meta_window_set_icon_geometry() method [Florian; #692997]
+* Require XFixes 5.0 [Jasper; #677215]
+* Change unredirection hints to match spec changes [Adel; #693064]
+* Improve unredict heuristicts [Adel; #683786]
+* Misc bug fixes and cleanups [Florian, Jasper, Adel; #691874, #679901,
+  #692952, #693042]
+
+Contributors:
+  Adel Gadllah, William Jon McCann, Florian Müllner, Jasper St. Pierre,
+  Colin Walters
+
+Translations:
+  Daniel Mustieles [es], Ihar Hrachyshka [be], Nilamdyuti Goswami [as],
+  Gheyret Kenji [ug], Kjartan Maraas [nb], Yaron Shahrabani [he],
+  Piotr Drąg [pl], Chao-Hsiung Liao [zh_HK,zh_TW], Milo Casagrande [it]
+
+3.7.4
+=====
+* Add support for bypass compositor hints [Adel; #683020]
+* Make automaximization optional [Adel; #680990]
+* Add method for checking if the application is responding [Giovanni; #684340]
+* Expose the xinput opcode [Jasper; #690590]
+* Rebrand "minimize" as "hide" [Florian; #682887]
+* Misc bug fixes and cleanups [Giovanni, Ray, Jasper, Matthias, Debarshi,
+  Florian, Rui; #690454, #690573, #690593, #690956, #691363, #690609, #690317,
+  #689263]
+
+Contributors:
+  Giovanni Campagna, Matthias Clasen, Adel Gadllah, Rui Matos, Florian Müllner,
+  Debarshi Ray, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Mattias Põldaru [et], Yaron Shahrabani [he], Daniel Mustieles [es],
+  Khaled Hosny [ar], Fran Diéguez [gl], A S Alam [pa], Piotr Drąg [pl],
+  Rafael Ferreira [pt_BR], Nilamdyuti Goswami [as], Alexander Shopov [bg],
+  Matej Urbančič [sl]
+
+3.7.3
+=====
+* Fix maximized windows jumping to other monitors [Alban; #556696]
+* Add 'switch-applications' keybinding [Florian; #688913]
+* Add a convenience method to focus the default window [Jasper; #689652]
+* Increase typical icon size to 96 [Jasper; #689651]
+* Port to XInput2 [Jasper; #688779]
+* Give dynamic keybindings a keybinding action [Florian; #682315]
+* Misc. fixes and cleanups [Jasper, Rui; #688777]
+
+Contributors:
+  Alban Crequy, Rui Matos, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Nilamdyuti Goswami [as], Piotr Drąg [pl], Yaron Shahrabani [he],
+  Dr.T.Vasudevan [ta], ManojKumar Giri [or], Shankar Prasad [kn]
+
+3.7.2
+=====
+* Fix spurious focus changes when showing desktop [Florian; #686928]
+* MetaPluginManager: don't send events to Clutter twice [Owen; #686406]
+* Add the ability to add shader hooks to MetaBackgroundActor [Giovanni; #669798]
+* Only process keyboard mapping events for the core X keyboard [Rui; #674859]
+* Import keybinding files from Metacity [Florian; #687672]
+* Add compositor hook to process keybindings selectively [Florian; #688202]
+* MetaBackgroundActor: add a setter for GLSL uniforms [Giovanni; #682536]
+* Misc. fixes and cleanups [Jasper, Rui, Florian, Rico; #688182]
+
+Contributors:
+  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
+  Owen Taylor, Rico Tzschichholz
+
+Translations:
+  Rafael Ferreira [pt_BR], Tobias Endrigkeit [de], Yaron Shahrabani [he]
+
+3.7.1
+=====
+* screen: Ignore num-workspaces when using dynamic workspaces [Florian; #685439]
+
+Contributors:
+  Florian Müllner
+
+Translations:
+  Mattias Põldaru [et], Kjartan Maraas [nb], Мирослав Николић [sr, sr@latin],
+  Marek Černocký [cs], Andika Triwidada [id], Daniel Mustieles [es],
+  Fran Diéguez [gl], Matej Urbančič [sl]
+
+3.6.1
+=====
+* Fix crash when opening large popup menus [Jasper; #681676]
+* window: Don't move the desktop window after monitor hotplug [Jasper; #681159]
+* Expose MetaPlugin to introspection [Evan; #671098]
+* Optionally delay focus changes in focus-follows-mouse mode [Florian; #678169]
+* Resize the guard window when the X screen is resized [Benjamin; #670396]
+* display: Only manage the default X screen [Jürg; #648156]
+* Misc cleanups: [Owen; #587255]
+
+Contributors:
+  Benjamin Berg, Jürg Billeter, Evan Broder, Florian Müllner, Jasper St. Pierre,
+  Owen Taylor
+
+Translations:
+  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Sayak Sarkar [bn_IN],
+  Sandeep Sheshrao Shedmake [mr], Ask H. Larsen [da], Shankar Prasad [kn],
+  Alexander Shopov [bg], Aurimas Černius [lt], Ihar Hrachyshka [be],
+  Kjartan Maraas [nb], Daniel Mustieles [es], Changwoo Ryu [ko],
+  Yuri Myasoedov [ru], Tom Tryfonidis [el], Rūdolfs Mazurs [lv],
+  Chris Leonard [en_GB], Piotr Drąg [pl], Fran Diéguez [gl], Gil Forcada [ca],
+  Matej Urbančič [sl], Andika Triwidada [id], Carles Ferrando [ca]
+
+3.6.0
+=====
+
+Translations:
+  Alexander Shopov [bg], Daniel Korostil [uk], Rajesh Ranjan [hi],
+  Krishnababu Krothapalli [te], Ani Peter [ml], Rūdolfs Mazurs [lv],
+  Sweta Kothari [gu], Ihar Hrachyshka [be], Noriko Mizumoto [ja],
+  Timo Jyrinki [fi], Mattias Põldaru [et]
+
+3.5.92
+======
+* screen: Allow NULL out arguments in meta_screen_get_size [Tomeu]
+* display: Add API to set wm_name / wm_keybindings [Florian; #671010]
+* Improve the not responding dialog [Jon, Florian; #684306]
+* Misc. bugfixes [Jasper]
+
+Contributors:
+  William Jon McCann, Florian Müllner, Jasper St. Pierre, Tomeu Vizoso
+
+Translations:
+  Gabor Kelemen [hu], Piotr Drąg [pl], Dr.T.Vasudevan [ta], Bruce Cowan [en_GB],
+  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Gil Forcada [ca],
+  Carles Ferrando [ca@valencia], Tobias Endrigkeit [de], Tom Tryfonidis [el],
+  Nguyễn Thái Ngọc Duy [vi], Changwoo Ryu [ko], Ask H. Larsen [da],
+  Rafael Ferreira [pt_BR], Marek Černocký [cs]
+
+3.5.91
+======
+* Do not include markup in app not responding dialog [Alex]
+* Fix subtracting unredirected windows from visible region [Jasper; #677116]
+* Minor improvements and bugfixes [Jasper, Florian; #682648, #682993]
+
+Contributors:
+  Alexander Larsson, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Dirgita [id], Piotr Drąg [pl], A S Alam [pa], Yuri Myasoedov [ru],
+  Milo Casagrande [it], Nilamdyuti Goswami [as], Tom Tryfonidis [el],
+  Duarte Loreto [pt], Fran Diéguez [gl], Nguyễn Thái Ngọc Duy [vi],
+  Aurimas Černius [lt], Daniel Nylander [sv]
+
+3.5.90
+======
+* Fix logic for handling translations of the windows group [Owen; #681221]
+* Handle painting inside a Clutter clone [Owen; #681953]
+* Update overlay-key on settings changes [Florian; #681906]
+* Add keybinding for overlay-key [Florian; #665547]
+* Minor fixes and improvements [Javier, Florian]
+
+Contributors:
+  Javier Jardón, Florian Müllner, Owen Taylor
+
+Translations:
+  Sweta Kothari [gu], Muhammet Kara [tr], Khaled Hosny [ar],
+  Sandeep Sheshrao Shedmake [mr]
+
+3.5.5
+=====
+* Fix flickering around windows when using window group [Tom; #681221]
+
+Contributor(s):
+  Tom Beckmann
+
+Translations:
+  Chao-Hsiung Liao [zh_HK, zh_TW], Matej Urbančič [sl], Fran Diéguez [gl],
+  Мирослав Николић [sr, sr@latin], Yaron Shahrabani [he], Kjartan Maraas [nb]
+
+3.5.4
+=====
+* Make it possible to reimplement move-to-workspace keybindings from plugins
+  [Giovanni; #674104]
+* Add a preference to ignore hide-titlebar-when-maximized hint [Rico; #678947]
+* window: Also use hide-titlebar-when-maximized when tiled [Florian; #679290]
+* Center modal dialogs on their parent instead [Florian; #674499]
+* Reduce amount of markup in translated messages [Matthias; #679660]
+* Fix focus problem after closing a window with focus-follows-mouse
+  [Jasper; #675982]
+* Handle changes of the attach-modal-dialogs preference [Florian; #679904]
+* Do not restore tiling on unmaximize [Florian; #677565]
+* Misc. fixes and cleanups [Jasper Adriaanse, Jasper, Debarshi, Pavel;
+  #679153, 673824]
+
+Contributors:
+ Jasper Lievisse Adriaanse, Giovanni Campagna, Matthias Clasen, Florian Müllner,
+ Debarshi Ray, Jasper St. Pierre, Rico Tzschichholz, Pavel Vasin
+
+Translations:
+ Alexander Shopov [bg], Kjartan Maraas [nb], Yaron Shahrabani [he],
+ Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Daniel Mustieles [es]
+
+3.5.3
+=====
+* Simplify plugin system [Jasper; #676855]
+* meta-window-actor: Don't unredirect shaped windows [Jasper; #677657]
+* screen: Add new public meta_screen_get_current_monitor API [Tim; #642591]
+* frames: Increase the size of resize corners [Jasper; #677669]
+* window: Make some window methods public [Jasper; #678126]
+* Fix crash when running mutter stand-alone [Jasper; #678238]
+* meta-window-actor: Fix potential crash in shaping code [Jasper; #677977]
+* Misc. fixes [Jasper, Marc-Antoine, Rico]
+
+Contributors:
+ Tim L, Marc-Antoine Perennou, Jasper St. Pierre, Rico Tzschichholz
+
+Translations:
+
+ Daniel Mustieles [es], Matej Urbančič [sl], Khaled Hosny [ar],
+ Bruno Brouard [fr], Fran Diéguez [gl]
+
+3.5.2
+=====
+* keybindings: Remove 'toggle-recording' binding [Florian; #674376]
+* Switch to gtk-doc syntax [Jasper; #673752]
+* shaped-texture: never slice shape mask texture [Robert; #674731]
+* Make Mutter stop relying on Cogl including a GL header [Neil; #672711]
+* Make support for "XFree86" Xinerama mandatory [Owen; #674727]
+* meta_window_move_frame(): fix crash when frame is NULL [Owen; #675254]
+* Fix memory leaks [Pavel; #672640]
+* Code cleanups [Jasper; #671104 #674876 #676052]
+* Look for themes in XDG user data dir [Jasper; #675316]
+* Remove frame pixel caching [Jasper; #675111]
+* stack: Ignore keep-on-top property on maximized windows [Florian; #673581]
+* Misc. fixes [Javier, Jasper, Owen, Rico]
+
+Contributors:
+ Robert Bragg, Javier Járdon, Florian Müllner, Neil Roberts, Jasper St. Pierre, 
+ Owen Taylor, Rico Tzschichholz, Pavel Vasin
+
+Translations:
+ Praveen Illa [te], Luca Ferretti [it], Daniel Mustieles [es]
+
+3.4.1
+=====
+* API change: the meta_display_add_keybinding() function added in 3.4
+  wasn't usable from a GNOME Shell extension, so has been changed to take
+  a GSettings object rather than the name of a schema [Jasper; #673014]
+* Don't try to auto-maximize not-maximizable windows; this fixes the problem
+  with the Nautilus desktop window being mis-positioned when enabled
+  [Owen; #673566]
+* Fix a crash in the default plugin (not used in GNOME) [Giovanni; #673809]
+* Make the <Super> key work when set as the mouse button modifier
+  [Florian; #662476]
+
+Contributors:
+ Giovanni Campagna, Florian Muellner, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Khaled Hosny [ar], Jordi Serratosa [ca], Carles Ferrando [ca@valencia],
+ Christian Kirbach [de], Kristjan Schmidt [eo], Arash Mousavi [fa],
+ Jiro Matsuzawa [ja], Shankar Prasad [kn], Aurimas Černius [lt],
+ Yinghua Wang [zh_CN]
+
+3.4.0
+=====
+* Fix crash when a full-screen window is opened [Jasper; #672797]
+* Fix memory leaks [Pavel; #672640]
+
+Contributors:
+ Jasper St. Pierre, Pavel Vasin
+
+Translations:
+ Marek Černocký, Petr Kovar [cz], Bruno Brouard [fr], Sweta Kothari [gu],
+ Yaron Shahrabani [he], Changwoo Ryu [kr], Enrico Nicoletto [pt_BR],
+ Yuri Myasoedov [ru], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi]
+
+3.3.92
+======
+* Automaximize large windows on map [Adel; #671677]
+* When unmaximizing windows, make sure the unminimized size
+  is signficantly less than the maximized size [Adel; #671677]
+* Don't offer maximize option for windows larger than the screen
+  [Jasper; #643606]
+* Always focus the window immediately underneath without restacking
+  when closing a window [Jasper; #620744]
+* Avoid drawing shadows when two windows are tiled together [Rui; #643075]
+* Remove tooltips for window decorations [Florian; #645101]
+* Add org.gnome.mutter.dynamic-workspaces GSetting - when this is set
+  to true, workspace counts are never saved to GSettings, avoiding
+  pointless disk traffic for GNOME dynamic workspaces [Florian; #671568]
+* Add ::grab-op-begin, ::grab-op-end signals to MetaDisplay [Jasper; #670658]
+* Add meta_display_get_ignored_modifier_mask() [Florian; #665215]
+* Remove pointless wrapper methods on MetaPlugin [Jasper; #671103]
+* Fix frame drawing with 3.3.x GTK+ releases [Florian; #671796]
+* Build fixes [Jasper, Rico, Rui]
+* Misc bug fixes [Damien, Jasper, Lionel, Marius, Owen, Rui;
+  #661256, #667437, #671601, #671087, #672374]
+
+Contributors:
+ Stefano Facchini, Adel Gadllah, Lionel Landwerlin, Mariusz Libera,
+ Rui Matos, Florian Müllner, Jasper St. Pierre, Damien Radtke, Owen Taylor,
+ Rico Tzschichholz
+
+Translations:
+ Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Alexander Shopov [bg],
+ David Planella [ca], Carles Ferrando [ca@valencia], Kenneth Nielsen [dk],
+ Bruce Cowan [en_GB], Daniel Mustieles [es], Mattias Põldaru [et],
+ Inaki Larranaga Murgoitio [eu], Timo Jyrinki [fi], Fran Diéguez [gl],
+ Gabor Kelemen [hu], Changwoo Ryu [ko], Anita Reitere [lv],
+ Kjartan Maraas [nb], Wouter Bolsterlee [nl], A S Alam [pa], Piotr Drąg [pl],
+ Duarte Loreto [pt], Yuri Myasoedov [ru], Daniel Nylander [se],
+ Matej Urbančič [sl], Miroslav Nikolić [sr], Tirumurti Vasudevan [ta],
+ Sasi Bhushan [te], Daniel Korostil [uk], Nguyễn Thái Ngọc Duy [vi],
+ YunQiang Su [zh_CN], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.90
+======
+* Update for Cogl API changes [Robert]
+* Bug fixes [Adel, Jasper;  #659643]
+* Build fixes [Jasper, Owen]
+
+Contributors:
+ Robert Bragg, Adel Gadllah, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Ask H. Larsen [dk], Miroslav Nikolić [sr]
+
+3.3.5
+=====
+* MetaShapedTexture no longer is a ClutterTexture subclass [Jasper; #660941]
+* Add meta_shaped_texture_get_image() [Jasper; #660941]
+* Cleanups [Rui, Jasper; #657639]
+* Depend on GTK+ 3.3.7 [Rico]
+
+Contributors:
+ Rui Matos, Jasper St. Pierre, Rico Tzschichholz
+
+Translations:
+ Kjartan Maraas [nb], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.4
+=====
+* Adapt to changes in GtkStateFlags [Owen]
+* Redo properties for applications menu corresponding to GTK+ changes -
+  they are now _GTK_* not DBUS_*. [Ryan]
+* Fix crash on gnome-shell restart when a modal dialog is open [Owen; #668299]
+* Code cleanup [Florian; #666039]
+
+Contributors:
+ Ryan Lortie, Florian Müllner, Owen Taylor
+
+Translations:
+ Alexander Shopov [bg], Fran Diéguez [gl]
+
+3.3.3
+=====
+* Add keybindings for tiling to left or right [Florian; #648700]
+* Support GTK+'s hide-titlebar-when-maximized hint [Florian; #665617]
+* Load _DBUS_APPLICATION_ID, _DBUS_UNIQUE_NAME, _DBUS_OBJECT_PATH
+  property [Colin, Ryan; #664851]
+* Handle changes to workspaces-only-on-primary GSetting [Florian; #664853]
+* Don't use the Clutter default stage [Jasper; #664028]
+* Fix compilation with --disable-introspection [Lionel; #661871]
+* Fix problem where stage could end up mis-sized on startup with
+  multiple monitors [Lionel]
+* Misc bug fixes [Adel, Lionel, Jasper; #666015]
+
+Contributors:
+ Adel Gadllah, Lionel Landwerlin, Florian Müllner, Jasper St. Pierre
+
+Translations:
+ Daniel Mustieles [es], Yaron Shahrabani [he], Kjartan Maraas [nb],
+ Matej Urbančič [sk], Muhammet Kara [tr]
+
+3.3.2
+=====
+
+* Move from GConf to GSettings for preferences [Florian; #635378]
+* Add meta_display_add_keybinding()/meta_display_remove_keybinding()
+  to allow creating new keybindings at runtime [Florian; #663428]
+* Add suport for new _NET_WM_STATE_FOCUSED atom in _NET_WM_STATE
+  to allow applications to draw unfocused windows differently
+  [Rui; #661427]
+* Add meta_window_move_resize_frame() to allow specifying the
+  size and position of a window via the outside dimensions of the
+  window frame.
+* Don't activate window tiling when moving in snap mode
+  [Rui; #662270]
+* Remove the ability to resize a window from the inner edge of
+  the titlebar [Jasper; #660129]
+* Fix for deprecations in GTK+ [Jasper, Rico; #662574, #662895]
+* Misc bug fixes [Jasper, Rico, Rui; #662895, #642652, #660941, #662225]
+
+Contributors:
+ Tim Cuthbertson, Rui Matos, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
+
+Translations:
+ Jorge González (es), Kjartan Maraas (nb), Krishnababu Krothapalli (te), Nguyễn Thái Ngọc Duy (vi)
+
+3.2.1
+=====
+* Allow keyboard window switching (alt-Tab) during drag-and-drop
+  [Matthias, #660457]
+* Don't add invisible resize borders to fullscreen windows
+  [Jasper, Owen; #659854]
+* Fix crash when toplevel windows were set to unexpected window types
+  [Owen; #599988]
+* Correct problems with windows moving when restarting or switching
+  window managers [Jasper; #660848]
+* Fix interaction of tiled windows with multiple monitors
+  [Rui; #642580, #657519]
+* Make meta_display_unmanage_screen() public [Jasper; #660848]
+* Fix problem with turning off window decorations on the fly [Rui; #660773]
+* Fix spurious assertion failures with themes such as Nodoka [Sandro; #661286]
+* Misc bug fixes [Adel, Jasper, Rui; #660464, #660854, #662053]
+
+Contributors:
+ Matthias Clasen, Sandro Mani, Rui Matos, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Tommi Vainikainen [fi], Miroslav Nikolić [sr, sr@latin], Muhammet Kara [tr]
+
+3.2.0
+=====
+* Fix _NET_WM_FRAME_EXTENTS not to include invisible borders [Jasper; #659848]
+* Fix application-specified window placement (-geometry) for
+  invisible borders [Jasper; #659848]
+
+Contributors:
+ Jasper St. Pierre
+
+Translations:
+ Nilamdyuti Goswami [as], Carles Ferrando [ca@valencia], Petr Kovar [cz],
+ Mario Blättermann [de], Inaki Larranaga [eu], Gabor Kelemen [hu],
+ Takayoshi Okano [ja], Changwoo Ryu [ko], Djavan Fagundes [pt_BR]
+
+3.1.92
+======
+* Fix bug with unredirecting full-screen windows on multi-monitor -
+  notably affected gnome-screensaver [Adel; #657869]
+* Disable top resizing of attached dialogs [Jasper; #657795]
+* Code cleanup [Jasper, Rui]
+* Misc bug fixes [Adel, Florian, Jasper, Rui;
+  #658069, #659266, #659523, #659477]
+
+Contributors:
+ Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre
+
+Translations:
+ Joan Duran [ca], Joe Hansen [dk], Jiro Matsuzawa [ja], Daniel Korostil [uk]
+
+3.1.91.1
+========
+* Fix problem where certain application updates would get lost [#657071, Owen]
+* Fix a problem where after resuming from the screensaver, things got
+  slow [#658228, Jasper, Adel]
+* When a monitor is plugged or unplugged, keep existing windows on their
+  current monitor [#645408, Alex]
+* Remove 'Mutter' title from alerts such as
+  "The widow '%s' is not responding" [Matthias]
+* Remove pointless warning:
+   Received a _NET_WM_MOVERESIZE message for %s; these
+   messages lack timestamps and therefore suck.
+  [Rui]
+* Misc bug fixes [Jasper]
+* Build fixes [Javier]
+
+Contributors:
+ Matthias Clasen, Adel Gadllah, Javier Jardón, Alex Larsson, Rui Matos,
+ Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Ihar Hrachyshka [be], Bruce Cowan [en_FB], Daniel Mustieles [es],
+ Claude Paroz [fr], Andika Triwidada [id], Luca Ferretti [it],
+ Rudolfs Mazurs [lt], Piotr Drąg [pl], Duarte Loreto [pt],
+ Matej Urbančič [sl], Tirumurti Vasudevan [ta], Chao-Hsiung Liao [zh_KH, TW]
+
+3.1.90.1
+========
+* Fix crash when no windows are open [Adel; #657692]
+* Fix annotations for new strictness in gobject-introspection [Jasper, Owen]
+* Fix some errors with rounded frame drawing [Jasper; #657661]
+
+Contributors:
+ Adel Gadllah, Jasper St. Pierre, Owen Taylor
+
+3.1.90
+======
+* Extend the draggable portion of window borders outside the visible frame
+  for easy resizing with thin borders. (New draggable_border_width GConf key
+  controls the total width of visible and invisible borders.)
+  [Jasper; #644930]
+* Draw rounded window corners with antialising [Jasper; #628195]
+* Unredirect override-redirect fullscreen windows, such as full-screen
+  3D games to avoid any performance impact [Adel; #597014]
+* Add :resizable and :above properties to MetaWindow. [Tim; #653858]
+* Add MUTTER_DISABLE_FALLBACK_COLOR environment variable to allow visualizing
+  places where a color is missing for gtk:custom() colors [Florian; #656112]
+* Don't attach modal dialogs to special windows like the desktop;
+  add meta_window_is_attached_dialog() [Dan, #646761]
+* Make MetaBackgroundActor public, allow creating multiple instances
+  (sharing a common texture), and add a :dim-factor property
+  [Rui, Owen; #656433]
+* Fix attached dialogs to not be resizable from the top and to be
+  position correctly [Jasper; #656619]
+* Misc bug fixes [Jasper, Rui; #656335, #657583]
+
+Contributors:
+ Tim Cuthbertson, Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre,
+ Owen Taylor, Dan Winship
+
+Translations:
+ Alexander Shopov [bg], Jorge González [es], Fran Dieguez [gl],
+ Yaron Shahrabani [he], Takeshi Aihana [ja], Aurimas Černius [lt],
+ Kjartan Maraas [nb], A S Alam [pa], Yuri Kozlov [ru], Daniel Nylander [se],
+ Theppitak Karoonboonyanan [th], Abduxukur Abdurixit [ug], Aron Xu [zh_CN]
+
+3.1.4
+=====
+* Use better, much more subtle shadow definitions [Jakub; #649374]
+* Add the ability to use named GTK+ colors in theme files as
+  gtk:custom(name,fallback) [Florian; #648709]
+* Port from GdkColor to GdkRGBA and from GtkStyle to GtkStyleContext
+  [Florian; #650586]
+* Try to fix window bindings using the Super key [Owen; #624869]
+* Update to using more modern Cogl and Clutter APIs
+  [Adel, Emmanuele, Neil; #654551 #654729 #654730 #655064]
+* Fix for srcdir != builddir builds [Thierry; #624910]
+* Make handling of focus appearance for attached dialogs more robust
+  [Dan; #647712]
+* Misc bug fixes
+  [Dan, Florian, Jasper, Owen, Rui; #642957 #649374 #650661 #654489 #654539]
+
+Contributors:
+ Emmanuele Bassi, Adel Gadllah, Rui Matos, Florian Müllner, Neil Roberts,
+ Jasper St. Pierre, Jakub Steiner, Owen Taylor
+
+Translations:
+ Ihar Hrachyshka [be], Jorge González, Daniel Mustieles [es],
+ Fran Dieguez [gl], Yaron Shahrabani [he], Takeshi Aihana [ja],
+ Kjartan Maraas [nb], Rudolfs Mazurs [lv], Matej Urbančič [sl],
+ Abduxukur Abdurixit [ug], Nguyễn Thái Ngọc Duy [vi]
+
+3.1.3.1
+=======
+* Back API version down to "3.0" - the change to Meta-3.1.gir
+  was unintentional [Owen]
+
+Translations:
+ Yaron Shahrabani [he], Kjartan Maraas [nb], Muhammet Kara [tr]
+
 3.1.3
 =====
 * Support dark window theme variants for windows with a dark

README

@@ -1,16 +1,10 @@
-Metacity is not a meta-City as in an urban center, but rather
+The original codebase named "Metacity" is not a meta-City as in an
-Meta-ness as in the state of being meta. i.e. metacity : meta as
+urban center, but rather Meta-ness as in the state of being
-opacity : opaque. Also it may have something to do with the Meta key
+meta. i.e. metacity : meta as opacity : opaque. Also it may have
-on UNIX keyboards.
+something to do with the Meta key on UNIX keyboards.
 
-The first release of Metacity was version 2.3. Metacity has no need for
+Since then, it has been renamed mutter after a rebase on top of
-your petty hangups about version numbers.
+clutter as a compositing manager.
-
-The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
-2.10.x, 2.12.x, 2.14.x, 2.16.x.
-
-Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
-2.15.x, 2.17.x.
 
 COMPILING MUTTER
 ===
@@ -18,8 +12,7 @@ COMPILING MUTTER
 You need GTK+ 2.2.  For startup notification to work you need
 libstartup-notification at
 http://www.freedesktop.org/software/startup-notification/ or on the
-GNOME ftp site. You also need GConf 1.2 (unless building a funky
+GNOME ftp site.
-extra-small embedded metacity with --disable-gconf, see below).
 You need Clutter 1.0. You need gobject-introspection 0.6.3.
 
 REPORTING BUGS AND SUBMITTING PATCHES
@@ -59,25 +52,24 @@ MUTTER FEATURES
    and should work with KWin, fvwm2, and other EWMH-compliant WMs.)
 
  - Has a simple theme system and a couple of extra themes come with it.
-   Change themes via gconf-editor or gconftool or GNOME themes control
+   Change themes via gsettings:
-   panel:
+     gsettings set org.gnome.desktop.wm.preferences theme Crux
-     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
+     gsettings set org.gnome.desktop.wm.preferences theme Gorilla
-     gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
+     gsettings set org.gnome.desktop.wm.preferences theme Atlanta
-     gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
+     gsettings set org.gnome.desktop.wm.preferences theme Bright
-     gconftool-2 --type=string --set /apps/metacity/general/theme Bright
 
    See theme-format.txt for docs on the theme format. Use 
    metacity-theme-viewer to preview themes.
 
- - Change number of workspaces via gconf-editor or gconftool:
+ - Change number of workspaces via gsettings:
-     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
+     gsettings set org.gnome.desktop.wm.preferences num-workspaces 5
 
    Can also change workspaces from GNOME 2 pager.
 
  - Change focus mode:
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
+     gsettings set org.gnome.desktop.wm.preferences focus-mode mouse
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
+     gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode click
+     gsettings set org.gnome.desktop.wm.preferences focus-mode click
 
  - Global keybinding defaults include:   
 
@@ -92,10 +84,9 @@ MUTTER FEATURES
 
    Change keybindings for example:
 
-     unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
+     gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 '[<Alt>F1]'
    
-   Also try the GNOME keyboard shortcuts control panel, or
+   Also try the GNOME keyboard shortcuts control panel.
-   gconf-editor.
 
  - Window keybindings:
 

autogen.sh

@@ -5,9 +5,9 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="mutter"
-REQUIRED_AUTOMAKE_VERSION=1.10
+REQUIRED_AUTOMAKE_VERSION=1.13
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level metacity directory"

configure.ac

@@ -1,8 +1,9 @@
 AC_PREREQ(2.50)
+AC_CONFIG_MACRO_DIR([m4])
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [1])
+m4_define([mutter_minor_version], [11])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_micro_version], [4])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -15,9 +16,13 @@ AC_INIT([mutter], [mutter_version],
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-AM_MAINTAINER_MODE
+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
@@ -34,7 +39,7 @@ 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])
 
@@ -61,21 +66,25 @@ AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN
 
-GTK_MIN_VERSION=2.91.7
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26
 
-MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"
+CLUTTER_PACKAGE=clutter-1.0
 
-AC_ARG_ENABLE(gconf,
+MUTTER_PC_MODULES="
-  AC_HELP_STRING([--disable-gconf],
+   gtk+-3.0 >= 3.3.7
-                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
+   gio-2.0 >= 2.25.10
-  enable_gconf=yes)
+   pango >= 1.2.0
+   cairo >= 1.10.0
+   gsettings-desktop-schemas >= 3.7.3
+   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
+   $CLUTTER_PACKAGE >= 1.17.1
+   cogl-1.0 >= 1.17.1
+   upower-glib >= 0.99.0
+   gnome-desktop-3.0
+"
 
-if test x$enable_gconf = xyes; then
+GLIB_GSETTINGS
-    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
-fi
 
 AC_ARG_ENABLE(verbose-mode,
   AC_HELP_STRING([--disable-verbose-mode],
@@ -111,17 +120,32 @@ AC_ARG_ENABLE(shape,
                  [disable mutter's use of the shaped window extension]),,
   enable_shape=auto)
 
-## try definining HAVE_BACKTRACE
+## Wayland support requires the xserver.xml protocol extension found in the weston
-AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
+## 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/Xorg"])
 
 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)
-# gtk_window_set_icon_name requires gtk2+-2.6.0
+PKG_CHECK_MODULES(MUTTER_LAUNCH, libdrm libsystemd-login)
-PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
+
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
+saved_LIBS="$LIBS"
+LIBS="$LIBS $MUTTER_LAUNCH"
+AC_CHECK_FUNCS([sd_session_get_vt])
+LIBS="$saved_LIBS"
 
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -171,128 +195,71 @@ else
   fi
 fi
 
-XCOMPOSITE_VERSION=0.2
-
-AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
-if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
-  echo "Building with compositing manager"
-
-  ## force on render also
-  have_xrender=yes
-else
-  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
-fi
-
-CLUTTER_VERSION=1.2.0
-CLUTTER_PACKAGE=clutter-1.0
-AC_SUBST(CLUTTER_PACKAGE)
-if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
-  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
-  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
-
-  dnl Check for the clutter-glx-texture-pixmap header
-  mutter_save_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
-  AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
-                  [have_glx_texture_pixmap=yes],
-                  [have_glx_texture_pixmap=no])
-  CPPFLAGS="$mutter_save_cppflags"
-
-  if test x$have_glx_texture_pixmap = xyes; then
-    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
-              [Is ClutterGLXTexturePixmap available?])
-  fi
-else
-  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
-fi
-
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 
 if test x$found_introspection != xno; then
   AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
-  META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
+  # Since we don't make any guarantees about stability and we don't support
+  # parallel install, there's no real reason to change directories, filenames,
+  # etc. as we change the Mutter tarball version. Note that this must match
+  # api_version in src/Makefile.am
+  META_GIR=Meta_3_0_gir
+  # META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
   AC_SUBST(META_GIR)
 fi
 
-AC_MSG_CHECKING([Xcursor])
+MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
-if $PKG_CONFIG xcursor; then
-     have_xcursor=yes
-  else
-     have_xcursor=no
-  fi
-  AC_MSG_RESULT($have_xcursor)
 
-if test x$have_xcursor = xyes; then
+# We always build with wayland enabled
-  echo "Building with Xcursor"
+AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
-  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
-fi
 
+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)
 
+PKG_CHECK_EXISTS([xi >= 1.6.99.1],
+                 AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
+
+# This is used for plugins
+AC_SUBST(CLUTTER_PACKAGE)
+PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
+
 AC_PATH_XTRA
 
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
-# Check for Xinerama extension (Solaris impl or Xfree impl)
+# Check for Xinerama extension - we only support the "XFree86" style,
+# and not the older Solaris-only version; recent Solaris supports the
+# XFree86 style.
 mutter_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
-AC_ARG_ENABLE(xinerama,
+have_xinerama=yes
-  AC_HELP_STRING([--disable-xinerama],
+AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-                 [disable mutter's use of the Xinerama extension]),
+    [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-  try_xinerama=$enable_xinerama,try_xinerama=yes)
+		     [X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
-
+		     if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-use_solaris_xinerama=no
+			 X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-use_xfree_xinerama=no
+		     fi],
-if test "${try_xinerama}" != no; then
+		     have_xinerama=no,
-    case "$host" in
+		     [#include <X11/Xlib.h>])],
-        *-*-solaris*)
+    have_xinerama=no, -lXext $ALL_X_LIBS)
-            # Check for solaris
+AC_MSG_CHECKING(for Xinerama support)
-            use_solaris_xinerama=yes
+AC_MSG_RESULT($have_xinerama)
-            AC_CHECK_LIB(Xext, XineramaGetInfo,
-                         use_solaris_xinerama=yes, use_solaris_xinerama=no,
-                         $ALL_X_LIBS)
-            if test "x$use_solaris_xinerama" = "xyes"; then
-                AC_CHECK_HEADER(X11/extensions/xinerama.h,
-                                if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                    X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                fi
-                                AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
-                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
-                                use_solaris_xinerama=no,
-                                [#include <X11/Xlib.h>])
-            fi
-            AC_MSG_CHECKING(for Xinerama support on Solaris)
-            AC_MSG_RESULT($use_solaris_xinerama);
-            ;;
-        *)
-            # Check for XFree
-            use_xfree_xinerama=yes
-            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
-                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                 fi
-                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
-                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
-                                 use_xfree_xinerama=no,
-                                 [#include <X11/Xlib.h>])],
-                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
-            AC_MSG_CHECKING(for Xinerama support on XFree86)
-            AC_MSG_RESULT($use_xfree_xinerama);
-            ;;
-    esac
-fi
 
 CPPFLAGS="$mutter_save_cppflags"
 
+if test x$have_xinerama = xno; then
+   AC_MSG_ERROR([Xinerama extension was not found])
+fi
+
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
@@ -363,9 +330,6 @@ if test "x$found_xsync" = "xyes"; then
 fi
 
 MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
-MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
-MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
 found_sm=no
 case "$MUTTER_LIBS" in
@@ -408,18 +372,6 @@ fi
 
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
-if test x$enable_gconf = xyes; then
-   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-   if test x"$GCONFTOOL" = xno; then
-     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-   fi
-
-   AM_GCONF_SOURCE_2
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
 AC_PATH_PROG(ZENITY, zenity, no)
 if test x"$ZENITY" = xno; then
   AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
@@ -432,11 +384,7 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 
-# For fix-meta-rectangle.py
+GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-AM_PATH_PYTHON([2.5])
-
-# Use gnome-doc-utils:
-GNOME_DOC_INIT([0.8.0])
 
 #### Warnings (last since -Werror can disturb other tests)
 
@@ -497,7 +445,7 @@ if test "$enable_compile_warnings" != no ; then
     if test "$enable_compile_warnings" = error; then
       case " $CFLAGS " in
       *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror" ;;
+      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
       esac
     fi
   fi
@@ -508,24 +456,17 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
+doc/reference/Makefile
+doc/reference/meta-docs.sgml
 src/Makefile
-src/wm-tester/Makefile
+src/libmutter-wayland.pc
-src/libmutter.pc
-src/mutter-plugins.pc
-src/tools/Makefile
 src/compositor/plugins/Makefile
+protocol/Makefile
 po/Makefile.in
 ])
 
 AC_OUTPUT
 
-if test x$enable_gconf = xno; then
-        echo "*** WARNING WARNING WARNING WARNING WARNING"
-        echo "*** Building without GConf.  This means there's no"
-        echo "*** way to change prefs except hacking source code."
-        echo "*** This is intended for embedded systems etc., not for normal use."
-fi
-
 if test x$enable_verbose_mode = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
         echo "*** Building without verbose mode"
@@ -536,15 +477,12 @@ fi
 
 dnl ==========================================================================
 echo "
-mutter-$VERSION
+mutter-wayland-$VERSION
 
 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 
-	GConf:                    ${enable_gconf}
-	XFree86 Xinerama:         ${use_xfree_xinerama}
-	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
@@ -559,8 +497,8 @@ MUTTER_MINOR_VERSION=mutter_minor_version
 if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then
    stable_version=`expr $MUTTER_MINOR_VERSION - 1`
    echo "This is the UNSTABLE branch of mutter"
-   echo -n "Use 2.$stable_version.x for stable "
+   echo -n "Use 3.$stable_version.x for stable "
-   echo    "(gnome-2-$stable_version branch in git)"
+   echo    "(gnome-3-$stable_version branch in git)"
 else
    echo "This is the stable branch of mutter"
 fi

doc/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = man
+SUBDIRS = man reference
 
 EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt

doc/how-to-get-focus-right.txt

@@ -31,8 +31,7 @@ workspaces.  In these cases, there needs to be a rule consistent with
 the above about the new window to choose.
 
 Focus method  Behavior
-    click     Focus the most recently used window (same as the window
+    click     Focus the window on top
-              on top)
    sloppy     Focus the window containing the pointer if there is such
               a window, otherwise focus the most recently used window.
     mouse     Focus the non-DESKTOP window containing the pointer if

doc/man/Makefile.am

@@ -1,4 +1,3 @@
-man_MANS = mutter.1 mutter-theme-viewer.1 \
+man_MANS = mutter.1
-	   mutter-window-demo.1 mutter-message.1
 
 EXTRA_DIST = $(man_MANS)

doc/man/mutter-message.1

@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.\" -----
-.\" This file was confirmed to be licenced under the GPL
-.\" by its author and copyright holder, Akira TAGOH, on June 1st 2008:
-.\"
-.\" > I'm comfortable with DFSG-free. that sounds great if you think it's
-.\" > useful and worth containing it in upstream.
-.\" ...
-.\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
-.\" > since I have contributed that for Debian. so GPL is no problem for me.
-.\" -----
-.TH MUTTER\-MESSAGE 1 "28 August 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-MUTTER\-MESSAGE \- a command to send a message to Mutter
-.SH SYNOPSIS
-.B MUTTER\-MESSAGE
-[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B mutter\-message\fP.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
-.SH OPTIONS
-.TP
-.B restart
-Restart \fBmutter\fP(1) which is running.
-.TP
-.B reload-theme
-Reload a theme which is specified on gconf database.
-.TP
-.B enable-keybindings
-Enable all of keybindings which is specified on gconf database.
-.TP
-.B disable-keybindings
-Disable all of keybindings which is specified on gconf database.
-.SH SEE ALSO
-.BR mutter (1)
-.SH AUTHOR
-This manual page was written by Akira TAGOH <tagoh@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).

doc/man/mutter-theme-viewer.1

@@ -1,43 +0,0 @@
-.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.\"
-.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
-.\" 
-.TH MUTTER-THEME-VIEWER 1 "1 June 2004" 
-.SH NAME
-mutter-theme-viewer \- view mutter themes
-.SH SYNOPSIS
-.B mutter-theme-viewer
-[
-.I THEMENAME
-]
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-.B mutter-theme-viewer
-allows you to preview any installed Mutter theme.
-.PP
-When designing a new Mutter theme, you can use
-.B mutter-theme-viewer
-to measure the performance of a window frame option, and to preview
-the option.
-.SH OPTIONS
-.TP
-.I THEMENAME
-Name of the theme to be shown (\fIAtlanta\fR by default).
-It is case-sensitive.
-.SH FILES
-.br
-.nf
-.TP
-.I /usr/share/themes
-system themes directory
-.TP
-.I /usr/share/themes/*/mutter-1/mutter-theme-1.xml
-theme specification file
-.SH AUTHOR
-This manual page was written by Jose M. Moya <josem@die.upm.es>, for
-the Debian  GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.\" Always quote multiple words for .SH
-.BR mutter (1),
-.BR mutter-window-demo (1).

doc/man/mutter-window-demo.1

@@ -1,25 +0,0 @@
-.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.\"
-.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
-.\" 
-.TH MUTTER-WINDOW-DEMO 1 "1 June 2004" 
-.SH NAME
-mutter-window-demo \- demo of window features
-.SH SYNOPSIS
-.B mutter-window-demo
-.SH DESCRIPTION
-.\" Putting a newline after each sentence can generate better output.
-This program demonstrates various kinds of windows that window
-managers and window manager themes should handle.
-.PP
-Be sure to tear off the menu and toolbar, those are also a special
-kind of window.
-.SH AUTHOR
-This manual page was written by Jose M. Moya <josem@die.upm.es>, for
-the Debian  GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.\" Always quote multiple words for .SH
-.BR x-window-manager (1),
-.BR mutter (1),
-.BR mutter-theme-viewer (1).

doc/man/mutter.1

@@ -51,7 +51,7 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gsettings.
 .SH SEE ALSO
 .BR mutter-message (1)
 .SH AUTHOR

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

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>

doc/reference/meta-sections.txt

@@ -0,0 +1,685 @@
+<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_window_mapped
+meta_compositor_window_unmapped
+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>
+

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>

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>

doc/theme-format.txt

@@ -22,6 +22,18 @@ 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
 ========================================
 

mutter.doap

@@ -21,6 +21,7 @@ environment.</description>
   -->
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
+  <download-page rdf:resource="http://download.gnome.org/sources/mutter-wayland/" />
   <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
@@ -39,4 +40,11 @@ environment.</description>
       <gnome:userid>otaylor</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Florian Müllner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
+      <gnome:userid>fmuellner</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 </Project>

po/LINGUAS

@@ -44,6 +44,7 @@ is
 it
 ja
 ka
+kk
 kn
 ko
 ku
@@ -80,6 +81,7 @@ sr@latin
 sv
 ta
 te
+tg
 th
 tk
 tr

po/POTFILES.in

@@ -1,7 +1,10 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+src/50-mutter-navigation.xml.in
+src/50-mutter-system.xml.in
+src/50-mutter-windows.xml.in
 src/compositor/compositor.c
-src/core/all-keybindings.h
+src/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -9,6 +12,7 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
+src/core/monitor.c
 src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
@@ -17,15 +21,12 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/mutter.desktop.in
+src/mutter-wayland.desktop.in
-src/mutter-wm.desktop.in
+src/org.gnome.mutter.gschema.xml.in
-src/mutter.schemas.in
+src/org.gnome.mutter.wayland.gschema.xml.in
-src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
-src/ui/theme-viewer.c
-

po/ast.po

@@ -37,7 +37,6 @@ msgstr "Petición d'información ventana desconocida: %d"
 #. Translators: %s is a window title
 #: ../src/core/delete.c:95
 #, c-format
-#, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> nun ta respondiendo."
 
@@ -122,7 +121,6 @@ msgstr "Comandu de terminal nun definíu.\n"
 
 #: ../src/core/main.c:130
 #, c-format
-#, c-format
 msgid ""
 "mutter %s\n"
 "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@@ -261,7 +259,6 @@ msgstr "Error axustando númberu d'arees de trabayu a %d: %s\n"
 
 #: ../src/core/prefs.c:2028 ../src/core/prefs.c:2531
 #, c-format
-#, c-format
 msgid "Workspace %d"
 msgstr "Espaciu de Trabayu %d"
 
@@ -275,7 +272,6 @@ msgstr "\"%s\" atopau na base de datos de configuración nun ye un valor válidu
 
 #: ../src/core/prefs.c:2612
 #, c-format
-#, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fallu al afitar nome pal espaciu de trabayu %d a \"%s\": %s\n"
 
@@ -286,19 +282,16 @@ msgstr "Fallu al afitar l'estáu del compositor: %s\n"
 
 #: ../src/core/prefs.c:2845
 #, c-format
-#, c-format
 msgid "Error setting clutter plugin list: %s\n"
 msgstr "Fallu al afitar la llista desordenada de plugin: %s\n"
 
 #: ../src/core/prefs.c:2889
 #, c-format
-#, c-format
 msgid "Error setting live hidden windows status status: %s\n"
 msgstr "Fallu al afitar l'estáu de les ventanes anubríes: %s\n"
 
 #: ../src/core/prefs.c:2917
 #, c-format
-#, c-format
 msgid "Error setting no tab popup status: %s\n"
 msgstr "Fallu al afitar l'estáu de les llingüetes emerxentes: %s\n"
 
@@ -358,7 +351,6 @@ msgstr "Falló analizar ficheru de sesión guardáu: %s\n"
 
 #: ../src/core/session.c:1198
 #, c-format
-#, c-format
 msgid "<mutter_session> attribute seen but we already have the session ID"
 msgstr "Vióse l'atributu <mutter_session> pero yá tenemos la ID de sesión"
 
@@ -404,7 +396,6 @@ msgstr "Abiertu archivu log %s\n"
 
 #: ../src/core/util.c:139 ../src/tools/mutter-message.c:176
 #, c-format
-#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter compilose ensin sofitu pal mou testu\n"
 
@@ -499,19 +490,19 @@ msgid ""
 msgstr "La propiedá %s del ventanu 0x%lx contien un códigu UTF-8 non válidu pal "
 "elementu %d na llista\n"
 
-#: ../src/include/all-keybindings.h:88
+#: ../src/include/all-keybindings.h:88 ../src/50-mutter-navigation.xml.in.h:18
 msgid "Switch to workspace 1"
 msgstr "Cambiar a espaciu de trabayu 1"
 
-#: ../src/include/all-keybindings.h:90
+#: ../src/include/all-keybindings.h:90 ../src/50-mutter-navigation.xml.in.h:19
 msgid "Switch to workspace 2"
 msgstr "Cambiar a espaciu de trabayu 2"
 
-#: ../src/include/all-keybindings.h:92
+#: ../src/include/all-keybindings.h:92 ../src/50-mutter-navigation.xml.in.h:20
 msgid "Switch to workspace 3"
 msgstr "Cambiar a espaciu de trabayu 3"
 
-#: ../src/include/all-keybindings.h:94
+#: ../src/include/all-keybindings.h:94 ../src/50-mutter-navigation.xml.in.h:21
 msgid "Switch to workspace 4"
 msgstr "Cambiar a espaciu de trabayu 4"
 
@@ -640,47 +631,57 @@ msgstr "Saca una semeya d'una ventana"
 msgid "Run a terminal"
 msgstr "Executar una terminal"
 
-#: ../src/include/all-keybindings.h:271
+#: ../src/include/all-keybindings.h:271 ../src/50-mutter-windows.xml.in.h:1
 msgid "Activate the window menu"
 msgstr "Activar el menú de la ventana"
 
-#: ../src/include/all-keybindings.h:274
+#: ../src/include/all-keybindings.h:274 ../src/50-mutter-windows.xml.in.h:13
+#, fuzzy
 msgid "Toggle fullscreen mode"
-msgstr "Camudar a modu pantalla completa"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a modu pantalla completa\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a mou pantalla completa"
 
-#: ../src/include/all-keybindings.h:276
+#: ../src/include/all-keybindings.h:276 ../src/50-mutter-windows.xml.in.h:14
+#, fuzzy
 msgid "Toggle maximization state"
-msgstr "Camudar a estáu maximizáu"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a estáu maximizáu\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Conmutar l'estáu maximizáu"
 
 #: ../src/include/all-keybindings.h:278
 msgid "Toggle whether a window will always be visible over other windows"
 msgstr "Conmutar si una ventana siempres se verá encima d'otres ventanes"
 
-#: ../src/include/all-keybindings.h:280
+#: ../src/include/all-keybindings.h:280 ../src/50-mutter-windows.xml.in.h:4
 msgid "Maximize window"
 msgstr "Maximizar ventana"
 
-#: ../src/include/all-keybindings.h:282
+#: ../src/include/all-keybindings.h:282 ../src/50-mutter-windows.xml.in.h:12
 msgid "Restore window"
 msgstr "Restaurar la ventana"
 
-#: ../src/include/all-keybindings.h:284
+#: ../src/include/all-keybindings.h:284 ../src/50-mutter-windows.xml.in.h:15
 msgid "Toggle shaded state"
 msgstr "Activa estáu endolcáu"
 
-#: ../src/include/all-keybindings.h:286
+#: ../src/include/all-keybindings.h:286 ../src/50-mutter-windows.xml.in.h:7
 msgid "Minimize window"
 msgstr "Minimizar ventana"
 
-#: ../src/include/all-keybindings.h:288
+#: ../src/include/all-keybindings.h:288 ../src/50-mutter-windows.xml.in.h:2
 msgid "Close window"
 msgstr "Zarrar ventana"
 
-#: ../src/include/all-keybindings.h:290
+#: ../src/include/all-keybindings.h:290 ../src/50-mutter-windows.xml.in.h:8
 msgid "Move window"
 msgstr "Mover ventana"
 
-#: ../src/include/all-keybindings.h:292
+#: ../src/include/all-keybindings.h:292 ../src/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Cambiar el tamañu la ventana"
 
@@ -689,18 +690,22 @@ msgid "Toggle whether window is on all workspaces or just one"
 msgstr "Conmutar si la ventana apaez en toles árees de trabayu o namái nuna"
 
 #: ../src/include/all-keybindings.h:299
+#: ../src/50-mutter-navigation.xml.in.h:10
 msgid "Move window to workspace 1"
 msgstr "Mover ventana al espaciu de trabayu 1"
 
 #: ../src/include/all-keybindings.h:302
+#: ../src/50-mutter-navigation.xml.in.h:11
 msgid "Move window to workspace 2"
 msgstr "Mover ventana al espaciu de trabayu 2"
 
 #: ../src/include/all-keybindings.h:305
+#: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Move window to workspace 3"
 msgstr "Mover ventana al espaciu de trabayu 3"
 
 #: ../src/include/all-keybindings.h:308
+#: ../src/50-mutter-navigation.xml.in.h:13
 msgid "Move window to workspace 4"
 msgstr "Mover ventana al espaciu de trabayu 4"
 
@@ -736,19 +741,24 @@ msgstr "Mover ventana al espaciu de trabayu 11"
 msgid "Move window to workspace 12"
 msgstr "Mover ventana al espaciu de trabayu 12"
 
-#: ../src/include/all-keybindings.h:344
+#: ../src/include/all-keybindings.h:344 ../src/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Mover ventana un espaciu de trabayu a manzorga"
 
-#: ../src/include/all-keybindings.h:347
+#: ../src/include/all-keybindings.h:347 ../src/50-mutter-navigation.xml.in.h:8
+#, fuzzy
 msgid "Move window one workspace to the right"
-msgstr "Mover ventana un espaciu de trabayu a derecha"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Mover ventana un espaciu de trabayu a derecha\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Mover ventana un espaciu de trabayu a madrecha"
 
-#: ../src/include/all-keybindings.h:350
+#: ../src/include/all-keybindings.h:350 ../src/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Mover ventana un espaciu de trabayu p'arriba"
 
-#: ../src/include/all-keybindings.h:353
+#: ../src/include/all-keybindings.h:353 ../src/50-mutter-navigation.xml.in.h:6
 msgid "Move window one workspace down"
 msgstr "Mover ventana un espaciu de trabayu p'abaxo"
 
@@ -757,19 +767,29 @@ msgid "Raise window if it's covered by another window, otherwise lower it"
 msgstr ""
 "Llevantar la ventana si ta cubierta por otra ventana, minimizala n'otru casu"
 
-#: ../src/include/all-keybindings.h:358
+#: ../src/include/all-keybindings.h:358 ../src/50-mutter-windows.xml.in.h:9
+#, fuzzy
 msgid "Raise window above other windows"
-msgstr "Poner el ventanu en primer planu"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Poner el ventanu en primer planu\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Poner la ventana en primer planu"
 
-#: ../src/include/all-keybindings.h:360
+#: ../src/include/all-keybindings.h:360 ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
 msgid "Lower window below other windows"
-msgstr "Ventanu más baxu per debaxo d'otros ventanos"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Ventanu más baxu per debaxo d'otros ventanos\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Ventana más baxa per debaxo d'otres ventanes"
 
-#: ../src/include/all-keybindings.h:364
+#: ../src/include/all-keybindings.h:364 ../src/50-mutter-windows.xml.in.h:6
 msgid "Maximize window vertically"
 msgstr "Maximizar ventana verticalmente"
 
-#: ../src/include/all-keybindings.h:368
+#: ../src/include/all-keybindings.h:368 ../src/50-mutter-windows.xml.in.h:5
 msgid "Maximize window horizontally"
 msgstr "Maximizar ventana horizontalmente"
 
@@ -983,7 +1003,6 @@ msgstr "Espaciu de Trabayu %d%n"
 
 #: ../src/ui/menu.c:213
 #, c-format
-#, c-format
 msgid "Workspace 1_0"
 msgstr "Espaciu de Trabayu 1_0"
 
@@ -1724,7 +1743,6 @@ msgstr "Nun se permite testu dientro del elementu <%s>"
 #: ../src/ui/theme-parser.c:3748 ../src/ui/theme-parser.c:3760
 #: ../src/ui/theme-parser.c:3772
 #, c-format
-#, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> especificáu dos vegaes pa esti tema"
 
@@ -1936,6 +1954,96 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d espresiones de coordenaes interpretaes en %g segundos (%g segundos de "
 "media)\n"
 
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Hide all normal windows"
+msgstr "Anubrir toles ventanes normales"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+#, fuzzy
+msgid "Move to workspace above"
+msgstr "Mover al área de trabayu d'arriba"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+#, fuzzy
+msgid "Move to workspace below"
+msgstr "Mover al área de trabayu d'abaxo"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+#, fuzzy
+msgid "Move to workspace left"
+msgstr "Mover al área de trabayu de la izquierda"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+#, fuzzy
+msgid "Move to workspace right"
+msgstr "Mover al área de trabayu de la derecha"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+#, fuzzy
+msgid "Navigation"
+msgstr "Navegación"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+#, fuzzy
+msgid "Switch applications"
+msgstr "Movese ente aplicaciones"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+#, fuzzy
+msgid "Switch system controls"
+msgstr "Cambiar ente controles del sistema"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+#, fuzzy
+msgid "Switch system controls directly"
+msgstr "Movese ente los controles del sistema direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+#, fuzzy
+msgid "Switch windows directly"
+msgstr "Cambiar ventanes direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+#, fuzzy
+msgid "Switch windows of an app directly"
+msgstr "Movese ente les ventanes d'una aplicación direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+#, fuzzy
+msgid "Switch windows of an application"
+msgstr "Movese ente les ventanes d'una aplicación"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "Show the activities overview"
+msgstr "Amosar el resume d'actividaes"
+
+#: ../src/50-mutter-system.xml.in.h:2
+#, fuzzy
+msgid "Show the run command prompt"
+msgstr "Amosar l'elementu «executar comando»"
+
+#: ../src/50-mutter-system.xml.in.h:3
+#, fuzzy
+msgid "System"
+msgstr "Sistema"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+#, fuzzy
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Llevantar la ventana si ta cubierta, minimizala n'otru casu"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+#, fuzzy
+msgid "Toggle window on all workspaces or one"
+msgstr "Conmutar la ventana en toles árees de trabayu o namái nuna"
+
+#: ../src/50-mutter-windows.xml.in.h:17
+#, fuzzy
+msgid "Windows"
+msgstr "Ventanes"
+
 #~ msgid "Desktop"
 #~ msgstr "Escritoriu"
 

po/et.po

@@ -7,253 +7,175 @@
 #
 # Tõivo Leedjärv <toivo linux ee>, 2004.
 # Ivar Smolin <okul linux ee>, 2005, 2006, 2009–2011.
-# Mattias Põldaru <mahfiaz gmail com>, 2008–2011.
+# Mattias Põldaru <mahfiaz@gmail.com>, 2008–2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&component=general\n"
+"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-07 23:35+0000\n"
+"POT-Creation-Date: 2013-09-10 15:25+0000\n"
-"PO-Revision-Date: 2011-03-09 06:41+0200\n"
+"PO-Revision-Date: 2013-09-11 23:20+0300\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
-"Language-Team: Estonian <gnome-et@linux.ee>\n"
+"Language-Team: Estonian <>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+msgid "Navigation"
+msgstr "Navigeerimine"
+
+msgid "Move window to workspace 1"
+msgstr "Akna liigutamine 1. tööalale"
+
+msgid "Move window to workspace 2"
+msgstr "Akna liigutamine 2. tööalale"
+
+msgid "Move window to workspace 3"
+msgstr "Akna liigutamine 3. tööalale"
+
+msgid "Move window to workspace 4"
+msgstr "Akna liigutamine 4. tööalale"
+
+msgid "Move window one workspace to the left"
+msgstr "Akna tõstmine vasakpoolsele tööalale"
+
+msgid "Move window one workspace to the right"
+msgstr "Akna tõstmine parempoolsele tööalale"
+
+msgid "Move window one workspace up"
+msgstr "Akna tõstmine ülemisele tööalale"
+
+msgid "Move window one workspace down"
+msgstr "Akna tõstmine alumisele tööalale"
+
+msgid "Switch applications"
+msgstr "Rakenduste vahetamine"
+
+msgid "Switch windows"
+msgstr "Akende vahetamine"
+
+msgid "Switch windows of an application"
+msgstr "Rakenduse akende vahetamine"
+
+msgid "Switch system controls"
+msgstr "Süsteemi juhtalade vahetamine"
+
+msgid "Switch windows directly"
+msgstr "Akende kohene vahetamine"
+
+msgid "Switch windows of an app directly"
+msgstr "Rakenduse akende kohene vahetamine"
+
+msgid "Switch system controls directly"
+msgstr "Süsteemi juhtalade kohene vahetamine"
+
+msgid "Hide all normal windows"
+msgstr "Kõigi tavaliste akende peitmine"
 
 msgid "Switch to workspace 1"
-msgstr "Lülitumine 1. tööalale"
+msgstr "1. tööalale liikumine"
 
 msgid "Switch to workspace 2"
-msgstr "Lülitumine 2. tööalale"
+msgstr "2. tööalale liikumine"
 
 msgid "Switch to workspace 3"
-msgstr "Lülitumine 3. tööalale"
+msgstr "3. tööalale liikumine"
 
 msgid "Switch to workspace 4"
-msgstr "Lülitumine 4. tööalale"
+msgstr "4. tööalale liikumine"
 
-msgid "Switch to workspace 5"
+msgid "Move to workspace left"
-msgstr "Lülitumine 5. tööalale"
+msgstr "Vasakpoolsele tööalale liikumine"
 
-msgid "Switch to workspace 6"
+msgid "Move to workspace right"
-msgstr "Lülitumine 6. tööalale"
+msgstr "Parempoolsele tööalale liikumine"
 
-msgid "Switch to workspace 7"
+msgid "Move to workspace above"
-msgstr "Lülitumine 7. tööalale"
+msgstr "Ülemisele tööalale liikumine"
 
-msgid "Switch to workspace 8"
+msgid "Move to workspace below"
-msgstr "Lülitumine 8. tööalale"
+msgstr "Alumisele tööalale liikumine"
 
-msgid "Switch to workspace 9"
+msgid "System"
-msgstr "Lülitumine 9. tööalale"
+msgstr "Süsteem"
 
-msgid "Switch to workspace 10"
+msgid "Show the run command prompt"
-msgstr "Lülitumine 10. tööalale"
+msgstr "Käsuviiba kuvamine"
 
-msgid "Switch to workspace 11"
+msgid "Show the activities overview"
-msgstr "Lülitumine 11. tööalale"
+msgstr "Tegevuste ülevaate avamine"
 
-msgid "Switch to workspace 12"
+msgid "Windows"
-msgstr "Lülitumine 12. tööalale"
+msgstr "Aknad"
-
-msgid "Switch to workspace on the left of the current workspace"
-msgstr "Lülitumine sellest tööalast vasakul olevale tööalale"
-
-msgid "Switch to workspace on the right of the current workspace"
-msgstr "Lülitumine sellest tööalast paremal olevale tööalale"
-
-msgid "Switch to workspace above the current workspace"
-msgstr "Lülitumine selle tööala kohal olevale tööalale"
-
-msgid "Switch to workspace below the current workspace"
-msgstr "Lülitumine selle tööala all olevale tööalale"
-
-msgid "Move between windows of an application, using a popup window"
-msgstr "Liigu rakenduse akende vahel, hüpikaknaga"
-
-msgid "Move backward between windows of an application, using a popup window"
-msgstr "Liigu rakenduse akende vahel tagasisuunas, hüpikaknaga"
-
-msgid "Move between windows, using a popup window"
-msgstr "Liigu akende vahel, hüpikaknaga"
-
-msgid "Move backward between windows, using a popup window"
-msgstr "Liigu akende vahel tagasisuunas, hüpikaknaga"
-
-msgid "Move between panels and the desktop, using a popup window"
-msgstr "Liigu paneelide ja töölaua vahel, hüpikaknaga"
-
-msgid "Move backward between panels and the desktop, using a popup window"
-msgstr "Liigu tagasisuunas paneelide ja töölaua vahel, hüpikaknaga"
-
-msgid "Move between windows of an application immediately"
-msgstr "Liigu koheselt rakenduse akende vahel"
-
-msgid "Move backward between windows of an application immediately"
-msgstr "Liigu koheselt rakenduse akende vahel tagasisuunas"
-
-msgid "Move between windows immediately"
-msgstr "Liigu koheselt akende vahel"
-
-msgid "Move backward between windows immediately"
-msgstr "Liigu koheselt akende vahel tagasisuunas"
-
-msgid "Move between panels and the desktop immediately"
-msgstr "Liigu koheselt paneeli ja töölaua vahel"
-
-msgid "Move backward between panels and the desktop immediately"
-msgstr "Liigu koheselt tagasisuunas paneelide ja töölaua vahel"
-
-msgid "Hide all normal windows and set focus to the desktop"
-msgstr "Peida kõik tavalised aknad ja fokuseeri töölaud"
-
-msgid "Show the panel's main menu"
-msgstr "Paneeli peamenüü näitamine"
-
-msgid "Show the panel's \"Run Application\" dialog box"
-msgstr "Paneeli dialoogi \"Käivita rakendus\" näitamine"
-
-msgid "Start or stop recording the session"
-msgstr "Seansi salvestamise käivitamine või seiskamine"
-
-msgid "Take a screenshot"
-msgstr "Kuvatõmmise võtmine"
-
-msgid "Take a screenshot of a window"
-msgstr "Kuvatõmmise võtmine aknast"
-
-msgid "Run a terminal"
-msgstr "Terminali käivitamine"
 
 msgid "Activate the window menu"
-msgstr "Aknamenüü aktiveerimine"
+msgstr "Aknamenüü avamine"
 
 msgid "Toggle fullscreen mode"
-msgstr "Täisekraanivaate sisse- ja väljalülitamine"
+msgstr "Täisekraanoleku vahetamine"
 
 msgid "Toggle maximization state"
-msgstr "Maksimeeritud oleku sisse- ja väljalülitamine"
+msgstr "Maksimeeritud oleku vahetamine"
-
-msgid "Toggle whether a window will always be visible over other windows"
-msgstr "Lüliti määrab, kas aken on alati teiste akende kohal nähtav"
 
 msgid "Maximize window"
 msgstr "Akna maksimeerimine"
 
 msgid "Restore window"
-msgstr "Taasta akna suurus"
+msgstr "Akna taastamine"
 
 msgid "Toggle shaded state"
-msgstr "Varjatud oleku lüliti"
+msgstr "Varjatud oleku vahetamine"
-
-msgid "Minimize window"
-msgstr "Akna minimeerimine"
 
 msgid "Close window"
 msgstr "Akna sulgemine"
 
+msgid "Hide window"
+msgstr "Peida aken"
+
 msgid "Move window"
-msgstr "Teisalda aken"
+msgstr "Akna liigutamine"
 
 msgid "Resize window"
-msgstr "Muuda akna suurust"
+msgstr "Akna suuruse muutmine"
 
-msgid "Toggle whether window is on all workspaces or just one"
+msgid "Toggle window on all workspaces or one"
-msgstr "Lüliti määrab, kas aken on kõigil tööaladel või ainult ühel"
+msgstr "Akna kõigil või ühel tööalal olemise vahetamine"
 
-msgid "Move window to workspace 1"
+msgid "Raise window if covered, otherwise lower it"
-msgstr "Akna tõstmine 1. tööalale"
+msgstr "Akna tõstmine, kui see on kaetud, muul juhul langetamine"
-
-msgid "Move window to workspace 2"
-msgstr "Akna tõstmine 2. tööalale"
-
-msgid "Move window to workspace 3"
-msgstr "Akna tõstmine 3. tööalale"
-
-msgid "Move window to workspace 4"
-msgstr "Akna tõstmine 4. tööalale"
-
-msgid "Move window to workspace 5"
-msgstr "Akna tõstmine 5. tööalale"
-
-msgid "Move window to workspace 6"
-msgstr "Akna tõstmine 6. tööalale"
-
-msgid "Move window to workspace 7"
-msgstr "Akna tõstmine 7. tööalale"
-
-msgid "Move window to workspace 8"
-msgstr "Akna tõstmine 8. tööalale"
-
-msgid "Move window to workspace 9"
-msgstr "Akna tõstmine 9. tööalale"
-
-msgid "Move window to workspace 10"
-msgstr "Akna tõstmine 10. tööalale"
-
-msgid "Move window to workspace 11"
-msgstr "Akna tõstmine 11. tööalale"
-
-msgid "Move window to workspace 12"
-msgstr "Akna tõstmine 12. tööalale"
-
-msgid "Move window one workspace to the left"
-msgstr "Akna tõstmine ühe tööala võrra vasakule"
-
-msgid "Move window one workspace to the right"
-msgstr "Akna tõstmine ühe tööala võrra paremale"
-
-msgid "Move window one workspace up"
-msgstr "Akna tõstmine ühe tööala võrra ülespoole"
-
-msgid "Move window one workspace down"
-msgstr "Akna tõstmine ühe tööala võrra allapoole"
-
-msgid "Raise window if it's covered by another window, otherwise lower it"
-msgstr "Tõsta aken, kui seda katab teine aken, muul juhul vii tahapoole"
 
 msgid "Raise window above other windows"
-msgstr "Akna tõstmine teiste akende kohale"
+msgstr "Akna tõstmine teiste kohale"
 
 msgid "Lower window below other windows"
-msgstr "Saada aken teiste taha"
+msgstr "Akna langetamine teiste taha"
 
 msgid "Maximize window vertically"
-msgstr "Maksimeeri aken vertikaalselt"
+msgstr "Akna vertikaalne maksimeerimine"
 
 msgid "Maximize window horizontally"
-msgstr "Maksimeeri aken horisontaalselt"
+msgstr "Akna horisontaalne maksimeerimine"
 
-msgid "Move window to north-west (top left) corner"
+msgid "View split on left"
-msgstr "Akna tõstmine ekraani loodepoolsesse (ülemisse vasakusse) nurka"
+msgstr "Vaade poolitatakse vasakult"
 
-msgid "Move window to north-east (top right) corner"
+msgid "View split on right"
-msgstr "Akna tõstmine ekraani kirdepoolsesse (ülemisse paremasse) nurka"
+msgstr "Vaade poolitatakse paremalt"
 
-msgid "Move window to south-west (bottom left) corner"
+#. This probably means that a non-WM compositor like xcompmgr is running;
-msgstr "Akna tõstmine ekraani edelapoolsesse (alumisse vasakusse) nurka"
+#. * we have no way to get it to exit
+#, c-format
+msgid ""
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr "Teine komposiithaldur juba töötab ekraani %i kuval \"%s\"."
 
-msgid "Move window to south-east (bottom right) corner"
+msgid "background texture could not be created from file"
-msgstr "Akna tõstmine ekraani kagupoolsesse (alumisse paremasse) nurka"
+msgstr "failist polnud võimalik taustatekstuuri luua"
-
-msgid "Move window to north (top) side of screen"
-msgstr "Akna tõstmine ekraani põhjapoolsesse (ülemisse) serva"
-
-msgid "Move window to south (bottom) side of screen"
-msgstr "Akna tõstmine ekraani lõunapoolsesse (alumisse) serva"
-
-msgid "Move window to east (right) side of screen"
-msgstr "Akna tõstmine ekraani idapoolsesse (paremasse) serva"
-
-msgid "Move window to west (left) side of screen"
-msgstr "Akna tõstmine ekraani läänepoolsesse (vasakusse) serva"
-
-msgid "Move window to center of screen"
-msgstr "Akna tõstmine ekraani keskele"
 
 msgid "Bell event"
 msgstr "Helina sündmus"
@@ -262,10 +184,12 @@ msgstr "Helina sündmus"
 msgid "Unknown window information request: %d"
 msgstr "Tundmatu aknateabe päring: %d"
 
-#. Translators: %s is a window title
 #, c-format
-msgid "<tt>%s</tt> is not responding."
+msgid "“%s” is not responding."
-msgstr "<tt>%s</tt> ei vasta."
+msgstr "„%s” ei vasta."
+
+msgid "Application is not responding."
+msgstr "Rakendus ei vasta."
 
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
@@ -294,26 +218,9 @@ msgstr ""
 "Mõni teine programm juba kasutab klahvi %s koos muuteklahvidega %x "
 "kiirklahvina\n"
 
-#. Displayed when a keybinding which is
-#. * supposed to launch a program fails.
-#.
 #, c-format
-msgid ""
+msgid "\"%s\" is not a valid accelerator\n"
-"There was an error running <tt>%s</tt>:\n"
+msgstr "\"%s\" pole sobiv kiirklahv\n"
-"\n"
-"%s"
-msgstr ""
-"<tt>%s</tt> käivitamisel esines viga:\n"
-"\n"
-"%s"
-
-#, c-format
-msgid "No command %d has been defined.\n"
-msgstr "Käsku %d pole defineeritud.\n"
-
-#, c-format
-msgid "No terminal command has been defined.\n"
-msgstr "Terminalikäsku pole defineeritud.\n"
 
 msgid "Disable connection to session manager"
 msgstr "Seansihalduriga ühendumise keelamine"
@@ -343,6 +250,17 @@ msgid ""
 msgstr ""
 "Teemat ei leitud! Veendu, et %s on olemas ja sisaldab harilikke teemasid.\n"
 
+msgid "Built-in display"
+msgstr "Sisseehitatud kuva"
+
+#. TRANSLATORS: this is a monitor name (in case we don't know
+#. the vendor), it's Unknown followed by a size in inches,
+#. like 'Unknown 15"'
+#.
+#, c-format
+msgid "Unknown %s"
+msgstr "Tundmatu %s"
+
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -361,41 +279,8 @@ msgstr ""
 msgid "Print version"
 msgstr "Versiooni printimine"
 
-msgid "Comma-separated list of compositor plugins"
+msgid "Mutter plugin to use"
-msgstr "Komaga eraldatud nimekiri komposiitmontaaži pluginatest"
+msgstr "Millist Mutteri pluginat kasutada"
-
-#.
-#. * We found it, but it was invalid.  Complain.
-#. *
-#. * FIXME: This replicates the original behaviour, but in the future
-#. * we might consider reverting invalid keys to their original values.
-#. * (We know the old value, so we can look up a suitable string in
-#. * the symtab.)
-#. *
-#. * (Empty comment follows so the translators don't see this.)
-#.
-#.
-#, c-format
-msgid "GConf key '%s' is set to an invalid value\n"
-msgstr "GConf võtme '%s' väärtus on vigane\n"
-
-#, c-format
-msgid "%d stored in GConf key %s is out of range %d to %d\n"
-msgstr ""
-"%d, mis on salvestatud GConf võtmes %s, on väljaspool piirkonda %d - %d\n"
-
-#, c-format
-msgid "GConf key \"%s\" is set to an invalid type\n"
-msgstr "GConf-i võti \"%s\" on määratud vigase tüübiga\n"
-
-#, c-format
-msgid "GConf key %s is already in use and can't be used to override %s\n"
-msgstr ""
-"GConfi võti %s on juba kasutusel ja sellega ei saa tühistada võtit %s\n"
-
-#, c-format
-msgid "Can't override GConf key, %s not found\n"
-msgstr "GConfi võtit pole võimalik tühistada, võtit %s ei leitud\n"
 
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
@@ -405,8 +290,8 @@ msgstr ""
 "ei pruugi õigesti käituda.\n"
 
 #, c-format
-msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgid "Could not parse font description \"%s\" from GSettings key %s\n"
-msgstr "Fondi kirjeldust \"%s\" GConf võtmest %s ei saa töödelda\n"
+msgstr "Fondi kirjeldust \"%s\" GSettings võtmest %s pole võimalik töödelda\n"
 
 #, c-format
 msgid ""
@@ -416,14 +301,6 @@ msgstr ""
 "Seadistuste andmebaasist leitud \"%s\" ei ole sobiv väärtus hiireklahvi "
 "modifikaatoriks\n"
 
-#, c-format
-msgid "Error setting number of workspaces to %d: %s\n"
-msgstr "Viga tööalade arvuks %d määramisel: %s\n"
-
-#, c-format
-msgid "Workspace %d"
-msgstr "Tööala %d"
-
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -433,16 +310,8 @@ msgstr ""
 "\"\n"
 
 #, c-format
-msgid "Error setting name for workspace %d to \"%s\": %s\n"
+msgid "Workspace %d"
-msgstr "Viga tööalale %d nime \"%s\" määramisel: %s\n"
+msgstr "Tööala %d"
-
-#, c-format
-msgid "Error setting live hidden windows status status: %s\n"
-msgstr "Viga varjus elushoitavate akende oleku määramisel: %s\n"
-
-#, c-format
-msgid "Error setting no tab popup status: %s\n"
-msgstr ""
 
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
@@ -524,7 +393,6 @@ msgstr "Tõrge logifaili %s avamisel funktsiooniga fdopen(): %s\n"
 msgid "Opened log file %s\n"
 msgstr "Avati logifail %s\n"
 
-#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter kompileeriti ilma jutuka režiimi toeta\n"
 
@@ -540,10 +408,6 @@ msgstr "Aknahalduri hoiatus: "
 msgid "Window manager error: "
 msgstr "Aknahalduri viga: "
 
-#. Translators: This is the title used on dialog boxes
-msgid "Mutter"
-msgstr "Mutter"
-
 #. first time through
 #, c-format
 msgid ""
@@ -581,6 +445,12 @@ msgstr "%s (masinas %s)"
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Vigane WM_TRANSIENT_FOR aknale 0x%lx määratud %s jaoks.\n"
 
+#, c-format
+msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
+msgstr ""
+"WM_TRANSIENT_FOR aknale 0x%lx määratud %s jaoks tekitaks tsüklilise "
+"korduse.\n"
+
 #, c-format
 msgid ""
 "Window 0x%lx has property %s\n"
@@ -604,18 +474,8 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr "Omadus %s aknal 0x%lx sisaldab vigast UTF-8 %d kirjele nimekirjas\n"
 
-msgid "Attach modal dialogs"
+msgid "Mutter"
-msgstr "Modaaldialoogide kinnistamine"
+msgstr "Mutter"
-
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"Määrab, kas varjatud aknaid (nt minimeeritud ja teistel tööaladel aknad) "
-"hoitakse elus."
-
-msgid "Live Hidden Windows"
-msgstr "Varjatud akende aktiivsus"
 
 msgid "Modifier to use for extended window management operations"
 msgstr "Laiendatud aknaoperatsioonide korral kasutatav muuteklahv"
@@ -632,6 +492,9 @@ msgstr ""
 "klahv\". Eeldatavasti määratakse selle seose väärtuseks vaikimisi või tühi "
 "sõne."
 
+msgid "Attach modal dialogs"
+msgstr "Modaaldialoogide kinnistamine"
+
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -640,42 +503,85 @@ msgstr ""
 "Kui märgitud, siis eraldi tiitliribade asemel on moodaalsed dialoogid "
 "emaakna tiitliribade küljes ning liiguvad koos emaaknaga."
 
-#, c-format
+msgid "Enable edge tiling when dropping windows on screen edges"
-msgid "Usage: %s\n"
+msgstr "Akna ümberpaigutamine selle lohistamisel ekraani serva"
-msgstr "Kasutamine: %s\n"
 
-msgid "Close Window"
+msgid ""
-msgstr "Sulge aken"
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+"Kui märgitud, siis akna lohistamine ekraani külgservale maksimeerib selle "
+"vertikaalselt ja laius katab pool saadaolevast laiusest. Akna lohistamine "
+"ekraani ülaserva maksimeerib akna täielikult."
 
-msgid "Window Menu"
+msgid "Workspaces are managed dynamically"
-msgstr "Aknamenüü"
+msgstr "Tööalade dünaamiline haldus"
 
-msgid "Minimize Window"
+msgid ""
-msgstr "Akna minimeerimine"
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Määrab, kas tööalasid hallatakse dünaamiliselt või on nende arv staatiline "
+"(arvu määrab org.gnome.desktop.wm.preferences all võti num-workspaces)."
 
-msgid "Maximize Window"
+msgid "Workspaces only on primary"
-msgstr "Akna maksimeerimine"
+msgstr "Tööalad ainult peamisel"
 
-msgid "Restore Window"
+msgid ""
-msgstr "Akna taastamine"
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Määrab, kas tööalade vahetamine mõjutab kõiki aknaid kõigil monitoridel või "
+"ainult aknaid peamisel monitoril."
 
-msgid "Roll Up Window"
+msgid "No tab popup"
-msgstr "Akna kokkukerimine"
+msgstr "Tabulaatoril pole hüpikakent"
 
-msgid "Unroll Window"
+msgid ""
-msgstr "Akna lahtikerimine"
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"Kui märgitud, siis on hüpikaken ja esiletõstmise raam keelatud akende "
+"vahetamisel."
 
-msgid "Keep Window On Top"
+msgid "Delay focus changes until the pointer stops moving"
-msgstr "Akna kõige pealmiseks määramine"
+msgstr "Fookusemuutused lükatakse edasi kuni kursor peatub"
 
-msgid "Remove Window From Top"
+msgid ""
-msgstr "Eemalda aken kõige pealmise kohalt"
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
+msgstr ""
+"Kui tõene ning fookusrežiim on kas \"sloppy\" või \"mouse\", siis fookust ei "
+"vahetata kohe, kui kursor aknale liigub, vaid alles pärast kursori peatumist."
 
-msgid "Always On Visible Workspace"
+msgid "Draggable border width"
-msgstr "Alati nähtaval tööalal"
+msgstr "Lohistatava äärise laius."
 
-msgid "Put Window On Only One Workspace"
+msgid ""
-msgstr "Tõsta aken ainult ühele tööalale"
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+"Lohistatava äärise laius. Kui kujunduse nähtavatest ääristest ei piisa, "
+"lisatakse puuduoleva osa jaoks nähtamatu ääris."
+
+msgid "Auto maximize nearly monitor sized windows"
+msgstr "Peaaegu monitori suurused ekraanid maksimeeritakse automaatselt"
+
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+"Kui lubatud, maksimeeritakse automaatselt aknad, mis on avanedes monitori "
+"suurused."
+
+msgid "Select window from tab popup"
+msgstr "Akna valimine tabulaatori hüpikaknalt"
+
+msgid "Cancel tab popup"
+msgstr "Tabulaatori hüpikakna katkestamine"
 
 #. Translators: Translate this string the same way as you do in libwnck!
 msgid "Mi_nimize"
@@ -877,6 +783,30 @@ msgstr "Raami geomeetria ei määra nuppude suurust"
 msgid "Gradients should have at least two colors"
 msgstr "Värviüleminekus peaks olema vähemalt kaks värvi"
 
+#, c-format
+msgid ""
+"GTK custom color specification must have color name and fallback in "
+"parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
+msgstr ""
+"GTK kohandatud värvi määrang peab sisaldama sulgudes värvi nimetust ning "
+"varuvärvi, nt gtk:custom(foo,bar); väärtust \"%s\" pole võimalik töödelda"
+
+#, c-format
+msgid ""
+"Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
+"_ are valid"
+msgstr ""
+"gtk:custom color_name parameetris sobimatu märk '%c', lubatud on ainult A-Za-"
+"z0-9-_"
+
+#, c-format
+msgid ""
+"Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
+"fit the format"
+msgstr ""
+"Gtk:custom vorming on \"gtk:custom(värvi_nimi,varuvärv)\", \"%s\" ei sobi "
+"selle vorminguga"
+
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1358,178 +1288,151 @@ msgstr "Selle teema jaoks on <%s> määratud kaks korda"
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Tõrge %s teema jaoks korrektse faili leidmisel\n"
 
-msgid "_Windows"
+#~ msgid "Usage: %s\n"
-msgstr "_Aknad"
+#~ msgstr "Kasutamine: %s\n"
 
-msgid "_Dialog"
+#~ msgid "_Windows"
-msgstr "_Dialoog"
+#~ msgstr "_Aknad"
 
-msgid "_Modal dialog"
+#~ msgid "_Dialog"
-msgstr "_Modaaldialoog"
+#~ msgstr "_Dialoog"
 
-msgid "_Utility"
+#~ msgid "_Modal dialog"
-msgstr "_Utiliit"
+#~ msgstr "_Modaaldialoog"
 
-msgid "_Splashscreen"
+#~ msgid "_Utility"
-msgstr "_Käivitusekraan"
+#~ msgstr "_Utiliit"
 
-msgid "_Top dock"
+#~ msgid "_Splashscreen"
-msgstr "Ü_lemine dokk"
+#~ msgstr "_Käivitusekraan"
 
-msgid "_Bottom dock"
+#~ msgid "_Top dock"
-msgstr "_Alumine dokk"
+#~ msgstr "Ü_lemine dokk"
 
-msgid "_Left dock"
+#~ msgid "_Bottom dock"
-msgstr "_Vasak dokk"
+#~ msgstr "_Alumine dokk"
 
-msgid "_Right dock"
+#~ msgid "_Left dock"
-msgstr "_Parem dokk"
+#~ msgstr "_Vasak dokk"
 
-msgid "_All docks"
+#~ msgid "_Right dock"
-msgstr "_Kõik dokid"
+#~ msgstr "_Parem dokk"
 
-msgid "Des_ktop"
+#~ msgid "_All docks"
-msgstr "_Töölaud"
+#~ msgstr "_Kõik dokid"
 
-msgid "Open another one of these windows"
+#~ msgid "Des_ktop"
-msgstr "Ava neist akendest järgmine"
+#~ msgstr "_Töölaud"
 
-msgid "This is a demo button with an 'open' icon"
+#~ msgid "Open another one of these windows"
-msgstr "See on näidisnupp koos 'ava' ikooniga"
+#~ msgstr "Ava neist akendest järgmine"
 
-msgid "This is a demo button with a 'quit' icon"
+#~ msgid "This is a demo button with an 'open' icon"
-msgstr "See on näidisnupp koos 'lõpeta' ikooniga"
+#~ msgstr "See on näidisnupp koos 'ava' ikooniga"
 
-msgid "This is a sample message in a sample dialog"
+#~ msgid "This is a demo button with a 'quit' icon"
-msgstr "See on näidisteade näidisdialoogis"
+#~ msgstr "See on näidisnupp koos 'lõpeta' ikooniga"
 
-#, c-format
+#~ msgid "This is a sample message in a sample dialog"
-msgid "Fake menu item %d\n"
+#~ msgstr "See on näidisteade näidisdialoogis"
-msgstr "Võltsitud menüüpunkt %d\n"
 
-msgid "Border-only window"
+#~ msgid "Fake menu item %d\n"
-msgstr "Ainult raamiga aken"
+#~ msgstr "Võltsitud menüüpunkt %d\n"
 
-msgid "Bar"
+#~ msgid "Border-only window"
-msgstr "Riba"
+#~ msgstr "Ainult raamiga aken"
 
-msgid "Normal Application Window"
+#~ msgid "Bar"
-msgstr "Tavaline rakenduseaken"
+#~ msgstr "Riba"
 
-msgid "Dialog Box"
+#~ msgid "Normal Application Window"
-msgstr "Dialoogikast"
+#~ msgstr "Tavaline rakenduseaken"
 
-msgid "Modal Dialog Box"
+#~ msgid "Dialog Box"
-msgstr "Modaalne dialoogikast"
+#~ msgstr "Dialoogikast"
 
-msgid "Utility Palette"
+#~ msgid "Modal Dialog Box"
-msgstr "Rakendite palett"
+#~ msgstr "Modaalne dialoogikast"
 
-msgid "Torn-off Menu"
+#~ msgid "Utility Palette"
-msgstr "Ärarebitav menüü"
+#~ msgstr "Rakendite palett"
 
-msgid "Border"
+#~ msgid "Torn-off Menu"
-msgstr "Raam"
+#~ msgstr "Ärarebitav menüü"
 
-msgid "Attached Modal Dialog"
+#~ msgid "Border"
-msgstr "Kinnistatud modaaldialoog"
+#~ msgstr "Raam"
 
-#, c-format
+#~ msgid "Attached Modal Dialog"
-msgid "Button layout test %d"
+#~ msgstr "Kinnistatud modaaldialoog"
-msgstr "Nuppude paigutuse test %d"
 
-#, c-format
+#~ msgid "Button layout test %d"
-msgid "%g milliseconds to draw one window frame"
+#~ msgstr "Nuppude paigutuse test %d"
-msgstr "%g millisekundit kulub ühe akna raami joonistamiseks"
 
-#, c-format
+#~ msgid "%g milliseconds to draw one window frame"
-msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+#~ msgstr "%g millisekundit kulub ühe akna raami joonistamiseks"
-msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n"
 
-#, c-format
+#~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
-msgid "Error loading theme: %s\n"
+#~ msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n"
-msgstr "Viga teema laadimisel: %s\n"
 
-#, c-format
+#~ msgid "Error loading theme: %s\n"
-msgid "Loaded theme \"%s\" in %g seconds\n"
+#~ msgstr "Viga teema laadimisel: %s\n"
-msgstr "Teema \"%s\" laaditi %g sekundiga\n"
 
-msgid "Normal Title Font"
+#~ msgid "Loaded theme \"%s\" in %g seconds\n"
-msgstr "Tiitli tavasuurusega kirjatüüp"
+#~ msgstr "Teema \"%s\" laaditi %g sekundiga\n"
 
-msgid "Small Title Font"
+#~ msgid "Normal Title Font"
-msgstr "Tiitli väike kirjatüüp"
+#~ msgstr "Tiitli tavasuurusega kirjatüüp"
 
-msgid "Large Title Font"
+#~ msgid "Small Title Font"
-msgstr "Tiitli suur kirjatüüp"
+#~ msgstr "Tiitli väike kirjatüüp"
 
-msgid "Button Layouts"
+#~ msgid "Large Title Font"
-msgstr "Nuppude paigutus"
+#~ msgstr "Tiitli suur kirjatüüp"
 
-msgid "Benchmark"
+#~ msgid "Button Layouts"
-msgstr "Jõudlus"
+#~ msgstr "Nuppude paigutus"
 
-msgid "Window Title Goes Here"
+#~ msgid "Benchmark"
-msgstr "Siia tuleb akna pealkiri"
+#~ msgstr "Jõudlus"
 
-#, c-format
+#~ msgid "Window Title Goes Here"
-msgid ""
+#~ msgstr "Siia tuleb akna pealkiri"
-"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
-"seconds wall clock time including X server resources (%g milliseconds per "
-"frame)\n"
-msgstr ""
-"Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit kaadrile) "
-"ja %g sekundiga seinakella järgi, millesse on kaasatud X-serveri "
-"ressursikasutus (%g millisekundit kaadrile)\n"
-
-msgid "position expression test returned TRUE but set error"
-msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea"
-
-msgid "position expression test returned FALSE but didn't set error"
-msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga"
-
-msgid "Error was expected but none given"
-msgstr "Oodati viga, aga ühtegi ei edastatud"
-
-#, c-format
-msgid "Error %d was expected but %d given"
-msgstr "Oodati viga %d, aga edastati viga %d"
-
-#, c-format
-msgid "Error not expected but one was returned: %s"
-msgstr "Viga ei oodatud, aga üks edastati: %s"
-
-#, c-format
-msgid "x value was %d, %d was expected"
-msgstr "x väärtus oli %d, oodati väärtust %d"
-
-#, c-format
-msgid "y value was %d, %d was expected"
-msgstr "y väärtus oli %d, oodati väärtust %d"
-
-#, c-format
-msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr ""
-"%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n"
 
 #~ msgid ""
-#~ "Don't make fullscreen windows that are maximized and have no decorations"
+#~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and "
-#~ msgstr "Ei tehta maksimeeritud ilma raamita täisekraanaknaid."
+#~ "%g seconds wall clock time including X server resources (%g milliseconds "
+#~ "per frame)\n"
+#~ msgstr ""
+#~ "Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit "
+#~ "kaadrile) ja %g sekundiga seinakella järgi, millesse on kaasatud X-"
+#~ "serveri ressursikasutus (%g millisekundit kaadrile)\n"
 
-#~ msgid "Whether window popup/frame should be shown when cycling windows."
+#~ msgid "position expression test returned TRUE but set error"
-#~ msgstr "Kas hüpikakent/raami näidatakse akende vahetamisel."
+#~ msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea"
 
-#~ msgid "Internal argument for GObject introspection"
+#~ msgid "position expression test returned FALSE but didn't set error"
-#~ msgstr "GObject enesevaatluse siseargument"
+#~ msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga"
 
-#~ msgid "Failed to restart: %s\n"
+#~ msgid "Error was expected but none given"
-#~ msgstr "Tõrge taaskäivitamisel: %s\n"
+#~ msgstr "Oodati viga, aga ühtegi ei edastatud"
 
-#~ msgid "Error setting clutter plugin list: %s\n"
+#~ msgid "Error %d was expected but %d given"
-#~ msgstr "Viga clutteri pluginate nimekirja määramisel: %s\n"
+#~ msgstr "Oodati viga %d, aga edastati viga %d"
 
-#~ msgid "Clutter Plugins"
+#~ msgid "Error not expected but one was returned: %s"
-#~ msgstr "Clutteri pluginad"
+#~ msgstr "Viga ei oodatud, aga üks edastati: %s"
 
-#~ msgid "Plugins to load for the Clutter-based compositing manager."
+#~ msgid "x value was %d, %d was expected"
-#~ msgstr "Clutteril põhineva komposiitmontaažihalduri laadimise pluginad."
+#~ msgstr "x väärtus oli %d, oodati väärtust %d"
+
+#~ msgid "y value was %d, %d was expected"
+#~ msgstr "y väärtus oli %d, oodati väärtust %d"
+
+#~ msgid ""
+#~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+#~ msgstr ""
+#~ "%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n"
+
+#~ msgid "Minimize window"
+#~ msgstr "Akna minimeerimine"

po/ro.po

@@ -1944,6 +1944,33 @@ msgstr ""
 "Expresiile pentru coordonate %d parsate în %g secunde (o medie de %g "
 "secunde)\n"
 
+#: ../src/50-mutter-launchers.xml.in.h:1
+#, fuzzy
+msgid "Launchers"
+msgstr "Lansatori"
+
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Navigation"
+msgstr "Navigare"
+
+#: ../src/50-mutter-screenshot.xml.in.h:1
+#, fuzzy
+#| msgid "Take a screenshot"
+msgid "Screenshots"
+msgstr "Capturi de ecran"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "System"
+msgstr "Sistem"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+#, fuzzy
+#| msgid "/_Windows"
+msgid "Windows"
+msgstr "Ferestre"
+
 #~ msgid "Window Management"
 #~ msgstr "Administrare ferestre"
 

protocol/Makefile.am

@@ -0,0 +1,7 @@
+NULL =
+
+EXTRA_DIST = \
+	gtk-shell.xml \
+	xdg-shell.xml \
+	xserver.xml \
+	$(NULL)

protocol/gtk-shell.xml

@@ -0,0 +1,30 @@
+<protocol name="gtk">
+
+  <interface name="gtk_shell" version="1">
+    <enum name="capability">
+      <entry name="global_app_menu" value="1"/>
+      <entry name="global_menu_bar" value="2"/>
+    </enum>
+
+    <event name="capabilities">
+      <arg name="capabilities" type="uint"/>
+    </event>
+
+    <request name="get_gtk_surface">
+      <arg name="gtk_surface" type="new_id" interface="gtk_surface"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
+  </interface>
+
+  <interface name="gtk_surface" version="1">
+    <request name="set_dbus_properties">
+      <arg name="application_id" type="string" allow-null="true"/>
+      <arg name="app_menu_path" type="string" allow-null="true"/>
+      <arg name="menubar_path" type="string" allow-null="true"/>
+      <arg name="window_object_path" type="string" allow-null="true"/>
+      <arg name="application_object_path" type="string" allow-null="true"/>
+      <arg name="unique_bus_name" type="string" allow-null="true"/>
+    </request>
+  </interface>
+
+</protocol>

protocol/xdg-shell.xml

@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="xdg_shell">
+
+  <copyright>
+    Copyright © 2008-2013 Kristian Høgsberg
+    Copyright © 2013      Rafael Antognolli
+    Copyright © 2013      Jasper St. Pierre
+    Copyright © 2010-2013 Intel Corporation
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <interface name="xdg_shell" version="1">
+    <description summary="create desktop-style surfaces">
+      This interface is implemented by servers that provide
+      desktop-style user interfaces.
+
+      It allows clients to associate a xdg_surface with
+      a basic surface.
+    </description>
+
+    <enum name="version">
+      <description summary="latest protocol version">
+	Use this enum to check the protocol version, and it will be updated
+	automatically.
+      </description>
+      <entry name="current" value="1" summary="Always the latest version"/>
+    </enum>
+
+
+    <request name="use_unstable_version">
+      <description summary="enable use of this unstable version">
+	Use this request in order to enable use of this interface.
+
+	Understand and agree that one is using an unstable interface,
+	that will likely change in the future, breaking the API.
+      </description>
+      <arg name="version" type="int"/>
+    </request>
+
+    <request name="get_xdg_surface">
+      <description summary="create a shell surface from a surface">
+	Create a shell surface for an existing surface.
+
+	Only one shell or popup surface can be associated with a given
+	surface.
+      </description>
+      <arg name="id" type="new_id" interface="xdg_surface"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
+
+    <request name="get_xdg_popup">
+      <description summary="create a shell surface from a surface">
+	Create a popup surface for an existing surface.
+
+	Only one shell or popup surface can be associated with a given
+	surface.
+      </description>
+      <arg name="id" type="new_id" interface="xdg_popup"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="parent" type="object" interface="wl_surface"/>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/>
+      <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+      <arg name="flags" type="uint"/>
+    </request>
+  </interface>
+
+  <interface name="xdg_surface" version="1">
+
+    <description summary="desktop-style metadata interface">
+      An interface that may be implemented by a wl_surface, for
+      implementations that provide a desktop-style user interface.
+
+      It provides requests to treat surfaces like windows, allowing to set
+      properties like maximized, fullscreen, minimized, and to move and resize
+      them, and associate metadata like title and app id.
+
+      On the server side the object is automatically destroyed when
+      the related wl_surface is destroyed.  On client side,
+      xdg_surface.destroy() must be called before destroying
+      the wl_surface object.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="remove xdg_surface interface">
+	The xdg_surface interface is removed from the wl_surface object
+	that was turned into a xdg_surface with
+	xdg_shell.get_xdg_surface request. The xdg_surface properties,
+	like maximized and fullscreen, are lost. The wl_surface loses
+	its role as a xdg_surface. The wl_surface is unmapped.
+      </description>
+    </request>
+
+    <request name="set_transient_for">
+      <description summary="surface is a child of another surface">
+	Setting a surface as transient of another means that it is child
+	of another surface.
+
+	Child surfaces are stacked above their parents, and will be
+	unmapped if the parent is unmapped too. They should not appear
+	on task bars and alt+tab.
+      </description>
+      <arg name="parent" type="object" interface="wl_surface" allow-null="true"/>
+    </request>
+
+    <request name="set_title">
+      <description summary="set surface title">
+	Set a short title for the surface.
+
+	This string may be used to identify the surface in a task bar,
+	window list, or other user interface elements provided by the
+	compositor.
+
+	The string must be encoded in UTF-8.
+      </description>
+      <arg name="title" type="string"/>
+    </request>
+
+    <request name="set_app_id">
+      <description summary="set surface class">
+	Set an id for the surface.
+
+	The app id identifies the general class of applications to which
+	the surface belongs.
+
+	It should be the ID that appears in the new desktop entry
+	specification, the interface name.
+      </description>
+      <arg name="app_id" type="string"/>
+    </request>
+
+    <request name="pong">
+      <description summary="respond to a ping event">
+	A client must respond to a ping event with a pong request or
+	the client may be deemed unresponsive.
+      </description>
+      <arg name="serial" type="uint" summary="serial of the ping event"/>
+    </request>
+
+    <event name="ping">
+      <description summary="ping client">
+	Ping a client to check if it is receiving events and sending
+	requests. A client is expected to reply with a pong request.
+      </description>
+      <arg name="serial" type="uint"/>
+    </event>
+
+    <request name="move">
+      <description summary="start an interactive move">
+	Start a pointer-driven move of the surface.
+
+	This request must be used in response to a button press event.
+	The server may ignore move requests depending on the state of
+	the surface (e.g. fullscreen or maximized).
+      </description>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/>
+      <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
+    </request>
+
+    <enum name="resize_edge">
+      <description summary="edge values for resizing">
+	These values are used to indicate which edge of a surface
+	is being dragged in a resize operation. The server may
+	use this information to adapt its behavior, e.g. choose
+	an appropriate cursor image.
+      </description>
+      <entry name="none" value="0"/>
+      <entry name="top" value="1"/>
+      <entry name="bottom" value="2"/>
+      <entry name="left" value="4"/>
+      <entry name="top_left" value="5"/>
+      <entry name="bottom_left" value="6"/>
+      <entry name="right" value="8"/>
+      <entry name="top_right" value="9"/>
+      <entry name="bottom_right" value="10"/>
+    </enum>
+
+    <request name="resize">
+      <description summary="start an interactive resize">
+	Start a pointer-driven resizing of the surface.
+
+	This request must be used in response to a button press event.
+	The server may ignore resize requests depending on the state of
+	the surface (e.g. fullscreen or maximized).
+      </description>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat whose pointer is used"/>
+      <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
+      <arg name="edges" type="uint" summary="which edge or corner is being dragged"/>
+    </request>
+
+    <event name="configure">
+      <description summary="suggest resize">
+	The configure event asks the client to resize its surface.
+
+	The size is a hint, in the sense that the client is free to
+	ignore it if it doesn't resize, pick a smaller size (to
+	satisfy aspect ratio or resize in steps of NxM pixels).
+
+	The edges parameter provides a hint about how the surface
+	was resized. The client may use this information to decide
+	how to adjust its content to the new size (e.g. a scrolling
+	area might adjust its content position to leave the viewable
+	content unmoved). Valid edge values are from resize_edge enum.
+
+	The client is free to dismiss all but the last configure
+	event it received.
+
+	The width and height arguments specify the size of the window
+	in surface local coordinates.
+      </description>
+
+      <arg name="edges" type="uint"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+    </event>
+
+    <request name="set_output">
+      <description summary="set the default output used by this surface">
+	Set the default output used by this surface when it is first mapped.
+
+	If this value is NULL (default), it's up to the compositor to choose
+	which display will be used to map this surface.
+
+	When fullscreen or maximized state are set on this surface, and it
+	wasn't mapped yet, the output set with this method will be used.
+	Otherwise, the output where the surface is currently mapped will be
+	used.
+      </description>
+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
+    </request>
+
+    <event name="request_set_fullscreen">
+      <description summary="server requests that the client set fullscreen">
+	Event sent from the compositor to the client requesting that the client
+	goes to a fullscreen state. It's the client job to call set_fullscreen
+	and really trigger the fullscreen state.
+      </description>
+    </event>
+
+    <event name="request_unset_fullscreen">
+      <description summary="server requests that the client unset fullscreen">
+	Event sent from the compositor to the client requesting that the client
+	leaves the fullscreen state. It's the client job to call
+	unset_fullscreen and really leave the fullscreen state.
+      </description>
+    </event>
+
+    <request name="set_fullscreen">
+      <description summary="set the surface state as fullscreen">
+	Set the surface as fullscreen.
+
+	After this request, the compositor should send a configure event
+	informing the output size.
+
+	This request informs the compositor that the next attached buffer
+	committed will be in a fullscreen state. The buffer size should be the
+	same size as the size informed in the configure event, if the client
+	doesn't want to leave any empty area.
+
+	In other words: the next attached buffer after set_maximized is the new
+	maximized buffer. And the surface will be positioned at the maximized
+	position on commit.
+
+	A simple way to synchronize and wait for the correct configure event is
+	to use a wl_display.sync request right after the set_fullscreen
+	request. When the sync callback returns, the last configure event
+	received just before it will be the correct one, and should contain the
+	right size for the surface to maximize.
+
+	Setting one state won't unset another state. Use
+	xdg_surface.unset_fullscreen for unsetting it.
+      </description>
+    </request>
+
+    <request name="unset_fullscreen">
+      <description summary="unset the surface state as fullscreen">
+	Unset the surface fullscreen state.
+
+	Same negotiation as set_fullscreen must be used.
+      </description>
+    </request>
+
+    <event name="request_set_maximized">
+      <description summary="server requests that the client set maximized">
+	Event sent from the compositor to the client requesting that the client
+	goes to a maximized state. It's the client job to call set_maximized
+	and really trigger the maximized state.
+      </description>
+    </event>
+
+    <event name="request_unset_maximized">
+      <description summary="server requests that the client unset maximized">
+	Event sent from the compositor to the client requesting that the client
+	leaves the maximized state. It's the client job to call unset_maximized
+	and really leave the maximized state.
+      </description>
+    </event>
+
+    <request name="set_maximized">
+      <description summary="set the surface state as maximized">
+	Set the surface as maximized.
+
+	After this request, the compositor will send a configure event
+	informing the output size minus panel and other MW decorations.
+
+	This request informs the compositor that the next attached buffer
+	committed will be in a maximized state. The buffer size should be the
+	same size as the size informed in the configure event, if the client
+	doesn't want to leave any empty area.
+
+	In other words: the next attached buffer after set_maximized is the new
+	maximized buffer. And the surface will be positioned at the maximized
+	position on commit.
+
+	A simple way to synchronize and wait for the correct configure event is
+	to use a wl_display.sync request right after the set_maximized request.
+	When the sync callback returns, the last configure event received just
+	before it will be the correct one, and should contain the right size
+	for the surface to maximize.
+
+	Setting one state won't unset another state. Use
+	xdg_surface.unset_maximized for unsetting it.
+      </description>
+    </request>
+
+    <request name="unset_maximized">
+      <description summary="unset the surface state as maximized">
+	Unset the surface maximized state.
+
+	Same negotiation as set_maximized must be used.
+      </description>
+    </request>
+
+    <request name="set_minimized">
+      <description summary="set the surface state as minimized">
+	Set the surface minimized state.
+
+	Setting one state won't unset another state.
+      </description>
+    </request>
+
+    <event name="focused_set">
+      <description summary="surface was focused">
+	The focused_set event is sent when this surface has been
+	activated. Window decorations should be updated accordingly.
+      </description>
+    </event>
+
+    <event name="focused_unset">
+      <description summary="surface was unfocused">
+	The focused_unset event is sent when this surface has been
+	deactivated, because another surface has been activated. Window
+	decorations should be updated accordingly.
+      </description>
+    </event>
+  </interface>
+
+  <interface name="xdg_popup" version="1">
+    <description summary="desktop-style metadata interface">
+      An interface that may be implemented by a wl_surface, for
+      implementations that provide a desktop-style popups/menus. A popup
+      surface is a transient surface with an added pointer grab.
+
+      An existing implicit grab will be changed to owner-events mode,
+      and the popup grab will continue after the implicit grab ends
+      (i.e. releasing the mouse button does not cause the popup to be
+      unmapped).
+
+      The popup grab continues until the window is destroyed or a mouse
+      button is pressed in any other clients window. A click in any of
+      the clients surfaces is reported as normal, however, clicks in
+      other clients surfaces will be discarded and trigger the callback.
+
+      The x and y arguments specify the locations of the upper left
+      corner of the surface relative to the upper left corner of the
+      parent surface, in surface local coordinates.
+
+      xdg_popup surfaces are always transient for another surface.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="remove xdg_surface interface">
+	The xdg_surface interface is removed from the wl_surface object
+	that was turned into a xdg_surface with
+	xdg_shell.get_xdg_surface request. The xdg_surface properties,
+	like maximized and fullscreen, are lost. The wl_surface loses
+	its role as a xdg_surface. The wl_surface is unmapped.
+      </description>
+    </request>
+
+    <request name="pong">
+      <description summary="respond to a ping event">
+	A client must respond to a ping event with a pong request or
+	the client may be deemed unresponsive.
+      </description>
+      <arg name="serial" type="uint" summary="serial of the ping event"/>
+    </request>
+
+    <event name="ping">
+      <description summary="ping client">
+	Ping a client to check if it is receiving events and sending
+	requests. A client is expected to reply with a pong request.
+      </description>
+      <arg name="serial" type="uint"/>
+    </event>
+
+    <event name="popup_done">
+      <description summary="popup interaction is done">
+	The popup_done event is sent out when a popup grab is broken,
+	that is, when the users clicks a surface that doesn't belong
+	to the client owning the popup surface.
+      </description>
+      <arg name="serial" type="uint" summary="serial of the implicit grab on the pointer"/>
+    </event>
+
+  </interface>
+</protocol>

protocol/xserver.xml

@@ -0,0 +1,18 @@
+<protocol name="xserver">
+
+  <interface name="xserver" version="1">
+    <request name="set_window_id">
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="id" type="uint"/>
+    </request>
+
+    <event name="client">
+      <arg name="fd" type="fd"/>
+    </event>
+
+    <event name="listen_socket">
+      <arg name="fd" type="fd"/>
+    </event>
+  </interface>
+
+</protocol>

src/50-mutter-navigation.xml.in

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                _name="Navigation"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="move-to-workspace-1"
+	              _description="Move window to workspace 1" />
+
+	<KeyListEntry name="move-to-workspace-2"
+	              _description="Move window to workspace 2" />
+
+	<KeyListEntry name="move-to-workspace-3"
+	              _description="Move window to workspace 3" />
+
+	<KeyListEntry name="move-to-workspace-4"
+	              _description="Move window to workspace 4" />
+
+	<KeyListEntry name="move-to-workspace-left"
+	              _description="Move window one workspace to the left" />
+
+	<KeyListEntry name="move-to-workspace-right"
+	              _description="Move window one workspace to the right" />
+
+	<KeyListEntry name="move-to-workspace-up"
+	              _description="Move window one workspace up" />
+
+	<KeyListEntry name="move-to-workspace-down"
+	              _description="Move window one workspace down" />
+
+	<KeyListEntry name="switch-applications"
+	              _description="Switch applications"/>
+
+	<KeyListEntry name="switch-windows"
+	              _description="Switch windows"/>
+
+	<KeyListEntry name="switch-group"
+	              _description="Switch windows of an application"/>
+
+	<KeyListEntry name="switch-panels"
+	              _description="Switch system controls"/>
+
+	<KeyListEntry name="cycle-windows"
+	              _description="Switch windows directly"/>
+
+	<KeyListEntry name="cycle-group"
+	              _description="Switch windows of an app directly"/>
+
+	<KeyListEntry name="cycle-panels"
+	              _description="Switch system controls directly"/>
+
+	<KeyListEntry name="show-desktop"
+	              _description="Hide all normal windows"/>
+
+	<KeyListEntry name="switch-to-workspace-1"
+	              _description="Switch to workspace 1" />
+
+	<KeyListEntry name="switch-to-workspace-2"
+	              _description="Switch to workspace 2" />
+
+	<KeyListEntry name="switch-to-workspace-3"
+	              _description="Switch to workspace 3" />
+
+	<KeyListEntry name="switch-to-workspace-4"
+	              _description="Switch to workspace 4" />
+
+	<KeyListEntry name="switch-to-workspace-left"
+	              _description="Move to workspace left" />
+
+	<KeyListEntry name="switch-to-workspace-right"
+	              _description="Move to workspace right" />
+
+	<KeyListEntry name="switch-to-workspace-up"
+	              _description="Move to workspace above" />
+
+	<KeyListEntry name="switch-to-workspace-down"
+	              _description="Move to workspace below" />
+
+</KeyListEntries>

src/50-mutter-system.xml.in

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                _name="System"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
+
+	<KeyListEntry name="panel-main-menu" _description="Show the activities overview"/>
+
+</KeyListEntries>
+

src/50-mutter-windows.xml.in

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                _name="Windows"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
+
+	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
+
+	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
+
+	<KeyListEntry name="maximize" _description="Maximize window"/>
+
+	<KeyListEntry name="unmaximize" _description="Restore window"/>
+
+	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
+
+	<KeyListEntry name="close" _description="Close window"/>
+
+	<KeyListEntry name="minimize" _description="Hide window"/>
+
+	<KeyListEntry name="begin-move" _description="Move window"/>
+
+	<KeyListEntry name="begin-resize" _description="Resize window"/>
+
+	<KeyListEntry name="toggle-on-all-workspaces"
+	              _description="Toggle window on all workspaces or one"/>
+
+	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
+
+	<KeyListEntry name="raise" _description="Raise window above other windows"/>
+
+	<KeyListEntry name="lower" _description="Lower window below other windows"/>
+
+	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
+
+	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
+
+	<KeyListEntry name="toggle-tiled-left"
+                      schema="org.gnome.mutter.keybindings"
+                      _description="View split on left"/>
+
+	<KeyListEntry name="toggle-tiled-right"
+                      schema="org.gnome.mutter.keybindings"
+                      _description="View split on right"/>
+
+</KeyListEntries>
+

src/Makefile.am

@@ -1,12 +1,16 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:
 
-lib_LTLIBRARIES = libmutter.la
+lib_LTLIBRARIES = libmutter-wayland.la
 
-SUBDIRS=wm-tester tools compositor/plugins
+SUBDIRS=compositor/plugins
 
 INCLUDES=								\
+	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
+	-DCOGL_ENABLE_EXPERIMENTAL_API					\
+	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \
 	$(MUTTER_CFLAGS)						\
+	-I$(top_builddir)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
 	-I$(srcdir)/ui							\
@@ -26,26 +30,48 @@ INCLUDES=								\
 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
 
-mutter_built_sources = \
+INCLUDES += \
-	mutter-marshal.h \
+	-I$(srcdir)/wayland						\
-	mutter-marshal.c \
+	-I$(builddir)/wayland						\
-	mutter-enum-types.h \
+	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
-	mutter-enum-types.c
 
-libmutter_la_SOURCES =				\
+mutter_built_sources = \
+	$(dbus_idle_built_sources)		\
+	$(dbus_xrandr_built_sources)		\
+	mutter-enum-types.h 			\
+	mutter-enum-types.c			\
+	wayland/gtk-shell-protocol.c		\
+	wayland/gtk-shell-server-protocol.h	\
+	wayland/gtk-shell-client-protocol.h	\
+	wayland/xdg-shell-protocol.c		\
+	wayland/xdg-shell-server-protocol.h	\
+	wayland/xdg-shell-client-protocol.h	\
+	wayland/xserver-protocol.c		\
+	wayland/xserver-server-protocol.h	\
+	wayland/xserver-client-protocol.h
+
+libmutter_wayland_la_SOURCES =			\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
+	core/barrier.c				\
+	meta/barrier.h				\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
 	core/boxes-private.h			\
 	meta/boxes.h				\
+	compositor/clutter-utils.c		\
+	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
 	compositor/cogl-utils.h			\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
+	compositor/meta-background.c		\
 	compositor/meta-background-actor.c	\
-	compositor/meta-background-actor.h	\
+	compositor/meta-background-actor-private.h	\
+	compositor/meta-background-group.c	\
+	compositor/meta-cullable.c		\
+	compositor/meta-cullable.h		\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -54,7 +80,11 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
-	compositor/meta-shaped-texture.h	\
+	compositor/meta-shaped-texture-private.h 	\
+	compositor/meta-surface-actor.c		\
+	compositor/meta-surface-actor.h		\
+	compositor/meta-texture-rectangle.c	\
+	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
@@ -66,6 +96,9 @@ libmutter_la_SOURCES =				\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
 	meta/compositor.h			\
+	meta/meta-background.h			\
+	meta/meta-background-actor.h		\
+	meta/meta-background-group.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
@@ -82,10 +115,10 @@ libmutter_la_SOURCES =				\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
+	core/edid-parse.c			\
+	core/edid.h				\
 	core/errors.c				\
 	meta/errors.h				\
-	core/eventqueue.c			\
-	core/eventqueue.h			\
 	core/frame.c				\
 	core/frame.h				\
 	ui/gradient.c				\
@@ -100,6 +133,16 @@ libmutter_la_SOURCES =				\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
+	core/meta-cursor-tracker.c		\
+	core/meta-cursor-tracker-private.h	\
+	core/meta-idle-monitor.c		\
+	core/meta-idle-monitor-private.h	\
+	core/meta-xrandr-shared.h		\
+	core/monitor.c				\
+	core/monitor-config.c			\
+	core/monitor-kms.c			\
+	core/monitor-private.h			\
+	core/monitor-xrandr.c			\
 	core/mutter-Xatomtype.h			\
 	core/place.c				\
 	core/place.h				\
@@ -117,6 +160,7 @@ libmutter_la_SOURCES =				\
 	core/stack-tracker.h			\
 	core/util.c				\
 	meta/util.h				\
+	core/util-private.h			\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
@@ -129,9 +173,6 @@ libmutter_la_SOURCES =				\
 	meta/common.h				\
 	core/core.h				\
 	ui/ui.h					\
-	inlinepixbufs.h				\
-	ui/fixedtip.c				\
-	ui/fixedtip.h				\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@@ -148,18 +189,40 @@ libmutter_la_SOURCES =				\
 	ui/theme.c				\
 	meta/theme.h				\
 	ui/theme-private.h			\
-	ui/ui.c					\
+	ui/ui.c
-	core/all-keybindings.h			\
+
-	meta/preview-widget.h			\
+nodist_libmutter_wayland_la_SOURCES =		\
-	ui/preview-widget.c			\
 	$(mutter_built_sources)
 
-libmutter_la_LDFLAGS = -no-undefined
+libmutter_wayland_la_SOURCES +=			\
-libmutter_la_LIBADD  = $(MUTTER_LIBS)
+	wayland/meta-wayland.c			\
+	wayland/meta-wayland-private.h		\
+	wayland/meta-xwayland-private.h		\
+	wayland/meta-xwayland.c			\
+	wayland/meta-wayland-data-device.c      \
+	wayland/meta-wayland-data-device.h      \
+	wayland/meta-wayland-keyboard.c		\
+	wayland/meta-wayland-keyboard.h		\
+	wayland/meta-wayland-pointer.c		\
+	wayland/meta-wayland-pointer.h		\
+	wayland/meta-wayland-seat.c		\
+	wayland/meta-wayland-seat.h		\
+	wayland/meta-wayland-stage.h		\
+	wayland/meta-wayland-stage.c		\
+	wayland/meta-wayland-surface.c		\
+	wayland/meta-wayland-surface.h		\
+	wayland/meta-wayland-types.h		\
+	wayland/meta-wayland-versions.h		\
+	wayland/meta-weston-launch.c		\
+	wayland/meta-weston-launch.h
+
+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_base_headers =		\
+	meta/barrier.h				\
 	meta/boxes.h				\
 	meta/common.h				\
 	meta/compositor-mutter.h		\
@@ -170,7 +233,13 @@ libmutterinclude_base_headers =		\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
+	meta/meta-background-actor.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-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
 	meta/prefs.h				\
@@ -184,27 +253,38 @@ libmutterinclude_base_headers =		\
 # Excluded from scanning for introspection but installed
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
-	meta/preview-widget.h			\
 	meta/atomnames.h
 
-libmutterincludedir = $(includedir)/mutter/meta
+libmutterincludedir = $(includedir)/mutter-wayland/meta
 
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)
 
-mutter_theme_viewer_SOURCES=  \
+bin_PROGRAMS=mutter-wayland
-	ui/theme-viewer.c
 
-bin_PROGRAMS=mutter mutter-theme-viewer
+mutter_wayland_SOURCES = core/mutter.c
+mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
 
-mutter_SOURCES = core/mutter.c
+bin_PROGRAMS+=mutter-launch
-mutter_LDADD = $(MUTTER_LIBS) libmutter.la
+
+mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h
+
+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)
 
-api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+# Since we don't make any guarantees about stability and we don't support
+# parallel install, there's no real reason to change directories, filenames,
+# etc. as we change the Mutter tarball version.
+#api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+api_version = 3.0
 
 # These files are in package-private directories, even though they may be used
 # by plugins.  If you're writing a plugin, use g-ir-compiler --add-include-path
@@ -217,122 +297,90 @@ 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 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
+@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@_PACKAGES = clutter-1.0 gtk+-3.0
+@META_GIR@_EXPORT_PACKAGES = libmutter-wayland
 @META_GIR@_CFLAGS = $(INCLUDES)
-@META_GIR@_LIBS = libmutter.la
+@META_GIR@_LIBS = libmutter-wayland.la
 @META_GIR@_FILES =				\
 	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_la_SOURCES))
+	$(filter %.c,$(libmutter_wayland_la_SOURCES) $(nodist_libmutter_wayland_la_SOURCES))
 @META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 
 endif
 
-mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
-
 testboxes_SOURCES = core/testboxes.c
 testgradient_SOURCES = ui/testgradient.c
 testasyncgetprop_SOURCES = core/testasyncgetprop.c
 
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
-testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
+testboxes_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
+testgradient_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=mutter.desktop.in
+desktopfiles_in_files=mutter-wayland.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
 
-wmpropertiesdir=$(datadir)/gnome/wm-properties
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-wmproperties_in_files=mutter-wm.desktop.in
+xml_in_files = \
-wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+        50-mutter-navigation.xml.in	\
-wmproperties_DATA = $(wmproperties_files)
+        50-mutter-system.xml.in		\
+        50-mutter-windows.xml.in
+xml_DATA     = $(xml_in_files:.xml.in=.xml)
 
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
-schema_in_files = mutter.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
+gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
-@INTLTOOL_SCHEMAS_RULE@
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = mutter-schemas.convert
 
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-else
-install-data-local:
-endif
-
-IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
-VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
-          stock_minimize_data $(srcdir)/stock_minimize.png \
-          stock_delete_data $(srcdir)/stock_delete.png
-
-BUILT_SOURCES = inlinepixbufs.h
 CLEANFILES =					\
-	inlinepixbufs.h				\
+	mutter-wayland.desktop			\
-	mutter.desktop				\
 	mutter-wm.desktop			\
-	mutter.schemas				\
+	org.gnome.mutter.gschema.xml		\
+	org.gnome.mutter.wayland.gschema.xml	\
+	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
 
-inlinepixbufs.h: $(IMAGES)
-	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
-
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = libmutter.pc mutter-plugins.pc
+pkgconfig_DATA = libmutter-wayland.pc
 
 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_files)		\
 	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
-	$(schema_in_files)		\
+	$(xml_in_files)			\
-	libmutter.pc.in \
+	org.gnome.mutter.gschema.xml.in \
-	mutter-plugins.pc.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 \
-	mutter-marshal.list
+	xrandr.xml idle-monitor.xml
 
-BUILT_SOURCES += $(mutter_built_sources)
+BUILT_SOURCES = $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)
 
-mutter-marshal.h: stamp-mutter-marshal.h
-	@true
-stamp-mutter-marshal.h: Makefile mutter-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--prefix=_mutter_marshal \
-		--header \
-	$(srcdir)/mutter-marshal.list > xgen-tmh && \
-	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
-	rm -f xgen-tmh && \
-	echo timestamp > $(@F)
-
-mutter-marshal.c: Makefile mutter-marshal.list
-	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
-	 $(GLIB_GENMARSHAL) \
-		--prefix=_mutter_marshal \
-		--body \
-	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
-	cp -f xgen-tmc mutter-marshal.c && \
-	rm -f xgen-tmc
-
 mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template $(srcdir)/mutter-enum-types.h.in \
+	    --template mutter-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
 	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
 	rm -f xgen-teth && \
@@ -341,7 +389,35 @@ stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.
 mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template $(srcdir)/mutter-enum-types.c.in \
+	    --template mutter-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc
+
+dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
+
+$(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-xrandr					\
+		$(srcdir)/xrandr.xml
+
+
+$(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-idle-monitor				\
+		--c-generate-object-manager						\
+		$(srcdir)/idle-monitor.xml
+
+wayland/%-protocol.c : $(top_builddir)/protocol/%.xml
+	mkdir -p wayland
+	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml
+	mkdir -p wayland
+	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
+wayland/%-client-protocol.h : $(top_builddir)/protocol/%.xml
+	mkdir -p wayland
+	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@

src/compositor/clutter-utils.c

@@ -0,0 +1,120 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Utilities for use with Cogl
+ *
+ * Copyright 2010 Red Hat, Inc.
+ * Copyright 2010 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "clutter-utils.h"
+#include <math.h>
+
+/* This file uses pixel-aligned region computation to determine what
+ * can be clipped out. This only really works if everything is aligned
+ * to the pixel grid - not scaled or rotated and at integer offsets.
+ *
+ * (This could be relaxed - if we turned off filtering for unscaled
+ * windows then windows would be, by definition aligned to the pixel
+ * grid. And for rectangular windows without a shape, the outline that
+ * we draw for an unrotated window is always a rectangle because we
+ * don't use antialasing for the window boundary - with or without
+ * filtering, with or without a scale. But figuring out exactly
+ * what pixels will be drawn by the graphics system in these cases
+ * gets tricky, so we just go for the easiest part - no scale,
+ * and at integer offsets.)
+ *
+ * The way we check for pixel-aligned is by looking at the
+ * transformation into screen space of the allocation box of an actor
+ * and and checking if the corners are "close enough" to integral
+ * pixel values.
+ */
+
+/* The definition of "close enough" to integral pixel values is
+ * equality when we convert to 24.8 fixed-point.
+ */
+static inline int
+round_to_fixed (float x)
+{
+  return roundf (x * 256);
+}
+
+/* This helper function checks if (according to our fixed point precision)
+ * the vertices @verts form a box of width @widthf and height @heightf
+ * located at integral coordinates. These coordinates are returned
+ * in @x_origin and @y_origin.
+ */
+gboolean
+meta_actor_vertices_are_untransformed (ClutterVertex *verts,
+                                       float          widthf,
+                                       float          heightf,
+                                       int           *x_origin,
+                                       int           *y_origin)
+{
+  int width, height;
+  int v0x, v0y, v1x, v1y, v2x, v2y, v3x, v3y;
+  int x, y;
+
+  width = round_to_fixed (widthf); height = round_to_fixed (heightf);
+
+  v0x = round_to_fixed (verts[0].x); v0y = round_to_fixed (verts[0].y);
+  v1x = round_to_fixed (verts[1].x); v1y = round_to_fixed (verts[1].y);
+  v2x = round_to_fixed (verts[2].x); v2y = round_to_fixed (verts[2].y);
+  v3x = round_to_fixed (verts[3].x); v3y = round_to_fixed (verts[3].y);
+
+  /* Using shifting for converting fixed => int, gets things right for
+   * negative values. / 256. wouldn't do the same
+   */
+  x = v0x >> 8;
+  y = v0y >> 8;
+
+  /* At integral coordinates? */
+  if (x * 256 != v0x || y * 256 != v0y)
+    return FALSE;
+
+  /* Not scaled? */
+  if (v1x - v0x != width || v2y - v0y != height)
+    return FALSE;
+
+  /* Not rotated/skewed? */
+  if (v0x != v2x || v0y != v1y ||
+      v3x != v1x || v3y != v2y)
+    return FALSE;
+
+  if (x_origin)
+    *x_origin = x;
+  if (y_origin)
+    *y_origin = y;
+
+  return TRUE;
+}
+
+/* Check if an actor is "untransformed" - which actually means transformed by
+ * at most a integer-translation. The integer translation, if any, is returned.
+ */
+gboolean
+meta_actor_is_untransformed (ClutterActor *actor,
+                             int          *x_origin,
+                             int          *y_origin)
+{
+  gfloat widthf, heightf;
+  ClutterVertex verts[4];
+
+  clutter_actor_get_size (actor, &widthf, &heightf);
+  clutter_actor_get_abs_allocation_vertices (actor, verts);
+
+  return meta_actor_vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
+}
+

src/compositor/clutter-utils.h

@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Utilities for use with Clutter
+ *
+ * Copyright 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __META_CLUTTER_UTILS_H__
+#define __META_CLUTTER_UTILS_H__
+
+#include <clutter/clutter.h>
+gboolean meta_actor_vertices_are_untransformed (ClutterVertex *verts,
+                                                float          widthf,
+                                                float          heightf,
+                                                int           *x_origin,
+                                                int           *y_origin);
+gboolean meta_actor_is_untransformed (ClutterActor *actor,
+                                      int          *x_origin,
+                                      int          *y_origin);
+
+#endif /* __META_CLUTTER_UTILS_H__ */

src/compositor/cogl-utils.c

@@ -16,19 +16,18 @@
  * 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  */
 
+#include <clutter/clutter.h>
 #include "cogl-utils.h"
 
 /**
  * meta_create_color_texture_4ub:
- * @red:
+ * @red: red component
- * @green:
+ * @green: green component
- * @blue:
+ * @blue: blue component
- * @alpha:
+ * @alpha: alpha component
  * @flags: Optional flags for the texture, or %COGL_TEXTURE_NONE;
  *   %COGL_TEXTURE_NO_SLICING is useful if the texture will be
  *   repeated to create a constant color fill, since hardware
@@ -39,7 +38,7 @@
  *
  * Return value: (transfer full): a newly created Cogl texture
  */
-CoglHandle
+CoglTexture *
 meta_create_color_texture_4ub (guint8           red,
                                guint8           green,
                                guint8           blue,
@@ -49,7 +48,7 @@ meta_create_color_texture_4ub (guint8           red,
   CoglColor color;
   guint8 pixel[4];
 
-  cogl_color_set_from_4ub (&color, red, green, blue, alpha);
+  cogl_color_init_from_4ub (&color, red, green, blue, alpha);
   cogl_color_premultiply (&color);
 
   pixel[0] = cogl_color_get_red_byte (&color);
@@ -68,43 +67,42 @@ meta_create_color_texture_4ub (guint8           red,
 /* Based on gnome-shell/src/st/st-private.c:_st_create_texture_material.c */
 
 /**
- * meta_create_texture_material:
+ * meta_create_texture_pipeline:
  * @src_texture: (allow-none): texture to use initially for the layer
  *
- * Creates a material with a single layer. Using a common template
+ * Creates a pipeline with a single layer. Using a common template
- * allows sharing a shader for different uses in Mutter. To share the same
+ * makes it easier for Cogl to share a shader for different uses in
- * shader with all other materials that are just texture plus opacity
+ * Mutter.
- * would require Cogl fixes.
- * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
  *
- * Return value: (transfer full): a newly created Cogl material
+ * Return value: (transfer full): a newly created #CoglPipeline
  */
-CoglHandle
+CoglPipeline *
-meta_create_texture_material (CoglHandle src_texture)
+meta_create_texture_pipeline (CoglTexture *src_texture)
 {
-  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
+  static CoglPipeline *texture_pipeline_template = NULL;
-  CoglHandle material;
+  CoglPipeline *pipeline;
 
-  /* We use a material that has a dummy texture as a base for all
+  /* The only state used in the pipeline that would affect the shader
-     texture materials. The idea is that only the Cogl texture object
+     generation is the texture type on the layer. Therefore we create
-     would be different in the children so it is likely that Cogl will
+     a template pipeline which sets this state and all texture
-     be able to share GL programs between all the textures. */
+     pipelines are created as a copy of this. That way Cogl can find
-  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
+     the shader state for the pipeline more quickly by looking at the
+     pipeline ancestry instead of resorting to the shader cache. */
+  if (G_UNLIKELY (texture_pipeline_template == NULL))
     {
-      CoglHandle dummy_texture;
+      CoglContext *ctx =
+        clutter_backend_get_cogl_context (clutter_get_default_backend ());
 
-      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
+      texture_pipeline_template = cogl_pipeline_new (ctx);
-                                                     COGL_TEXTURE_NONE);
+      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
-
+                                            0, /* layer */
-      texture_material_template = cogl_material_new ();
+                                            COGL_TEXTURE_TYPE_2D);
-      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
-      cogl_handle_unref (dummy_texture);
     }
 
-  material = cogl_material_copy (texture_material_template);
+  pipeline = cogl_pipeline_copy (texture_pipeline_template);
 
-  if (src_texture != COGL_INVALID_HANDLE)
+  if (src_texture != NULL)
-    cogl_material_set_layer (material, 0, src_texture);
+    cogl_pipeline_set_layer_texture (pipeline, 0, src_texture);
 
-  return material;
+  return pipeline;
 }

src/compositor/cogl-utils.h

@@ -15,9 +15,7 @@
  * 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  */
 
 #ifndef __META_COGL_UTILS_H__
@@ -25,11 +23,11 @@
 
 #include <cogl/cogl.h>
 
-CoglHandle meta_create_color_texture_4ub (guint8           red,
+CoglTexture * meta_create_color_texture_4ub (guint8           red,
-                                          guint8           green,
+                                             guint8           green,
-                                          guint8           blue,
+                                             guint8           blue,
-                                          guint8           alpha,
+                                             guint8           alpha,
-                                          CoglTextureFlags flags);
+                                             CoglTextureFlags flags);
-CoglHandle meta_create_texture_material  (CoglHandle src_texture);
+CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture);
 
 #endif /* __META_COGL_UTILS_H__ */

src/compositor/compositor-private.h

@@ -8,6 +8,7 @@
 #include <meta/compositor.h>
 #include <meta/display.h>
 #include "meta-plugin-manager.h"
+#include "meta-window-actor-private.h"
 #include <clutter/clutter.h>
 
 typedef struct _MetaCompScreen MetaCompScreen;
@@ -16,31 +17,38 @@ struct _MetaCompositor
 {
   MetaDisplay    *display;
 
-  Atom            atom_x_root_pixmap;
-  Atom            atom_x_set_root;
-  Atom            atom_net_wm_window_opacity;
   guint           repaint_func_id;
 
   ClutterActor   *shadow_src;
 
   MetaPlugin     *modal_plugin;
 
-  gboolean        show_redraw : 1;
+  gint64          server_time_query_time;
-  gboolean        debug       : 1;
+  gint64          server_time_offset;
-  gboolean        no_mipmaps  : 1;
+
+  guint           server_time_is_monotonic_time : 1;
+  guint           show_redraw : 1;
+  guint           debug       : 1;
+  guint           no_mipmaps  : 1;
 };
 
 struct _MetaCompScreen
 {
   MetaScreen            *screen;
 
-  ClutterActor          *stage, *window_group, *overlay_group;
+  ClutterActor          *stage, *window_group, *top_window_group, *overlay_group;
   ClutterActor          *background_actor;
-  ClutterActor		*hidden_group;
   GList                 *windows;
   GHashTable            *windows_by_xid;
   Window                 output;
 
+  CoglOnscreen          *onscreen;
+  CoglFrameClosure      *frame_closure;
+
+  /* Used for unredirecting fullscreen windows */
+  guint                   disable_unredirect_count;
+  MetaWindowActor             *unredirected_window;
+
   /* Before we create the output window */
   XserverRegion     pending_input_region;
 
@@ -49,21 +57,22 @@ struct _MetaCompScreen
   MetaPluginManager *plugin_mgr;
 };
 
+/* Wait 2ms after vblank before starting to draw next frame */
+#define META_SYNC_DELAY 2
+
 void meta_switch_workspace_completed (MetaScreen    *screen);
-void meta_set_stage_input_region     (MetaScreen    *screen,
-                                      XserverRegion  region);
-void meta_empty_stage_input_region   (MetaScreen    *screen);
 
 gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
                                       MetaPlugin       *plugin,
-                                      Window            grab_window,
-                                      Cursor            cursor,
                                       MetaModalOptions  options,
                                       guint32           timestamp);
 void     meta_end_modal_for_plugin   (MetaScreen       *screen,
                                       MetaPlugin       *plugin,
                                       guint32           timestamp);
 
+gint64 meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
+                                                      gint64       monotonic_time);
+
 void meta_check_end_modal (MetaScreen *screen);
 
 #endif /* META_COMPOSITOR_PRIVATE_H */

src/compositor/meta-background-actor-private.h

@@ -0,0 +1,11 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef META_BACKGROUND_ACTOR_PRIVATE_H
+#define META_BACKGROUND_ACTOR_PRIVATE_H
+
+#include <meta/screen.h>
+#include <meta/meta-background-actor.h>
+
+cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);
+
+#endif /* META_BACKGROUND_ACTOR_PRIVATE_H */

src/compositor/meta-background-actor.c

@@ -1,7 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * meta-background-actor.c: Actor for painting the root window background
- *
  * Copyright 2009 Sander Dijkhuis
  * Copyright 2010 Red Hat, Inc.
  *
@@ -16,121 +14,52 @@
  * 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  *
  * Portions adapted from gnome-shell/src/shell-global.c
  */
 
+/**
+ * SECTION:meta-background-actor
+ * @title: MetaBackgroundActor
+ * @short_description: Actor for painting the root window background
+ *
+ */
+
 #include <config.h>
 
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 
+#include <clutter/clutter.h>
+
 #include <X11/Xatom.h>
 
 #include "cogl-utils.h"
 #include "compositor-private.h"
 #include <meta/errors.h>
-#include "meta-background-actor.h"
+#include <meta/meta-background.h>
+#include "meta-background-actor-private.h"
+#include "meta-cullable.h"
 
-struct _MetaBackgroundActorClass
+struct _MetaBackgroundActorPrivate
 {
-  ClutterActorClass parent_class;
+  cairo_region_t *clip_region;
 };
 
-struct _MetaBackgroundActor
+static void cullable_iface_init (MetaCullableInterface *iface);
-{
-  ClutterActor parent;
 
-  CoglHandle material;
+G_DEFINE_TYPE_WITH_CODE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR,
-  MetaScreen *screen;
+                         G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init));
-  cairo_region_t *visible_region;
-  float texture_width;
-  float texture_height;
-
-  guint have_pixmap : 1;
-};
-
-G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);
 
 static void
-update_wrap_mode (MetaBackgroundActor *self)
+set_clip_region (MetaBackgroundActor *self,
+                 cairo_region_t      *clip_region)
 {
-  int width, height;
+  MetaBackgroundActorPrivate *priv = self->priv;
-  CoglMaterialWrapMode wrap_mode;
 
-  meta_screen_get_size (self->screen, &width, &height);
+  g_clear_pointer (&priv->clip_region, (GDestroyNotify) cairo_region_destroy);
-
+  if (clip_region)
-  /* We turn off repeating when we have a full-screen pixmap to keep from
+    priv->clip_region = cairo_region_copy (clip_region);
-   * getting artifacts from one side of the image sneaking into the other
-   * side of the image via bilinear filtering.
-   */
-  if (width == self->texture_width && height == self->texture_height)
-    wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
-  else
-    wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;
-
-  cogl_material_set_layer_wrap_mode (self->material, 0, wrap_mode);
-}
-
-static void
-set_texture (MetaBackgroundActor *self,
-             CoglHandle           texture)
-{
-  MetaDisplay *display;
-
-  display = meta_screen_get_display (self->screen);
-
-  /* This may trigger destruction of an old texture pixmap, which, if
-   * the underlying X pixmap is already gone has the tendency to trigger
-   * X errors inside DRI. For safety, trap errors */
-  meta_error_trap_push (display);
-  cogl_material_set_layer (self->material, 0, texture);
-  meta_error_trap_pop (display);
-
-  self->texture_width = cogl_texture_get_width (texture);
-  self->texture_height = cogl_texture_get_height (texture);
-
-  update_wrap_mode (self);
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
-}
-
-/* Sets our material to paint with a 1x1 texture of the stage's background
- * color; doing this when we have no pixmap allows the application to turn
- * off painting the stage. There might be a performance benefit to
- * painting in this case with a solid color, but the normal solid color
- * case is a 1x1 root pixmap, so we'd have to reverse-engineer that to
- * actually pick up the (small?) performance win. This is just a fallback.
- */
-static void
-set_texture_to_stage_color (MetaBackgroundActor *self)
-{
-  ClutterActor *stage = meta_get_stage_for_screen (self->screen);
-  ClutterColor color;
-  CoglHandle texture;
-
-  clutter_stage_get_color (CLUTTER_STAGE (stage), &color);
-
-  /* Slicing will prevent COGL from using hardware texturing for
-   * the tiled 1x1 pixmap, and will cause it to draw the window
-   * background in millions of separate 1x1 rectangles */
-  texture = meta_create_color_texture_4ub (color.red, color.green,
-                                           color.blue, 0xff,
-                                           COGL_TEXTURE_NO_SLICING);
-  set_texture (self, texture);
-  cogl_handle_unref (texture);
-}
-
-static void
-on_notify_stage_color (GObject             *stage,
-                       GParamSpec          *pspec,
-                       MetaBackgroundActor *self)
-{
-  if (!self->have_pixmap)
-    set_texture_to_stage_color (self);
 }
 
 static void
@@ -138,22 +67,9 @@ meta_background_actor_dispose (GObject *object)
 {
   MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
 
-  meta_background_actor_set_visible_region (self, NULL);
+  set_clip_region (self, NULL);
 
-  if (self->material != COGL_INVALID_HANDLE)
+  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
-    {
-      cogl_handle_unref (self->material);
-      self->material = COGL_INVALID_HANDLE;
-    }
-
-  if (self->screen != NULL)
-    {
-      ClutterActor *stage = meta_get_stage_for_screen (self->screen);
-      g_signal_handlers_disconnect_by_func (stage,
-                                            (gpointer) on_notify_stage_color,
-                                            self);
-      self->screen = NULL;
-    }
 }
 
 static void
@@ -162,15 +78,20 @@ meta_background_actor_get_preferred_width (ClutterActor *actor,
                                            gfloat       *min_width_p,
                                            gfloat       *natural_width_p)
 {
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  ClutterContent *content;
-  int width, height;
+  gfloat width;
 
-  meta_screen_get_size (self->screen, &width, &height);
+  content = clutter_actor_get_content (actor);
+
+  if (content)
+    clutter_content_get_preferred_size (content, &width, NULL);
+  else
+    width = 0;
 
   if (min_width_p)
     *min_width_p = width;
   if (natural_width_p)
-    *natural_width_p = height;
+    *natural_width_p = width;
 }
 
 static void
@@ -180,10 +101,15 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
                                             gfloat       *natural_height_p)
 
 {
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  ClutterContent *content;
-  int width, height;
+  gfloat height;
 
-  meta_screen_get_size (self->screen, &width, &height);
+  content = clutter_actor_get_content (actor);
+
+  if (content)
+    clutter_content_get_preferred_size (content, NULL, &height);
+  else
+    height = 0;
 
   if (min_height_p)
     *min_height_p = height;
@@ -191,233 +117,100 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
     *natural_height_p = height;
 }
 
-static void
-meta_background_actor_paint (ClutterActor *actor)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  guchar opacity = clutter_actor_get_paint_opacity (actor);
-  int width, height;
-
-  meta_screen_get_size (self->screen, &width, &height);
-
-  cogl_material_set_color4ub (self->material,
-                              opacity, opacity, opacity, opacity);
-
-  cogl_set_source (self->material);
-
-  if (self->visible_region)
-    {
-      int n_rectangles = cairo_region_num_rectangles (self->visible_region);
-      int i;
-
-      for (i = 0; i < n_rectangles; i++)
-        {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (self->visible_region, i, &rect);
-
-          cogl_rectangle_with_texture_coords (rect.x, rect.y,
-                                              rect.x + rect.width, rect.y + rect.height,
-                                              rect.x / self->texture_width,
-                                              rect.y / self->texture_height,
-                                              (rect.x + rect.width) / self->texture_width,
-                                              (rect.y + rect.height) / self->texture_height);
-        }
-    }
-  else
-    {
-      cogl_rectangle_with_texture_coords (0.0f, 0.0f,
-                                          width, height,
-                                          0.0f, 0.0f,
-                                          width / self->texture_width,
-                                          height / self->texture_height);
-    }
-}
-
-#if CLUTTER_CHECK_VERSION(1, 5, 2)
-static gboolean
-meta_background_actor_get_paint_volume (ClutterActor       *actor,
-                                        ClutterPaintVolume *volume)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  int width, height;
-
-  meta_screen_get_size (self->screen, &width, &height);
-
-  clutter_paint_volume_set_width (volume, width);
-  clutter_paint_volume_set_height (volume, height);
-
-  return TRUE;
-}
-#endif
-
 static void
 meta_background_actor_class_init (MetaBackgroundActorClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
+  g_type_class_add_private (klass, sizeof (MetaBackgroundActorPrivate));
+
   object_class->dispose = meta_background_actor_dispose;
 
   actor_class->get_preferred_width = meta_background_actor_get_preferred_width;
   actor_class->get_preferred_height = meta_background_actor_get_preferred_height;
-  actor_class->paint = meta_background_actor_paint;
-#if CLUTTER_CHECK_VERSION(1, 5, 2)
-  actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
-#endif
 }
 
 static void
-meta_background_actor_init (MetaBackgroundActor *background_actor)
+meta_background_actor_init (MetaBackgroundActor *self)
 {
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                            META_TYPE_BACKGROUND_ACTOR,
+                                            MetaBackgroundActorPrivate);
 }
 
 /**
- * @screen: the #MetaScreen
  * meta_background_actor_new:
  *
- * Creates a new actor to draw the background for the given screen.
+ * Creates a new actor to draw the background for the given monitor.
+ * This actor should be associated with a #MetaBackground using
+ * clutter_actor_set_content()
  *
- * Return value: (transfer none): the newly created background actor
+ * Return value: the newly created background actor
  */
 ClutterActor *
-meta_background_actor_new (MetaScreen *screen)
+meta_background_actor_new (void)
 {
   MetaBackgroundActor *self;
-  ClutterActor *stage;
-
-  g_return_val_if_fail (META_IS_SCREEN (screen), NULL);
 
   self = g_object_new (META_TYPE_BACKGROUND_ACTOR, NULL);
 
-  self->screen = screen;
-
-  self->material = meta_create_texture_material (NULL);
-  cogl_material_set_layer_wrap_mode (self->material, 0,
-                                     COGL_MATERIAL_WRAP_MODE_REPEAT);
-
-  stage = meta_get_stage_for_screen (self->screen);
-  g_signal_connect (stage, "notify::color",
-                    G_CALLBACK (on_notify_stage_color), self);
-
-  meta_background_actor_update (self);
-
   return CLUTTER_ACTOR (self);
 }
 
-/**
+static void
- * meta_background_actor_update:
+meta_background_actor_cull_out (MetaCullable   *cullable,
- * @self: a #MetaBackgroundActor
+                                cairo_region_t *unobscured_region,
- *
+                                cairo_region_t *clip_region)
- * Refetches the _XROOTPMAP_ID property for the root window and updates
- * the contents of the background actor based on that. There's no attempt
- * to optimize out pixmap values that don't change (since a root pixmap
- * could be replaced by with another pixmap with the same ID under some
- * circumstances), so this should only be called when we actually receive
- * a PropertyNotify event for the property.
- */
-void
-meta_background_actor_update (MetaBackgroundActor *self)
 {
-  MetaDisplay *display;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (cullable);
-  MetaCompositor *compositor;
+  set_clip_region (self, clip_region);
-  Atom type;
+}
-  int format;
-  gulong nitems;
-  gulong bytes_after;
-  guchar *data;
-  Pixmap root_pixmap_id;
 
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
+static void
+meta_background_actor_reset_culling (MetaCullable *cullable)
+{
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (cullable);
+  set_clip_region (self, NULL);
+}
 
-  display = meta_screen_get_display (self->screen);
+static void
-  compositor = meta_display_get_compositor (display);
+cullable_iface_init (MetaCullableInterface *iface)
-
+{
-  root_pixmap_id = None;
+  iface->cull_out = meta_background_actor_cull_out;
-  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
+  iface->reset_culling = meta_background_actor_reset_culling;
-                           meta_screen_get_xroot  (self->screen),
-                           compositor->atom_x_root_pixmap,
-                           0, LONG_MAX,
-                           False,
-                           AnyPropertyType,
-                           &type, &format, &nitems, &bytes_after, &data) &&
-      type != None)
-  {
-     /* Got a property. */
-     if (type == XA_PIXMAP && format == 32 && nitems == 1)
-       {
-         /* Was what we expected. */
-         root_pixmap_id = *(Pixmap *)data;
-       }
-
-     XFree(data);
-  }
-
-  if (root_pixmap_id != None)
-    {
-      CoglHandle texture;
-
-      meta_error_trap_push (display);
-      texture = cogl_texture_pixmap_x11_new (root_pixmap_id, FALSE);
-      meta_error_trap_pop (display);
-
-      if (texture != COGL_INVALID_HANDLE)
-        {
-          set_texture (self, texture);
-          cogl_handle_unref (texture);
-
-          self->have_pixmap = True;
-          return;
-        }
-    }
-
-  self->have_pixmap = False;
-  set_texture_to_stage_color (self);
 }
 
 /**
- * meta_background_actor_set_visible_region:
+ * meta_background_actor_get_clip_region:
- * @self: a #MetaBackgroundActor
- * @visible_region: (allow-none): the area of the actor (in allocate-relative
- *   coordinates) that is visible.
- *
- * Sets the area of the background that is unobscured by overlapping windows.
- * This is used to optimize and only paint the visible portions.
- */
-void
-meta_background_actor_set_visible_region (MetaBackgroundActor *self,
-                                          cairo_region_t      *visible_region)
-{
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
-
-  if (self->visible_region)
-    {
-      cairo_region_destroy (self->visible_region);
-      self->visible_region = NULL;
-    }
-
-  if (visible_region)
-    {
-      cairo_rectangle_int_t screen_rect = { 0 };
-      meta_screen_get_size (self->screen, &screen_rect.width, &screen_rect.height);
-
-      /* Doing the intersection here is probably unnecessary - MetaWindowGroup
-       * should never compute a visible area that's larger than the root screen!
-       * but it's not that expensive and adds some extra robustness.
-       */
-      self->visible_region = cairo_region_create_rectangle (&screen_rect);
-      cairo_region_intersect (self->visible_region, visible_region);
-    }
-}
-
-/**
- * meta_background_actor_screen_size_changed:
  * @self: a #MetaBackgroundActor
  *
- * Called by the compositor when the size of the #MetaScreen changes
+ * Return value (transfer full): a #cairo_region_t that represents the part of
+ * the background not obscured by other #MetaBackgroundActor or
+ * #MetaWindowActor objects.
  */
-void
+cairo_region_t *
-meta_background_actor_screen_size_changed (MetaBackgroundActor *self)
+meta_background_actor_get_clip_region (MetaBackgroundActor *self)
 {
-  update_wrap_mode (self);
+  MetaBackgroundActorPrivate *priv = self->priv;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
+  ClutterActorBox content_box;
+  cairo_rectangle_int_t content_area = { 0 };
+  cairo_region_t *clip_region;
+
+  g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);
+
+  if (!priv->clip_region)
+      return NULL;
+
+  clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
+
+  content_area.x = content_box.x1;
+  content_area.y = content_box.y1;
+  content_area.width = content_box.x2 - content_box.x1;
+  content_area.height = content_box.y2 - content_box.y1;
+
+  clip_region = cairo_region_create_rectangle (&content_area);
+  cairo_region_intersect (clip_region, priv->clip_region);
+
+  return clip_region;
 }