Comprehensively rename to Mutter

Code:
All references in the code not related to themes, keybindings, or
GConf were changed from 'metacity' to 'mutter'. This includes, among other
things, strings, comments, the atoms used in the message protocol, and
the envvars used for debugging. The GConf schema file was reduced to
the 3 settings new to mutter.

The overall version was brought up to 2.27 to match current gnome.

Structure:
All files named '*metacity*' were renamed '*mutter*' with appropriate
changes in the automake system.  Files removed are
doc/creating_themes, src/themes, doc/metacity-theme.dtd,
metacity.doap.  These files will eventually end up in an external
gnome-wm-data module.

Installation location:
On the filesystem the mutter-plugindir was change from
$(libdir)/metacity/plugins/clutter to just $(libdir)/mutter/plugins.
The mutter-plugins.pc.in reflects these changes.

Note:
mutter.desktop.in and mutter-wm.desktop both continue to have
X-GNOME-WMSettingsModule=metacity set.  This allows
gnome-control-center to continue using libmetacity.so for
configuration.  This is fine since most the general keybindings and wm
settings are being read from /apps/metacity/* in gconf.

10 files changed, 36 insertions, 619 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09feb1da4..f613abd6e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man creating_themes
+SUBDIRS = man
 
-EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
+EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
diff --git a/doc/compositor-control.txt b/doc/compositor-control.txt
index e2e04bd79..1253cc3d6 100644
--- a/doc/compositor-control.txt
+++ b/doc/compositor-control.txt
@@ -42,5 +42,5 @@ options you can set are:
       menus zooming, dialogues being semi-transparent, and so on. Try it
       and see whether you like it.
 
-If you have any problems, ask on metacity-devel-list@gnome.org, or
+If you have any problems, ask on mutter-devel-list@gnome.org, or
 #gnome-hackers on gimpnet, or come and find me (tthurman at gnome) and ask.
diff --git a/doc/creating_themes/C/creating-metacity-themes.xml b/doc/creating_themes/C/creating-metacity-themes.xml
deleted file mode 100644
index ea5f040ef..000000000
--- a/doc/creating_themes/C/creating-metacity-themes.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
-  "http://docbook.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-
-<book id="index">
-
-  <bookinfo>
-
-    <title>Understanding Metacity Themes</title>
-
-    <authorgroup>
-      <author>
-        <firstname>Thomas</firstname>
-        <surname>Thurman</surname>
-      </author>
-    </authorgroup>
-
-    <abstract>
-
-      <para>
-        We very much appreciate any reports of inaccuracies or other errors in
-        this document.  Contributions are also most welcome.  Post your
-        suggestions, critiques or addenda to the <ulink
-          url="mailto:tthurman@gnome.org">team</ulink>.</para>
-
-    </abstract>
-
-    <copyright>
-      <year>2008</year>
-      <holder>Thomas Thurman</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-        Permission is granted to copy, distribute and/or modify this document
-        under the terms of the GNU Free Documentation License, Version 1.2
-        or any later version published by the Free Software Foundation;
-        with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-        You may obtain a copy of the GNU Free Documentation License from the Free Software Foundation by visiting their Web site or by writing to: Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-      </para>
-    </legalnotice>
-
-  </bookinfo>
-
-<chapter id="sec-introduction">
-<title>Introduction</title>
-
-<para>This is an article about how to theme Metacity.  It is a work in progress, and I have had to dig deeply to find some answers; I may well have made mistakes and I welcome corrections and suggestions.</para>
-<para>GNOME lets you theme a bunch of different things, but we're only talking about <literal>window border</literal> themes here, which some people call Metacity themes; <ulink url="http://en.wikipedia.org/wiki/Metacity#Themes">Wikipedia begins a sentence</ulink> with &quot;Despite the incomplete state of Metacity theme development documentation&quot;, and though there <emphasis>is</emphasis> <ulink url="http://svn.gnome.org/viewvc/metacity/trunk/doc/theme-format.txt?view=markup">documentation in the source</ulink>, apparently not many people find it, and it's written more for programmers than theme designers.  Glynn Foster also wrote <ulink url="http://developer.gnome.org/doc/tutorials/metacity/metacity-themes.html">a very good introduction to Metacity themes</ulink> (<ulink url="http://home.arcor.de/rybaczyk/documents/tutorials/metacity/metacity-themes.de.html">[de]</ulink>) six years ago, but things have changed a little since then.  <ulink url="http://lists.freedesktop.org/archives/compiz/2006-September/000445.html">Metacity themes can also be used by Compiz</ulink>, and perhaps by other window managers for all I know.</para>
-
-<para>So, a Metacity theme is a set of instructions about how to &quot;decorate&quot; (draw the borders around) a window.  Presumably you don't want to style all windows identically, so the format lets you specify details for different kinds of window:</para>
-
-<para>
-<variablelist>
-  <varlistentry>
-    <term>state:</term><listitem><para>Every window must be in exactly one of these states: <literal>normal</literal>, <literal>dialog</literal>, <literal>modal dialog</literal> (i.e. a dialogue which means you can't interact with the rest of the program while it's up), <literal>menu</literal> (torn off from the main application, not that people do that much these days), <literal>utility</literal> (that is, palettes and toolboxes and things), and <literal>border</literal>.  X also allows a window to explicitly ask to be undecorated, but of course we don't provide for those in a list of decoration instructions.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>focused</term><listitem><para>Every window is either the active window (which X people call &quot;focused&quot;), or it isn't.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>maximized</term><listitem><para>Every window is either (fully) maximised (horizontal and vertical only don't count), or it isn't.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>shaded</term><listitem><para>Every window is either rolled up to show just its titlebar (which techies call &quot;shaded&quot; for some reason I can't fathom), or it isn't.</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<para>
-<itemizedlist>
-<listitem><para><emphasis>If a window is not fully maximised and not shaded,</emphasis> it either allows horizontal resizing, or it doesn't.</para></listitem>
-<listitem><para><emphasis>If a window is not fully maximised and not shaded,</emphasis> it either allows vertical resizing, or it doesn't.</para></listitem>
-</itemizedlist>
-</para>
-
-</chapter>
-
-<chapter>
-<title>What's in the file</title>
-
-<para>The files must be called either</para>
-
-<para>
-<itemizedlist>
-<listitem><para>~/.themes/<varname>N</varname>/metacity-1/metacity-theme-<varname>V</varname>.xml 
-for a theme used only by you, or</para></listitem>
-<listitem><para>/usr/share/themes/<varname>N</varname>/metacity-1/metacity-theme-<varname>V</varname>.xml 
-for a theme installed for all users.</para></listitem>
-</itemizedlist>
-</para>
-
-<para>where <varname>N</varname> is the name of the theme and <varname>V</varname> is the version of the format.  Version 2, <ulink url="http://svn.gnome.org/viewvc/metacity?view=revision&amp;revision=2973">introduced in October 2006</ulink>, adds a few extra features, but it's rarely used.  Version 1 is the original format.  The formats are fixed once they're stable for both backwards and forwards compatibility; <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=482165">new features</ulink> can't be added without introducing a new version number, which is why improvements come out rarely and in large clumps.  <literal>metacity-1</literal> in the names is a fossil and doesn't mean version 1 of anything.</para>
-
-<para>The metacity-theme-V.xml files are <ulink url="http://blogs.gnome.org/tthurman/2008/02/14/gmarkup/">GMarkup files</ulink>, which are very similar to XML.  For now, you actually have to write these in a text editor or something; you can either start with a blank page, or modify a theme someone else has made.  (I am thinking of writing a general theme editor program, but that'll have to wait until I've reduced Metacity's open bug queue a little.)  If you want to see a fully-fledged one, you can look at <ulink url="http://svn.gnome.org/viewvc/metacity/trunk/src/themes/Atlanta/metacity-theme-1.xml?view=markup">the current version of &quot;Atlanta&quot;</ulink>, one of the simplest themes, but even that is quite complicated-looking at first.</para>
-<para>So, let's talk about what actually goes inside the files.  As in any XML file, &lt;!-<!-- x -->- &#8230; <!-- x -->&gt; are comments.  At its most basic, it would go:</para>
-
-<para>
-<programlisting>
-&lt;metacity_theme&gt;
-&lt;!-<!-- x -->- Helper stuff: -<!-- x -->-&gt;
-&lt;info &#8230;&gt; &lt;!-<!-- x -->- to be explained -<!-- x -->-&gt;
-&lt;constant &#8230;&gt; &lt;!-<!-- x -->- maybe; to be explained -<!-- x -->-&gt;
-
-&lt;draw_ops &#8230;&gt; &lt;!-<!-- x -->- maybe; to be explained -<!-- x -->-&gt;
-
-&lt;!-<!-- x -->- Things we build the top level onto: -<!-- x -->-&gt;
-&lt;frame_geometry &#8230;&gt; &lt;!-<!-- x -->- to be explained -<!-- x -->-&gt;
-
-&lt;frame_style &#8230;&gt; &lt;!-<!-- x -->- to be explained -<!-- x -->-&gt;
-&lt;frame_style_set &#8230;&gt; &lt;!-<!-- x -->- to be explained -<!-- x -->-&gt;
-
-&lt;!-<!-- x -->- And the top level: -<!-- x -->-&gt;
-
-&lt;window type=&quot;normal&quot; style_set=&quot;&#8230;&quot; /&gt;
-&lt;window type=&quot;dialog&quot; style_set=&quot;&#8230;&quot; /&gt;
-&lt;window type=&quot;modal_dialog&quot; style_set=&quot;&#8230;&quot; /&gt;
-
-&lt;window type=&quot;menu&quot; style_set=&quot;&#8230;&quot; /&gt;
-&lt;window type=&quot;utility&quot; style_set=&quot;&#8230;&quot; /&gt;
-&lt;window type=&quot;border&quot; style_set=&quot;&#8230;&quot; /&gt;
-
-&lt;/metacity_theme&gt;
-</programlisting>
-</para>
-
-</chapter>
-
-<chapter>
-<title>Matching windows</title>
-
-<para>
-<variablelist>
-  <varlistentry>
-    <term>window</term><listitem><para>You see that at the top level we have a list of &lt;window&gt; tags, one for each window state we discussed above.  The style_set argument of each of these gives the name of a frame_style_set.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>frame_style_set:</term><listitem><para>tells Metacity how to draw windows according to whether they're focused or not, maximised or not, shaded or not, and allowing resizing vertically, horizontally, both, or neither.  It looks like this:</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<para>
-<programlisting>
-&lt;frame_style_set&gt;
-&lt;frame focus=&quot;F&quot; state=&quot;S&quot; resize=&quot;R&quot; style=&quot;N&quot;/&gt;
-&lt;frame&#8230; /&gt;
-
-&#8230;
-&lt;/frame_style_set&gt;
-</programlisting>
-</para>
-
-<para>where:</para>
-
-<para>
-<variablelist>
-  <varlistentry>
-    <term>F</term><listitem><para>is yes for focused, no for unfocused.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>S</term><listitem><para>combines the shaded and maximized flags: normal, maximized, shaded, or maximized_and_shaded.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>R</term><listitem><para>represents resize permissions that the window gives us: none, vertical, horizontal, or both.  Frame settings for maximised windows, which can't be resized, don't have this attribute.</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<para>
-<varname>N</varname> is the name of a <literal>frame_style</literal> to apply to a window which has these attributes.</para>
-
-<para>A <literal>frame_style_set</literal> tag may also have a &quot;parent&quot; tag, which should be the name of another <literal>frame_style_set</literal>. This means that if Metacity wants to know about a kind of window which that <literal>frame_style_set</literal> doesn't describe, it should look in the parent.  Most of the more complicated tags in Metacity theme files also have a &quot;parent&quot; attribute which work the same way.  This is particularly useful because, taken together, all the <literal>frame_style_set</literal>s in a theme file must be capable of matching every possible kind of window; if a window turns up that they can't match, there will be an error at runtime.</para>
-
-<para>Let's recap what we've seen so far. The combination of a <literal>window</literal>, which matches a window's state (normal, dialog, and so forth), with an entry in the corresponding <literal>frame_style_set</literal>, which matches its focus, shadedness, maximisedness, and resize permissions where relevant, will allow you to make a list of rules to match any window against.  The next piece of this puzzle lets you specify what Metacity should do with such windows once it's matched them.</para>
-
-</chapter>
-
-<chapter>
-<title>Actually drawing stuff</title>
-
-<para><literal>frame_style:</literal> This is probably the most complicated part of the whole system. A <literal>frame_style</literal> a series of <emphasis><literal>piece</literal></emphasis>s and <emphasis><literal>button</literal></emphasis>s.  It looks like this:</para>
-
-<para>
-<programlisting>
-&lt;frame_style name=&quot;&#8230;&quot; geometry=&quot;G&quot;&gt;
-&lt;piece position=&quot;P&quot;&gt;
-&lt;draw_ops&gt;
-&lt;/draw_ops&gt;
-&lt;/piece&gt;
-&#8230;
-&lt;button function=&quot;F&quot; state=&quot;S&quot; draw_ops=&quot;D&quot;/&gt;
-
-&lt;draw_ops&gt;
-&lt;/draw_ops&gt;
-&lt;/button&gt;
-&#8230;
-&lt;/frame_style&gt;
-</programlisting>
-</para>
-
-<para>The <literal>pieces</literal> are pieces of the window frame.  When Metacity draws a window frame, it renders its various pieces always in the same order.  The bolded parts are all the possible values of P:</para>
-
-<para>
-<itemizedlist>
-<listitem><para>the <literal>entire_background</literal>, covering the whole frame</para></listitem>
-
-<listitem><para>the <literal>titlebar</literal>, covering the entire background of the titlebar</para></listitem>
-<listitem><para>the <literal>titlebar_middle</literal>, the part of the titlebar that doesn't touch its edges</para></listitem>
-<listitem><para>the <literal>left_titlebar_edge</literal>, <literal>right_titlebar_edge</literal>, <literal>top_titlebar_edge</literal>, and <literal>bottom_titlebar_edge</literal></para></listitem>
-
-<listitem><para>the <literal>title</literal>, just exactly that area which is covered by the text on the titlebar</para></listitem>
-<listitem><para>the <literal>left_edge</literal>, <literal>right_edge</literal>, and <literal>bottom_edge</literal> of the frame (yes, there is no top_edge: it's identical to top_titlebar_edge, isn't it?)</para></listitem>
-<listitem><para>the <literal>overlay</literal>, which covers everything&#8211; the same as entire_background, but done last instead of first.</para></listitem>
-</itemizedlist>
-</para>
-
-<para><emphasis>What</emphasis> Metacity draws in these pieces is decided by the theme.  If a <literal>frame_style</literal> or its parents don't specify a particular piece, nothing will be drawn for that piece.  You have two ways to specify what to draw: one is that the <literal>piece</literal> tag can have a <literal>draw_ops</literal> tag inside it which lists a sequence of drawing operations in Metacity's custom format.  <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=107012">You might ask why we don't use SVG</ulink>; one answer is that SVG support wasn't very strong when this format was designed, and another answer is that these days you can use SVG all you like; just include it as an image and Metacity will know what to do.</para>
-
-<para>An alternative to including a draw_ops tag inside a piece tag is to add a draw_ops attribute to the piece tag.  Then you can add a draw_ops tag at top level (inside the metacity_theme tag) with a name attribute, and Metacity will use that.  This is useful if you use similar draw_ops over and over.</para>
-<para>I'm not going to document draw_ops at present, because this is already very long.  I will write it up later and link it from here.</para>
-<para>The <literal>button</literal> tag tells Metacity how, but not where, to draw buttons.  Buttons are drawn after all the pieces are finished, and the way to draw them is also given using draw_ops.  You ought to provide buttons for all the possible kinds of button; if you don't give one it won't be drawn, which is unfortunate for the user who wants to use it:</para>
-
-<para>
-<itemizedlist>
-<listitem><para><literal>left_left_background</literal>, <literal>left_middle_background</literal>, and <literal>left_right_background</literal> don't represent buttons as such, but the background behind them, assuming there can be at most three buttons on the left.  These days there can be more, so the extra ones also use left_middle_background.</para></listitem>
-
-<listitem><para><literal>right_left_background</literal>, <literal>right_middle_background</literal>, and <literal>right_right_background</literal> similarly.</para></listitem>
-<listitem><para><literal>close</literal>, <literal>minimize</literal>, <literal>maximize</literal> are the obvious original three buttons.</para></listitem>
-<listitem><para><literal>menu</literal> is the menu button you can click to get a list of actions you can perform on the window.</para></listitem>
-
-<listitem><para><literal>shade</literal>, <literal>above</literal>, <literal>stick</literal> are similar to the original buttons but only allowed in version 2</para></listitem>
-<listitem><para><literal>unshade</literal>, <literal>unabove</literal>, <literal>unstick</literal> are the toggled versions of these buttons.  Again, version 2 only.</para></listitem>
-
-</itemizedlist>
-</para>
-
-<para>The reason there are toggled versions of shade, above, and stick, and not maximize, is that by the time you get this far you've probably already decided whether you're drawing a maximised window.  So if you <emphasis>are</emphasis> drawing a maximised window, you can make the button called &quot;maximize&quot; look how you want the restore button to be; otherwise, make it look like you want the maximise button to be.</para>
-<para>For each button tag you should also set a &quot;state&quot; attribute; this time the state is either <literal>normal</literal> (the way you see it most of the time), <literal>pressed</literal>, or <literal>prelight</literal> (this makes the buttons subtly light up when you hover over them).  You only really need &quot;normal&quot;, but the others are good to have too.</para>
-
-<para>The &quot;geometry&quot; attribute of a <literal>frame_style</literal> tag is the name of a&#8230;</para>
-
-</chapter>
-
-<chapter>
-<title>Geometry</title>
-
-<para>The <literal>geometry</literal> tag defines the sizes of things around the window.  It is important, but not easy to explain, and again this file has gone on too long.  I'll write it up later.</para>
-
-</chapter>
-
-<chapter>
-<title>Other things which lie around a file</title>
-
-<para>The most important other thing in a theme file is the metadata held in the <literal>info</literal> tag.  This contains a set of tags each of which contains some text explaining something about the theme itself, in a sort of <ulink url="http://en.wikipedia.org/wiki/Dublin_Core">Dublin Core</ulink> sort of way.  (Next time around, we should probably use the actual Dublin Core.)  The tags are <literal>name</literal>, <literal>author</literal>, <literal>copyright</literal>, <literal>date</literal>, and <literal>description</literal>.</para>
-
-<para>Version 1 of the format had a <literal>menu_icon</literal> tag at top level, which let themes specify the icons beside options in the menu you get from the menu icon.  This has become redundant; the icons are taken from the icon theme!  The tag can still be used in all formats, but does nothing and is deprecated.</para>
-<para>Version 2 of the format has a <literal>fallback</literal> tag at top level, which let the theme specify what icon a window should be considered to have if it doesn't provide an icon of its own.  This should also be taken from the icon theme, <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=524343">if anyone fancies fixing it</ulink>, and the tag should also then be deprecated.  It shouldn't be hard.</para>
-
-</chapter>
-
-<chapter>
-<title>When you're working on a theme</title>
-
-<para>When you're editing a theme, you can view it without using it on the whole desktop using
-<command>metacity-theme-viewer YourThemeName</command></para>
-<para>and view it on the whole desktop using
-<command>gconftool -<!-- x -->-type=string -<!-- x -->-set /apps/metacity/general/theme YourThemeName</command></para>
-
-<para>Whenever you change the selected theme in GConf, Metacity will load the newly-chosen theme.  This is how control-center does it.  But when you change a theme, as you're working on it, you might want to ask Metacity to reload the theme which is currently used on the whole desktop to reflect your changes.  You can do this using the little-known <command>metacity-message</command> program, with the command <literal>metacity-message reload-theme</literal>.  This works by sending the ClientMessage <literal>_METACITY_RELOAD_THEME_MESSAGE</literal> to the root window, in case you're interested.</para>
-
-<para>Once you're done with your theme, consider submitting it to <ulink url="http://art.gnome.org/themes/metacity/">the art.gnome.org site</ulink>, or <ulink url="http://www.gnome-look.org/index.php?xcontentmode=101">the gnome-look site</ulink>.</para>
-
-</chapter>
-
-<chapter>
-<title>The future</title>
-
-<para>Please feel free to link to this so people don't have to keep asking the basic questions and can start asking the deeper ones.  One of the important deeper ones is: where should we go in the future?  Since this format is becoming something of a de facto standard between window managers, should we set up some kind of freedesktop.org standards discussion?  Would it be useful to spin off Metacity's theme parsing code into a separate, LGPL-licensed library so that other applications could use it more easily?</para>
-<para>What would a version 3 of this format look like?  Could we simplify the window / frame_style_set system? (I can imagine abolishing both, and being able to write <literal>&lt;frame_style for=&quot;normal+unfocused+maximized&quot;&gt;&#8230;</literal> and having Metacity assume it applied to all resize permissions and shadednesses.) Maybe we should try to do everything with SVG we can? Getting more wild and handwavey, is it worth keeping XML-like?  Maybe if other window managers were dealing with the files, .ini-style files would be more universally useful? Or perhaps not.  And then of course we need a decent graphical editor for it.  I have a few ideas, but if anyone fancies jumping in...</para>
-</chapter>
-
-</book>
-
-
diff --git a/doc/creating_themes/Makefile.am b/doc/creating_themes/Makefile.am
deleted file mode 100644
index 54b10e234..000000000
--- a/doc/creating_themes/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-### This part of Makefile.am can be customized by you.
-
-# gnome-doc-utils standard variables:
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-# The name of the directory in /usr/share/gnome/help/, 
-# and the name of the main .xml file:
-DOC_MODULE = creating-metacity-themes
-
-# The names of any files included via entity declarations.
-DOC_ENTITIES =
-
-# The names of any files included by xincluded (preferred):
-DOC_INCLUDES =
-
-# The names of any pictures:
-DOC_FIGURES = 
-
-# The names of any locales for which documentation translations exist:
-DOC_LINGUAS =
-
-
-
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1277f5b7b..d2eb64d9b 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,4 @@
-man_MANS = metacity.1 metacity-theme-viewer.1 \
-	   metacity-window-demo.1 metacity-message.1
+man_MANS = mutter.1 mutter-theme-viewer.1 \
+	   mutter-window-demo.1 mutter-message.1
 
 EXTRA_DIST = $(man_MANS)
diff --git a/doc/man/metacity-message.1 b/doc/man/mutter-message.1
index 7ee62cd75..c301875e1 100644
--- a/doc/man/metacity-message.1
+++ b/doc/man/mutter-message.1
@@ -12,7 +12,7 @@
 .\" > 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 METACITY\-MESSAGE 1 "28 August 2002"
+.TH MUTTER\-MESSAGE 1 "28 August 2002"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -26,24 +26,24 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-METACITY\-MESSAGE \- a command to send a message to Metacity
+MUTTER\-MESSAGE \- a command to send a message to Mutter
 .SH SYNOPSIS
-.B METACITY\-MESSAGE
+.B MUTTER\-MESSAGE
 [restart|reload\-theme|enable\-keybindings|disable\-keybindings]
 .SH DESCRIPTION
 This manual page documents briefly the
-.B metacity\-message\fP.
+.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.
-\fBmetacity\-message\fP send a specified message to \fBmetacity\fP(1).
+\fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
 .SH OPTIONS
 .TP
 .B restart
-Restart \fBmetacity\fP(1) which is running.
+Restart \fBmutter\fP(1) which is running.
 .TP
 .B reload-theme
 Reload a theme which is specified on gconf database.
@@ -54,7 +54,7 @@ Enable all of keybindings which is specified on gconf database.
 .B disable-keybindings
 Disable all of keybindings which is specified on gconf database.
 .SH SEE ALSO
-.BR metacity (1)
+.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).
diff --git a/doc/man/metacity-theme-viewer.1 b/doc/man/mutter-theme-viewer.1
index 72df142f6..19fc0be76 100644
--- a/doc/man/metacity-theme-viewer.1
+++ b/doc/man/mutter-theme-viewer.1
@@ -3,21 +3,21 @@
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
-.TH METACITY-THEME-VIEWER 1 "1 June 2004" 
+.TH MUTTER-THEME-VIEWER 1 "1 June 2004" 
 .SH NAME
-metacity-theme-viewer \- view metacity themes
+mutter-theme-viewer \- view mutter themes
 .SH SYNOPSIS
-.B metacity-theme-viewer
+.B mutter-theme-viewer
 [
 .I THEMENAME
 ]
 .SH DESCRIPTION
 .\" Putting a newline after each sentence can generate better output.
-.B metacity-theme-viewer
-allows you to preview any installed Metacity theme.
+.B mutter-theme-viewer
+allows you to preview any installed Mutter theme.
 .PP
-When designing a new Metacity theme, you can use
-.B metacity-theme-viewer
+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
@@ -32,12 +32,12 @@ It is case-sensitive.
 .I /usr/share/themes
 system themes directory
 .TP
-.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+.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 metacity (1),
-.BR metacity-window-demo (1).
+.BR mutter (1),
+.BR mutter-window-demo (1).
diff --git a/doc/man/metacity-window-demo.1 b/doc/man/mutter-window-demo.1
index b7e4a852c..605d0483a 100644
--- a/doc/man/metacity-window-demo.1
+++ b/doc/man/mutter-window-demo.1
@@ -3,11 +3,11 @@
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
-.TH METACITY-WINDOW-DEMO 1 "1 June 2004" 
+.TH MUTTER-WINDOW-DEMO 1 "1 June 2004" 
 .SH NAME
-metacity-window-demo \- demo of window features
+mutter-window-demo \- demo of window features
 .SH SYNOPSIS
-.B metacity-window-demo
+.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
@@ -21,5 +21,5 @@ 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 metacity (1),
-.BR metacity-theme-viewer (1).
+.BR mutter (1),
+.BR mutter-theme-viewer (1).
diff --git a/doc/man/metacity.1 b/doc/man/mutter.1
index 3232ade0a..785d20826 100644
--- a/doc/man/metacity.1
+++ b/doc/man/mutter.1
@@ -2,7 +2,7 @@
 .\" 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)
-.TH METACITY 1 "11 February 2006"
+.TH MUTTER 1 "11 February 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,25 +16,25 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-METACITY \- minimal GTK2 Window Manager
+MUTTER \- Clutter based compositing GTK2 Window Manager
 .SH SYNOPSIS
-.B metacity
+.B mutter
 [\-\-display=\fIDISPLAY\fP] [\-\-replace] [\-\-sm\-client\-id=\fIID\fP] [\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-version] [\-\-help]
 .SH DESCRIPTION
 This manual page documents briefly
-.B metacity\fP.
+.B mutter\fP.
 .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.
-\fBmetacity\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop.  \fBmetacity\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
+\fBmutter\fP is a minimal X window manager aimed at nontechnical users and is designed to integrate well with the GNOME desktop.  \fBmutter\fP lacks some features that may be expected by traditional UNIX or other technical users; these users may want to investigate other available window managers for use with GNOME or standalone.
 .SH OPTIONS
 .TP
 .B \-\-display=DISPLAY
 Connect to X display \fIDISPLAY\fP.
 .TP
 .B \-\-replace
-a window manager which is running is replaced by \fBmetacity\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
+a window manager which is running is replaced by \fBmutter\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
 .TP
 .B \-\-sm\-client\-id=ID
 Specify a session management \fIID\fP.
@@ -51,10 +51,10 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmetacity\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 gconf editing (gconf-editor or gconftool-2).
 .SH SEE ALSO
-.BR metacity-message (1)
+.BR mutter-message (1)
 .SH AUTHOR
 The original manual page was written by Thom May <thom@debian.org>.  It was updated by Akira TAGOH <tagoh@debian.org>
 for the Debian GNU/Linux system (with permission to use by others), and then updated by Luke Morton and Philip O'Brien
-for inclusion in metacity.
+for inclusion in mutter.
diff --git a/doc/metacity-theme.dtd b/doc/metacity-theme.dtd
deleted file mode 100644
index a84a43e47..000000000
--- a/doc/metacity-theme.dtd
+++ /dev/null
@@ -1,273 +0,0 @@
-<!--
- DTD for Metacity themes, as of Metacity 2.4.1
- Author: Ross Burton <ross@burtonini.com>
- Copyright (C) 2002 Ross Burton
- Licensed under the GPL, version 2
--->
-
-<!-- Top-level element -->
-<!ELEMENT metacity_theme (info,(window|frame_style_set|frame_style|frame_geometry|constant|draw_ops|menu_icon)+)>
-
-<!-- Theme metadata -->
-<!ELEMENT info (name?|author?|copyright?|date?|description?)*>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT copyright (#PCDATA)>
-<!ELEMENT date (#PCDATA)>
-<!ELEMENT description (#PCDATA)>
-
-<!ENTITY % xyrequired "
-	x			CDATA #REQUIRED
-	y			CDATA #REQUIRED
-">
-
-<!ENTITY % xyimplied "
-	x			CDATA #IMPLIED
-	y			CDATA #IMPLIED
-">
-
-<!ENTITY % widthheightrequired "
-	width		CDATA #REQUIRED
-	height		CDATA #REQUIRED
-">
-
-<!ENTITY % widthheightimplied "
-	width		CDATA #IMPLIED
-	height		CDATA #IMPLIED
-">
-
-<!ENTITY % boolean "(true|false)">
-
-<!ENTITY % piece_positions "
-(entire_background|titlebar|titlebar_middle|left_titlebar_edge|right_titlebar_edge|top_titlebar_edge|bottom_titlebar_edge|title|left_edge|right_edge|bottom_edge|overlay)
-">
-
-<!ENTITY % gtk-state "
-	state (normal|prelight|active|selected|insensitive) #REQUIRED
-">
-
-<!ENTITY % gtk-shadow "
-	shadow (none|in|out|etched_in|etched_out) #REQUIRED
-">
-
-
-<!-- The actual theme -->
-
-<!ELEMENT window EMPTY>
-<!ATTLIST window
-	type		(normal|dialog|modal_dialog|menu|utility|border) #REQUIRED
-	style_set		CDATA #REQUIRED
->
-
-
-<!ELEMENT frame_style_set (frame+)>
-<!ATTLIST frame_style_set
-	name		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-	focus		(yes|no) #REQUIRED
-	state		(normal|maximized|shaded|maximized_and_shaded) #REQUIRED
-	resize		(both|horizontal|vertical|none) #IMPLIED
-	style		CDATA #REQUIRED
->
-
-<!ELEMENT frame_style (piece|button)*>
-<!ATTLIST frame_style
-	name		CDATA #REQUIRED
-	geometry		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
->
-
-<!ELEMENT piece (draw_ops?)>
-<!ATTLIST piece
-	position		%piece_positions; #REQUIRED
-	draw_ops		CDATA #IMPLIED
->
-
-<!ELEMENT button (draw_ops?)>
-<!ATTLIST button
-	function		(menu|minimize|maximize|close|left_left_background|left_middle_background|left_right_background|right_left_background|right_middle_background|right_right_background) #REQUIRED
-	state		(normal|prelight|pressed) #REQUIRED
-	draw_ops		CDATA #IMPLIED
->
-
-<!ELEMENT frame_geometry (border|(aspect_ratio|distance))+>
-<!ATTLIST frame_geometry
-	name		CDATA #REQUIRED
-	parent		CDATA #IMPLIED
-	title_scale		(xx-small|x-small|small|medium|large|x-large|xx-large) #IMPLIED
-	has_title		(true|false) 'true'
-	rounded_top_left		%boolean; #IMPLIED
-	rounded_top_right		%boolean; #IMPLIED
-	rounded_bottom_left	%boolean; #IMPLIED
-	rounded_bottom_right	%boolean; #IMPLIED
->
-
-<!ELEMENT distance EMPTY>
-<!ATTLIST distance
-	name		(left_width|right_width|bottom_height|title_vertical_pad|right_titlebar_edge|left_titlebar_edge|button_width|button_height) #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT border EMPTY>
-<!ATTLIST border
-	name		CDATA #REQUIRED
-	top		CDATA #REQUIRED
-	bottom		CDATA #REQUIRED
-	left		CDATA #REQUIRED
-	right		CDATA #REQUIRED
->
-
-<!ELEMENT aspect_ratio EMPTY>
-<!ATTLIST aspect_ratio
-	name		CDATA #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT draw_ops (line|rectangle|arc|tint|gradient|image|gtk_arrow|gtk_box|gtk_vline|icon|title|clip|include|tile)*>
-<!-- not sure about this.. maybe it should be removed. see #3478 in theme-parser.c -->
-<!ATTLIST draw_ops
-	name		CDATA #IMPLIED
->
-
-<!ELEMENT line EMPTY>
-<!ATTLIST line
-	color			CDATA #REQUIRED
-	x1			CDATA #REQUIRED
-	y1			CDATA #REQUIRED
-	x2			CDATA #REQUIRED
-	y2			CDATA #REQUIRED
-	width		CDATA #IMPLIED
-	dash_on_length CDATA #IMPLIED
-	dash_off_length CDATA #IMPLIED
->
-
-<!ELEMENT rectangle EMPTY>
-<!ATTLIST rectangle
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	filled			%boolean; 'false'
->
-
-<!ELEMENT arc EMPTY>
-<!ATTLIST arc
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	start_angle	CDATA	#REQUIRED
-	extent_angle	CDATA	#REQUIRED
-	filled			%boolean; 'false'
->
-
-<!ELEMENT icon EMPTY>
-<!ATTLIST icon
-	%xyrequired;
-	width		CDATA #REQUIRED
-	height		CDATA #REQUIRED
-	alpha		CDATA #IMPLIED
-	fill_type		(tile|scale) 'scale'
->
-
-<!ELEMENT image EMPTY>
-<!ATTLIST image
-	filename		CDATA #REQUIRED
-	colorize		CDATA #IMPLIED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #IMPLIED
-	fill_type		(tile|scale) 'scale'
->
-
-<!ELEMENT tile EMPTY>
-<!ATTLIST tile
-	name		CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	tile_xoffset	CDATA #IMPLIED
-	tile_yoffset	CDATA #IMPLIED
-	tile_width		CDATA #REQUIRED
-	tile_height	CDATA #REQUIRED
->
-
-<!ELEMENT clip EMPTY>
-<!ATTLIST clip
-	%xyrequired;
-	%widthheightrequired;
->
-
-<!ELEMENT title EMPTY>
-<!ATTLIST title
-	color			CDATA #REQUIRED
-	%xyrequired;
->
-
-<!ELEMENT tint EMPTY>
-<!ATTLIST tint
-	color			CDATA #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #REQUIRED
->
-
-<!ELEMENT gtk_box EMPTY>
-<!ATTLIST gtk_box
-	%gtk-state;
-	%gtk-shadow;
-	%xyrequired;
-	%widthheightrequired;
->
-
-<!ELEMENT gtk_arrow EMPTY>
-<!ATTLIST gtk_arrow
-	%gtk-state;
-	%gtk-shadow;
-	arrow		(up|down|left|right) #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	filed			CDATA #IMPLIED
->
-
-<!ELEMENT gtk_vline EMPTY>
-<!ATTLIST gtk_vline
-	%gtk-state;
-	x			CDATA #REQUIRED
-	y1			CDATA #REQUIRED
-	y2			CDATA #REQUIRED
->
-
-<!ELEMENT gradient (color)+>
-<!ATTLIST gradient
-	type		(vertical|horizontal|diagonal) #REQUIRED
-	%xyrequired;
-	%widthheightrequired;
-	alpha		CDATA #IMPLIED
->
-
-<!ELEMENT color EMPTY>
-<!ATTLIST color
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT include EMPTY>
-<!ATTLIST include
-	name		CDATA #REQUIRED
-	%xyimplied;
-	%widthheightimplied;
->
-
-<!ELEMENT constant EMPTY>
-<!ATTLIST constant
-	name		CDATA #REQUIRED
-	value		CDATA #REQUIRED
->
-
-<!ELEMENT menu_icon (draw_ops?)>
-<!ATTLIST menu_icon
-	function		(close|maximize|minimize|unmaximize) #REQUIRED
-	%gtk-state;
-	draw_ops		CDATA #IMPLIED
->