Bump version to 3.11.92

Update NEWS.
build: Don't try to distribute removed files
2014-03-19 21:22:46 +01:00 · 2014-03-19 21:09:02 +01:00 · 2014-03-19 21:09:02 +01:00 · 2014-03-19 09:12:48 -04:00 · 2014-03-18 22:08:04 -04:00 · 2014-03-18 22:06:31 -04:00
357 changed files with 139623 additions and 159598 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,17 +13,25 @@ config.sub
 configure
 depcomp
 install-sh
 intltool-extract.in
 intltool-merge.in
 libtool
 ltmain.sh
 missing
 .deps
-src/metacity-wm.desktop
+src/50-mutter-navigation.xml
 src/50-mutter-system.xml
 src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter-wayland.desktop
 *.o
 *.a
 *.lo
 *.la
 .libs
 *.swp
 *.gir
 *.typelib
 tidy-enum-types.[ch]
 tidy-marshal.[ch]
 stamp-tidy-enum-types.h
@@ -35,26 +43,68 @@ stamp-h1
 stamp-it
 .intltool-merge-cache
 POTFILES
 po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
-inlinepixbufs.h
+libmutter-wayland.pc
-libmetacity-private.pc
+mutter-wayland
-metacity
+mutter-launch
-metacity-dialog
+org.gnome.mutter.gschema.valid
-metacity-theme-viewer
+org.gnome.mutter.gschema.xml
-metacity.desktop
+org.gnome.mutter.wayland.gschema.valid
-metacity.schemas
+org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
-metacity-grayscale
+mutter-grayscale
-metacity-mag
+mutter-mag
-metacity-message
+mutter-message
-metacity-window-demo
+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/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
 src/xdg-shell-protocol.c
 src/xdg-shell-server-protocol.h
 src/xserver-protocol.c
 src/xserver-server-protocol.h
 doc/reference/*.args
 doc/reference/*.bak
 doc/reference/*.hierarchy
 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
 gtk-doc.m4
 intltool.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
--- a/1
+++ b/1
@@ -1 +0,0 @@
 Havoc Pennington <hp@redhat.com>
--- a/159
+++ b/159
@@ -1,159 +0,0 @@
 Metacity Standards Compliance
 =============================
 $Id$
 1) Introduction
 2) EWMH Compliance
  a. Root Window Properties
  b. Root Window Messages
  c. Application Window Properties
  d. Window Manager Protocols
 3) ICCCM Compliance
 1) Introduction
 ---------------
 This document details metacity compliance with the relevent standards.
 The format of this document is as follows:
 [-/+?] Hint Name/Feature Name (Version number)
       Errata/Comments
 The first character indicates the level of compliance as follows:
    -   none
    /   partial
    +   complete
    ?   unknown
 The title indicates a feature or a hint in the specification, and the
 version number indicates the minimum version of the specification
 supported by metacity.  Later versions may be supported if no
 incompatible changes have been made in the specification.
 2) EWMH Compliance
 ------------------
 The EWMH, or Extended Window Manager Hints is a freedesktop.org-
 developed standard to support a number of conventions for
 communication between the window manager and clients.  It builds on
 and extends the ICCCM (See Section 3).  A copy of the current EWMH
 standard is available at http://freedesktop.org/Standards/wm-spec/
  a. Root Window Properties
  -------------------------
 + _NET_SUPPORTED (1.3)
 + _NET_CLIENT_LIST (1.3)
 + _NET_NUMBER_OF_DESKTOPS (1.3)
 + _NET_DESKTOP_GEOMETRY (1.3)
  Metacity does not implement large desktops, so this is kept set to
  the screen size.
 + _NET_DESKTOP_VIEWPORT (1.3)
  Metacity does not implement viewports, so this is a constant (0,0).
 + _NET_CURRENT_DESKTOP (1.3)
 + _NET_DESKTOP_NAMES (1.3)
 + _NET_ACTIVE_WINDOW (1.3)
 + _NET_WORKAREA (1.3)
 + _NET_SUPPORTING_WM_CHECK (1.3)
 + _NET_VIRTUAL_ROOTS (1.3)
  Metacity does not read or set this property, but it does not use
  virtual roots to implement virtual desktops, so it complies with the
  specification.
 + _NET_DESKTOP_LAYOUT (1.3)
 + _NET_SHOWING_DESKTOP (1.3)
  b. Root Window Messages
  -----------------------
 + _NET_CLOSE_WINDOW (1.3)
 - _NET_MOVERESIZE_WINDOW (1.3)
  Metacity supports this message, but the specification is unclear on
  the layout of the detail value, and as such it is #if 0'd in the code
 + _NET_WM_MOVERESIZE (1.3)
 - _NET_RESTACK_WINDOW (1.3)
  Metacity will raise or lower windows in response to this message,
  but the sibling restack modes are not supported, and it is currently
  #if 0'd in the code.
 + _NET_REQUEST_FRAME_EXTENTS (1.3)  
  c. Application Window Properties
  --------------------------------
 + _NET_WM_NAME (1.3)
 + _NET_WM_VISIBLE_NAME (1.3)
  Metacity does not set this property, but metacity will never display
  a name different from _NET_WM_NAME
 + _NET_WM_ICON_NAME (1.3)
 + _NET_WM_VISIBLE_ICON_NAME (1.3)
  Metacity does not set this property, but metacity will never display
  a name different from _NET_WM_NAME
 + _NET_WM_DESKTOP (1.3)
 + _NET_WM_WINDOW_TYPE (1.3)
 / _NET_WM_STATE (1.3)
  This property is read and updated according to the specification,
  but see caveat below.
  Metacity does not recognize separate vertical and horizontal
  maximization states.  Currently metacity will do a two-dimensional
  maximization if either property is set.
  See: http://bugzilla.gnome.org/show_bug.cgi?id=113601
  Metacity doesn't implement viewports so _NET_WM_STATE_STICKY is
  unimplemented.
 + _NET_WM_ALLOWED_ACTIONS (1.3)
  Metacity keeps this hint up to date.  The code is somewhat crufty
  and should be rewritten, though it is functional.
  See: http://bugzilla.gnome.org/show_bug.cgi?id=90420
 + _NET_WM_STRUT (1.3)
 + _NET_WM_STRUT_PARTIAL (1.3)
 + _NET_WM_ICON_GEOMETRY (1.3)
  Metacity uses this property to draw minimize/restore animations
 + _NET_WM_ICON (1.3)
 + _NET_WM_PID (1.3)
 + _NET_WM_HANDLED_ICONS (1.3)
  Metacity does not read or set this property.  However, metacity
  never manages iconified windows, and so has no need to do so.
 + _NET_WM_USER_TIME (1.3)
  Metacity uses this property to prevent applications from stealing
  focus if supported by the toolkit.
 + _NET_FRAME_EXTENTS (1.3)
  If set in response to a _NET_REQUEST_FRAME_EXTENTS message received
  prior to the window being mapped, this may be an estimate.  This is,
  however, expressly allowed by the specification.
  d. Window Manager Protocols
  ---------------------------
 + _NET_WM_PING (1.3)
 3) ICCCM Compliance
 -------------------
 TODO
--- a/41
+++ b/41
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                       Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-			    Preamble
+                            Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
-			    NO WARRANTY
+                            NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
-
+
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/15414
+++ b/15414
--- a/1297
+++ b/1297
--- a/298
+++ b/298
@@ -1,298 +0,0 @@
 Intro...
 Window managers have a few ways in which they are significantly different
 from other applications.  This file, combined with the code overview in
 doc/code-overview.txt, should hopefully provide a series of relatively
 quick pointers (hopefully only a few minutes each) to some of the places
 one can look to orient themselves and get started.  Some of this will be
 general to window managers on X, much will be specific to Metacity, and
 there's probably some information that's common to programs in general but
 is nonetheless useful.
 Overview
  Administrative issues
  Minimal Building/Testing Environment
  Relevant standards and X properties
  Debugging and testing
    Debugging logs
    Adding information to the log
    Valgrind
    Testing Utilities
  Technical gotchas to keep in mind
  Other important reading
    Extra reading
    Ideas for tasks to work on
 Administrative issues
  Don't commit substantive code in here without asking hp@redhat.com.
  Adding translations, no-brainer typo fixes, etc. is fine.
  The code could use cleanup in a lot of places, feel free to do so.
  See http://developer.gnome.org/dotplan/for_maintainers.html for
  information on how to make a release.  The only difference from those
  instructions is that the minor version number of a Metacity release
  should always be a number from the Fibonacci sequence.
 Minimal Building/Testing Environment
  You do not need to _install_ a development version of Metacity to
  build, run and test it; you can run it from some temporary
  directory.  Also, you do not need to build all of Gnome in order to
  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
  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,
  pkg-config, intltool, and libtool) and be ready to build and test
  Metacity.  Steps to do so:
  $ svn checkout http://svn.gnome.org/svn/metacity/trunk metacity
  $ cd metacity
  $ ./autogen.sh --prefix /usr
  $ make
  $ ./src/metacity --replace
  Again, note that you do not need to run 'make install'.
 Relevant standards and X properties
  There are two documents that describe some basics about how window
  managers should behave: the ICCCM (Inter-Client Communication Conventions
  Manual) and EWMH (Extended Window Manager Hints).  You can find these at
  the following locations:
    ICCCM - http://tronche.com/gui/x/icccm/
    EWMH  - :pserver:anoncvs@pdx.freedesktop.org:/cvs
  The ICCCM is usually available in RPM or DEB format as well.  There is
  actually an online version of the EWMH, but it is almost always woefully
  out of date.  Just get it from cvs with these commands (the backslash
  means include the stuff from the next line):
    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions login
    cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/icccm-extensions \
      checkout wm-spec
  DO NOT GO AND READ THOSE THINGS.  THEY ARE REALLY, REALLY BORING.
  If you do, you'll probably end up catching up on your sleep instead of
  hacking on Metacity. ;-)  Instead, just look at the table of contents and
  glance at a page or two to get an idea of what's in there.  Then only
  refer to it if you see something weird in the code and you don't know
  what it is but has some funny looking name like you see in one of those
  two documents.
  You can refer to the COMPLIANCE file for additional information on these
  specifications and Metacity's compliance therewith.
  One of the major things those documents cover that are useful to learn
  about immediately are X properties.  The right way to learn about those,
  though, is through hand on experimentation with the xprop command (and
  then look up things you find from xprop in those two manuals if you're
  curious enough).  First, try running
    xprop
  in a terminal and click on one of the windows on your screen.  That gives
  you the x properties for that window.  Look through them and get a basic
  idea of what's there for kicks.  Note that you can get rid of some of the
  verboseness by grepping out the _NET_WM_ICON stuff, i.e.
    xprop | grep -v _NET_WM_ICON
  Next, try running
    xprop -root
  in a terminal.  There's all the properties of the root window (which you
  can think of as the "main" Xserver window).  You can also manually
  specify individual windows that you want the properties of with
    xprop -id <id>
  if you know the id of the window in question.  You can get the id of a
  given window by either running xwininfo, e.g.
    xwininfo | grep "Window id" | cut -f 4 -d ' '
  or by looking at the _NET_CLIENT_STACKING property of the root
  window.  Finally, it can also be useful to add "-spy" (without the
  quotes) to the xprop command to get it to continually monitor that
  window and report any changes to you.
 Debugging information
  Trying to run a window manager under a typical debugger, such as gdb,
  unfortunately just doesn't work very well.  So, we have to resort to
  other methods.
  Debugging logs
  First, note that you can start a new version of metacity to replace the
  existing one by running
    metacity --replace
  (which also comes in handy in the form "./src/metacity --replace" when
  trying to quickly test a small change while hacking on metacity without
  doing a full "make install", though I'm going off topic...)  This will
  allow you to see any warnings printed at the terminal.  Sometimes it's
  useful to have these directed to a logfile instead, which you can do by
  running
    METACITY_USE_LOGFILE=1 metacity --replace
  The logfile it uses will be printed in the terminal.  Sometimes, it's
  useful to get more information than just warnings.  You can set
  METACITY_VERBOSE to do that, like so:
    METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 metacity --replace
  (note that METACITY_VERBOSE=1 can be problematic without
  METACITY_USE_LOGFILE=1; avoid it unless running in from something that
  won't be managed by the new Metacity--see bug 305091 for more details).
  There are also other flags, such as METACITY_DEBUG, most of which I
  haven't tried and don't know what they do.  Go to the source code
  directory and run
    grep "METACITY_" * | grep getenv
  to find out what the other ones are.
  Adding information to the log
  Since we can't single step with a debugger, we often have to fall back to
  the primitive method of getting information we want to know: adding
  "print" statements.  Metacity has a fairly structured way to do this,
  using the functions meta_warning, meta_topic, and meta_verbose.  All
  three have the same basic format as printf, except that meta_topic also
  takes a leading enumeration parameter to specify the type of message
  being shown (makes it easier for grepping in a verbose log).  You'll find
  tons of examples in the source code if you need them; just do a quick
  grep or look in most any file.  Note that meta_topic and meta_verbose
  messages only appear if verbosity is turned on.  I tend to frequently add
  temporary meta_warning statements (or switch meta_topic or meta_verbose
  ones to meta_warning ones) and then undo the changes once I've learned
  the info that I needed.
  There is also a meta_print_backtrace (which again is only active if
  verbosity is turned on) that can also be useful if you want to learn how
  a particular line of code gets called.  And, of course, there's always
  g_assert if you want to make sure some section isn't executed (or isn't
  executed under certain conditions).
  Valgrind
  Valgrind is awesome for finding memory leaks or corruption and
  uninitialized variables.  But I also tend to use it in a non-traditional
  way as a partial substitute for a normal debugger: it can provide me with
  a stack trace of where metacity is crashing if I made a change that
  caused it to do so, which is one of the major uses of debuggers.  (And,
  what makes it cooler than a debugger is that there will also often be
  warnings pinpointing the cause of the crash from either some kind of
  simple memory corruption or an uninitialized variable).  Sometimes, when
  I merely want to know what is calling a particular function I'll just
  throw in an "int i; printf("%d\n", i);" just because valgrind will give
  me a full stacktrace whenever it sees that uninitialized variable being
  used (yes, I could use meta_print_backtrace, but that means I have to
  turn verbosity on).
  To run metacity under valgrind, use options typical for any Gnome
  program, such as
    valgrind --log-file=metacity.log --tool=memcheck --num-callers=48 \
    --leak-check=yes --leak-resolution=high --show-reachable=yes     \
    ./src/metacity --replace
  where, again, the backslashes mean to join all the stuff on the following
  line with the previous one.
  However, there is a downside.  Things run a little bit slowly, and it
  appears that you'll need about 1.5GB of ram, which unfortunately prevents
  most people from trying this.
  Testing Utilities
  src/run-metacity.sh
    The script src/run-metacity.sh is useful to hack on the window manager. 
    It runs metacity in an Xnest. e.g.:
      CLIENTS=3 ./run-metacity.sh
    or 
      DEBUG=memprof ./run-metacity.sh
    or
      DEBUG_TEST=1 ./run-metacity-sh
    or whatever.
  metacity-message
    The tool metacity-message can be used as follows:
      metacity-message reload-theme
      metacity-message restart
      metacity-message enable-keybindings
      metacity-message disable-keybindings
    The first of these is useful for testing themes, the second is just
    another way (besides the --restart flag to metacity itself) of
    restarting metacity, and the third is useful for testing Metacity when
    running it under an Xnest (typically, the Metacity under the Xnest
    wouldn't get keybinding notifications--making keyboard navigation not
    work--but if you disable the keybindings for the global Metacity then
    the Metacity under the Xnest can then get those keybinding notifications).
  metacity-window-demo
    metacity-window-demo is good for trying behavior of various kinds
    of window without launching a full desktop.
 Technical gotchas to keep in mind
  Files that include gdk.h or gtk.h are not supposed to include
  display.h or window.h or other core files.  Files in the core
  (display.[hc], window.[hc]) are not supposed to include gdk.h or
  gtk.h.  Reasons:
    "Basically you don't want GDK most of the time. It adds
    abstractions that cause problems, because they aren't designed to
    be used in a WM where we do weird stuff (display grabs, and just
    being the WM). At best GDK adds inefficiency, at worst it breaks
    things in weird ways where you have to be a GDK guru to figure
    them out. Owen also told me that they didn't want to start adding
    a lot of hacks to GDK to let a WM use it; we both agreed back in
    the mists of time that metacity would only use it for the "UI"
    bits as it does.
    Having the split in the source code contains and makes very clear
    the interface between the WM and GDK/GTK. This keeps people from
    introducing extra GDK/GTK usage when it isn't needed or
    appropriate. Also, it speeds up the compilation a bit, though this
    was perhaps more relevant 5 years ago than it is now.
    There was also a very old worry that the GDK stuff might have to
    be in a separate process to work right; that turned out to be
    untrue. Though who knows what issues the CM will introduce."
  Remember that strings stored in X properties are not in UTF-8, and they
  have to end up in UTF-8 before we try putting them through Pango.
  If you make any X request involving a client window, you have to
  meta_error_trap_push() around the call; this is not necessary for X
  requests on the frame windows.
  Remember that not all windows have frames, and window->frame can be NULL.
 Other important reading & where to get started
  Extra reading
  There are some other important things to read to get oriented as well.
  These are:
    http://pobox.com/~hp/features.html
    rationales.txt
    doc/code-overview.txt
  It pays to read http://pobox.com/~hp/features.html in order
  to understand the philosophy of Metacity.
  The rationales.txt file has two things: (1) a list of design choices with
  links in the form of bugzilla bugs that discuss the issue, and (2) a list
  outstanding bug categories, each of which is tracked by a particular
  tracker bug in bugzilla from which you can find several closely related
  bug reports.
  doc/code-overview.txt provides a fairly good overview of the code,
  including coverage of the function of the various files, the main
  structures and their relationships, and places to start looking in the
  code tailored to general categories of tasks.
  Ideas for tasks to work on
  There are a variety of things you could work on in the code.  You may
  have ideas of your own, but in case you don't, let me provide a list of
  ideas you could choose from:
  If you're ambitious, there's a list of things Havoc made that he'd really
  like to see tackled, which you can find at
  http://log.ometer.com/2004-05.html.  Be sure to double check with someone
  to make sure the item is still relevant if you're interested in one of
  these.  Another place to look for ideas, of course, is bugzilla.  One can
  just do queries and look for things that look fixable.
  However, perhaps the best way of getting ideas of related tasks to work
  on, is to look at the second half of the rationales.txt file, which tries
  to group bugs by type.
--- a/8
+++ b/8
@@ -1,8 +0,0 @@
 Tomas Frydrych
 Email: tf linux intel com
 Userid: tomasf
 Owen Taylor
 Email: otaylor redhat com
 Userid: otaylor
--- a/43
+++ b/43
@@ -1,43 +0,0 @@
 Currently active maintainers
 --------------------------------
 Elijah Newren
 Email: newren gmail com
 Userid: newren
  - Usually won't touch the theme bugs (isn't interested) or the
    compositor (until open source nvidia drivers are up to snuff).
    Tends to be most interested in libwnck/gtk interactions, focus
    issues, constraints problems, and raising/stacking, but works on
    just about anything other than themes and the compositor.
 Thomas Thurman
 Email: thomas thurman org uk
 Userid: tthurman
  - Responsible for all theme bugs and the compositor (thank goodness
    Thomas got involved, eh?).  I'm sure he'll replace this sentence
    with his interests when he reads it.  ;-)
 Semi-active maintainers
 --------------------------------
 Havoc Pennington
 Email: hp  redhat com
 Userid: hp
  - Original author.  Doesn't patch metacity anymore, but is active in
    answering questions, responding to bugs, providing very helpful
    suggestions and insight, and even assisting with debugging.
 Important historical figureheads
 --------------------------------
 Rob Adams (readams  readams net)
  - Was the main maintainer of metacity for a while; particular areas
    of focus included xinerama, placement, and an older version of the
    constraints code.  Still responds to bugs every once in a while.
 Søren Sandmann (sandmann  redhat com)
  - Wrote most of the current compositing manager code + libcm
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS=src po doc
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--- a/1734
+++ b/1734
--- a/425
+++ b/425
@@ -1,425 +0,0 @@
 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.
 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).
 You need Clutter 1.0. You need gobject-introspection 0.6.3.
 REPORTING BUGS AND SUBMITTING PATCHES
 ===
 Report new bugs on http://bugzilla.gnome.org. Please check for
 duplicates, *especially* if you are reporting a feature request. 
 Please do *not* add "me too!" or "yes I really want this!" comments to
 feature requests in bugzilla. Please read
 http://pobox.com/~hp/features.html prior to adding any kind of flame
 about missing features or misfeatures.
 Feel free to send patches too; Metacity is relatively small and
 simple, so if you find a bug or want to add a feature it should be
 pretty easy.  Send me mail, or put the patch in bugzilla.
 See the HACKING file for some notes on hacking Mutter.
 MUTTER FEATURES
 ===
 - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts, 
   etc. come from GTK+ theme.
 - Does not expose the concept of "window manager" to the user.  Some
   of the features in the GNOME control panel and other parts of the
   desktop happen to be implemented in metacity, such as changing your
   window border theme, or changing your window navigation shortcuts,
   but the user doesn't need to know this.
 - Includes only the window manager; does not try to be a desktop
   environment. The pager, configuration, etc. are all separate and
   modular. The "libwnck" library (which I also wrote) is available
   for writing metacity extensions, pagers, and so on. (But libwnck
   isn't metacity specific, or GNOME-dependent; it requires only GTK,
   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
   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
   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
 - Global keybinding defaults include:   
    Alt-Tab                forward cycle window focus
    Alt-Shift-Tab          backward cycle focus
    Alt-Ctrl-Tab           forward cycle focus among panels
    Alt-Ctrl-Shift-Tab     backward cycle focus among panels
    Alt-Escape             cycle window focus without a popup thingy
    Ctrl-Alt-Left Arrow    previous workspace
    Ctrl-Alt-Right Arrow   next workspace
    Ctrl-Alt-D             minimize/unminimize all, to show desktop
   Change keybindings for example:
     unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
   Also try the GNOME keyboard shortcuts control panel, or
   gconf-editor.
 - Window keybindings:
    Alt-space         window menu
    Mnemonics work in the menu. That is, Alt-space then underlined
    letter in the menu item works.
    Choose Move from menu, and arrow keys to move the window.
    While moving, hold down Control to move slower, and 
      Shift to snap to edges.
    Choose Resize from menu, and nothing happens yet, but 
      eventually I might implement something.
    Keybindings for things like maximize window, vertical maximize,
    etc. can be bound, but may not all exist by default. See
    metacity.schemas.
 - Window mouse bindings:
    Clicking anywhere on frame with button 1 will raise/focus window
    If you click a window control, such as the close button, then the 
     control will activate on button release if you are still over it
     on release (as with most GUI toolkits)
    If you click and drag borders with button 1 it resizes the window
    If you click and drag the titlebar with button 1 it moves the 
     window.
    If you click anywhere on the frame with button 2 it lowers the 
     window.
    If you click anywhere on the frame with button 3 it shows the 
     window menu.
    If you hold down Super (windows key) and click inside a window, it
     will move the window (buttons 1 and 2) or show menu (button 3).
     Or you can configure a different modifier for this.
    If you pick up a window with button 1 and then switch workspaces
     the window will come with you to the new workspace, this is 
     a feature copied from Enlightenment.
    If you hold down Shift while moving a window, the window snaps
     to edges of other windows and the screen.
 - Session management:
    Mutter connects to the session manager and will set itself up to
     be respawned. It theoretically restores sizes/positions/workspace
     for session-aware applications.
 - Mutter implements much of the EWMH window manager specification
   from freedesktop.org, as well as the older ICCCM.  Please refer to
   the COMPLIANCE file for information on mutter compliance with
   these standards.
 - Uses Pango to render text, so has cool i18n capabilities. 
   Supports UTF-8 window titles and such.
 - There are simple animations for actions such as minimization, 
   to help users see what is happening. Should probably 
   have a few more of these and make them nicer.
 - if you have the proper X setup, set the GDK_USE_XFT=1 
   environment variable to get antialiased window titles.
 - considers the panel when placing windows and maximizing
   them.
 - handles the window manager selection from the ICCCM. Will exit if
   another WM claims it, and can claim it from another WM if you pass
   the --replace argument. So if you're running another
   ICCCM-compliant WM, you can run "mutter --replace" to replace it
   with Metacity.
 - does basic colormap handling
 - and much more! well, maybe not a lot more.
 HOW TO ADD EXTERNAL FEATURES
 ===
 You can write a mutter "plugin" such as a pager, window list, icon
 box, task menu, or even things like "window matching" using the
 Extended Window Manager Hints. See http://www.freedesktop.org for the
 EWMH specification. An easy-to-use library called "libwnck" is
 available that uses the EWMH and is specifically designed for writing
 WM accessories.
 You might be interested in existing accessories such as "Devil's Pie"
 by Ross Burton, which add features to Mutter (or other
 EWMH-compliant WMs).
 MUTTER BUGS, NON-FEATURES, AND CAVEATS
 ===
 See bugzilla: http://bugzilla.gnome.org/query.cgi
 FAQ
 ===
 Q: Will you add my feature?
 A: If it makes sense to turn on unconditionally, or is genuinely a
   harmless preference that I would not be embarrassed to put in a
   simple, uncluttered, user-friendly configuration dialog.
   If the only rationale for your feature is that other window
   managers have it, or that you are personally used to it, or
   something like that, then I will not be impressed. Metacity is
   firmly in the "choose good defaults" camp rather than the "offer 6
   equally broken ways to do it, and let the user pick one" camp.
   This is part of a "no crackrock" policy, despite some exceptions
   I'm mildly embarrassed about. For example, multiple workspaces
   probably constitute crackrock, they confuse most users and really
   are not that useful if you have a decent tasklist and so on. But I
   am too used to them to turn them off.  Or alternatively
   iconification/tasklist is crack, and workspaces/pager are good. But
   having both is certainly a bit wrong.  Sloppy focus is probably
   crackrock too.
   But don't think unlimited crack is OK just because I slipped up a
   little. No slippery slope here.
   Don't let this discourage patches and fixes - I love those. ;-)
   Just be prepared to hear the above objections if your patch adds
   some crack-ridden configuration option.
   http://pobox.com/~hp/free-software-ui.html
   http://pobox.com/~hp/features.html   
 Q: Will Mutter be part of GNOME?
 A: It is not officially part of GNOME as of GNOME 2.27. We are
   hoping to have mutter officially included as of GNOME 2.28. 
 Q: Why does Mutter remember the workspace/position of some apps 
   but not others across logout/login?
 A: Mutter only stores sizes/positions for apps that are session
   managed. As far as I can determine, there is no way to attempt to
   remember workspace/position for non-session-aware apps without
   causing a lot of weird effects.
   The reason is that you don't know which non-SM-aware apps were
   launched by the session. When you initially log in, Metacity sees a
   bunch of new windows appear. But it can't distinguish between
   windows that were stored in your session, or windows you just
   launched after logging in. If Metacity tried to guess that a window
   was from the session, it could e.g. end up maximizing a dialog, or
   put a window you just launched on another desktop or in a weird
   place. And in fact I see a lot of bugs like this in window managers
   that try to handle non-session-aware apps.
   However, for session-aware apps, Mutter can tell that the
   application instance is from the session and thus restore it
   reliably, assuming the app properly restores the windows it had 
   open on session save.
   So the correct way to fix the situation is to make apps
   session-aware. libSM has come with X for years, it's very
   standardized, it's shared by GNOME and KDE - even twm is
   session-aware. So anyone who won't take a patch to add SM is more
   archaic than twm - and you should flame them. ;-)
   Docs on session management:
    http://www.fifi.org/doc/xspecs/xsmp.txt.gz
    http://www.fifi.org/doc/xspecs/SMlib.txt.gz
   See also the ICCCM section on SM. For GNOME apps, use the
   GnomeClient object. For a simple example of using libSM directly,
   twm/session.c in the twm source code is pretty easy to understand.
 Q: How about adding viewports in addition to workspaces?
 A: I could conceivably be convinced to use viewports _instead_ of
   workspaces, though currently I'm not thinking that. But I don't
   think it makes any sense to have both; it's just confusing. They
   are functionally equivalent.
   You may think this means that you won't have certain keybindings, 
   or something like that. This is a misconception. The only 
   _fundamental_ difference between viewports and workspaces is that 
   with viewports, windows can "overlap" and appear partially on 
   one and partially on another. All other differences that
   traditionally exist in other window managers are accidental - 
   the features commonly associated with viewports can be implemented
   for workspaces, and vice versa.
   So I don't want to have two kinds of
   workspace/desktop/viewport/whatever, but I'm willing to add
   features traditionally associated with either kind if those
   features make sense.
 Q: Why is the panel always on top?
 A: Because it's a better user interface, and until we made this not
   configurable a bunch of apps were not getting fixed (the app
   authors were just saying "put your panel on the bottom" instead of
   properly supporting fullscreen mode, and such).
   rationales.txt has the bugzilla URL for some flamefesting on this,
   if you want to go back and relive the glory.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
 Q: Why is there no edge flipping?
 A: This one is also in rationales.txt. Because "ouija board" UI, where
   you just move the mouse around and the computer guesses what you
   mean, has a lot of issues. This includes mouse focus, shade-hover
   mode, edge flipping, autoraise, etc. Metacity has mouse focus and
   autoraise as a compromise, but these features are all confusing for
   many users, and cause problems with accessibility, fitt's law, and
   so on.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
 Q: Why does wireframe move/resize suck?
 A: You can turn it on with the reduced_resources setting.
   But: it has low usability, and is a pain
   to implement, and there's no reason opaque move/resize should be a
   problem on any setup that can run a modern desktop worth a darn to
   begin with.
   Read these and the bugzilla stuff before asking/commenting:
     http://pobox.com/~hp/free-software-ui.html
     http://pobox.com/~hp/features.html   
   The reason we had to add wireframe anyway was broken 
   proprietary apps that can't handle lots of resize events.
 Q: Why no XYZ?
 A: You are probably getting the idea by now - check rationales.txt,
   query/search bugzilla, and read http://pobox.com/~hp/features.html
   and http://pobox.com/~hp/free-software-ui.html
   Then sit down and answer the question for yourself.  Is the feature
   good? What's the rationale for it? Answer "why" not just "why not."
   Justify in terms of users as a whole, not just users like
   yourself. How else can you solve the same problem? etc. If that
   leads you to a strong opinion, then please, post the rationale for
   discussion to an appropriate bugzilla bug, or to
   usability@gnome.org.
   Please don't just "me too!" on bugzilla bugs, please don't think
   flames will get you anywhere, and please don't repeat rationale
   that's already been offered.
 Q: Your dumb web pages you made me read talk about solving problems in
   fundamental ways instead of adding preferences or workarounds.
   What are some examples where metacity has done this?
 A: There are quite a few, though many opportunities remain.  Sometimes
   the real fix involves application changes. The metacity approach is
   that it's OK to require apps to change, though there are also
   plenty of workarounds in metacity for battles considered too hard
   to fight.
   Here are some examples:
   - fullscreen mode was introduced to allow position constraints,
     panel-on-top, and other such things to apply to normal windows
     while still allowing video players etc. to "just work"
   - "whether to include minimized windows in Alt+Tab" was solved 
     by putting minimized windows at the *end* of the tab order. 
   - Whether to pop up a feedback display during Alt+Tab was solved by
     having both Alt+Tab and Alt+Esc
   - Whether to have a "kill" feature was solved by automatically
     detecting and offering to kill stuck apps. Better, metacity
     actually does "kill -9" on the process, it doesn't just
     disconnect the process from the X server. You'll appreciate this
     if you ever did a "kill" on Netscape 4, and watched it keep
     eating 100% CPU even though the X server had booted it.
   - The workspaces vs. viewports mess was avoided by adding
     directional navigation and such to workspaces, see discussion
     earlier in this file.
   - Instead of configurable placement algorithms, there's just one 
     that works fairly well most of the time.
   - To avoid excess CPU use during opaque move/resize, we rate limit
     the updates to the application window's size.
   - Instead of configurable "show size of window while resizing,"
     it's only shown for windows where it matters, such as terminals.
     (Only use-case given for all windows is for web designers
     choosing their web browser size, but there are web sites and
     desktop backgrounds that do this for you.)
   - Using startup notification, applications open on the workspace
     where you launched them, not the active workspace when their
     window is opened.
   - and much more.
 Q: I think mutter sucks.
 A: Feel free to use any WM you like. The reason metacity follows the
   ICCCM and EWMH specifications is that it makes metacity a modular,
   interchangeable part in the desktop. libwnck-based apps such as the
   GNOME window list will work just fine with any EWMH-compliant WM.
 Q: Did you spend a lot of time on this?
 A: Originally the answer was no. Sadly the answer is now yes.
 Q: How can you claim that you are anti-crack, while still 
   writing a window manager?
 A: I have no comment on that.
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 srcdir=`dirname $0`
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.10
-(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"
--- a/configure.ac
+++ b/configure.ac
@@ -0,0 +1,495 @@
 AC_PREREQ(2.50)
 AC_CONFIG_MACRO_DIR([m4])
 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [11])
 m4_define([mutter_micro_version], [92])
 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
 m4_define([mutter_plugin_api_version], [3])
 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 AM_MAINTAINER_MODE([enable])
 # Change pkglibdir and pkgdatadir to mutter-wayland instead of mutter
 PACKAGE="mutter-wayland"
 AC_SUBST([PACKAGE], [$PACKAGE])
 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
 MUTTER_MICRO_VERSION=mutter_micro_version
 MUTTER_PLUGIN_API_VERSION=mutter_plugin_api_version
 AC_SUBST(MUTTER_MAJOR_VERSION)
 AC_SUBST(MUTTER_MINOR_VERSION)
 AC_SUBST(MUTTER_MICRO_VERSION)
 AC_SUBST(MUTTER_PLUGIN_API_VERSION)
 MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins"
 AC_SUBST(MUTTER_PLUGIN_DIR)
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 GETTEXT_PACKAGE=mutter-wayland
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
 #### Integer sizes
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0
 MUTTER_PC_MODULES="
   gtk+-3.0 >= 3.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.17.5
   cogl-1.0 >= 1.17.1
   upower-glib >= 0.99.0
   gnome-desktop-3.0
 "
 GLIB_GSETTINGS
 AC_ARG_ENABLE(verbose-mode,
  AC_HELP_STRING([--disable-verbose-mode],
                 [disable mutter's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
  enable_verbose_mode=yes)
 if test x$enable_verbose_mode = xyes; then
    AC_DEFINE(WITH_VERBOSE_MODE,1,[Build with verbose mode support])
 fi
 AC_ARG_ENABLE(sm,
  AC_HELP_STRING([--disable-sm],
                 [disable mutter's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
  enable_sm=auto)
 AC_ARG_ENABLE(startup-notification,
  AC_HELP_STRING([--disable-startup-notification],
                 [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
  enable_startup_notification=auto)
 AC_ARG_WITH(libcanberra,
  AC_HELP_STRING([--without-libcanberra],
                 [disable the use of libcanberra for playing sounds]),,
  with_libcanberra=auto)
 AC_ARG_ENABLE(xsync,
  AC_HELP_STRING([--disable-xsync],
                 [disable mutter's use of the XSync extension]),,
  enable_xsync=auto)
 AC_ARG_ENABLE(shape,
  AC_HELP_STRING([--disable-shape],
                 [disable mutter's use of the shaped window extension]),,
  enable_shape=auto)
 ## Wayland support requires the xserver.xml protocol extension found in the weston
 ## repository but since there aren't currently established conventions for
 ## installing and discovering these we simply require a location to be given
 ## explicitly...
 AC_ARG_WITH([wayland-protocols],
            [AS_HELP_STRING([--with-wayland-protocols], [Location for wayland extension protocol specs])],
            [
            ],
            [])
 AC_ARG_WITH([xwayland-path],
            [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
            [XWAYLAND_PATH="$withval"],
            [XWAYLAND_PATH="$bindir/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)
 PKG_CHECK_MODULES(MUTTER_LAUNCH, libdrm libsystemd-login)
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
 AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
 STARTUP_NOTIFICATION_VERSION=0.7
 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
   have_startup_notification=yes
 else
   have_startup_notification=no
 fi
 AC_MSG_RESULT($have_startup_notification)
 if test x$enable_startup_notification = xyes; then
   have_startup_notification=yes
   echo "startup-notification support forced on"
 elif test x$enable_startup_notification = xauto; then
   true
 else
   have_startup_notification=no
 fi
 if test x$have_startup_notification = xyes; then
  echo "Building with libstartup-notification"
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
  AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
 else
  echo "Building without libstartup-notification"
 fi
 have_libcanberra=no
 AC_MSG_CHECKING([libcanberra-gtk])
 if test x$with_libcanberra = xno ; then
  AC_MSG_RESULT([disabled])
 else
  if $PKG_CONFIG --exists $CANBERRA_GTK '>=' $CANBERRA_GTK_VERSION; then
    have_libcanberra=yes
    AC_MSG_RESULT(yes)
    MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CANBERRA_GTK"
    AC_DEFINE([HAVE_LIBCANBERRA], 1, [Building with libcanberra for playing sounds])
  else
    AC_MSG_RESULT(no)
    if test x$with_libcanberra = xyes ; then
      AC_MSG_ERROR([libcanberra forced and libcanberra-gtk was not found])
    fi
  fi
 fi
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 if test x$found_introspection != xno; then
  AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
  # 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
 MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcursor"
 AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
 AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
  AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
 AC_SUBST([WAYLAND_SCANNER])
 AC_SUBST(XWAYLAND_PATH)
 MUTTER_PC_MODULES="$MUTTER_PC_MODULES clutter-wayland-1.0 clutter-wayland-compositor-1.0 clutter-egl-1.0 wayland-server libdrm"
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
 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 - 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"
 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,
               [AC_CHECK_HEADER(X11/extensions/shape.h,
                                SHAPE_LIBS=-lXext found_shape=yes)],
               , $ALL_X_LIBS)
 if test x$enable_shape = xno; then
   found_shape=no
 fi
 if test x$enable_shape = xyes; then
   if test "$found_shape" = "no"; then
      AC_MSG_ERROR([--enable-shape forced and Shape not found])
      exit 1
   fi
 fi
 if test "x$found_shape" = "xyes"; then
   AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
 fi
 found_xkb=no
 AC_CHECK_LIB(X11, XkbQueryExtension,
               [AC_CHECK_HEADER(X11/XKBlib.h,
                                found_xkb=yes)],
 	, $ALL_X_LIBS)
 if test "x$found_xkb" = "xyes"; then
   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
 fi
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
               [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                RANDR_LIBS=-lXrandr found_randr=yes,,
 				[#include <X11/Xlib.h>])],
               , -lXrender -lXext $ALL_X_LIBS)
 if test "x$found_randr" = "xyes"; then
   AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
 fi
 XSYNC_LIBS=
 found_xsync=no
 AC_CHECK_LIB(Xext, XSyncQueryExtension,
               [AC_CHECK_HEADER(X11/extensions/sync.h,
                                found_xsync=yes,,
 				[#include <X11/Xlib.h>])],
               , $ALL_X_LIBS)
 if test x$enable_xsync = xno; then
   found_xsync=no
 fi
 if test x$enable_xsync = xyes; then
   if test "$found_xsync" = "no"; then
      AC_MSG_ERROR([--enable-xsync forced and XSync not found])
      exit 1
   fi
 fi
 if test "x$found_xsync" = "xyes"; then
   XSYNC_LIBS=-lXext
   AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi
 MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 found_sm=no
 case "$MUTTER_LIBS" in
 *-lSM*)
    found_sm=yes
    ;;
 *)
  AC_CHECK_LIB(SM, SmcSaveYourselfDone,
               [AC_CHECK_HEADERS(X11/SM/SMlib.h,
                                MUTTER_LIBS="-lSM -lICE $MUTTER_LIBS" found_sm=yes)],
               , $MUTTER_LIBS)
    ;;
 esac
 if test x$enable_sm = xno; then
   found_sm=no
 fi
 if test x$enable_sm = xyes; then
   if test "$found_sm" = "no"; then
      AC_MSG_ERROR([--enable-sm forced and -lSM not found])
      exit 1
   fi
 fi
 if test "$found_sm" = "yes"; then
   AC_DEFINE(HAVE_SM, , [Building with SM support])
 fi
 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
 HOST_ALIAS=$host_alias
 AC_SUBST(HOST_ALIAS)
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 if test x"$GDK_PIXBUF_CSOURCE" = xno; then
  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
 fi
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 AC_PATH_PROG(ZENITY, zenity, no)
 if test x"$ZENITY" = xno; then
  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
 fi
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		enable debugging],,
 	enable_debug=no)
 if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 #### Warnings (last since -Werror can disturb other tests)
 # Stay command-line compatible with the gnome-common configure option. Here
 # minimum/yes/maximum are the same, however.
 AC_ARG_ENABLE(compile_warnings,
  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
  enable_compile_warnings=error)
 changequote(,)dnl
 if test "$enable_compile_warnings" != no ; then
  if test "x$GCC" = "xyes"; then
    case " $CFLAGS " in
    *[\ \	]-Wall[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wall" ;;
    esac
 #   case " $CFLAGS " in
 #   *[\ \	]-Wshadow[\ \	]*) ;;
 #   *) CFLAGS="$CFLAGS -Wshadow" ;;
 #   esac
    case " $CFLAGS " in
    *[\ \	]-Wchar-subscripts[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wmissing-declarations[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wnested-externs[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wnested-externs" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wpointer-arith[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wcast-align[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wcast-align" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-Wsign-compare[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -Wsign-compare" ;;
    esac
    if test "$enable_compile_warnings" = error; then
      case " $CFLAGS " in
      *[\ \	]-Werror[\ \	]*) ;;
      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
      esac
    fi
  fi
 fi
 changequote([,])dnl
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
 doc/reference/Makefile
 doc/reference/meta-docs.sgml
 src/Makefile
 src/libmutter-wayland.pc
 src/compositor/plugins/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT
 if test x$enable_verbose_mode = xno; then
        echo "*** WARNING WARNING WARNING WARNING WARNING"
        echo "*** Building without verbose mode"
        echo "*** This means there's no way to debug mutter problems."
        echo "*** Please build normal desktop versions of mutter"
        echo "*** with verbose mode enabled so users can use it when they report bugs."
 fi
 dnl ==========================================================================
 echo "
 mutter-wayland-$VERSION
 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
 	Shape extension:          ${found_shape}
 	Xsync:                    ${found_xsync}
 	Xcursor:                  ${have_xcursor}
 "
 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 3.$stable_version.x for stable "
   echo    "(gnome-3-$stable_version branch in git)"
 else
   echo "This is the stable branch of mutter"
 fi
--- a/configure.in
+++ b/configure.in
@@ -1,551 +0,0 @@
 AC_PREREQ(2.50)
 m4_define([mutter_major_version], [2])
 m4_define([mutter_minor_version], [27])
 m4_define([mutter_micro_version], [5])
 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
 m4_define([mutter_plugin_api_version], [2])
 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 AM_MAINTAINER_MODE
 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
 MUTTER_MICRO_VERSION=mutter_micro_version
 MUTTER_PLUGIN_API_VERSION=mutter_plugin_api_version
 AC_SUBST(MUTTER_MAJOR_VERSION)
 AC_SUBST(MUTTER_MINOR_VERSION)
 AC_SUBST(MUTTER_MICRO_VERSION)
 AC_SUBST(MUTTER_PLUGIN_API_VERSION)
 MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins"
 AC_SUBST(MUTTER_PLUGIN_DIR)
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 GETTEXT_PACKAGE=mutter
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 IT_PROG_INTLTOOL([0.34.90])
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
 #### Integer sizes
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN
 #### Warnings
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
  case " $CFLAGS " in
  *[\ \	]-Wall[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wall" ;;
  esac
 #  case " $CFLAGS " in
 #  *[\ \	]-Wshadow[\ \	]*) ;;
 #  *) CFLAGS="$CFLAGS -Wshadow" ;;
 #  esac
  case " $CFLAGS " in
  *[\ \	]-Wchar-subscripts[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wmissing-declarations[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wnested-externs[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wnested-externs" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wpointer-arith[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wcast-align[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wcast-align" ;;
  esac
  case " $CFLAGS " in
  *[\ \	]-Wsign-compare[\ \	]*) ;;
  *) CFLAGS="$CFLAGS -Wsign-compare" ;;
  esac
  if test "x$enable_ansi" = "xyes"; then
    case " $CFLAGS " in
    *[\ \	]-ansi[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -ansi" ;;
    esac
    case " $CFLAGS " in
    *[\ \	]-pedantic[\ \	]*) ;;
    *) CFLAGS="$CFLAGS -pedantic" ;;
    esac
  fi
 fi
 changequote([,])dnl
 MUTTER_PC_MODULES='gtk+-2.0 >= 2.10.0 pango >= 1.2.0'
 AC_ARG_ENABLE(gconf,
  AC_HELP_STRING([--disable-gconf],
                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
  enable_gconf=yes)
 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
 AC_ARG_ENABLE(verbose-mode,
  AC_HELP_STRING([--disable-verbose-mode],
                 [disable mutter's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
  enable_verbose_mode=yes)
 if test x$enable_verbose_mode = xyes; then
    AC_DEFINE(WITH_VERBOSE_MODE,1,[Build with verbose mode support])
 fi
 AC_ARG_ENABLE(sm,
  AC_HELP_STRING([--disable-sm],
                 [disable mutter's session management support, for embedded/size-sensitive custom non-GNOME builds]),,
  enable_sm=auto)
 AC_ARG_ENABLE(startup-notification,
  AC_HELP_STRING([--disable-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_ENABLE(xsync,
  AC_HELP_STRING([--disable-xsync],
                 [disable mutter's use of the XSync extension]),,
  enable_xsync=auto)
 AC_ARG_ENABLE(shape,
  AC_HELP_STRING([--disable-shape],
                 [disable mutter's use of the shaped window extension]),,
  enable_shape=auto)
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 AM_GLIB_GNU_GETTEXT
 ## here we get the flags we'll actually use
 # GOptionEntry requires	glib-2.6.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
 # gtk_window_set_icon_name requires gtk2+-2.6.0
 PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-2.0 >= 2.6.0)
 PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-2.0 >= 2.6.0)
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
 AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
 STARTUP_NOTIFICATION_VERSION=0.7
 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
   have_startup_notification=yes
 else
   have_startup_notification=no
 fi
 AC_MSG_RESULT($have_startup_notification)
 if test x$enable_startup_notification = xyes; then
   have_startup_notification=yes
   echo "startup-notification support forced on"
 elif test x$enable_startup_notification = xauto; then
   true
 else
   have_startup_notification=no
 fi
 if test x$have_startup_notification = xyes; then
  echo "Building with libstartup-notification"
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
  AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
 else
  echo "Building without libstartup-notification"
 fi
 XCOMPOSITE_VERSION=0.2
 AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
 if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
  echo "Building with compositing manager"
  ## force on render also
  have_xrender=yes
 else
  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
 fi
 CLUTTER_VERSION=1.0.0
 CLUTTER_PACKAGE=clutter-1.0
 AC_SUBST(CLUTTER_PACKAGE)
 if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
  dnl Check for the clutter-glx-texture-pixmap header
  mutter_save_cppflags="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
  AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
                  [have_glx_texture_pixmap=yes],
                  [have_glx_texture_pixmap=no])
  CPPFLAGS="$mutter_save_cppflags"
  if test x$have_glx_texture_pixmap = xyes; then
    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
              [Is ClutterGLXTexturePixmap available?])
  fi
 else
  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
 fi
 if test x$with_introspection != xno; then
  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0, 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
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
 AC_PATH_XTRA
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 # Check for Xinerama extension (Solaris impl or Xfree impl)
 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
 CPPFLAGS="$mutter_save_cppflags"
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
               [AC_CHECK_HEADER(X11/extensions/shape.h,
                                SHAPE_LIBS=-lXext found_shape=yes)],
               , $ALL_X_LIBS)
 if test x$enable_shape = xno; then
   found_shape=no
 fi
 if test x$enable_shape = xyes; then
   if test "$found_shape" = "no"; then
      AC_MSG_ERROR([--enable-shape forced and Shape not found])
      exit 1
   fi
 fi
 if test "x$found_shape" = "xyes"; then
   AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
 fi
 found_xkb=no
 AC_CHECK_LIB(X11, XkbQueryExtension,
               [AC_CHECK_HEADER(X11/XKBlib.h,
                                found_xkb=yes)],
 	, $ALL_X_LIBS)
 if test "x$found_xkb" = "xyes"; then
   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
 fi
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
               [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                RANDR_LIBS=-lXrandr found_randr=yes,,
 				[#include <X11/Xlib.h>])],
               , -lXrender -lXext $ALL_X_LIBS)
 if test "x$found_randr" = "xyes"; then
   AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
 fi
 XSYNC_LIBS=
 found_xsync=no
 AC_CHECK_LIB(Xext, XSyncQueryExtension,
               [AC_CHECK_HEADER(X11/extensions/sync.h,
                                found_xsync=yes,,
 				[#include <X11/Xlib.h>])],
               , $ALL_X_LIBS)
 if test x$enable_xsync = xno; then
   found_xsync=no
 fi
 if test x$enable_xsync = xyes; then
   if test "$found_xsync" = "no"; then
      AC_MSG_ERROR([--enable-xsync forced and XSync not found])
      exit 1
   fi
 fi
 if test "x$found_xsync" = "xyes"; then
   XSYNC_LIBS=-lXext
   AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi
 MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 MUTTER_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"
 MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 found_sm=no
 case "$MUTTER_LIBS" in
 *-lSM*)
    found_sm=yes
    ;;
 *)
  AC_CHECK_LIB(SM, SmcSaveYourselfDone,
               [AC_CHECK_HEADERS(X11/SM/SMlib.h,
                                MUTTER_LIBS="-lSM -lICE $MUTTER_LIBS" found_sm=yes)],
               , $MUTTER_LIBS)
    ;;
 esac
 if test x$enable_sm = xno; then
   found_sm=no
 fi
 if test x$enable_sm = xyes; then
   if test "$found_sm" = "no"; then
      AC_MSG_ERROR([--enable-sm forced and -lSM not found])
      exit 1
   fi
 fi
 if test "$found_sm" = "yes"; then
   AC_DEFINE(HAVE_SM, , [Building with SM support])
 fi
 AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
 HOST_ALIAS=$host_alias
 AC_SUBST(HOST_ALIAS)
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 if test x"$GDK_PIXBUF_CSOURCE" = xno; then
  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
 fi
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 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])
 fi
 AC_ARG_ENABLE(debug,
 	[  --enable-debug		enable debugging],,
 	enable_debug=no)
 if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 # Warnings are there for a reason
 if test "x$GCC" = "xyes"; then
  CFLAGS="$CFLAGS -Wall -Werror -ansi"
 fi
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
 src/libmutter-private.pc
 src/mutter-plugins.pc
 src/tools/Makefile
 src/compositor/plugins/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"
        echo "*** This means there's no way to debug mutter problems."
        echo "*** Please build normal desktop versions of mutter"
        echo "*** with verbose mode enabled so users can use it when they report bugs."
 fi
 dnl ==========================================================================
 echo "
 mutter-$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}
 	Introspection:            ${have_introspection}
 	Session management:       ${found_sm}
 	Shape extension:          ${found_shape}
 	Xsync:                    ${found_xsync}
 	Xcursor:                  ${have_xcursor}
 "
 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 Subversion)"
 else
   echo "This is the stable branch of mutter"
 fi
--- a/doc/Makefile.am
+++ b/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
+	how-to-get-focus-right.txt rationales.txt
--- a/doc/how-to-get-focus-right.txt
+++ b/doc/how-to-get-focus-right.txt
@@ -31,8 +31,7 @@ workspaces.  In these cases, there needs to be a rule consistent with
 the above about the new window to choose.
 Focus method  Behavior
-    click     Focus the most recently used window (same as the window
+    click     Focus the window on top
              on top)
   sloppy     Focus the window containing the pointer if there is such
              a window, otherwise focus the most recently used window.
    mouse     Focus the non-DESKTOP window containing the pointer if
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,3 @@
-man_MANS = mutter.1 mutter-theme-viewer.1 \
+man_MANS = mutter.1
 	   mutter-window-demo.1 mutter-message.1
 EXTRA_DIST = $(man_MANS)
--- a/doc/man/mutter-message.1
+++ b/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).
--- a/doc/man/mutter-theme-viewer.1
+++ b/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).
--- a/doc/man/mutter-window-demo.1
+++ b/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).
--- a/doc/man/mutter.1
+++ b/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
--- a/doc/rationales.txt
+++ b/doc/rationales.txt
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -0,0 +1,166 @@
 ## Process this file with automake to produce Makefile.in
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to
 # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
 # of using the various options.
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=meta
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # Directories containing the source code, relative to $(srcdir).
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
 DOC_SOURCE_DIR=../../src/
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=--rebuild-types
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
 MKDB_OPTIONS=--xml-mode --output-format=xml
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
 MKTMPL_OPTIONS=
 # Extra options to supply to gtkdoc-mkhtml
 MKHTML_OPTIONS=
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=$(top_srcdir)/src/*/*.h
 CFILE_GLOB=$(top_srcdir)/src/*/*.c
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
 EXTRA_HFILES=
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES= \
 	async-getprop.h \
 	atoms.h \
 	bell.h \
 	boxes-private.h \
 	clutter-utils.h \
 	cogl-utils.h \
 	compositor-private.h \
 	constraints.h \
 	core.h \
 	display-private.h \
 	draw-workspace.h \
 	edge-resistance.h \
 	eventqueue.h \
 	frame.h \
 	frames.h \
 	group-private.h \
 	group-props.h \
 	iconcache.h \
 	inlinepixbufs.h \
 	keybindings-private.h \
 	menu.h \
 	metaaccellabel.h \
 	meta-background-actor-private.h \
 	meta-background-group-private.h \
 	meta-module.h \
 	meta-plugin-manager.h \
 	meta-shadow-factory-private.h \
 	meta-texture-rectangle.h \
 	meta-texture-tower.h \
 	meta-window-actor-private.h \
 	meta-window-group.h \
 	meta-window-shape.h \
 	mutter-enum-types.h \
 	mutter-Xatomtype.h \
 	place.h \
 	preview-widget.h \
 	region-utils.h \
 	resizepopup.h \
 	screen-private.h \
 	session.h \
 	stack.h \
 	stack-tracker.h \
 	stamp-mutter-enum-types.h \
 	tabpopup.h \
 	theme.h \
 	theme-private.h \
 	tile-preview.h \
 	ui.h \
 	window-private.h \
 	window-props.h \
 	workspace-private.h \
 	xprops.h \
 	$(NULL)
 MKDB_OPTIONS+=--ignore-files="$(IGNORE_HFILES)"
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files= \
 	mutter-overview.xml \
 	running-mutter.xml \
 	$(NULL)
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
 expand_content_files= \
 	mutter-overview.xml \
 	running-mutter.xml \
 	$(NULL)
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(MUTTER_CFLAGS)
 GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter-wayland.la
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST +=
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES = $(DOC_MODULES).types
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
 #TESTS = $(GTKDOC_CHECK)
 endif
 -include $(top_srcdir)/git.mk
--- a/doc/reference/meta-docs.sgml.in
+++ b/doc/reference/meta-docs.sgml.in
@@ -0,0 +1,59 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
  <!ENTITY version "@VERSION@">
 ]>
 <book id="index">
  <bookinfo>
    <title>Mutter Reference Manual</title>
    <releaseinfo>
      This document is for Mutter &version;.
      The latest version of this documentation can be found on-line at
      <ulink role="online-location" url="http://developer.gnome.org/meta/">http://developer.gnome.org/meta/</ulink>.
    </releaseinfo>
  </bookinfo>
  <xi:include href="xml/mutter-overview.xml"/>
  <xi:include href="xml/running-mutter.xml"/>
  <part id="core-reference">
    <title>Mutter Core Reference</title>
    <xi:include href="xml/main.xml"/>
    <xi:include href="xml/common.xml"/>
    <xi:include href="xml/gradient.xml"/>
    <xi:include href="xml/prefs.xml"/>
    <xi:include href="xml/util.xml"/>
    <xi:include href="xml/errors.xml"/>
    <xi:include href="xml/meta-plugin.xml"/>
    <xi:include href="xml/barrier.xml"/>
    <xi:include href="xml/boxes.xml"/>
    <xi:include href="xml/compositor.xml"/>
    <xi:include href="xml/display.xml"/>
    <xi:include href="xml/group.xml"/>
    <xi:include href="xml/keybindings.xml"/>
    <xi:include href="xml/meta-background-actor.xml"/>
    <xi:include href="xml/meta-shadow-factory.xml"/>
    <xi:include href="xml/meta-shaped-texture.xml"/>
    <xi:include href="xml/meta-window-actor.xml"/>
    <xi:include href="xml/screen.xml"/>
    <xi:include href="xml/window.xml"/>
    <xi:include href="xml/workspace.xml"/>
  </part>
  <chapter id="object-tree">
    <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
  </chapter>
  <index id="api-index-full">
    <title>API Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index id="deprecated-api-index" role="deprecated">
    <title>Index of deprecated API</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/doc/reference/meta-sections.txt
+++ b/doc/reference/meta-sections.txt
@@ -0,0 +1,683 @@
 <SECTION>
 <FILE>barrier</FILE>
 <TITLE>MetaBarrier</TITLE>
 MetaBarrier
 MetaBarrierClass
 meta_barrier_is_active
 meta_barrier_destroy
 meta_barrier_release
 MetaBarrierDirection
 MetaBarrierEvent
 <SUBSECTION Standard>
 META_BARRIER
 META_BARRIER_CLASS
 META_BARRIER_GET_CLASS
 META_IS_BARRIER
 META_IS_BARRIER_CLASS
 META_TYPE_BARRIER
 META_TYPE_BARRIER_EVENT
 MetaBarrierPrivate
 meta_barrier_event_get_type
 meta_barrier_get_type
 </SECTION>
 <SECTION>
 <FILE>boxes</FILE>
 MetaRectangle
 MetaStrut
 MetaEdgeType
 MetaEdge
 meta_rectangle_copy
 meta_rectangle_free
 meta_rect
 meta_rectangle_area
 meta_rectangle_intersect
 meta_rectangle_equal
 meta_rectangle_union
 meta_rectangle_overlap
 meta_rectangle_vert_overlap
 meta_rectangle_horiz_overlap
 meta_rectangle_could_fit_rect
 meta_rectangle_contains_rect
 <SUBSECTION Standard>
 META_TYPE_RECTANGLE
 meta_rectangle_get_type
 </SECTION>
 <SECTION>
 <FILE>common</FILE>
 META_VIRTUAL_CORE_POINTER_ID
 META_VIRTUAL_CORE_KEYBOARD_ID
 MetaFrameFlags
 MetaMenuOp
 MetaWindowMenuFunc
 MetaGrabOp
 MetaCursor
 MetaFrameType
 MetaVirtualModifier
 MetaDirection
 MetaMotionDirection
 MetaSide
 MetaButtonFunction
 MAX_BUTTONS_PER_CORNER
 MetaButtonLayout
 MetaFrameBorders
 meta_frame_borders_clear
 META_ICON_WIDTH
 META_ICON_HEIGHT
 META_MINI_ICON_WIDTH
 META_MINI_ICON_HEIGHT
 META_DEFAULT_ICON_NAME
 META_PRIORITY_RESIZE
 META_PRIORITY_BEFORE_REDRAW
 META_PRIORITY_REDRAW
 META_PRIORITY_PREFS_NOTIFY
 POINT_IN_RECT
 MetaStackLayer
 MetaWindowMenu
 MetaResizePopup
 </SECTION>
 <SECTION>
 <FILE>compositor</FILE>
 MetaCompEffect
 MetaCompositor
 meta_compositor_new
 meta_compositor_destroy
 meta_compositor_manage_screen
 meta_compositor_unmanage_screen
 meta_compositor_window_shape_changed
 meta_compositor_process_event
 meta_compositor_filter_keybinding
 meta_compositor_add_window
 meta_compositor_remove_window
 meta_compositor_show_window
 meta_compositor_hide_window
 meta_compositor_switch_workspace
 meta_compositor_maximize_window
 meta_compositor_unmaximize_window
 meta_compositor_sync_window_geometry
 meta_compositor_set_updates_frozen
 meta_compositor_queue_frame_drawn
 meta_compositor_sync_stack
 meta_compositor_sync_screen_size
 meta_compositor_flash_screen
 meta_get_stage_for_screen
 meta_get_overlay_group_for_screen
 meta_get_overlay_window
 meta_get_window_actors
 meta_get_window_group_for_screen
 meta_get_top_window_group_for_screen
 meta_disable_unredirect_for_screen
 meta_enable_unredirect_for_screen
 meta_set_stage_input_region
 meta_empty_stage_input_region
 </SECTION>
 <SECTION>
 <FILE>display</FILE>
 MetaTabList
 MetaTabShowType
 meta_XFree
 meta_display_get_compositor_version
 meta_display_get_xinput_opcode
 meta_display_supports_extended_barriers
 meta_display_get_xdisplay
 meta_display_get_compositor
 meta_display_get_screens
 meta_display_has_shape
 meta_display_screen_for_root
 meta_display_get_focus_window
 meta_display_xwindow_is_a_no_focus_window
 meta_display_get_damage_event_base
 meta_display_get_shape_event_base
 meta_display_xserver_time_is_before
 meta_display_get_last_user_time
 meta_display_get_current_time
 meta_display_get_current_time_roundtrip
 meta_display_get_ignored_modifier_mask
 meta_display_get_tab_list
 meta_display_get_tab_next
 meta_display_get_tab_current
 meta_display_begin_grab_op
 meta_display_end_grab_op
 meta_display_get_grab_op
 meta_display_add_keybinding
 meta_display_remove_keybinding
 meta_display_get_keybinding_action
 meta_display_set_input_focus_window
 meta_display_focus_the_no_focus_window
 meta_display_sort_windows_by_stacking
 meta_display_get_leader_window
 meta_display_add_ignored_crossing_serial
 meta_display_unmanage_screen
 meta_display_clear_mouse_mode
 MetaDisplay
 MetaDisplayClass
 <SUBSECTION Standard>
 META_DISPLAY
 META_DISPLAY_CLASS
 META_DISPLAY_GET_CLASS
 META_IS_DISPLAY
 META_IS_DISPLAY_CLASS
 META_TYPE_DISPLAY
 meta_display_get_type
 </SECTION>
 <SECTION>
 <FILE>errors</FILE>
 meta_error_trap_push
 meta_error_trap_pop
 meta_error_trap_push_with_return
 meta_error_trap_pop_with_return
 </SECTION>
 <SECTION>
 <FILE>gradient</FILE>
 MetaGradientType
 meta_gradient_create_simple
 meta_gradient_create_multi
 meta_gradient_create_interwoven
 meta_gradient_add_alpha
 </SECTION>
 <SECTION>
 <FILE>group</FILE>
 MetaGroup
 meta_window_get_group
 meta_window_compute_group
 meta_window_shutdown_group
 meta_window_group_leader_changed
 meta_display_lookup_group
 meta_group_list_windows
 meta_group_update_layers
 meta_group_get_startup_id
 meta_group_get_size
 meta_group_property_notify
 </SECTION>
 <SECTION>
 <FILE>keybindings</FILE>
 MetaKeyBinding
 META_TYPE_KEY_BINDING
 meta_key_binding_get_name
 meta_key_binding_get_modifiers
 meta_key_binding_get_mask
 meta_key_binding_is_builtin
 meta_keybindings_set_custom_handler
 meta_screen_ungrab_all_keys
 meta_screen_grab_all_keys
 </SECTION>
 <SECTION>
 <FILE>main</FILE>
 meta_get_option_context
 meta_init
 meta_run
 meta_get_replace_current_wm
 meta_set_wm_name
 meta_set_gnome_wm_keybindings
 MetaExitCode
 meta_exit
 meta_quit
 </SECTION>
 <SECTION>
 <FILE>meta-background</FILE>
 <TITLE>MetaBackground</TITLE>
 MetaBackgroundEffects
 MetaBackground
 MetaBackgroundClass
 meta_background_new
 meta_background_copy
 meta_background_load_gradient
 meta_background_load_color
 meta_background_load_still_frame
 meta_background_load_file_async
 meta_background_load_file_finish
 meta_background_get_filename
 meta_background_get_style
 meta_background_get_shading
 meta_background_get_color
 meta_background_get_second_color
 <SUBSECTION Standard>
 META_BACKGROUND
 META_BACKGROUND_CLASS
 META_BACKGROUND_GET_CLASS
 META_IS_BACKGROUND
 META_IS_BACKGROUND_CLASS
 META_TYPE_BACKGROUND
 MetaBackgroundPrivate
 meta_background_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-background-actor</FILE>
 <TITLE>MetaBackgroundActor</TITLE>
 MetaBackgroundActor
 MetaBackgroundActorClass
 meta_background_actor_new_for_screen
 MetaSnippetHook
 meta_background_actor_add_glsl_snippet
 meta_background_actor_set_uniform_float
 <SUBSECTION Standard>
 META_BACKGROUND_ACTOR
 META_BACKGROUND_ACTOR_CLASS
 META_BACKGROUND_ACTOR_GET_CLASS
 META_IS_BACKGROUND_ACTOR
 META_IS_BACKGROUND_ACTOR_CLASS
 META_TYPE_BACKGROUND_ACTOR
 MetaBackgroundActorPrivate
 meta_background_actor_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-background-group</FILE>
 <TITLE>MetaBackgroundGroup</TITLE>
 MetaBackgroundGroupClass
 meta_background_group_new
 <SUBSECTION Standard>
 META_BACKGROUND_GROUP
 META_BACKGROUND_GROUP_CLASS
 META_BACKGROUND_GROUP_GET_CLASS
 META_IS_BACKGROUND_GROUP
 META_IS_BACKGROUND_GROUP_CLASS
 META_TYPE_BACKGROUND_GROUP
 MetaBackgroundGroupPrivate
 meta_background_group_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-plugin</FILE>
 <TITLE>MetaPlugin</TITLE>
 MetaPlugin
 MetaPluginClass
 MetaPluginInfo
 meta_plugin_running
 meta_plugin_debug_mode
 meta_plugin_get_info
 MetaPluginVersion
 META_PLUGIN_DECLARE
 meta_plugin_switch_workspace_completed
 meta_plugin_minimize_completed
 meta_plugin_maximize_completed
 meta_plugin_unmaximize_completed
 meta_plugin_map_completed
 meta_plugin_destroy_completed
 MetaModalOptions
 meta_plugin_begin_modal
 meta_plugin_end_modal
 meta_plugin_get_screen
 meta_plugin_manager_set_plugin_type
 <SUBSECTION Standard>
 META_IS_PLUGIN
 META_IS_PLUGIN_CLASS
 META_PLUGIN
 META_PLUGIN_CLASS
 META_PLUGIN_GET_CLASS
 META_TYPE_PLUGIN
 MetaPluginPrivate
 meta_plugin_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-shadow-factory</FILE>
 MetaShadowParams
 meta_shadow_factory_get_default
 meta_shadow_factory_set_params
 meta_shadow_factory_get_params
 MetaShadowFactory
 MetaShadowFactoryClass
 <SUBSECTION Standard>
 META_IS_SHADOW_FACTORY
 META_IS_SHADOW_FACTORY_CLASS
 META_SHADOW_FACTORY
 META_SHADOW_FACTORY_CLASS
 META_SHADOW_FACTORY_GET_CLASS
 META_TYPE_SHADOW_FACTORY
 meta_shadow_factory_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-shaped-texture</FILE>
 <TITLE>MetaShapedTexture</TITLE>
 MetaShapedTexture
 MetaShapedTextureClass
 meta_shaped_texture_new
 meta_shaped_texture_set_create_mipmaps
 meta_shaped_texture_update_area
 meta_shaped_texture_set_pixmap
 meta_shaped_texture_get_texture
 meta_shaped_texture_set_mask_texture
 meta_shaped_texture_set_clip_region
 meta_shaped_texture_get_image
 <SUBSECTION Standard>
 META_IS_SHAPED_TEXTURE
 META_IS_SHAPED_TEXTURE_CLASS
 META_SHAPED_TEXTURE
 META_SHAPED_TEXTURE_CLASS
 META_SHAPED_TEXTURE_GET_CLASS
 META_TYPE_SHAPED_TEXTURE
 MetaShapedTexturePrivate
 meta_shaped_texture_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-window-actor</FILE>
 <TITLE>MetaWindowActor</TITLE>
 MetaWindowActor
 MetaWindowActorClass
 meta_window_actor_get_x_window
 meta_window_actor_get_workspace
 meta_window_actor_get_meta_window
 meta_window_actor_get_texture
 meta_window_actor_is_override_redirect
 meta_window_actor_get_description
 meta_window_actor_showing_on_its_workspace
 meta_window_actor_is_destroyed
 <SUBSECTION Standard>
 META_IS_WINDOW_ACTOR
 META_IS_WINDOW_ACTOR_CLASS
 META_TYPE_WINDOW_ACTOR
 META_WINDOW_ACTOR
 META_WINDOW_ACTOR_CLASS
 META_WINDOW_ACTOR_GET_CLASS
 MetaWindowActorPrivate
 meta_window_actor_get_type
 </SECTION>
 <SECTION>
 <FILE>meta-cullable</FILE>
 <TITLE>MetaCullable</TITLE>
 MetaCullable
 MetaCullableInterface
 meta_cullable_cull_out
 meta_cullable_reset_culling
 meta_cullable_cull_out_children
 meta_cullable_reset_culling_children
 <SUBSECTION Standard>
 META_TYPE_CULLABLE
 META_CULLABLE
 META_IS_CULLABLE
 META_CULLABLE_GET_IFACE
 meta_cullable_get_type
 </SECTION>
 <SECTION>
 <FILE>prefs</FILE>
 MetaPreference
 MetaPrefsChangedFunc
 meta_prefs_add_listener
 meta_prefs_remove_listener
 meta_prefs_init
 meta_prefs_override_preference_schema
 meta_preference_to_string
 meta_prefs_get_mouse_button_mods
 meta_prefs_get_mouse_button_resize
 meta_prefs_get_mouse_button_menu
 meta_prefs_get_focus_mode
 meta_prefs_get_focus_new_windows
 meta_prefs_get_attach_modal_dialogs
 meta_prefs_get_raise_on_click
 meta_prefs_get_theme
 meta_prefs_get_titlebar_font
 meta_prefs_get_num_workspaces
 meta_prefs_get_dynamic_workspaces
 meta_prefs_get_disable_workarounds
 meta_prefs_get_auto_raise
 meta_prefs_get_auto_raise_delay
 meta_prefs_get_focus_change_on_pointer_rest
 meta_prefs_get_gnome_accessibility
 meta_prefs_get_gnome_animations
 meta_prefs_get_edge_tiling
 meta_prefs_get_auto_maximize
 meta_prefs_get_button_layout
 meta_prefs_get_action_double_click_titlebar
 meta_prefs_get_action_middle_click_titlebar
 meta_prefs_get_action_right_click_titlebar
 meta_prefs_set_num_workspaces
 meta_prefs_get_workspace_name
 meta_prefs_change_workspace_name
 meta_prefs_get_cursor_theme
 meta_prefs_get_cursor_size
 meta_prefs_get_compositing_manager
 meta_prefs_get_force_fullscreen
 meta_prefs_set_force_fullscreen
 meta_prefs_get_workspaces_only_on_primary
 meta_prefs_get_no_tab_popup
 meta_prefs_set_no_tab_popup
 meta_prefs_get_draggable_border_width
 meta_prefs_get_ignore_request_hide_titlebar
 meta_prefs_set_ignore_request_hide_titlebar
 MetaKeyBindingAction
 MetaKeyBindingFlags
 MetaKeyCombo
 MetaKeyHandlerFunc
 meta_prefs_get_keybindings
 meta_prefs_get_keybinding_action
 meta_prefs_get_window_binding
 meta_prefs_get_overlay_binding
 meta_prefs_get_visual_bell
 meta_prefs_bell_is_audible
 meta_prefs_get_visual_bell_type
 MetaKeyHandler
 <SUBSECTION Standard>
 meta_key_binding_get_type
 </SECTION>
 <SECTION>
 <FILE>screen</FILE>
 MetaScreen
 MetaScreenClass
 meta_screen_get_screen_number
 meta_screen_get_display
 meta_screen_get_xroot
 meta_screen_get_size
 meta_screen_get_compositor_data
 meta_screen_set_compositor_data
 meta_screen_for_x_screen
 meta_screen_set_cm_selection
 meta_screen_unset_cm_selection
 meta_screen_get_startup_sequences
 meta_screen_get_workspaces
 meta_screen_get_n_workspaces
 meta_screen_get_workspace_by_index
 meta_screen_remove_workspace
 meta_screen_append_new_workspace
 meta_screen_get_active_workspace_index
 meta_screen_get_active_workspace
 meta_screen_get_n_monitors
 meta_screen_get_primary_monitor
 meta_screen_get_current_monitor
 meta_screen_get_monitor_geometry
 meta_screen_get_monitor_index_for_rect
 meta_screen_focus_default_window
 MetaScreenCorner
 meta_screen_override_workspace_layout
 <SUBSECTION Standard>
 META_IS_SCREEN
 META_IS_SCREEN_CLASS
 META_SCREEN
 META_SCREEN_CLASS
 META_SCREEN_GET_CLASS
 META_TYPE_SCREEN
 meta_screen_get_type
 </SECTION>
 <SECTION>
 <FILE>util</FILE>
 meta_is_verbose
 meta_set_verbose
 meta_is_debugging
 meta_set_debugging
 meta_is_syncing
 meta_set_syncing
 meta_set_replace_current_wm
 meta_debug_spew_real
 meta_verbose_real
 meta_bug
 meta_warning
 meta_fatal
 MetaDebugTopic
 meta_topic_real
 meta_add_verbose_topic
 meta_remove_verbose_topic
 meta_push_no_msg_prefix
 meta_pop_no_msg_prefix
 meta_unsigned_long_equal
 meta_unsigned_long_hash
 meta_frame_type_to_string
 meta_gravity_to_string
 _
 N_
 meta_g_utf8_strndup
 meta_free_gslist_and_elements
 meta_show_dialog
 meta_debug_spew
 meta_verbose
 meta_topic
 MetaLaterType
 meta_later_add
 meta_later_remove
 </SECTION>
 <SECTION>
 <FILE>window</FILE>
 MetaWindow
 MetaWindowClass
 MetaWindowType
 MetaMaximizeFlags
 meta_window_get_frame
 meta_window_has_focus
 meta_window_appears_focused
 meta_window_is_shaded
 meta_window_is_monitor_sized
 meta_window_is_override_redirect
 meta_window_is_skip_taskbar
 meta_window_get_rect
 meta_window_get_input_rect
 meta_window_get_frame_rect
 meta_window_get_outer_rect
 meta_window_client_rect_to_frame_rect
 meta_window_frame_rect_to_client_rect
 meta_window_get_screen
 meta_window_get_display
 meta_window_get_xwindow
 meta_window_get_window_type
 meta_window_get_window_type_atom
 meta_window_get_workspace
 meta_window_get_monitor
 meta_window_is_on_all_workspaces
 meta_window_located_on_workspace
 meta_window_is_hidden
 meta_window_activate
 meta_window_activate_with_workspace
 meta_window_get_description
 meta_window_get_wm_class
 meta_window_get_wm_class_instance
 meta_window_showing_on_its_workspace
 meta_window_get_gtk_application_id
 meta_window_get_gtk_unique_bus_name
 meta_window_get_gtk_application_object_path
 meta_window_get_gtk_window_object_path
 meta_window_get_gtk_app_menu_object_path
 meta_window_get_gtk_menubar_object_path
 meta_window_move
 meta_window_move_frame
 meta_window_move_resize_frame
 meta_window_move_to_monitor
 meta_window_resize
 meta_window_set_demands_attention
 meta_window_unset_demands_attention
 meta_window_get_startup_id
 meta_window_change_workspace_by_index
 meta_window_change_workspace
 meta_window_get_compositor_private
 meta_window_set_compositor_private
 meta_window_configure_notify
 meta_window_get_role
 meta_window_get_layer
 meta_window_find_root_ancestor
 meta_window_is_ancestor_of_transient
 MetaWindowForeachFunc
 meta_window_foreach_transient
 meta_window_foreach_ancestor
 meta_window_get_maximized
 meta_window_is_fullscreen
 meta_window_is_on_primary_monitor
 meta_window_requested_bypass_compositor
 meta_window_requested_dont_bypass_compositor
 meta_window_is_mapped
 meta_window_toplevel_is_mapped
 meta_window_get_icon_geometry
 meta_window_set_icon_geometry
 meta_window_maximize
 meta_window_unmaximize
 meta_window_minimize
 meta_window_unminimize
 meta_window_raise
 meta_window_lower
 meta_window_get_title
 meta_window_get_transient_for
 meta_window_get_transient_for_as_xid
 meta_window_delete
 meta_window_get_stable_sequence
 meta_window_get_user_time
 meta_window_get_pid
 meta_window_get_client_machine
 meta_window_is_remote
 meta_window_is_modal
 meta_window_is_attached_dialog
 meta_window_get_mutter_hints
 meta_window_get_frame_type
 meta_window_get_frame_bounds
 meta_window_get_tile_match
 meta_window_make_fullscreen
 meta_window_unmake_fullscreen
 meta_window_make_above
 meta_window_unmake_above
 meta_window_shade
 meta_window_unshade
 meta_window_stick
 meta_window_unstick
 meta_window_kill
 meta_window_focus
 meta_window_check_alive
 meta_window_get_work_area_current_monitor
 meta_window_get_work_area_for_monitor
 meta_window_get_work_area_all_monitors
 meta_window_begin_grab_op
 <SUBSECTION Standard>
 META_IS_WINDOW
 META_IS_WINDOW_CLASS
 META_TYPE_WINDOW
 META_WINDOW
 META_WINDOW_CLASS
 META_WINDOW_GET_CLASS
 meta_window_get_type
 </SECTION>
 <SECTION>
 <FILE>workspace</FILE>
 MetaWorkspace
 MetaWorkspaceClass
 meta_workspace_index
 meta_workspace_get_screen
 meta_workspace_list_windows
 meta_workspace_get_work_area_for_monitor
 meta_workspace_get_work_area_all_monitors
 meta_workspace_activate
 meta_workspace_activate_with_focus
 meta_workspace_update_window_hints
 meta_workspace_set_builtin_struts
 meta_workspace_get_neighbor
 <SUBSECTION Standard>
 META_IS_WORKSPACE
 META_IS_WORKSPACE_CLASS
 META_TYPE_WORKSPACE
 META_WORKSPACE
 META_WORKSPACE_CLASS
 META_WORKSPACE_GET_CLASS
 meta_workspace_get_type
 </SECTION>
--- a/doc/reference/mutter-overview.xml
+++ b/doc/reference/mutter-overview.xml
@@ -0,0 +1,15 @@
 <part id="mutter-overview">
  <title>Overview</title>
  <partintro>
    <para>Mutter is a GObject-based library for creating compositing window managers.</para>
    <para>Compositors that wish to use Mutter must implement a subclass of #MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().</para>
    <para>#MetaPlugin provides virtual functions that allow to override default behavior in the window management code, such as the effect to perform when a window is created or when switching workspaces.</para>
  </partintro>
 </part>
--- a/doc/reference/running-mutter.xml
+++ b/doc/reference/running-mutter.xml
@@ -0,0 +1,100 @@
 <part id="running-mutter">
  <title>Running Mutter</title>
  <partintro>
    <section id="environment-variables">
      <title>Environment Variables</title>
      <para>
        Mutter automatically checks environment variables during
        its initialization. These environment variables are meant
        as debug tools or overrides for default behaviours:
      </para>
      <variablelist>
        <varlistentry>
          <term>MUTTER_VERBOSE</term>
          <listitem>
            <para>Enable verbose mode, in which more information is printed to the console. Mutter needs to be built with the --enable-verbose-mode option (enabled by default). For more fine-grained control of the output, see meta_add_verbose_topic().</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DEBUG</term>
          <listitem>
            <para>Traps and prints X errors to the console.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_G_FATAL_WARNINGS</term>
          <listitem>
            <para>Causes any logging from the domains Mutter, Gtk, Gdk, Pango or GLib to terminate the process (only when using the log functions in GLib).</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_USE_LOGFILE</term>
          <listitem>
            <para>Log all messages to a temporary file.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DEBUG_XINERAMA</term>
          <listitem>
            <para>Log extra information about support of the XINERAMA extension.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DEBUG_SM</term>
          <listitem>
            <para>Log extra information about session management.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DEBUG_BUTTON_GRABS</term>
          <listitem>
            <para>Log extra information about button grabs.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_SYNC</term>
          <listitem>
            <para>Call XSync after each X call.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DISPLAY</term>
          <listitem>
            <para>Name of the X11 display to use.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>META_DISABLE_MIPMAPS</term>
          <listitem>
            <para>Disable use of mipmaps for the textures that back window pixmaps.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_USE_STATIC_GRAVITY</term>
          <listitem>
            <para>Enable support for clients with static bit-gravity.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_WM_CLASS_FILTER</term>
          <listitem>
            <para>Comma-separated list of WM_CLASS names to which to restrict Mutter to.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>MUTTER_DISABLE_FALLBACK_COLOR</term>
          <listitem>
            <para>Disable fallback for themed colors, for easier detection of typographical errors.</para>
          </listitem>
        </varlistentry>
      </variablelist>
    </section>
  </partintro>
 </part>
--- a/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -4,6 +4,7 @@ of the theme format, and a given theme can support more than one format.
 Version 1:     THEMEDIR/metacity-1/metacity-theme-1.xml
  (original metacity format)
 Version 2:     THEMEDIR/metacity-1/metacity-theme-2.xml
 Version 3:     THEMEDIR/metacity-1/metacity-theme-3.xml
 The subdirectory name is "metacity-1" in all versions.
@@ -21,6 +22,71 @@ This document has separate sections for each format version. You may
 want to read the document in reverse order, since the base features
 are discussed under version 1.
 New Features in Theme Format Version 3.4
 ========================================
 An additional color type is added to pick up custom colors defined
 in the GTK+ theme's CSS:
  gtk:custom(name,fallback)
 where <name> refers to a custom color defined with @define-color in
 the GTK+ theme, and <fallback> provides an alternative color definition
 in case the color referenced by <name> is not found.
 New Features in Theme Format Version 3.3
 ========================================
 Add two additional button background functions - left_single_background and
 right_single_background - for button groups with just a single button.
 There are now additional frame states to style left/right tiled windows
 differently ("tiled_left", "tiled_right", "tiled_left_and_shaded",
 "tiled_right_and_shaded").
 New Features in Theme Format Version 3.2
 ========================================
 A new window type 'attached' is added for modal dialogs which are
 attached to their parent window. (When the attach_modal_dialogs preference
 is turned on.) If no style is defined for the 'attached' window type,
 the 'border' window type will be used instead.
 New Features in Theme Format Version 3.1
 ========================================
 Additional predefined variables are added for positioning expressions:
 frame_x_center: the X center of the entire frame, with respect to the
     piece currently being drawn.
 frame_y_center: the Y center of the entire frame, with respect to the
     piece currently being drawn.
 The <title/> element now supports an "ellipsize_width" attribute. When
 specified, this gives a width at which to ellipsize the title. If not
 specified, the title will simply be clipped to the title area.
 New Features in Theme Format Version 3
 ======================================
 Format version 3 has exactly one new feature; any element in the file
 can now have a version attribute:
  version="[<|<=|=>|>] MAJOR.MINOR"
 (< and > should be to be entity escaped as &lt; and &gt;). If this
 version check is not met, then the element and its children will be
 ignored. This allows having alternate sections of the theme file for
 older and newer version of the Metacity theme format.
 When placed on the toplevel <metacity_theme> element, an unsatisfied
 version check will not just cause the contents of the file to be
 ignored, it will also cause the lookup of a theme file to proceed on
 and look for an older format 2 or format 1 file. This allows making a
 metacity-theme-3.xml file that is only used the format version 3.2 or
 newer is supported, and using metacity-theme-1.xml for older window
 managers.
 New Features in Theme Format Version 2
 ======================================
--- a/mutter.doap
+++ b/mutter.doap
@@ -6,11 +6,22 @@
  <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/" />
  -->
  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
  <download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
  <download-page rdf:resource="http://download.gnome.org/sources/mutter-wayland/" />
  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
@@ -29,4 +40,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>
--- a/po/LINGUAS
+++ b/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
@@ -57,6 +59,7 @@ mn
 mr
 ms
 nb
 nds
 ne
 nl
 nn
@@ -78,9 +81,11 @@ sr@latin
 sv
 ta
 te
 tg
 th
 tk
 tr
 ug 
 uk
 vi
 wa
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,28 +1,32 @@
 # 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
 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
+src/x11/session.c
 src/core/util.c
 src/core/window.c
-src/core/window-props.c
+src/x11/window-props.c
-src/core/xprops.c
+src/x11/xprops.c
-src/include/all-keybindings.h
+src/mutter-wayland.desktop.in
-src/mutter.desktop.in
+src/org.gnome.mutter.gschema.xml.in
-src/mutter-wm.desktop.in
+src/org.gnome.mutter.wayland.gschema.xml.in
 src/mutter.schemas.in
 src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
 src/ui/theme-viewer.c
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/ast.po
+++ b/po/ast.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/ml.po
+++ b/po/ml.po
--- a/po/mr.po
+++ b/po/mr.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nds.po
+++ b/po/nds.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/ug.po
+++ b/po/ug.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/50-mutter-navigation.xml.in
+++ b/src/50-mutter-navigation.xml.in
@@ -0,0 +1,92 @@
 <?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="move-to-monitor-left"
 	              _description="Move window one monitor to the left" />
 	<KeyListEntry name="move-to-monitor-right"
 	              _description="Move window one monitor to the right" />
 	<KeyListEntry name="move-to-monitor-up"
 	              _description="Move window one monitor up" />
 	<KeyListEntry name="move-to-monitor-down"
 	              _description="Move window one monitor 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>
--- a/src/50-mutter-system.xml.in
+++ b/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>
--- a/src/50-mutter-windows.xml.in
+++ b/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>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,112 +1,164 @@
 # 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_COMPOSITOR_API					\
 	-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)\"			\
 	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
 mutter_built_sources = \
-	mutter-marshal.h \
+	$(dbus_idle_built_sources)		\
-	mutter-marshal.c \
+	$(dbus_xrandr_built_sources)		\
-	mutter-enum-types.h \
+	mutter-enum-types.h 			\
-	mutter-enum-types.c
+	mutter-enum-types.c			\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
 	xdg-shell-protocol.c			\
 	xdg-shell-server-protocol.h		\
 	xserver-protocol.c			\
 	xserver-server-protocol.h
-mutter_SOURCES= 				\
+wayland_protocols = \
-	core/async-getprop.c			\
+	wayland/protocol/gtk-shell.xml		\
-	core/async-getprop.h			\
+	wayland/protocol/xdg-shell.xml		\
-	core/alttabhandler.c			\
+	wayland/protocol/xserver.xml
-	include/alttabhandler.h			\
+
-	core/alttabhandlerdefault.c		\
+libmutter_wayland_la_SOURCES =			\
-	include/alttabhandlerdefault.h		\
+	core/above-tab-keycode.c		\
 	core/barrier.c				\
 	meta/barrier.h				\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
-	include/boxes.h				\
+	core/boxes-private.h			\
 	meta/boxes.h				\
 	compositor/clutter-utils.c		\
 	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
 	compositor/cogl-utils.h			\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
-	compositor/mutter-module.c		\
+	compositor/meta-background.c		\
-	compositor/mutter-module.h		\
+	compositor/meta-background-actor.c	\
-	compositor/mutter-plugin.c		\
+	compositor/meta-background-actor-private.h	\
-	compositor/mutter-plugin-manager.c	\
+	compositor/meta-background-group.c	\
-	compositor/mutter-plugin-manager.h	\
+	compositor/meta-cullable.c		\
-	compositor/mutter-shaped-texture.c	\
+	compositor/meta-cullable.h		\
-	compositor/mutter-window.c		\
+	compositor/meta-module.c		\
-	compositor/mutter-window-private.h	\
+	compositor/meta-module.h		\
-	compositor/mutter-window-group.c	\
+	compositor/meta-plugin.c		\
-	compositor/mutter-window-group.h	\
+	compositor/meta-plugin-manager.c	\
-	compositor/shadow.c			\
+	compositor/meta-plugin-manager.h	\
-	compositor/shadow.h			\
+	compositor/meta-shadow-factory.c	\
-	compositor/mutter-shaped-texture.h	\
+	compositor/meta-shadow-factory-private.h	\
-	compositor/tidy/tidy-texture-frame.c	\
+	compositor/meta-shaped-texture.c	\
-	compositor/tidy/tidy-texture-frame.h	\
+	compositor/meta-shaped-texture-private.h 	\
-	include/compositor.h			\
+	compositor/meta-surface-actor.c		\
-	include/mutter-plugin.h			\
+	compositor/meta-surface-actor.h		\
-	include/mutter-window.h			\
+	compositor/meta-surface-actor-x11.c	\
-	include/compositor-mutter.h 		\
+	compositor/meta-surface-actor-x11.h	\
 	compositor/meta-surface-actor-wayland.c	\
 	compositor/meta-surface-actor-wayland.h	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
 	compositor/meta-window-actor-private.h	\
 	compositor/meta-window-group.c		\
 	compositor/meta-window-group.h		\
 	compositor/meta-window-shape.c		\
 	compositor/meta-window-shape.h		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
 	meta/compositor.h			\
 	meta/meta-background.h			\
 	meta/meta-background-actor.h		\
 	meta/meta-background-group.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
 	meta/compositor-mutter.h 		\
 	core/constraints.c			\
 	core/constraints.h			\
 	core/core.c				\
 	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			\
+	meta/errors.h				\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
-	core/frame-private.h			\
+	core/frame.h				\
 	include/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				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
-	core/mutter-Xatomtype.h		\
+	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			\
+	meta/screen.h				\
-	include/types.h                         \
+	meta/types.h				\
 	core/session.c				\
 	core/session.h				\
 	core/stack.c				\
 	core/stack.h				\
 	core/stack-tracker.c			\
 	core/stack-tracker.h			\
 	core/util.c				\
-	include/util.h				\
+	meta/util.h				\
-	core/window-props.c			\
+	core/util-private.h			\
 	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				\
+	meta/common.h				\
-	include/xprops.h			\
+	core/core.h				\
-	include/common.h			\
+	ui/ui.h					\
 	include/core.h				\
 	include/ui.h				\
 	inlinepixbufs.h				\
 	ui/fixedtip.c				\
 	ui/fixedtip.h				\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@@ -114,86 +166,125 @@ mutter_SOURCES= 				\
 	ui/metaaccellabel.c			\
 	ui/metaaccellabel.h			\
 	ui/resizepopup.c			\
-	include/resizepopup.h			\
+	ui/resizepopup.h			\
 	ui/tabpopup.c				\
 	include/tabpopup.h				\
 	ui/theme-parser.c			\
 	ui/theme-parser.h			\
 	ui/theme.c				\
-	ui/theme.h				\
+	meta/theme.h				\
-	ui/themewidget.c			\
+	ui/theme-private.h			\
 	ui/themewidget.h			\
 	ui/ui.c					\
-	include/all-keybindings.h               \
+	x11/iconcache.c				\
 	x11/iconcache.h				\
 	x11/async-getprop.c			\
 	x11/async-getprop.h			\
 	x11/group-private.h			\
 	x11/group-props.c			\
 	x11/group-props.h			\
 	x11/group.c				\
 	meta/group.h				\
 	x11/session.c				\
 	x11/session.h				\
 	x11/window-props.c			\
 	x11/window-props.h			\
 	x11/window-x11.c			\
 	x11/window-x11.h			\
 	x11/window-x11-private.h		\
 	x11/xprops.c				\
 	x11/xprops.h				\
 	wayland/meta-wayland.c			\
 	wayland/meta-wayland.h			\
 	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
 nodist_libmutter_wayland_la_SOURCES =		\
 	$(mutter_built_sources)
-# by setting libmutter_private_la_CFLAGS, the files shared with
+libmutter_wayland_la_LDFLAGS = -no-undefined
-# mutter proper will be compiled with different names.
+libmutter_wayland_la_LIBADD  = $(MUTTER_LIBS)
 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-parser.h			\
 	ui/theme.c				\
 	ui/theme.h
 libmutter_private_la_LDFLAGS = -no-undefined
 libmutter_private_la_LIBADD  = @MUTTER_LIBS@
 libmutterincludedir = $(includedir)/mutter/mutter-private
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
-	include/alttabhandler.h			\
+	meta/barrier.h				\
-	include/boxes.h				\
+	meta/boxes.h				\
-	ui/gradient.h				\
+	meta/common.h				\
-	include/main.h				\
+	meta/compositor-mutter.h		\
-	include/util.h				\
+	meta/compositor.h			\
-	include/common.h			\
+	meta/display.h				\
-	ui/theme-parser.h			\
+	meta/errors.h				\
-	ui/theme.h				\
+	meta/gradient.h				\
-	include/prefs.h				\
+	meta/group.h				\
-	include/window.h			\
+	meta/keybindings.h			\
-	include/workspace.h			\
+	meta/main.h				\
-	include/compositor.h			\
+	meta/meta-background-actor.h		\
-	include/compositor-mutter.h		\
+	meta/meta-background-group.h		\
-	include/types.h				\
+	meta/meta-background.h			\
-	include/errors.h			\
+	meta/meta-cursor-tracker.h		\
-	include/screen.h			\
+	meta/meta-idle-monitor.h		\
-	include/display.h			\
+	meta/meta-plugin.h			\
-	include/group.h				\
+	meta/meta-shaped-texture.h		\
-	include/keybindings.h			\
+	meta/meta-shadow-factory.h		\
-	include/mutter-plugin.h			\
+	meta/meta-window-actor.h		\
-	include/mutter-window.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			\
+	meta/atomnames.h
-	include/atomnames.h
+
 libmutterincludedir = $(includedir)/mutter-wayland/meta
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)
-mutter_theme_viewer_SOURCES=  \
+bin_PROGRAMS=mutter-wayland
 	ui/theme-viewer.c
-bin_PROGRAMS=mutter mutter-theme-viewer
+mutter_wayland_SOURCES = core/mutter.c
 mutter_wayland_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-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.
@@ -203,138 +294,93 @@ 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
+INTROSPECTION_GIRS = Meta-$(api_version).gir
-# so that libgirepository looks for symbols in the executable instead
+
-Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES)
+Meta-$(api_version).gir: libmutter-wayland.la
-	$(AM_V_GEN) pwd=`pwd` ;				\
+@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
-        cd $(srcdir) &&					\
+@META_GIR@_EXPORT_PACKAGES = libmutter-wayland
-	$(G_IR_SCANNER)					\
+@META_GIR@_CFLAGS = $(INCLUDES)
-		--namespace=Meta			\
+@META_GIR@_LIBS = libmutter-wayland.la
-		--nsversion=$(api_version)		\
+@META_GIR@_FILES =				\
-		--include=GObject-2.0			\
+	mutter-enum-types.h			\
-		--include=Gdk-2.0			\
+	$(libmutterinclude_base_headers)	\
-		--include=Gtk-2.0			\
+	$(filter %.c,$(libmutter_wayland_la_SOURCES) $(nodist_libmutter_wayland_la_SOURCES))
-		--include=Clutter-1.0			\
+@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 		--pkg=clutter-1.0			\
 		--pkg=gtk+-2.0				\
 		--include=xfixes-4.0			\
 		--program=$$pwd/mutter			\
 		$(filter %.c,$(mutter_SOURCES))		\
 		$(libmutterinclude_base_headers)	\
 		$(INCLUDES)				\
 		-o $$pwd/$@
 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=
+testboxes_SOURCES = core/testboxes.c
-mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
+testgradient_SOURCES = ui/testgradient.c
-mutter_LDFLAGS=-export-dynamic
+testasyncgetprop_SOURCES = x11/testasyncgetprop.c
 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
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
-testboxes_LDADD= @MUTTER_LIBS@
+testboxes_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testgradient_LDADD= @MUTTER_LIBS@
+testgradient_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
-testasyncgetprop_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wayland.la
@INTLTOOL_DESKTOP_RULE@
 desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=mutter.desktop.in
+desktopfiles_in_files=mutter-wayland.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
-wmpropertiesdir=$(datadir)/gnome/wm-properties
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-wmproperties_in_files=mutter-wm.desktop.in
+xml_in_files = \
-wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+        50-mutter-navigation.xml.in	\
-wmproperties_DATA = $(wmproperties_files)
+        50-mutter-system.xml.in		\
        50-mutter-windows.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
+dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 schema_in_files = mutter.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
-@INTLTOOL_SCHEMAS_RULE@
+convertdir = $(datadir)/GConf/gsettings
 convert_DATA = mutter-schemas.convert
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 else
 install-data-local:
 endif
 IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
          stock_minimize_data $(srcdir)/stock_minimize.png \
          stock_delete_data $(srcdir)/stock_delete.png
 BUILT_SOURCES = inlinepixbufs.h
 CLEANFILES =					\
-	inlinepixbufs.h				\
+	mutter-wayland.desktop			\
 	mutter.desktop				\
 	mutter-wm.desktop			\
-	mutter.schemas				\
+	org.gnome.mutter.gschema.xml		\
 	org.gnome.mutter.wayland.gschema.xml	\
 	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
 inlinepixbufs.h: $(IMAGES)
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmutter-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)		\
+	$(xml_in_files)			\
-	libmutter-private.pc.in	\
+	$(wayland_protocols)		\
-	mutter-plugins.pc.in  \
+	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)
+BUILT_SOURCES = $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)
 mutter-marshal.h: stamp-mutter-marshal.h
 	@true
 stamp-mutter-marshal.h: Makefile mutter-marshal.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
 		--prefix=_mutter_marshal \
 		--header \
 	$(srcdir)/mutter-marshal.list > xgen-tmh && \
 	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
 	rm -f xgen-tmh && \
 	echo timestamp > $(@F)
 mutter-marshal.c: Makefile mutter-marshal.list
 	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
 	 $(GLIB_GENMARSHAL) \
 		--prefix=_mutter_marshal \
 		--body \
 	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
 	cp -f xgen-tmc mutter-marshal.c && \
 	rm -f xgen-tmc
 mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template $(srcdir)/mutter-enum-types.h.in \
+	    --template mutter-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
 	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
 	rm -f xgen-teth && \
@@ -343,7 +389,30 @@ stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.
 mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template $(srcdir)/mutter-enum-types.c.in \
+	    --template mutter-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc
 dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
 $(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
 	$(AM_V_GEN)gdbus-codegen							\
 		--interface-prefix org.gnome.Mutter					\
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-xrandr					\
 		$(srcdir)/xrandr.xml
 $(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
 	$(AM_V_GEN)gdbus-codegen							\
 		--interface-prefix org.gnome.Mutter					\
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-idle-monitor				\
 		--c-generate-object-manager						\
 		$(srcdir)/idle-monitor.xml
 %-protocol.c : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
--- a/src/compositor/clutter-utils.c
+++ b/src/compositor/clutter-utils.c
@@ -0,0 +1,120 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Utilities for use with Cogl
 *
 * Copyright 2010 Red Hat, Inc.
 * Copyright 2010 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "clutter-utils.h"
 #include <math.h>
 /* This file uses pixel-aligned region computation to determine what
 * can be clipped out. This only really works if everything is aligned
 * to the pixel grid - not scaled or rotated and at integer offsets.
 *
 * (This could be relaxed - if we turned off filtering for unscaled
 * windows then windows would be, by definition aligned to the pixel
 * grid. And for rectangular windows without a shape, the outline that
 * we draw for an unrotated window is always a rectangle because we
 * don't use antialasing for the window boundary - with or without
 * filtering, with or without a scale. But figuring out exactly
 * what pixels will be drawn by the graphics system in these cases
 * gets tricky, so we just go for the easiest part - no scale,
 * and at integer offsets.)
 *
 * The way we check for pixel-aligned is by looking at the
 * transformation into screen space of the allocation box of an actor
 * and and checking if the corners are "close enough" to integral
 * pixel values.
 */
 /* The definition of "close enough" to integral pixel values is
 * equality when we convert to 24.8 fixed-point.
 */
 static inline int
 round_to_fixed (float x)
 {
  return roundf (x * 256);
 }
 /* This helper function checks if (according to our fixed point precision)
 * the vertices @verts form a box of width @widthf and height @heightf
 * located at integral coordinates. These coordinates are returned
 * in @x_origin and @y_origin.
 */
 gboolean
 meta_actor_vertices_are_untransformed (ClutterVertex *verts,
                                       float          widthf,
                                       float          heightf,
                                       int           *x_origin,
                                       int           *y_origin)
 {
  int width, height;
  int v0x, v0y, v1x, v1y, v2x, v2y, v3x, v3y;
  int x, y;
  width = round_to_fixed (widthf); height = round_to_fixed (heightf);
  v0x = round_to_fixed (verts[0].x); v0y = round_to_fixed (verts[0].y);
  v1x = round_to_fixed (verts[1].x); v1y = round_to_fixed (verts[1].y);
  v2x = round_to_fixed (verts[2].x); v2y = round_to_fixed (verts[2].y);
  v3x = round_to_fixed (verts[3].x); v3y = round_to_fixed (verts[3].y);
  /* Using shifting for converting fixed => int, gets things right for
   * negative values. / 256. wouldn't do the same
   */
  x = v0x >> 8;
  y = v0y >> 8;
  /* At integral coordinates? */
  if (x * 256 != v0x || y * 256 != v0y)
    return FALSE;
  /* Not scaled? */
  if (v1x - v0x != width || v2y - v0y != height)
    return FALSE;
  /* Not rotated/skewed? */
  if (v0x != v2x || v0y != v1y ||
      v3x != v1x || v3y != v2y)
    return FALSE;
  if (x_origin)
    *x_origin = x;
  if (y_origin)
    *y_origin = y;
  return TRUE;
 }
 /* Check if an actor is "untransformed" - which actually means transformed by
 * at most a integer-translation. The integer translation, if any, is returned.
 */
 gboolean
 meta_actor_is_untransformed (ClutterActor *actor,
                             int          *x_origin,
                             int          *y_origin)
 {
  gfloat widthf, heightf;
  ClutterVertex verts[4];
  clutter_actor_get_size (actor, &widthf, &heightf);
  clutter_actor_get_abs_allocation_vertices (actor, verts);
  return meta_actor_vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
 }
--- a/src/compositor/clutter-utils.h
+++ b/src/compositor/clutter-utils.h
@@ -0,0 +1,34 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Utilities for use with Clutter
 *
 * Copyright 2010 Red Hat, Inc.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __META_CLUTTER_UTILS_H__
 #define __META_CLUTTER_UTILS_H__
 #include <clutter/clutter.h>
 gboolean meta_actor_vertices_are_untransformed (ClutterVertex *verts,
                                                float          widthf,
                                                float          heightf,
                                                int           *x_origin,
                                                int           *y_origin);
 gboolean meta_actor_is_untransformed (ClutterActor *actor,
                                      int          *x_origin,
                                      int          *y_origin);
 #endif /* __META_CLUTTER_UTILS_H__ */
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@@ -0,0 +1,108 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Utilities for use with Cogl
 *
 * Copyright 2010 Red Hat, Inc.
 * Copyright 2010 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include <clutter/clutter.h>
 #include "cogl-utils.h"
 /**
 * meta_create_color_texture_4ub:
 * @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
 */
 CoglTexture *
 meta_create_color_texture_4ub (guint8           red,
                               guint8           green,
                               guint8           blue,
                               guint8           alpha,
                               CoglTextureFlags flags)
 {
  CoglColor color;
  guint8 pixel[4];
  cogl_color_init_from_4ub (&color, red, green, blue, alpha);
  cogl_color_premultiply (&color);
  pixel[0] = cogl_color_get_red_byte (&color);
  pixel[1] = cogl_color_get_green_byte (&color);
  pixel[2] = cogl_color_get_blue_byte (&color);
  pixel[3] = cogl_color_get_alpha_byte (&color);
  return cogl_texture_new_from_data (1, 1,
                                     flags,
                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE,
                                     COGL_PIXEL_FORMAT_ANY,
                                     4, pixel);
 }
 /* Based on gnome-shell/src/st/st-private.c:_st_create_texture_material.c */
 /**
 * meta_create_texture_pipeline:
 * @src_texture: (allow-none): texture to use initially for the layer
 *
 * Creates a pipeline with a single layer. Using a common template
 * makes it easier for Cogl to share a shader for different uses in
 * Mutter.
 *
 * Return value: (transfer full): a newly created #CoglPipeline
 */
 CoglPipeline *
 meta_create_texture_pipeline (CoglTexture *src_texture)
 {
  static CoglPipeline *texture_pipeline_template = NULL;
  CoglPipeline *pipeline;
  /* The only state used in the pipeline that would affect the shader
     generation is the texture type on the layer. Therefore we create
     a template pipeline which sets this state and all texture
     pipelines are created as a copy of this. That way Cogl can find
     the shader state for the pipeline more quickly by looking at the
     pipeline ancestry instead of resorting to the shader cache. */
  if (G_UNLIKELY (texture_pipeline_template == NULL))
    {
      CoglContext *ctx =
        clutter_backend_get_cogl_context (clutter_get_default_backend ());
      texture_pipeline_template = cogl_pipeline_new (ctx);
      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
                                            0, /* layer */
                                            COGL_TEXTURE_TYPE_2D);
    }
  pipeline = cogl_pipeline_copy (texture_pipeline_template);
  if (src_texture != NULL)
    cogl_pipeline_set_layer_texture (pipeline, 0, src_texture);
  return pipeline;
 }
--- a/Show More
+++ b/Show More
 el
 en_CA
 en_GB
+eo
 es
 et
 eu
 it
 ja
 ka
+kk
 kn
 ko
 ku
 mr
 ms
 nb
+nds
 ne
 nl
 nn
 sv
 ta
 te
+tg
 th
 tk
 tr
+ug
 uk
 vi
 wa