wayland: add support for pointer barriers

Use the clutter pointer constrain callback and a lot of copypasted
code from Xorg to implement reactive pointer barriers and pointer
barrier events.

https://bugzilla.gnome.org/show_bug.cgi?id=706655

.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-private.pc
-mutter
-mutter-theme-viewer
-mutter.desktop
-mutter.schemas
+libmutter-wayland.pc
+mutter-wayland
+mutter-launch
+org.gnome.mutter.gschema.valid
+org.gnome.mutter.gschema.xml
+org.gnome.mutter.wayland.gschema.valid
+org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
@@ -56,14 +61,43 @@ 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/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

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+ >=
-  2.6 if you manually revert the change from bug 348633), you should
-  be able to install your distro's development packages
-  (e.g. gtk2-devel, GConf2-devel, startup-notification-devel on
+  As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro
+  (gtk+ >= 2.6 if you manually revert the change from bug 348633), you
+  should be able to install your distro's development packages
+  (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,8 @@
 
-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

README

@@ -1,16 +1,10 @@
-Metacity is not a meta-City as in an urban center, but rather
-Meta-ness as in the state of being meta. i.e. metacity : meta as
-opacity : opaque. Also it may have something to do with the Meta key
-on UNIX keyboards.
+The original codebase named "Metacity" is not a meta-City as in an
+urban center, but rather Meta-ness as in the state of being
+meta. i.e. metacity : meta as opacity : opaque. Also it may have
+something to do with the Meta key on UNIX keyboards.
 
-The first release of Metacity was version 2.3. Metacity has no need for
-your petty hangups about version numbers.
-
-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.
+Since then, it has been renamed mutter after a rebase on top of
+clutter as a compositing manager.
 
 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
-extra-small embedded metacity with --disable-gconf, see below).
+GNOME ftp site.
 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
-   panel:
-     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
-     gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
-     gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
-     gconftool-2 --type=string --set /apps/metacity/general/theme Bright
+   Change themes via gsettings:
+     gsettings set org.gnome.desktop.wm.preferences theme Crux
+     gsettings set org.gnome.desktop.wm.preferences theme Gorilla
+     gsettings set org.gnome.desktop.wm.preferences theme Atlanta
+     gsettings set org.gnome.desktop.wm.preferences 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:
-     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
+ - Change number of workspaces via gsettings:
+     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
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode click
+     gsettings set org.gnome.desktop.wm.preferences focus-mode mouse
+     gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy
+     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
-   gconf-editor.
+   Also try the GNOME keyboard shortcuts control panel.
 
  - 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,8 @@
 AC_PREREQ(2.50)
 
-m4_define([mutter_major_version], [2])
-m4_define([mutter_minor_version], [91])
-m4_define([mutter_micro_version], [6])
+m4_define([mutter_major_version], [3])
+m4_define([mutter_minor_version], [10])
+m4_define([mutter_micro_version], [0.1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -15,9 +15,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 +38,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 +65,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,
-  AC_HELP_STRING([--disable-gconf],
-                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
-  enable_gconf=yes)
+MUTTER_PC_MODULES="
+   gtk+-3.0 >= 3.3.7
+   gio-2.0 >= 2.25.10
+   pango >= 1.2.0
+   cairo >= 1.10.0
+   gsettings-desktop-schemas >= 3.7.3
+   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
+   $CLUTTER_PACKAGE >= 1.15.94
+   cogl-1.0 >= 1.13.3
+   upower-glib > 0.9.11
+   gnome-desktop-3.0
+"
 
-if test x$enable_gconf = xyes; then
-    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
-fi
+GLIB_GSETTINGS
 
 AC_ARG_ENABLE(verbose-mode,
   AC_HELP_STRING([--disable-verbose-mode],
@@ -96,11 +104,6 @@ AC_ARG_ENABLE(startup-notification,
                  [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
   enable_startup_notification=auto)
 
-AC_ARG_WITH(introspection,
-  AC_HELP_STRING([--without-introspection],
-                 [disable the use of GObject introspection]),,
-  with_introspection=auto)
-
 AC_ARG_WITH(libcanberra,
   AC_HELP_STRING([--without-libcanberra],
                  [disable the use of libcanberra for playing sounds]),,
@@ -116,17 +119,32 @@ AC_ARG_ENABLE(shape,
                  [disable mutter's use of the shaped window extension]),,
   enable_shape=auto)
 
-## try definining HAVE_BACKTRACE
-AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
+## Wayland support requires the xserver.xml protocol extension found in the weston
+## repository but since there aren't currently established conventions for
+## installing and discovering these we simply require a location to be given
+## explicitly...
+AC_ARG_WITH([wayland-protocols],
+            [AS_HELP_STRING([--with-wayland-protocols], [Location for wayland extension protocol specs])],
+            [
+            ],
+            [])
+
+AC_ARG_WITH([xwayland-path],
+            [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
+            [XWAYLAND_PATH="$withval"],
+            [XWAYLAND_PATH="$bindir/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_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(MUTTER_LAUNCH, libdrm libsystemd-login)
+
+saved_LIBS="$LIBS"
+LIBS="$LIBS $MUTTER_LAUNCH"
+AC_CHECK_FUNCS([sd_session_get_vt])
+LIBS="$saved_LIBS"
 
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -176,137 +194,71 @@ else
   fi
 fi
 
-XCOMPOSITE_VERSION=0.2
+INTROSPECTION_VERSION=0.9.5
+GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 
-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.])
+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"
+  # 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
 
-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])
+MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
 
-  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"
+# We always build with wayland enabled
+AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
 
-  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
-
-if test x$with_introspection != xno; then
-  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.9.5, have_introspection=yes, have_introspection=no)
-  if test x$have_introspection=xyes; then
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
-    AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
-    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-    AC_SUBST(G_IR_SCANNER)
-    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-    AC_SUBST(G_IR_COMPILER)
-    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-    AC_SUBST(G_IR_GENERATE)
-    GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-    AC_SUBST(GIRDIR)
-    TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-    AC_SUBST(TYPELIBDIR)
-  fi
-fi
-AM_CONDITIONAL(WITH_INTROSPECTION, test "$have_introspection" = "yes")
-
-AC_MSG_CHECKING([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
-  echo "Building with Xcursor"
-  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,
-  AC_HELP_STRING([--disable-xinerama],
-                 [disable mutter's use of the Xinerama extension]),
-  try_xinerama=$enable_xinerama,try_xinerama=yes)
-
-use_solaris_xinerama=no
-use_xfree_xinerama=no
-if test "${try_xinerama}" != no; then
-    case "$host" in
-        *-*-solaris*)
-            # Check for solaris
-            use_solaris_xinerama=yes
-            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
+have_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],
+		     have_xinerama=no,
+		     [#include <X11/Xlib.h>])],
+    have_xinerama=no, -lXext $ALL_X_LIBS)
+AC_MSG_CHECKING(for Xinerama support)
+AC_MSG_RESULT($have_xinerama)
 
 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,
@@ -377,9 +329,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
@@ -422,18 +371,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])
@@ -446,11 +383,7 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 
-# For fix-meta-rectangle.py
-AM_PATH_PYTHON([2.5])
-
-# Use gnome-doc-utils:
-GNOME_DOC_INIT([0.8.0])
+GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
 #### Warnings (last since -Werror can disturb other tests)
 
@@ -511,7 +444,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
@@ -522,24 +455,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-private.pc
-src/mutter-plugins.pc
-src/tools/Makefile
+src/libmutter-wayland.pc
 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"
@@ -550,18 +476,15 @@ 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:            ${have_introspection}
+	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
 	Shape extension:          ${found_shape}
 	Xsync:                    ${found_xsync}
@@ -573,8 +496,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    "(gnome-2-$stable_version branch in git)"
+   echo -n "Use 3.$stable_version.x for stable "
+   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
-              on top)
+    click     Focus the window 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 \
-	   mutter-window-demo.1 mutter-message.1
+man_MANS = mutter.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,666 @@
+<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_keybindings_switch_window
+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>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_outer_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

@@ -6,6 +6,16 @@
 
   <name xml:lang="en">mutter</name>
   <shortdesc xml:lang="en">Window and compositing manager based on Clutter</shortdesc>
+  <description>Mutter is a window and compositing manager that displays and
+manages your desktop via OpenGL. Mutter combines a sophisticated display engine
+using the Clutter toolkit with solid window-management logic inherited from the
+Metacity window manager.
+
+While Mutter can be used stand-alone, it is primarily intended to be used as
+the display core of a larger system such as GNOME Shell. For this reason,
+Mutter is very extensible via plugins, which are used both to add fancy visual
+effects and to rework the window management behaviors to meet the needs of the
+environment.</description>
   <!--
   <homepage rdf:resource="http://www.gnome.org/" />
   -->
@@ -29,4 +39,11 @@
       <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

@@ -22,6 +22,7 @@ dz
 el
 en_CA
 en_GB
+eo
 es
 et
 eu
@@ -43,6 +44,7 @@ is
 it
 ja
 ka
+kk
 kn
 ko
 ku
@@ -79,6 +81,7 @@ sr@latin
 sv
 ta
 te
+tg
 th
 tk
 tr

po/POTFILES.in

@@ -1,5 +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/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -7,6 +12,8 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
+src/core/monitor.c
+src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
 src/core/session.c
@@ -14,16 +21,12 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/include/all-keybindings.h
-src/mutter.desktop.in
-src/mutter-wm.desktop.in
-src/mutter.schemas.in
-src/tools/mutter-message.c
+src/mutter-wayland.desktop.in
+src/org.gnome.mutter.gschema.xml.in
+src/org.gnome.mutter.wayland.gschema.xml.in
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
-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"
 

protocol/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = xserver.xml

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/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,32 +1,74 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:
 
-lib_LTLIBRARIES = libmutter-private.la
+lib_LTLIBRARIES = libmutter-wayland.la
 
-SUBDIRS=wm-tester tools compositor/plugins
+SUBDIRS=compositor/plugins
 
-INCLUDES=@MUTTER_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"
+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							\
+	-I$(srcdir)/compositor						\
+	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\
+	-DHOST_ALIAS=\"@HOST_ALIAS@\"					\
+	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"		\
+	-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\"				\
+	-DMUTTER_DATADIR=\"$(datadir)\"					\
+	-DG_LOG_DOMAIN=\"mutter\"					\
+	-DSN_API_NOT_YET_FROZEN=1					\
+	-DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION)			\
+	-DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION)			\
+	-DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION)			\
+	-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION)	\
+	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\
+	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
+
+INCLUDES += \
+	-I$(srcdir)/wayland						\
+	-I$(builddir)/wayland						\
+	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
 
 mutter_built_sources = \
-	mutter-marshal.h \
-	mutter-marshal.c \
-	mutter-enum-types.h \
-	mutter-enum-types.c
+	$(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/xserver-protocol.c		\
+	wayland/xserver-server-protocol.h	\
+	wayland/xserver-client-protocol.h
 
-mutter_SOURCES= 				\
+libmutter_wayland_la_SOURCES =			\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
+	core/barrier.c				\
+	meta/barrier.h				\
+	core/barrier-private.h			\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
 	core/boxes-private.h			\
-	include/boxes.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-background-group-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -35,7 +77,9 @@ mutter_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-texture-rectangle.c	\
+	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
@@ -46,11 +90,14 @@ mutter_SOURCES= 				\
 	compositor/meta-window-shape.h		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
-	include/compositor.h			\
-	include/meta-plugin.h			\
-	include/meta-shadow-factory.h		\
-	include/meta-window-actor.h		\
-	include/compositor-mutter.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		\
+	meta/compositor-mutter.h 		\
 	core/above-tab-keycode.c		\
 	core/constraints.c			\
 	core/constraints.h			\
@@ -58,39 +105,48 @@ mutter_SOURCES= 				\
 	core/delete.c				\
 	core/display.c				\
 	core/display-private.h			\
-	include/display.h			\
+	meta/display.h				\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
+	core/edid-parse.c			\
+	core/edid.h				\
 	core/errors.c				\
-	include/errors.h			\
-	core/eventqueue.c			\
-	core/eventqueue.h			\
+	meta/errors.h				\
 	core/frame.c				\
-	core/frame-private.h			\
-	include/frame.h				\
+	core/frame.h				\
 	ui/gradient.c				\
-	ui/gradient.h				\
+	meta/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	include/group.h				\
+	meta/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	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				\
 	core/prefs.c				\
-	include/prefs.h				\
+	meta/prefs.h				\
 	core/screen.c				\
 	core/screen-private.h			\
-	include/screen.h			\
-	include/types.h                         \
+	meta/screen.h				\
+	meta/types.h				\
 	core/session.c				\
 	core/session.h				\
 	core/stack.c				\
@@ -98,22 +154,20 @@ mutter_SOURCES= 				\
 	core/stack-tracker.c			\
 	core/stack-tracker.h			\
 	core/util.c				\
-	include/util.h				\
+	meta/util.h				\
+	core/util-private.h			\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
 	core/window-private.h			\
-	include/window.h			\
+	meta/window.h				\
 	core/workspace.c			\
 	core/workspace-private.h		\
 	core/xprops.c				\
-	include/xprops.h			\
-	include/common.h			\
-	include/core.h				\
-	include/ui.h				\
-	inlinepixbufs.h				\
-	ui/fixedtip.c				\
-	ui/fixedtip.h				\
+	core/xprops.h				\
+	meta/common.h				\
+	core/core.h				\
+	ui/ui.h					\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@@ -121,84 +175,110 @@ mutter_SOURCES= 				\
 	ui/metaaccellabel.c			\
 	ui/metaaccellabel.h			\
 	ui/resizepopup.c			\
-	include/resizepopup.h			\
+	ui/resizepopup.h			\
 	ui/tabpopup.c				\
-	include/tabpopup.h				\
+	ui/tabpopup.h				\
 	ui/tile-preview.c			\
-	include/tile-preview.h			\
+	ui/tile-preview.h			\
 	ui/theme-parser.c			\
 	ui/theme.c				\
-	ui/theme.h				\
+	meta/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
-	include/all-keybindings.h               \
 	$(mutter_built_sources)
 
-# by setting libmutter_private_la_CFLAGS, the files shared with
-# mutter proper will be compiled with different names.
-libmutter_private_la_CFLAGS =
-libmutter_private_la_SOURCES=			\
-	core/boxes.c				\
-	include/boxes.h				\
-	ui/gradient.c				\
-	ui/gradient.h				\
-	core/util.c				\
-	include/util.h				\
-	include/common.h			\
-	ui/preview-widget.c			\
-	ui/preview-widget.h			\
-	ui/theme-parser.c			\
-	ui/theme.c				\
-	ui/theme.h
+libmutter_wayland_la_SOURCES +=			\
+	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_private_la_LDFLAGS = -no-undefined
-libmutter_private_la_LIBADD  = @MUTTER_LIBS@
+libmutter_wayland_la_LDFLAGS = -no-undefined
+libmutter_wayland_la_LIBADD  = $(MUTTER_LIBS)
 
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
-	include/boxes.h				\
-	ui/gradient.h				\
-	include/main.h				\
-	include/util.h				\
-	include/common.h			\
-	ui/theme.h				\
-	include/prefs.h				\
-	include/window.h			\
-	include/workspace.h			\
-	include/compositor.h			\
-	include/compositor-mutter.h		\
-	include/types.h				\
-	include/errors.h			\
-	include/screen.h			\
-	include/display.h			\
-	include/group.h				\
-	include/keybindings.h			\
-	include/meta-plugin.h			\
-	include/meta-shadow-factory.h		\
-	include/meta-window-actor.h
+	meta/barrier.h				\
+	meta/boxes.h				\
+	meta/common.h				\
+	meta/compositor-mutter.h		\
+	meta/compositor.h			\
+	meta/display.h				\
+	meta/errors.h				\
+	meta/gradient.h				\
+	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				\
+	meta/screen.h				\
+	meta/theme.h				\
+	meta/types.h				\
+	meta/util.h				\
+	meta/window.h				\
+	meta/workspace.h
 
 # Excluded from scanning for introspection but installed
-# preview-widget.h: only part of libmutter-private
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
-	ui/preview-widget.h			\
-	include/atomnames.h
+	meta/atomnames.h
 
-libmutterincludedir = $(includedir)/mutter/mutter-private
+libmutterincludedir = $(includedir)/mutter-wayland/meta
 
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)
 
-mutter_theme_viewer_SOURCES=  \
-	ui/theme-viewer.c
+bin_PROGRAMS=mutter-wayland
 
-bin_PROGRAMS=mutter mutter-theme-viewer
+mutter_wayland_SOURCES = core/mutter.c
+mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
 
-api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+bin_PROGRAMS+=mutter-launch
+
+mutter_launch_SOURCES = wayland/weston-launch.c wayland/weston-launch.h
+
+mutter_launch_CFLAGS = $(MUTTER_LAUNCH_CFLAGS) -DLIBDIR=\"$(libdir)\"
+mutter_launch_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)
+
+# 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
 
-if WITH_INTROSPECTION
 # 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
 # and g-ir-compiler --includedir.
@@ -208,142 +288,92 @@ gir_DATA = Meta-$(api_version).gir
 typelibdir = $(pkglibdir)
 typelib_DATA = Meta-$(api_version).typelib
 
-# We need to strip out the attribute that would point back to libmutter-introspect
-# so that libgirepository looks for symbols in the executable instead
-Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES) Makefile
-	$(AM_V_GEN) pwd=`pwd` ;				\
-        cd $(srcdir) &&					\
-	$(G_IR_SCANNER)					\
-		--namespace=Meta			\
-		--nsversion=$(api_version)		\
-		--warn-all				\
-		--warn-error				\
-		--include=GObject-2.0			\
-		--include=Gdk-3.0			\
-		--include=Gtk-3.0			\
-		--include=Clutter-1.0			\
-		--pkg=clutter-1.0			\
-		--pkg=gtk+-3.0				\
-		--include=xlib-2.0			\
-		--include=xfixes-4.0			\
-		--program=$$pwd/mutter			\
-		mutter-enum-types.h			\
-		$(filter %.c,$(mutter_SOURCES))		\
-		$(libmutterinclude_base_headers)	\
-		$(INCLUDES)				\
-		-o $$pwd/$@
+INTROSPECTION_GIRS = Meta-$(api_version).gir
+
+Meta-$(api_version).gir: libmutter-wayland.la
+@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
+@META_GIR@_EXPORT_PACKAGES = libmutter-wayland
+@META_GIR@_CFLAGS = $(INCLUDES)
+@META_GIR@_LIBS = libmutter-wayland.la
+@META_GIR@_FILES =				\
+	mutter-enum-types.h			\
+	$(libmutterinclude_base_headers)	\
+	$(filter %.c,$(libmutter_wayland_la_SOURCES))
+@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 
-Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
-	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) Meta-$(api_version).gir -o $@
 endif
 
-EFENCE=
-mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
-mutter_LDFLAGS=-export-dynamic
-
-mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
-
-testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
-testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
-testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c
+testboxes_SOURCES = core/testboxes.c
+testgradient_SOURCES = ui/testgradient.c
+testasyncgetprop_SOURCES = core/testasyncgetprop.c
 
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
-testboxes_LDADD= @MUTTER_LIBS@
-testgradient_LDADD= @MUTTER_LIBS@
-testasyncgetprop_LDADD= @MUTTER_LIBS@
+testboxes_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
+testgradient_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=mutter.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
-wmproperties_in_files=mutter-wm.desktop.in
-wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
-wmproperties_DATA = $(wmproperties_files)
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
+xml_in_files = \
+        50-mutter-navigation.xml.in	\
+        50-mutter-system.xml.in		\
+        50-mutter-windows.xml.in
+xml_DATA     = $(xml_in_files:.xml.in=.xml)
 
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = mutter.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 
+gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
-@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.desktop				\
+	mutter-wayland.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-private.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)		\
-	libmutter-private.pc.in	\
-	mutter-plugins.pc.in  \
+	$(xml_in_files)			\
+	org.gnome.mutter.gschema.xml.in \
+	org.gnome.mutter.wayland.gschema.xml.in \
+	mutter-schemas.convert \
+	libmutter-wayland.pc.in \
 	mutter-enum-types.h.in \
 	mutter-enum-types.c.in \
-	mutter-marshal.list
+	xrandr.xml idle-monitor.xml
 
-BUILT_SOURCES += $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
+BUILT_SOURCES = $(mutter_built_sources)
+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 && \
@@ -352,7 +382,36 @@ 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 = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
+
+$(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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#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;
+
+  *x_origin = x;
+  *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,36 @@
+/* -*- 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#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

@@ -21,30 +21,36 @@
  * 02111-1307, USA.
  */
 
+#include <clutter/clutter.h>
 #include "cogl-utils.h"
 
 /**
  * meta_create_color_texture_4ub:
- * @red:
- * @green:
- * @blue:
- * @alpha:
+ * @red: red component
+ * @green: green component
+ * @blue: blue component
+ * @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
+ *   repeat can't be used for a sliced texture.
  *
  * Creates a texture that is a single pixel with the specified
  * unpremultiplied color components.
  *
  * Return value: (transfer full): a newly created Cogl texture
  */
-CoglHandle
-meta_create_color_texture_4ub (guint8 red,
-                               guint8 green,
-                               guint8 blue,
-                               guint8 alpha)
+CoglTexture *
+meta_create_color_texture_4ub (guint8           red,
+                               guint8           green,
+                               guint8           blue,
+                               guint8           alpha,
+                               CoglTextureFlags flags)
 {
   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);
@@ -53,7 +59,7 @@ meta_create_color_texture_4ub (guint8 red,
   pixel[3] = cogl_color_get_alpha_byte (&color);
 
   return cogl_texture_new_from_data (1, 1,
-                                     COGL_TEXTURE_NONE,
+                                     flags,
                                      COGL_PIXEL_FORMAT_RGBA_8888_PRE,
                                      COGL_PIXEL_FORMAT_ANY,
                                      4, pixel);
@@ -63,42 +69,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
- * allows sharing a shader for different uses in Mutter. To share the same
- * shader with all other materials that are just texture plus opacity
- * would require Cogl fixes.
- * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
+ * Creates a pipeline with a single layer. Using a common template
+ * makes it easier for Cogl to share a shader for different uses in
+ * Mutter.
  *
- * Return value: (transfer full): a newly created Cogl material
+ * Return value: (transfer full): a newly created #CoglPipeline
  */
-CoglHandle
-meta_create_texture_material (CoglHandle src_texture)
+CoglPipeline *
+meta_create_texture_pipeline (CoglTexture *src_texture)
 {
-  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
-  CoglHandle material;
+  static CoglPipeline *texture_pipeline_template = NULL;
+  CoglPipeline *pipeline;
 
-  /* We use a material that has a dummy texture as a base for all
-     texture materials. The idea is that only the Cogl texture object
-     would be different in the children so it is likely that Cogl will
-     be able to share GL programs between all the textures. */
-  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
+  /* The only state used in the pipeline that would affect the shader
+     generation is the texture type on the layer. Therefore we create
+     a template pipeline which sets this state and all texture
+     pipelines are created as a copy of this. That way Cogl can find
+     the shader state for the pipeline more quickly by looking at the
+     pipeline ancestry instead of resorting to the shader cache. */
+  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_material_template = cogl_material_new ();
-      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
-      cogl_handle_unref (dummy_texture);
+      texture_pipeline_template = cogl_pipeline_new (ctx);
+      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
+                                            0, /* layer */
+                                            COGL_TEXTURE_TYPE_2D);
     }
 
-  material = cogl_material_copy (texture_material_template);
+  pipeline = cogl_pipeline_copy (texture_pipeline_template);
 
-  if (src_texture != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (material, 0, src_texture);
+  if (src_texture != NULL)
+    cogl_pipeline_set_layer_texture (pipeline, 0, src_texture);
 
-  return material;
+  return pipeline;
 }

src/compositor/cogl-utils.h

@@ -25,10 +25,11 @@
 
 #include <cogl/cogl.h>
 
-CoglHandle meta_create_color_texture_4ub (guint8     red,
-                                          guint8     green,
-                                          guint8     blue,
-                                          guint8     alpha);
-CoglHandle meta_create_texture_material  (CoglHandle src_texture);
+CoglTexture * meta_create_color_texture_4ub (guint8           red,
+                                             guint8           green,
+                                             guint8           blue,
+                                             guint8           alpha,
+                                             CoglTextureFlags flags);
+CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture);
 
 #endif /* __META_COGL_UTILS_H__ */

src/compositor/compositor-private.h

@@ -5,9 +5,10 @@
 
 #include <X11/extensions/Xfixes.h>
 
-#include "compositor.h"
-#include "display.h"
+#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;
@@ -17,7 +18,6 @@ struct _MetaCompositor
   MetaDisplay    *display;
 
   Atom            atom_x_root_pixmap;
-  Atom            atom_x_set_root;
   Atom            atom_net_wm_window_opacity;
   guint           repaint_func_id;
 
@@ -25,22 +25,32 @@ struct _MetaCompositor
 
   MetaPlugin     *modal_plugin;
 
-  gboolean        show_redraw : 1;
-  gboolean        debug       : 1;
-  gboolean        no_mipmaps  : 1;
+  gint64          server_time_query_time;
+  gint64          server_time_offset;
+
+  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 +59,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,14 @@
+/* -*- 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>
+
+void meta_background_actor_set_clip_region  (MetaBackgroundActor *self,
+                                             cairo_region_t      *clip_region);
+
+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.
  *
@@ -23,132 +21,42 @@
  * 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 "errors.h"
-#include "meta-background-actor.h"
+#include <meta/errors.h>
+#include <meta/meta-background.h>
+#include "meta-background-actor-private.h"
 
-struct _MetaBackgroundActorClass
+struct _MetaBackgroundActorPrivate
 {
-  ClutterActorClass parent_class;
-};
-
-struct _MetaBackgroundActor
-{
-  ClutterActor parent;
-
-  CoglHandle material;
-  MetaScreen *screen;
-  cairo_region_t *visible_region;
-  float texture_width;
-  float texture_height;
-
-  guint have_pixmap : 1;
+  cairo_region_t *clip_region;
 };
 
 G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);
 
-static void
-update_wrap_mode (MetaBackgroundActor *self)
-{
-  int width, height;
-  CoglMaterialWrapMode wrap_mode;
-
-  meta_screen_get_size (self->screen, &width, &height);
-
-  /* We turn off repeating when we have a full-screen pixmap to keep from
-   * 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);
-  texture = meta_create_color_texture_4ub (color.red, color.green,
-                                           color.blue, 0xff);
-  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
 meta_background_actor_dispose (GObject *object)
 {
   MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
 
-  meta_background_actor_set_visible_region (self, NULL);
+  meta_background_actor_set_clip_region (self, NULL);
 
-  if (self->material != COGL_INVALID_HANDLE)
-    {
-      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;
-    }
+  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
 
 static void
@@ -157,15 +65,20 @@ meta_background_actor_get_preferred_width (ClutterActor *actor,
                                            gfloat       *min_width_p,
                                            gfloat       *natural_width_p)
 {
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  int width, height;
+  ClutterContent *content;
+  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
@@ -175,10 +88,15 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
                                             gfloat       *natural_height_p)
 
 {
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  int width, height;
+  ClutterContent *content;
+  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;
@@ -186,60 +104,25 @@ 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);
-  int width, height;
-
-  meta_screen_get_size (self->screen, &width, &height);
-
-  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;
+  ClutterContent *content;
+  gfloat width, height;
 
-  meta_screen_get_size (self->screen, &width, &height);
+  content = clutter_actor_get_content (actor);
+
+  if (!content)
+    return FALSE;
+
+  clutter_content_get_preferred_size (content, &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)
@@ -247,168 +130,99 @@ 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);
 }
 
 /**
- * meta_background_actor_update:
+ * meta_background_actor_set_clip_region:
  * @self: a #MetaBackgroundActor
- *
- * 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;
-  MetaCompositor *compositor;
-  Atom type;
-  int format;
-  gulong nitems;
-  gulong bytes_after;
-  guchar *data;
-  Pixmap root_pixmap_id;
-
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
-
-  display = meta_screen_get_display (self->screen);
-  compositor = meta_display_get_compositor (display);
-
-  root_pixmap_id = None;
-  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
-                           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:
- * @self: a #MetaBackgroundActor
- * @visible_region: (allow-none): the area of the actor (in allocate-relative
+ * @clip_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)
+meta_background_actor_set_clip_region (MetaBackgroundActor *self,
+                                       cairo_region_t      *clip_region)
 {
+  MetaBackgroundActorPrivate *priv;
+
   g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
 
-  if (self->visible_region)
-    {
-      cairo_region_destroy (self->visible_region);
-      self->visible_region = NULL;
-    }
+  priv = self->priv;
 
-  if (visible_region)
-    {
-      cairo_rectangle_int_t screen_rect = { 0 };
-      meta_screen_get_size (self->screen, &screen_rect.width, &screen_rect.height);
+  g_clear_pointer (&priv->clip_region,
+                   (GDestroyNotify)
+                   cairo_region_destroy);
 
-      /* 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);
-    }
+  if (clip_region)
+    priv->clip_region = cairo_region_copy (clip_region);
 }
 
 /**
- * meta_background_actor_screen_size_changed:
+ * meta_background_actor_get_clip_region:
  * @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
-meta_background_actor_screen_size_changed (MetaBackgroundActor *self)
+cairo_region_t *
+meta_background_actor_get_clip_region (MetaBackgroundActor *self)
 {
-  update_wrap_mode (self);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
+  MetaBackgroundActorPrivate *priv = self->priv;
+  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;
 }

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

@@ -0,0 +1,11 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef META_BACKGROUND_GROUP_PRIVATE_H
+#define META_BACKGROUND_GROUP_PRIVATE_H
+
+#include <meta/screen.h>
+#include <meta/meta-background-group.h>
+
+void meta_background_group_set_clip_region  (MetaBackgroundGroup *self,
+                                             cairo_region_t      *visible_region);
+#endif /* META_BACKGROUND_GROUP_PRIVATE_H */

src/compositor/meta-background-group.c

@@ -0,0 +1,110 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * SECTION:meta-background-group
+ * @title: MetaBackgroundGroup
+ * @short_description: Container for background actors
+ *
+ * This class is a subclass of ClutterActor with special handling for
+ * MetaBackgroundActor/MetaBackgroundGroup when painting children.
+ * It makes sure to only draw the parts of the backgrounds not
+ * occluded by opaque windows.
+ *
+ * See #MetaWindowGroup for more information behind the motivation,
+ * and details on implementation.
+ */
+
+#include <config.h>
+
+#include "compositor-private.h"
+#include "clutter-utils.h"
+#include "meta-background-actor-private.h"
+#include "meta-background-group-private.h"
+
+G_DEFINE_TYPE (MetaBackgroundGroup, meta_background_group, CLUTTER_TYPE_ACTOR);
+
+struct _MetaBackgroundGroupPrivate
+{
+  gpointer dummy;
+};
+
+static void
+meta_background_group_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (meta_background_group_parent_class)->dispose (object);
+}
+
+static gboolean
+meta_background_group_get_paint_volume (ClutterActor       *actor,
+                                        ClutterPaintVolume *volume)
+{
+  return clutter_paint_volume_set_from_allocation (volume, actor);
+}
+
+static void
+meta_background_group_class_init (MetaBackgroundGroupClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+
+  actor_class->get_paint_volume = meta_background_group_get_paint_volume;
+  object_class->dispose = meta_background_group_dispose;
+
+  g_type_class_add_private (klass, sizeof (MetaBackgroundGroupPrivate));
+}
+
+static void
+meta_background_group_init (MetaBackgroundGroup *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                            META_TYPE_BACKGROUND_GROUP,
+                                            MetaBackgroundGroupPrivate);
+}
+
+/**
+ * meta_background_group_set_clip_region:
+ * @self: a #MetaBackgroundGroup
+ * @region: (allow-none): the parts of the background to paint
+ *
+ * Sets the area of the backgrounds that is unobscured by overlapping windows.
+ * This is used to optimize and only paint the visible portions.
+ */
+void
+meta_background_group_set_clip_region (MetaBackgroundGroup *self,
+                                       cairo_region_t      *region)
+{
+  GList *children, *l;
+
+  children = clutter_actor_get_children (CLUTTER_ACTOR (self));
+  for (l = children; l; l = l->next)
+    {
+      ClutterActor *actor = l->data;
+
+      if (META_IS_BACKGROUND_ACTOR (actor))
+        {
+          meta_background_actor_set_clip_region (META_BACKGROUND_ACTOR (actor), region);
+        }
+      else if (META_IS_BACKGROUND_GROUP (actor))
+        {
+          int x, y;
+
+          if (!meta_actor_is_untransformed (actor, &x, &y))
+            continue;
+
+          cairo_region_translate (region, -x, -y);
+          meta_background_group_set_clip_region (META_BACKGROUND_GROUP (actor), region);
+          cairo_region_translate (region, x, y);
+        }
+    }
+  g_list_free (children);
+}
+
+ClutterActor *
+meta_background_group_new (void)
+{
+  MetaBackgroundGroup *background_group;
+
+  background_group = g_object_new (META_TYPE_BACKGROUND_GROUP, NULL);
+
+  return CLUTTER_ACTOR (background_group);
+}