Bump mutter version to 0.2

Do not use Fixed values with COGL
The COGL API expects floating point values, not fixed point ones.
2009-03-10 15:54:53 +00:00 · 2009-03-10 12:52:03 +00:00 · 2009-02-18 12:13:36 +00:00 · 2009-02-12 17:14:12 +00:00 · 2009-02-12 11:55:11 +00:00 · 2009-02-12 10:56:37 +00:00
200 changed files with 114744 additions and 77800 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,60 @@
+Makefile
+Makefile.in
+Makefile.in.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+.deps
+src/metacity-wm.desktop
+*.o
+*.a
+*.lo
+*.la
+.libs
+*.swp
+tidy-enum-types.[ch]
+tidy-marshal.[ch]
+stamp-tidy-enum-types.h
+stamp-tidy-marshal.h
+stamp-h1
+*.gmo
+*.make
+*~
+stamp-it
+.intltool-merge-cache
+POTFILES
+50-metacity-desktop-key.xml
+50-metacity-key.xml
+inlinepixbufs.h
+libmetacity-private.pc
+metacity
+metacity-dialog
+metacity-theme-viewer
+metacity.desktop
+metacity.schemas
+testasyncgetprop
+testboxes
+testgradient
+metacity-grayscale
+metacity-mag
+metacity-message
+metacity-window-demo
+focus-window
+test-gravity
+test-resizing
+test-size-hints
+wm-tester
+INSTALL
+mkinstalldirs
--- a/1571
+++ b/1571
--- a/4
+++ b/4
@@ -195,7 +195,7 @@ ALIASES                =
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.

-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C  = YES

 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
 # sources only. Doxygen will then generate output that is more tailored for Java. 
@@ -427,7 +427,7 @@ FILE_VERSION_FILTER    =
 # The QUIET tag can be used to turn on/off the messages that are generated 
 # by doxygen. Possible values are YES and NO. If left blank NO is used.

-QUIET                  = NO
+QUIET                  = YES

 # The WARNINGS tag can be used to turn on/off the warning messages that are 
 # generated by doxygen. Possible values are YES and NO. If left blank 
--- a/2
+++ b/2
@@ -22,6 +22,7 @@ Userid: tthurman

 Semi-active maintainers
 --------------------------------
+
 Havoc Pennington
 Email: hp  redhat com
 Userid: hp
@@ -32,6 +33,7 @@ Userid: hp

 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
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@

 SUBDIRS=src po doc

-EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
-	intltool-extract.in intltool-merge.in intltool-update.in
+EXTRA_DIST = HACKING MAINTAINERS rationales.txt

 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
--- a/418
+++ b/418
@@ -1,3 +1,421 @@
+2.25.144
+========
+
+Thanks to Matthias Claesen, Matt Kraai, Elijah Newren, Owen Taylor, and Thomas
+Thurman for improvements in this version.
+
+  - Optimise window property lookup (Thomas) (#549886)
+  - Fix slip in the above (Matt)
+  - Several memory leaks fixed (Matthias) (#552303, #552973, #552307)
+  - Fix longstanding crasher about colourmaps (Owen) (#568365)
+  - Alt+middle/right buttons can be switched (Thomas) (#437910)
+  - Support _NET_WM_MOVERESIZE_CANCEL (Elijah)
+  - minor fix paving the way for a theme editor (Thomas)
+
+Translations
+  David Planella (ca), Jorge González (es), Mattias Põldaru (et), saudat
+  mohammed (ha), Yuval Tanny\n (he), Gabor Kelemen (hu), Onye, Sylvester (ig),
+  Changwoo Ryu (ko), Raivis Dejus (lv), Kjartan Maraas (nb), Daniel Nylander (sv),
+  Fajuyitan, Sunday Ayo (yo), 甘露 (Gan Lu) (zh_CN)
+
+2.25.89
+=======
+
+Thanks to Yanko Kaneti, Frederic Peters, Thomas Thurman, and Colin Walters for
+improvements in this version.
+
+  - The maximisation key is a toggle. (Thomas) (#343824)
+  - "Unmaximise" is now called "restore". (Thomas) (#343824)
+  - New thread handling call for gconf (Frederic) (#565517)
+  - Add screenshot commands back which had been removed (Yanko) (#565343)
+  - move_to_corner_se keybinding fixed (Thomas)
+  - Windows on other workspaces which attempt to present themselves
+    are marked as needing attention (Colin) (#482354)
+  - End the grab op when the user clicks the titlebar (Thomas) (#401028)
+
+Translations
+  Jorge González (es)
+
+2.25.55
+=======
+
+Thanks to Erwann Chenede for improvements in this version.
+
+  - Fix build on Solaris (Erwann) (#564123)
+
+Translations
+  Mattias Põldaru (et), Luca Ferretti (it)
+
+2.25.34
+=======
+
+Thanks to Matt Kraai for improvements in this version.
+
+  - Fixes to Thomas's earlier fixes (Matt) (#562939)
+
+Translations
+  None
+
+2.25.21
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Fixes to allow building without compositor again (Thomas)
+  - Fixes for -Wall problems (Thomas)
+  - Various tool updates (Thomas)
+
+Translations: none
+
+
+2.25.13
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Add casts to fix failure to build from source on 64bit hosts (Thomas) (#562106)
+  - Added script to produce annoucements (Thomas)
+
+Translations
+  Jorge González (es)
+
+2.25.8
+======
+
+Thanks to Brian Cameron, Maxim Ermilov, Daniel Macks, Elijah Newren, Frederic
+Peters, Thomas Thurman, David Trowbridge, and Olav Vitters for improvements in
+this version.
+
+  - Reorder compiler flags (Daniel) (#562033)
+  - Fix compositor switch (Daniel) (#560990)
+  - Remove spurious warnings about operations on window "none" (Thomas)
+  - Fix _POSIX_C_SOURCE which was breaking OS X builds (Thomas) (#561962)
+  - -Werror -Wall and -ansi are now standard compile flags (Thomas)
+  - Merge screen and window keybindings files; fix minor alt-tab bug
+    in the process (Thomas) (#528337)
+  - Support _NET_WM_FULLSCREEN_MONITORS (David)
+  - Remove some deprecated calls (Thomas) (#560445)
+  - Clean up #includes (Maxim) (#560449)
+  - Update description of raise_on_click (Elijah)
+  - First dialogue delegated to zenity (Thomas)
+  - fix theme-parser typo (Olav)
+  - double-quote variable names in messages (Thomas) (#558309)
+  - fix accidental renaming of run_command_terminal (Thomas) (#557943)
+  - some null checks; problems exposed by new GDM (Brian) (#558058)
+  - ignore mouse button modifier if it's missing (Thomas) (Launchpad 258054, Launchpad 266929)
+  - fix docbook markup (Frederic)
+
+Translations
+  Astur (ast), Jorge González (es), Thomas Thurman (la), Leonardo Ferreira
+  Fontenelle (pt_BR), Daniel Nylander (sv)
+
+2.25.5
+======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Allow third-party apps to decide whether a window appears
+    on all workspaces (Thomas) (#557536)
+  - Fixed keybindings script (again) (Thomas)
+
+Translations
+  David Planella (ca), Robert Millan (ca@valencia)
+
+2.25.3
+======
+
+Brown paper bag release which fixes numerous build problems from last night's
+release of 2.25.2.  Apologies.
+
+Thanks to Murray Cumming, Thomas Thurman, and Götz Waschk for improvements
+in this version.
+
+  - Fix distcheck (Thomas) (#557356)
+  - add libm reference (Götz) (#557357)
+  - fix docbook tags (Murray) (#557337)
+
+Translations
+  Yavor Doganov (bg), David Planella (ca), Robert Millan (ca@valencia), Kenneth
+  Nielsen (da), Hendrik Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de
+  Búrca (ga), Launchpad Translations Administrators (hr), Gabor Kelemen (hu),
+  Thomas Thurman (la), Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte
+  Loreto (pt), Djavan Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk),
+  Laurent Dhima (sq), Горан Ракић (sr), Theppitak Karoonboonyanan (th),
+  Funda Wang (zh_CN)
+
+2.25.2
+======
+
+Thanks to Joe Marcus Clarke, Murray Cumming, Tomas Frydrych, William Lachance,
+Matthew Martin, Christian Persch, Thomas Thurman, and Vincent Untz for
+improvements in this version.
+
+  - Add handler for SIGTERM (Joe) (#553980)
+  - Minimised windows are necessarily obscured (Matthew) (#528927)
+  - Build fixes with the above (Christian, Tomas, Thomas) (#557335)
+    (#557201) (#469361)
+  - Changed keybindings to be in a single place (Thomas) (#469361)
+  - Add new document about themes (Murray)
+  - Remove obsolete support for fallback icons (Thomas)
+  - Pass modified mouse events to panels (William) (#554428)
+  - Change where desktop files should go (Vincent) (#549479)
+
+Translations
+  Yavor Doganov (bg), David Planella (ca), Kenneth Nielsen (da), Hendrik
+  Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de Búrca (ga), Launchpad
+  Translations Administrators (hr), Gabor Kelemen (hu), Thomas Thurman (la),
+  Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk), Laurent Dhima (sq),
+  Горан Ракић (sr), Theppitak Karoonboonyanan (th), Funda Wang (zh_CN)
+2.25.1
+======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Fix small memory leak, found by Matthias Clasen (Thomas) (#549952)
+  - Added move_to_center keybinding suggested by
+    Khanh-Dang Nguyen Thu Lam (Thomas) (#549979)
+  - Compositor can be turned on and off from the command line
+    (#545323) (Thomas)
+
+Translations
+  Khaled Hosny (ar), Petr Kovar (cs), Iñaki Larrañaga Murgoitio (eu), Ilkka
+  Tuohela (fi), Žygimantas Beručka (lt), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR), Laurent Dhima (sq)
+
+2.25.0
+======
+
+Thanks to Patrick Niklaus, Ted Percival, Eric Piel, Akira TAGOH, and Thomas
+Thurman for improvements in this version.
+
+  - Fix memory allocation problem in struts (Eric) (probably #468075)
+  - Ensure windows which start maximised know where to jump back
+    to, so they don't warp to other screens (Ted) (#504692)
+  - Added header comments to some files (Thomas)
+  - Icons for windows which are uncooperative enough not to provide
+    an icon are taken from the theme, not built in (Patrick) (#524343)
+  - Added manual page for metacity-message (Akira, from Debian downstream)
+
+Translations
+  Khaled Hosny (ar), Petr Kovar (cs), Ilkka Tuohela (fi), Duarte Loreto (pt), Djavan
+  Fagundes (pt_BR)
+
+2.23.89
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Added DOAP file. (Thomas)
+
+Translations
+  Khaled Hosny (ar), Luca Ferretti (it), Takeshi AIHANA (ja), Wouter
+  Bolsterlee (nl), Vladimir Melo (pt_BR), Daniel Nylander (sv)
+
+2.23.55
+=======
+
+Thanks to Elijah Newren and Thomas Thurman for improvements in this version.
+
+Contrary to rumour, this release does not add tabbing to everything.
+
+  - Display theme name in title bar of theme viewer (Thomas) (#430198)
+  - Allow toggling of non-compositor effects (Thomas) (#92867)
+  - Add some extra null checks (Thomas) (#422242)
+  - Check for double-freeing at the time of workspace freeing (Elijah) (#361804)
+  - Don't generate log messages unless we're logging (Thomas)
+  - Two windows which don't belong to any application can't be considered to
+    belong to the same application (Thomas)
+  - Various tidyings (Thomas)
+
+Translations
+  Yavor Doganov (bg), Gabor Kelemen (hu), Kjartan Maraas (nb), Matej
+  Urbančič (sl), Daniel Nylander (sv), Theppitak Karoonboonyanan (th)
+
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Commenting and tidying (Thomas)
+  - Fix possible compositor crash (Thomas) (#530702)
+
+Translations
+  Khaled Hosny (ar), Yavor Doganov (bg), Jorge González (es), Kjartan Maraas (nb),
+  Yannig Marchegay (Kokoyaya) (oc), Theppitak Karoonboonyanan (th), Clytie
+  Siddall (vi)
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Commenting and tidying (Thomas)
+  - Fix possible compositor crash (Thomas) (#530702)
+
+Translations
+  Khaled Hosny (ar), Yavor Doganov (bg), Jorge González (es), Kjartan Maraas (nb),
+  Yannig Marchegay (Kokoyaya) (oc), Theppitak Karoonboonyanan (th), Clytie
+  Siddall (vi)
+
+2.23.34
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Various commenting (Thomas)
+  - Ensure you can turn off compositor with "configure" (Thomas)
+  - Ensure you can turn off gconf with "configure" (Thomas) (#530870)
+
+Translations
+  Clytie Siddall (vi)
+
+2.23.21
+=======
+
+Thanks to Robert Escriva, Iain Holmes, Matt Krai, Thomas Thurman,
+and Chris Wang for improvements in this version.
+
+  - Add shadow ability for menus and tooltips (Iain) (#517442) (#517524)
+  - Fix possible crashes in compositor (Iain) (#534569) (#528787)
+  - Major reorganisation of compositor code (Iain)
+  - Initial version of XRender backend for the compositor (Iain)
+  - New basic public API for compositor (Iain)
+  - Window decoration updates colour when GTK theme changes (Robert) (#511826)
+  - Minor code cleanup for pedantic compilers (Thomas)
+  - Further code cleanup for pedantic compilers (Matt) (#526049)
+  - The atom list appears only once in the code (Thomas) (#530843)
+  - Don't attempt to read attributes of invalid windows (Chris) (#530485)
+
+Translations
+  Khaled Hosny (ar), Gabor Kelemen (hu), Kjartan Maraas (nb), Tino Meinen (nl),
+  Theppitak Karoonboonyanan (th)
+2.23.13
+=======
+
+Thanks to Erwann Chenede and Carlos Garnacho for improvements
+in this version.
+
+  - Re-enable cascading (Erwann) (#529925)
+  - Propagate opacity to frame windows (spec compliance!) (Carlos)
+
+Translations
+  - None this time!
+
+2.23.8
+======
+
+Thanks to Lucas Rocha, Iain Holmes, and Jens Granseuer for improvements
+in this version.
+
+        * No need to symlink to .desktop files (Lucas)
+        * Fixes to compositor's dealings with overlay windows (Iain)
+        * C89 fixes (Jens)
+
+Translators:
+Khaled Hosny (ar), Amitakhya Phukan (as), Ihar Hrachyshka (be@latin),
+Petr Kovar (cs), Rhys Jones (cy), Kenneth Nielsen (da), Andre Klapper (de),
+Jorge González (es), Iñaki Larrañaga Murgoitio (eu), Ilkka Tuohela (fi),
+Claude Paroz (fr), Seán de Búrca (ga), Ignacio Casal Quinteiro (gl),
+Yuval Tanny (he), Gabor Kelemen (hu), Luca Ferretti (it), Takeshi AIHANA (ja),
+Shankar Prasad (kn), Changwoo Ryu (ko), Arangel Angov (mk), sandeep shedmake (mr),
+Kjartan Maraas (nb), Nabin Gautam (ne), Wouter Bolsterlee (nl),
+Eskild Hustvedt (nn), Yannig Marchegay (Kokoyaya) (oc), Tomasz Dominikowski (pl),
+Duarte Loreto (pt), Vasiliy Faronov (ru), Daniel Nylander (sv),
+Theppitak Karoonboonyanan (th), Baris Cicek (tr), Maxim Dziumanenko (uk),
+Clytie Siddall (vi), Woodman Tuen (zh_HK), Woodman Tuen (zh_TW)
+2.23.5
+======
+
+Thanks to Lucas Rocha, Owen Taylor, and Thomas Thurman for improvements in this
+version.
+
+  - Updates of useless preferences don't crash (Thomas) (#526016)
+  - Compliance with new gnome-session (Lucas) (#525051)
+  - Preview widget doesn't crash on broken themes (Thomas) (Launchpad 199402)
+  - Initially iconic windows don't unminimise (Owen) (#491090)
+  - Move ~/.metacity to ~/.config/metacity (Thomas) (#518596)
+  - Metacity doesn't stay around when replaced (Thomas)
+  - Extra check for null return in a function (Thomas)
+  - Displays are singletons, simplifying code (Thomas) (#499301)
+
+Translations
+  Jorge González (es), Eskild Hustvedt (nn), Baris Cicek (tr), Clytie Siddall (vi)
+
+2.23.3
+======
+
+Thanks to Marco Pesenti Gritti, Iain Holmes, Josh Lee, Thomas Thurman, and
+Matthew Wilson for improvements in this version.
+
+  - Workspaces whose name is the same as the standard name, plus some string,
+    are not cut off. (Thomas) (#453678)
+  - Improve compositor performance (Iain) (#522166)
+  - Draw wallpaper correctly when we start up with compositor
+    (Iain) (#522599)
+  - Several other smaller compositor fixes (Iain)
+  - Don't draw shadows on shaped windows unless they have frames
+    (Iain) (#505333)
+  - Newly-created keep-above windows get focus (Marco) (#519188)
+  - Allow moving workspace when dragging with modifier key (Matthew)
+    (#474195)
+
+Translations
+  Kenneth Nielsen (da), Gabor Kelemen (hu), Vasiliy Faronov (ru), Daniel
+  Nylander (sv), Maxim Dziumanenko (uk), Woodman Tuen (zh_HK)
+
+2.23.2
+======
+
+Removed some debug statements introduced in 2.23.1.  Brown paper bag release.
+
+
+2.23.1
+======
+
+Thanks to Cosimo Cecchi, Jens Granseuer, Jim Huang, Andrea Del Signore, and
+Thomas Thurman for improvements in this version.
+
+(Cosimo's patch was very similar to another received from Jason Ribero.)
+
+  - Allow horizontal and vertical maximisation using the mouse (Cosimo/Jason)
+    (#358674)
+  - Allow "spacer" as a value for buttons, for blank space (Andrea) (#509165)
+  - Remove unused code (Jim)
+  - refactor preferences handling (Thomas)
+  - make sure we're valid C89 (Jens) (#518917)
+  - some messing with tool scripts (Thomas)
+
+Translations
+  Jorge González (es), Claude Paroz (fr), Woodman Tuen (zh_HK), Woodman
+  Tuen (zh_TW)
+
+2.23.0
+======
+
+Thanks to Matthias Clasen, Mikkel Kamstrup Erlandsen, Jim Huang, Thomas Thurman,
+and Thomas Wood for improvements in this version.
+
+  - the preview widget can draw shaped windows properly! (Thomas W, #460018)
+  - refactored handling of boolean and enumerated gconf preferences;
+    refactoring of string and integer preferences will follow shortly (Thomas T)
+  - Applications asking to move and resize windows at the same time have
+    both their requests granted (Mikkel) (#448183)
+  - Windows marked "skip taskbar" don't appear in the ctrl-alt-tab list
+    (Matthias) (#106249)
+  - fix session management detection (Thomas T) (#328210)
+  - when resizing with the keyboard, the cursor stays on a window edge if
+    you escape, whichever direction you were going (Thomas T) (#436257)
+  - fix major breakage when gconf was turned off in configure (Jim) (#515019)
+  - fix major breakage when verbose was turned off in configure (Jim) (#515152)
+  - fix name of verbose option in help (Thomas T)
+  - various bits of messing around with release scripts (Thomas T)
+
+Translations
+  Ihar Hrachyshka (be@latin), Ilkka Tuohela (fi), Ignacio Casal Quinteiro (gl),
+  Shankar Prasad (kn), Changwoo Ryu (ko), Nabin Gautam (ne), Wouter Bolsterlee (nl)
+
 2.21.13
 =======

--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.

 srcdir=`dirname $0`
@@ -15,7 +15,8 @@ REQUIRED_AUTOMAKE_VERSION=1.10
 }

 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from GNOME Subversion (or from"
+    echo "your distribution's package manager)."
    exit 1
 }
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,16 @@
 AC_PREREQ(2.50)

 m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [21])
+m4_define([metacity_minor_version], [25])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [13])
-
+m4_define([metacity_micro_version], [144])
+m4_define([mutter_version],[0.2])
 m4_define([metacity_version],
-          [metacity_major_version.metacity_minor_version.metacity_micro_version])
+          [metacity_major_version.metacity_minor_version.metacity_micro_version~mutter_version])
+
+m4_define([metacity_clutter_plugin_api_version], [2])
+
 AC_INIT([metacity], [metacity_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])

@@ -17,6 +20,18 @@ AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE

+METACITY_MAJOR_VERSION=metacity_major_version
+METACITY_MINOR_VERSION=metacity_minor_version
+METACITY_MICRO_VERSION=metacity_micro_version
+METACITY_CLUTTER_PLUGIN_API_VERSION=metacity_clutter_plugin_api_version
+AC_SUBST(METACITY_MAJOR_VERSION)
+AC_SUBST(METACITY_MINOR_VERSION)
+AC_SUBST(METACITY_MICRO_VERSION)
+AC_SUBST(METACITY_CLUTTER_PLUGIN_API_VERSION)
+
+MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins/clutter"
+AC_SUBST(MUTTER_PLUGIN_DIR)
+
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")

@@ -31,7 +46,7 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL

-#### Integer sizes 
+#### Integer sizes

 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
@@ -120,7 +135,7 @@ if test x$enable_gconf = xyes; then
 fi

 AC_ARG_ENABLE(verbose-mode,
-  AC_HELP_STRING([--disable-verbose],
+  AC_HELP_STRING([--disable-verbose-mode],
                 [disable metacity's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
  enable_verbose_mode=yes)

@@ -143,6 +158,11 @@ AC_ARG_ENABLE(compositor,
                 [disable metacity's compositing manager]),,
  enable_compositor=auto)

+AC_ARG_WITH(clutter,
+  AC_HELP_STRING([--with-clutter],
+                 [Use clutter for compositing]),,
+  with_clutter=auto)
+
 AC_ARG_ENABLE(xsync,
  AC_HELP_STRING([--disable-xsync],
                 [disable metacity's use of the XSync extension]),,
@@ -164,7 +184,7 @@ 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    
+# GOptionEntry requires	glib-2.6.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
 # gtk_window_set_icon_name requires gtk2+-2.60
 PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.6.0)
@@ -206,22 +226,13 @@ else
  echo "Building without libstartup-notification"
 fi

-## init this, it gets set either in the compositor check below 
+## init this, it gets set either in the compositor check below
 ## or the render-specific check later
 have_xrender=no

 XCOMPOSITE_VERSION=0.2
-AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
-if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-   have_xcomposite=yes
-else
-   have_xcomposite=no
-fi
-AC_MSG_RESULT($have_xcomposite)
-
 if test x$enable_compositor = xyes; then
   have_xcomposite=yes
-   echo "CompositeExt support forced on"
 elif test x$enable_compositor = xauto; then
   echo "Building compositing manager by default now."
   have_xcomposite=yes
@@ -229,10 +240,31 @@ else
   have_xcomposite=no
 fi

+if test x$with_clutter = xyes; then
+   have_xcomposite=yes
+   have_clutter=yes
+   echo "CompositeExt support and Clutter forced on"
+elif test x$with_clutter = xauto; then
+   have_clutter=no
+else
+   have_clutter=no
+fi
+
+AM_CONDITIONAL(WITH_CLUTTER, test "$have_clutter" = "yes")
+
+if test x$have_xcomposite = xyes; then
+   AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
+   if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
+      AC_MSG_RESULT([yes])
+   else
+      AC_MSG_ERROR([no. Use --disable-compositor to disable.])
+   fi
+fi
+
 if test x$have_xcomposite = xyes; then
-  echo "Building with CompositeExt"
  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
+  echo "Building with compositing manager"

  ## force on render also
  have_xrender=yes
@@ -270,6 +302,27 @@ if test x$have_xrender = xyes; then
  AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
 fi

+CLUTTER_PACKAGE=clutter-0.9
+AC_SUBST(CLUTTER_PACKAGE)
+if test x$have_clutter = xyes; then
+  METACITY_PC_MODULES="$METACITY_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
+  metacity_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="$metacity_save_cppflags"
+
+  if test x$have_glx_texture_pixmap = xyes; then
+    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
+              [Is ClutterGLXTexturePixmap available?])
+  fi
+fi
+
 AC_MSG_CHECKING([Xcursor])
 if $PKG_CONFIG xcursor; then
     have_xcursor=yes
@@ -281,7 +334,7 @@ if $PKG_CONFIG xcursor; then
 if test x$have_xcursor = xyes; then
  echo "Building with Xcursor"
  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
-  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) 
+  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
 fi

 PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
@@ -318,7 +371,7 @@ if test "${try_xinerama}" != no; then
                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
                                use_solaris_xinerama=no,
                                [#include <X11/Xlib.h>])
-            fi	
+            fi
            AC_MSG_CHECKING(for Xinerama support on Solaris)
            AC_MSG_RESULT($use_solaris_xinerama);
            ;;
@@ -327,12 +380,12 @@ if test "${try_xinerama}" != no; then
            use_xfree_xinerama=yes
            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"   
+                                 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]), 
+                                 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)
@@ -413,7 +466,7 @@ if test "x$found_xsync" = "xyes"; then
   AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
 fi

-METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
@@ -424,9 +477,9 @@ case "$METACITY_LIBS" in
    found_sm=yes
    ;;
 *)
-  AC_CHECK_LIB(SM, SmcSaveYourselfDone, 
+  AC_CHECK_LIB(SM, SmcSaveYourselfDone,
               [AC_CHECK_HEADERS(X11/SM/SMlib.h,
-                                METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=no)],
+                                METACITY_LIBS="-lSM -lICE $METACITY_LIBS" found_sm=yes)],
               , $METACITY_LIBS)
    ;;
 esac
@@ -446,7 +499,7 @@ if test "$found_sm" = "yes"; then
   AC_DEFINE(HAVE_SM, , [Building with SM support])
 fi

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

 HOST_ALIAS=$host_alias
 AC_SUBST(HOST_ALIAS)
@@ -459,7 +512,7 @@ fi

 AC_SUBST(GDK_PIXBUF_CSOURCE)

-if test x$enable_gconf = xyes; then 
+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])
@@ -471,21 +524,38 @@ else
  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 -Wall"
+	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/creating_themes/Makefile
 doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
 src/libmetacity-private.pc
+src/metacity-plugins.pc
 src/tools/Makefile
 src/themes/Makefile
+src/compositor/mutter/plugins/Makefile
 po/Makefile.in
 ])

@@ -525,6 +595,7 @@ metacity-$VERSION:
 	Xsync:                    ${found_xsync}
 	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
+	Clutter:                  ${have_clutter}
 "

 METACITY_MINOR_VERSION=metacity_minor_version
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = man 
+SUBDIRS = man creating_themes

 EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
--- a/doc/creating_themes/C/creating-metacity-themes.xml
+++ b/doc/creating_themes/C/creating-metacity-themes.xml
@@ -0,0 +1,286 @@
+<?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>
+
+
--- a/doc/creating_themes/Makefile.am
+++ b/doc/creating_themes/Makefile.am
@@ -0,0 +1,24 @@
+### 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 =
+
+
+
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,3 +1,4 @@
-man_MANS = metacity.1 metacity-theme-viewer.1 metacity-window-demo.1
+man_MANS = metacity.1 metacity-theme-viewer.1 \
+	   metacity-window-demo.1 metacity-message.1

 EXTRA_DIST = $(man_MANS)
--- a/doc/man/metacity-message.1
+++ b/doc/man/metacity-message.1
@@ -0,0 +1,60 @@
+.\"                                      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 METACITY\-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
+METACITY\-MESSAGE \- a command to send a message to Metacity
+.SH SYNOPSIS
+.B METACITY\-MESSAGE
+[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B metacity\-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).
+.SH OPTIONS
+.TP
+.B restart
+Restart \fBmetacity\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 metacity (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/metacity.doap
+++ b/metacity.doap
@@ -0,0 +1,710 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Project
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns="http://usefulinc.com/ns/doap#"
+  xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:admin="http://webns.net/mvcb/">
+
+ <name>The Metacity Window Manager</name>
+ <shortname>Metacity</shortname>
+
+ <!-- It's a blog.  Metacity has no homepage. -->
+ <homepage rdf:resource="http://blogs.gnome.org/metacity/" />
+
+ <!-- The date when the source control was initialised. -->
+ <created>2001-05-30</created>
+
+ <shortdesc xml:lang="en">
+   Metacity is a simple compositing window manager that integrates nicely with GNOME 2.
+</shortdesc>
+ <description xml:lang="en">
+A window manager for GNOME, with a focus on simplicity and usability
+rather than novelties or gimmicks.  It uses GTK+ 2 for drawing window frames,
+so that it inherits colours, fonts, and so on from the GTK+ theme.  Its author
+has characterised it as a &quot;boring window manager for the adult in you.
+Many window managers are like Marshmallow Froot Loops; Metacity is like Cheerios.&quot;
+ </description>
+
+ <!-- I haven't found anything appropriate; I made this up. -->
+ <category>window-manager</category>
+
+ <wiki rdf:resource="http://live.gnome.org/Metacity" />
+ <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=metacity" />
+ <screenshots rdf:resource="http://commons.wikimedia.org/wiki/Image:Metacity-screenshot.png" />
+
+ <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/metacity-devel-list" />
+
+ <programming-language>C</programming-language>
+ <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
+ <download-page rdf:resource="http://download.gnome.org/sources/metacity/" />
+
+ <repository>
+   <SVNRepository>
+     <location rdf:resource="http://svn.gnome.org/svn/metacity" />
+     <browse rdf:resource="http://svn.gnome.org/viewvc/metacity/" />
+   </SVNRepository>
+ </repository> 
+
+ <author>
+  <foaf:Person>
+     <foaf:name>Havoc Pennington</foaf:name>
+  </foaf:Person>
+ </author>
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Elijah Newren</foaf:name>
+  </foaf:Person>
+ </maintainer>
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Thomas Thurman</foaf:name>
+     <foaf:mbox rdf:resource="mailto:tthurman@gnome.org"/>
+  </foaf:Person>
+ </maintainer>
+
+	<release><Version>
+	    <name>2.25.1 release</name>
+	    <created>2008-09-01</created>
+	    <branch></branch>
+	    <revision>2.25.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.25/2.25.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.25/2.25.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.25.0 release</name>
+	    <created>2008-08-18</created>
+	    <branch></branch>
+	    <revision>2.25.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.25/2.25.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.25/2.25.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.89 release</name>
+	    <created>2008-08-04</created>
+	    <branch></branch>
+	    <revision>2.23.89</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.89.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.89.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.55 release</name>
+	    <created>2008-07-14</created>
+	    <branch></branch>
+	    <revision>2.23.55</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.55.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.55.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.34 release</name>
+	    <created>2008-06-16</created>
+	    <branch></branch>
+	    <revision>2.23.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.34 release</name>
+	    <created>2008-06-16</created>
+	    <branch></branch>
+	    <revision>2.23.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.34 release</name>
+	    <created>2008-06-02</created>
+	    <branch></branch>
+	    <revision>2.23.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.21 release</name>
+	    <created>2008-05-26</created>
+	    <branch></branch>
+	    <revision>2.23.21</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.21.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.21.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.13 release</name>
+	    <created>2008-04-27</created>
+	    <branch></branch>
+	    <revision>2.23.13</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.13.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.13.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.8 release</name>
+	    <created>2008-04-22</created>
+	    <branch></branch>
+	    <revision>2.23.8</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.8.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.8.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.5 release</name>
+	    <created>2008-04-06</created>
+	    <branch></branch>
+	    <revision>2.23.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.3 release</name>
+	    <created>2008-03-21</created>
+	    <branch></branch>
+	    <revision>2.23.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.2 release</name>
+	    <created>2008-03-07</created>
+	    <branch></branch>
+	    <revision>2.23.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.1 release</name>
+	    <created>2008-03-06</created>
+	    <branch></branch>
+	    <revision>2.23.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.23.0 release</name>
+	    <created>2008-02-26</created>
+	    <branch></branch>
+	    <revision>2.23.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.23/2.23.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.13 release</name>
+	    <created>2008-02-11</created>
+	    <branch></branch>
+	    <revision>2.21.13</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.13.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.13.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.8 release</name>
+	    <created>2008-02-03</created>
+	    <branch></branch>
+	    <revision>2.21.8</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.8.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.8.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.5 release</name>
+	    <created>2007-12-19</created>
+	    <branch></branch>
+	    <revision>2.21.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.3 release</name>
+	    <created>2007-12-14</created>
+	    <branch></branch>
+	    <revision>2.21.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.2 release</name>
+	    <created>2007-11-17</created>
+	    <branch></branch>
+	    <revision>2.21.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.21.1 release</name>
+	    <created>2007-11-11</created>
+	    <branch></branch>
+	    <revision>2.21.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.21/2.21.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.20.0 release</name>
+	    <created>2007-09-15</created>
+	    <branch></branch>
+	    <revision>2.20.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.20/2.20.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.20/2.20.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.55 release</name>
+	    <created>2007-08-07</created>
+	    <branch></branch>
+	    <revision>2.19.55</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.55.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.55.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.34 release</name>
+	    <created>2007-07-22</created>
+	    <branch></branch>
+	    <revision>2.19.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.21 release</name>
+	    <created>2007-06-18</created>
+	    <branch></branch>
+	    <revision>2.19.21</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.21.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.21.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.13 release</name>
+	    <created>2007-06-10</created>
+	    <branch></branch>
+	    <revision>2.19.13</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.13.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.13.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.8 release</name>
+	    <created>2007-06-04</created>
+	    <branch></branch>
+	    <revision>2.19.8</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.8.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.8.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.5 release</name>
+	    <created>2007-04-23</created>
+	    <branch></branch>
+	    <revision>2.19.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.3 release</name>
+	    <created>2007-04-16</created>
+	    <branch></branch>
+	    <revision>2.19.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.2 release</name>
+	    <created>2007-04-09</created>
+	    <branch></branch>
+	    <revision>2.19.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.19.1 release</name>
+	    <created>2007-04-04</created>
+	    <branch></branch>
+	    <revision>2.19.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.19/2.19.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.17.3 release</name>
+	    <created>2006-12-10</created>
+	    <branch></branch>
+	    <revision>2.17.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.17.2 release</name>
+	    <created>2006-11-06</created>
+	    <branch></branch>
+	    <revision>2.17.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.17.1 release</name>
+	    <created>2006-10-16</created>
+	    <branch></branch>
+	    <revision>2.17.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.17.0 release</name>
+	    <created>2006-10-07</created>
+	    <branch></branch>
+	    <revision>2.17.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.17/2.17.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.16.2 release</name>
+	    <created>2006-09-18</created>
+	    <branch></branch>
+	    <revision>2.16.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.16.1 release</name>
+	    <created>2006-09-11</created>
+	    <branch></branch>
+	    <revision>2.16.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.16.0 release</name>
+	    <created>2006-09-04</created>
+	    <branch></branch>
+	    <revision>2.16.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.16/2.16.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.34 release</name>
+	    <created>2006-08-21</created>
+	    <branch></branch>
+	    <revision>2.15.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.21 release</name>
+	    <created>2006-08-07</created>
+	    <branch></branch>
+	    <revision>2.15.21</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.21.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.21.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.13 release</name>
+	    <created>2006-07-24</created>
+	    <branch></branch>
+	    <revision>2.15.13</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.13.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.13.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.8 release</name>
+	    <created>2006-07-10</created>
+	    <branch></branch>
+	    <revision>2.15.8</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.8.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.8.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.5 release</name>
+	    <created>2006-06-12</created>
+	    <branch></branch>
+	    <revision>2.15.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.3 release</name>
+	    <created>2006-05-15</created>
+	    <branch></branch>
+	    <revision>2.15.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.2 release</name>
+	    <created>2006-04-25</created>
+	    <branch></branch>
+	    <revision>2.15.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.1 release</name>
+	    <created>2006-04-25</created>
+	    <branch></branch>
+	    <revision>2.15.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.15.0 release</name>
+	    <created>2006-04-24</created>
+	    <branch></branch>
+	    <revision>2.15.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.15/2.15.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.89 release</name>
+	    <created>2006-02-13</created>
+	    <branch></branch>
+	    <revision>2.13.89</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.89.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.89.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.55 release</name>
+	    <created>2006-01-30</created>
+	    <branch></branch>
+	    <revision>2.13.55</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.55.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.55.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.34 release</name>
+	    <created>2006-01-20</created>
+	    <branch></branch>
+	    <revision>2.13.34</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.34.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.34.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.21 release</name>
+	    <created>2006-01-16</created>
+	    <branch></branch>
+	    <revision>2.13.21</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.21.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.21.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.13 release</name>
+	    <created>2006-01-10</created>
+	    <branch></branch>
+	    <revision>2.13.13</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.13.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.13.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.8 release</name>
+	    <created>2006-01-02</created>
+	    <branch></branch>
+	    <revision>2.13.8</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.8.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.8.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.5 release</name>
+	    <created>2005-12-12</created>
+	    <branch></branch>
+	    <revision>2.13.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.3 release</name>
+	    <created>2005-11-22</created>
+	    <branch></branch>
+	    <revision>2.13.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.2 release</name>
+	    <created>2005-11-19</created>
+	    <branch></branch>
+	    <revision>2.13.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.1 release</name>
+	    <created>2005-11-14</created>
+	    <branch></branch>
+	    <revision>2.13.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.13.0 release</name>
+	    <created>2005-10-24</created>
+	    <branch></branch>
+	    <revision>2.13.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.13/2.13.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.12.1 release</name>
+	    <created>2005-10-03</created>
+	    <branch></branch>
+	    <revision>2.12.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.12/2.12.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.12/2.12.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.12.0 release</name>
+	    <created>2005-09-05</created>
+	    <branch></branch>
+	    <revision>2.12.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.12/2.12.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.12/2.12.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.11.3 release</name>
+	    <created>2005-08-22</created>
+	    <branch></branch>
+	    <revision>2.11.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.3.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.11.2 release</name>
+	    <created>2005-08-08</created>
+	    <branch></branch>
+	    <revision>2.11.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.11.1 release</name>
+	    <created>2005-07-24</created>
+	    <branch></branch>
+	    <revision>2.11.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.11.0 release</name>
+	    <created>2005-07-12</created>
+	    <branch></branch>
+	    <revision>2.11.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.11/2.11.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.10.2 release</name>
+	    <created>2005-06-27</created>
+	    <branch></branch>
+	    <revision>2.10.2</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.2.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.2.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.10.1 release</name>
+	    <created>2005-04-11</created>
+	    <branch></branch>
+	    <revision>2.10.1</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.1.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.1.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.10.0 release</name>
+	    <created>2005-03-07</created>
+	    <branch></branch>
+	    <revision>2.10.0</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.0.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.10/2.10.0.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.8.5 release</name>
+	    <created>2004-09-13</created>
+	    <branch></branch>
+	    <revision>2.8.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.8.5 release</name>
+	    <created>2004-09-13</created>
+	    <branch></branch>
+	    <revision>2.8.5</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.5.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.5.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.8.4 release</name>
+	    <created>2004-08-29</created>
+	    <branch></branch>
+	    <revision>2.8.4</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.4.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.4.tar.bz2"/>
+	</Version></release>
+
+	<release><Version>
+	    <name>2.8.3 release</name>
+	    <created>2004-08-15</created>
+	    <branch></branch>
+	    <revision>2.8.3</revision>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.3.tar.gz"/>
+	    <file-release rdf:resource="http://download.gnome.org/sources/metacity/2.8/2.8.3.tar.bz2"/>
+	</Version></release>
+
+	<!-- earlier ones not yet documented, and will have to be added by hand -->
+
+</Project>
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,486 @@
+2009-02-01  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-01-31  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation
+
+2009-01-31  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-01-29  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-01-24  Raivis DEjus  <orvils@gmail.com>
+
+	* lv.po: Updated Latvian translation.
+
+2009-01-22  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2009-01-17  Thomas Thurman  <tthurman@gnome.org>
+
+	* ig.po: Added Igbo translation by Sylvester Onye.
+	* yo.po Added Yoruba translation by Sunday Ayo Fajuyitan.
+	* ha.po: Added Hausa translation by Saudat Mohammed.
+	* LINGUAS: added Igbo, Yoruba and Hausa.
+	
+2009-01-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-01-09  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-03  甘露(Gan Lu) <rhythm.gan@gmail.com>
+
+        * zh_CN.po: Updated Chinese Simplified translation
+
+2009-01-03  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-12-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-12-12  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Imported updated translation from gnome-2-24 branch.
+
+2008-12-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-11-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-14  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation
+
+2008-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-03  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged from branch gnome-2-24. Minor capitalization fix in
+	the Brazilian Portuguese translation.
+
+2008-10-27 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Og Maciel.
+
+2008-10-27  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-10-23  Gil Forcada  <gforcada@gnome.org>
+
+	* LINGUAS: Added ast.
+	* ast.po: Added Asturian translation on behalf of Mikel González.
+
+2008-10-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca@valencia.po: New Valencian (Southern Catalan) translation
+	based on the Catalan file.
+	* LINGUAS: Added Valencian (Southern Catalan) (ca@valencia).
+
+2008-10-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Apply Catalan fixes from Robert Millan.
+
+2008-10-17  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-16  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation by Pavol Šimo.
+
+2008-10-15  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-15  Thomas Thurman  <tthurman@gnome.org>
+
+	* la.po: Updated Latin translation.
+
+2008-10-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-10-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation (merged from gnome-2-24 branch).
+
+2008-10-11  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Fixed minimize/unmaximize French translation (sync with 2.24) and
+	complete some other translations.
+
+2008-09-30 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Vladimir Melo.
+
+2008-09-29  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-27  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation.
+
+2008-09-27  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-09-24  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-22 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-22 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-22  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan <dumol@gnome.ro>
+
+2008-09-21  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-21  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-09-20  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-09-14  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed Portuguese terminology.
+
+2008-09-12  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-12  Goran Rakić  <grakic@devbase.net>
+
+        * sr.po, sr@latin.po: Updated Serbian translation (by Miloš Popović).
+
+2008-09-09  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2008-09-07  Seán de Búrca  <sdeburca@svn.gnome.org>
+
+	* ga.po: Updated Irish translation.
+
+2008-09-06  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2008-09-06  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation.
+
+2008-08-24  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-08-23  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-21  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-08-14  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-08-13  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Brazilian Portuguese translation updated by Djavan
+	Fagundes.
+
+2008-08-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-09  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-6  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-08-02  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-07-29  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Dutch translation updated by Wouter Bolsterlee.
+
+2008-07-25  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology fixes by Vladimir Melo.
+
+2008-07-17  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-07-14  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-07-10  Matej Urbančič  <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian Translation.
+
+2008-07-10  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-07-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-07-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-06-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-06-21  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-06-16  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Yavor Doganov <yavor@gnu.org>
+
+2008-06-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation  
+
+2008-06-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-06-11  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-06-11  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2008-06-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-06-01   Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2008-05-22  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-20  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-05-19  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-05-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-05-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-05-13  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-05-06  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-05-01  Gabor Kelemen  <kelemeng@gnome.org>
+
+	* hu.po: Translation updated.
+
+2008-04-20  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2008-04-10  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2008-04-04  Eskild Hustvedt  <eskildh@gnome.org>
+
+	* nn.po: Updated Norwegian Nynorsk translation
+
+2008-03-31 Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation
+	
+2008-03-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation
+
+2008-03-23  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+
+	* vi.po: Update Vietnamese translation
+
+2008-03-20  Abel Cheung  <abelcheung@gmail.com>
+
+	* zh_HK.po, zh_TW.po: Typo fix for traditional Chinese translations.
+
+2008-03-18  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-03-09  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation
+
+2008-03-09  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-03-09  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-03-09  Vasiliy Faronov  <qvvx@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2008-03-07 Maxim Dziumanenko <dziumanenko@gmail.com>
+
+        * uk.po: Updated Ukrainian translation.
+
+2008-03-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-03-01  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-02-27  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation (merged from gnome-2-22).
+
+2008-02-25  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-02-24  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation (bug #518255).
+
+2008-02-23  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2008-02-20  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-18  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2008-02-18  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2008-02-15  Runa Bhattacharjee <runabh@gmail.com>
+
+	* kn.po: Added Kannada Translations by Shankar Prasad
+	* LINGUAS: Added Kannada (kn) to the List of Languages
+
+2008-02-14  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-02-14  Pawan Chitrakar <chautari@gmail.com>
+
+	* ne.po: Updated Nepali Translation.
+
+2008-02-14  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-02-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2008-02-10  Duarte Loreto <happyguy_pt@hotmail.com>

 	* pt.po: Updated Portuguese translation.
@@ -79,7 +562,7 @@

 	* be@latin.po: Updated Belarusian Latin translation.

-2008-01-05   Clytie Siddall <clytie@riverland.net.au>
+2008-01-05  Clytie Siddall <clytie@riverland.net.au>

 	* vi.po: Updated Vietnamese translation.

@@ -110,7 +593,7 @@

 2007-12-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.

 2007-12-17  Daniel Nylander <po@danielnylander.se>

@@ -122,7 +605,7 @@

 2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500562 and bug #500831
+	* es.po: Updated Spanish translation, fixes bug #500562 and bug #500831

 2007-12-10  Matej Urbančič  <mateju@svn.gnome.org>

@@ -130,11 +613,11 @@

 2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500831
+	* es.po: Updated Spanish translation, fixes bug #500831

 2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>

-        * es.po: Updated Spanish translation, fixes bug #500562
+	* es.po: Updated Spanish translation, fixes bug #500562

 2007-12-08  Jakub Friedl  <jfriedl@suse.cz>

@@ -282,7 +765,7 @@

 2007-09-05  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-03  Clytie Siddall <clytie@riverland.net.au>

@@ -294,11 +777,11 @@

 2007-09-03  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-01  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-09-01  Stéphane Raimbault  <stephane.raimbault@gmail.com>

@@ -433,7 +916,7 @@

 2007-05-09  Jovan Naumovski  <jovan@lugola.net>

- 	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.

 2007-05-2  Djihed Afifi <djihed@gmail.com>

@@ -1838,7 +2321,7 @@

 2005-04-17  Pauli Virtanen <pauli.virtanen@hut.fi>

-	 * fi.po: Fix a small mistranslation.
+	* fi.po: Fix a small mistranslation.

 2005-04-09  Christopher Orr  <chris@protactin.co.uk>

@@ -2025,7 +2508,7 @@

 2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>

-	 * fi.po: Updated Finnish translation.
+	* fi.po: Updated Finnish translation.

 2005-02-05  Frank Arnold  <farnold@cvs.gnome.org>

@@ -2640,7 +3123,7 @@

 2004-02-07  Robert Sedak  <robert.sedak@sk.htnet.hr>

-	 * hr.po: Updated Croatian translation.
+	* hr.po: Updated Croatian translation.

 2004-02-08  Changwoo Ryu  <cwryu@debian.org>

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -3,6 +3,7 @@
 am
 ar
 as
+ast
 az
 be
 be@latin
@@ -11,6 +12,7 @@ bn
 bn_IN
 bs
 ca
+ca@valencia
 cs
 cy
 da
@@ -28,18 +30,22 @@ fr
 ga
 gl
 gu
+ha
 he
 hi
 hr
 hu
 hy
 id
+ig
 is
 it
 ja
 ka
+kn
 ko
 ku
+la
 lt
 lv
 mg
@@ -66,7 +72,7 @@ sk
 sl
 sq
 sr
-sr@Latn
+sr@latin
 sv
 ta
 th
@@ -76,6 +82,7 @@ uk
 vi
 wa
 xh
+yo
 zh_CN
 zh_HK
 zh_TW
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,20 +10,23 @@ src/core/keybindings.c
 src/core/main.c
 src/core/prefs.c
 src/core/screen.c
+src/core/schema-bindings.c
 src/core/session.c
 src/core/util.c
-src/core/window-props.c
 src/core/window.c
+src/core/window-props.c
 src/core/xprops.c
+src/include/all-keybindings.h
 src/metacity.desktop.in
-src/metacity.schemas.in
+src/metacity.schemas.in.in
+src/metacity-wm.desktop.in
+src/tools/metacity-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/metacity-dialog.c
 src/ui/resizepopup.c
+src/ui/theme.c
 src/ui/theme-parser.c
 src/ui/theme-viewer.c
-src/ui/theme.c
-src/tools/metacity-message.c

--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -0,0 +1,2 @@
+src/metacity.schemas.in
+
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/ast.po
+++ b/po/ast.po
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: atk.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-06 02:36+0200\n"
-"PO-Revision-Date: 2008-01-06 02:40+0200\n"
+"POT-Creation-Date: 2008-02-23 11:40+0200\n"
+"PO-Revision-Date: 2008-02-17 01:47+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: i18n@mova.org <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
@@ -67,12 +67,12 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nielha atrymać nazvu kamputara: %s\n"

-#: ../src/core/display.c:204
+#: ../src/core/display.c:256
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Nie staje pašyreńnia %s, vymahanaha dziela kampazycyi"

-#: ../src/core/display.c:368
+#: ../src/core/display.c:438
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Niemahčyma adčynić spałučeńnie z ekranam \"%s\" systemy X Window\n"
@@ -113,61 +113,60 @@ msgid "No command %d has been defined.\n"
 msgstr "Zahad %d nie akreśleny.\n"

 #: ../src/core/keybindings.c:3866
-#, c-format
 msgid "No terminal command has been defined.\n"
 msgstr "Zahad terminału nie akreśleny.\n"

-#: ../src/core/main.c:67
+#: ../src/core/main.c:112
 #, c-format
 msgid ""
 "metacity %s\n"
-"Copyright (C) 2001-2007 Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-2008 Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "metacity %s\n"
-"Aŭtarskija pravy (C) 2001-2007 Havoc Pennington, Red Hat, Inc. dy inšyja\n"
+"Aŭtarskija pravy (C) 2001-2008 Havoc Pennington, Red Hat, Inc. dy inšyja\n"
 "Heta volnaja prahrama; kab paznajomicca z umovami, pry jakich dapuščalna "
 "jaje kapijavać, zazirni ŭ jaje krynicy.\n"
 "Na prahramu nie dajuć NIJAKAJ HARANTYI, navat harantyi HANDLOVAJ PRYDATNAŚCI "
 "albo PRYDATNAŚCI DLA AKREŚLENYCH METAŬ.\n"

-#: ../src/core/main.c:172
+#: ../src/core/main.c:239
 msgid "Disable connection to session manager"
 msgstr "Uklučaje spałučeńnie z kiraŭnikom sesijaŭ"

-#: ../src/core/main.c:178
+#: ../src/core/main.c:245
 msgid "Replace the running window manager with Metacity"
 msgstr "Zamianiaje ŭruchomlenaha kiraŭnika voknaŭ na Metacity"

-#: ../src/core/main.c:184
+#: ../src/core/main.c:251
 msgid "Specify session management ID"
 msgstr "Akreślivaje ID haspadarańnia sesijami"

 # #FIXME Słova "display" -- nie samameta, ale lepšaj versii nie pryniali. Varyjanty byli: dyspłej, dysplej. Nivodaje nie spadabałasia.
-#: ../src/core/main.c:189
+#: ../src/core/main.c:256
 msgid "X Display to use"
 msgstr "Užyvany dysplej X"

-#: ../src/core/main.c:195
+#: ../src/core/main.c:262
 msgid "Initialize session from savefile"
 msgstr "Inicyjavańnie sesii z zapisanaha fajłu"

-#: ../src/core/main.c:201
+#: ../src/core/main.c:268
 msgid "Print version"
 msgstr "Pakazvaje versiju"

-#: ../src/core/main.c:207
+#: ../src/core/main.c:274
 msgid "Make X calls synchronous"
 msgstr "Synchranizuj vykliki X"

-#: ../src/core/main.c:361
+#: ../src/core/main.c:425
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Niemahčyma prahledzieć kataloh z matyvami: %s\n"

-#: ../src/core/main.c:377
+#: ../src/core/main.c:441
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -175,31 +174,43 @@ msgstr ""
 "Niemahčyma znajści nivodnaha z matyvaŭ. Spraŭdź, kali łaska, ci isnuje "
 "kataloh %s i ci jość u im standartnyja matyvy.\n"

-#: ../src/core/main.c:452
+#: ../src/core/main.c:513
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Restart nie ŭdaŭsia: %s\n"

-#: ../src/core/prefs.c:434
+#.
+#. * We found it, but it was invalid.  Complain.
+#. *
+#. * FIXME: This replicates the original behaviour, but in the future
+#. * we might consider reverting invalid keys to their original values.
+#. * (We know the old value, so we can look up a suitable string in
+#. * the symtab.)
+#.
+#: ../src/core/prefs.c:325 ../src/core/prefs.c:385
 #, c-format
-msgid "Type of %s was not integer"
-msgstr "Typ %s nia ceły"
+msgid "GConf key '%s' is set to an invalid value\n"
+msgstr "Kluču GConfa \"%s\" prypisanaja niapravilnaja vartaść\n"

-#: ../src/core/prefs.c:572 ../src/core/prefs.c:600 ../src/core/prefs.c:616
-#: ../src/core/prefs.c:632 ../src/core/prefs.c:648 ../src/core/prefs.c:664
-#: ../src/core/prefs.c:680 ../src/core/prefs.c:696 ../src/core/prefs.c:716
-#: ../src/core/prefs.c:732 ../src/core/prefs.c:748 ../src/core/prefs.c:766
-#: ../src/core/prefs.c:782 ../src/core/prefs.c:801 ../src/core/prefs.c:817
-#: ../src/core/prefs.c:852 ../src/core/prefs.c:868 ../src/core/prefs.c:885
-#: ../src/core/prefs.c:901 ../src/core/prefs.c:917 ../src/core/prefs.c:933
-#: ../src/core/prefs.c:949 ../src/core/prefs.c:964 ../src/core/prefs.c:979
-#: ../src/core/prefs.c:994 ../src/core/prefs.c:1010 ../src/core/prefs.c:1026
-#: ../src/core/prefs.c:1042 ../src/core/prefs.c:1058
+#: ../src/core/prefs.c:358 ../src/core/prefs.c:776 ../src/core/prefs.c:792
+#: ../src/core/prefs.c:808 ../src/core/prefs.c:824 ../src/core/prefs.c:840
+#: ../src/core/prefs.c:860 ../src/core/prefs.c:876 ../src/core/prefs.c:892
+#: ../src/core/prefs.c:910 ../src/core/prefs.c:926 ../src/core/prefs.c:945
+#: ../src/core/prefs.c:961 ../src/core/prefs.c:978 ../src/core/prefs.c:994
+#: ../src/core/prefs.c:1011 ../src/core/prefs.c:1027 ../src/core/prefs.c:1043
+#: ../src/core/prefs.c:1059 ../src/core/prefs.c:1075 ../src/core/prefs.c:1090
+#: ../src/core/prefs.c:1105 ../src/core/prefs.c:1121 ../src/core/prefs.c:1137
+#: ../src/core/prefs.c:1153 ../src/core/prefs.c:1169
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Kluč GConfa \"%s\" nieadpaviednaha typu\n"

-#: ../src/core/prefs.c:1103
+#: ../src/core/prefs.c:613
+#, c-format
+msgid "Type of %s was not integer"
+msgstr "Typ %s nia ceły"
+
+#: ../src/core/prefs.c:1214
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -208,12 +219,7 @@ msgstr ""
 "Vartaść \"%s\", znojdzienaja ŭ bazie źviestak kanfihuracyi, nie apisvaje "
 "pravilna madyfikatara knopki myšy\n"

-#: ../src/core/prefs.c:1127 ../src/core/prefs.c:1148 ../src/core/prefs.c:1705
-#, c-format
-msgid "GConf key '%s' is set to an invalid value\n"
-msgstr "Kluču GConfa \"%s\" prypisanaja niapravilnaja vartaść\n"
-
-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1344
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable cursor_size; must be in the "
@@ -222,12 +228,12 @@ msgstr ""
 "Vartaść %d, zapisanaja ŭ klučy GConfa %s, nie źjaŭlajecca prydatnaj "
 "vartaściu dla \"cursor_size\", jana musić być u dyjapazonie 1...128\n"

-#: ../src/core/prefs.c:1357
+#: ../src/core/prefs.c:1396
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Niemahčyma razabrać apisańnie \"%s\", paviazanaje z klučom GConfa %s\n"

-#: ../src/core/prefs.c:1599
+#: ../src/core/prefs.c:1638
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -236,7 +242,7 @@ msgstr ""
 "Vartaść %d, zapisanaja ŭ klučy GConfa %s, nie źjaŭlajecca pravilnaj ličbaj "
 "stałoŭ; maksymum składaje ciapier %d\n"

-#: ../src/core/prefs.c:1659
+#: ../src/core/prefs.c:1698
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -256,12 +262,12 @@ msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 "Padčas vyznačeńnia kolkaści rabočych abšaraŭ na %d adbyłasia pamyłka: %s\n"

-#: ../src/core/prefs.c:2246 ../src/core/prefs.c:2780 ../src/ui/menu.c:199
+#: ../src/core/prefs.c:2246 ../src/core/prefs.c:2782 ../src/ui/menu.c:199
 #, c-format
 msgid "Workspace %d"
 msgstr "Rabočy abšar %d"

-#: ../src/core/prefs.c:2276 ../src/core/prefs.c:2446
+#: ../src/core/prefs.c:2276 ../src/core/prefs.c:2449
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -270,7 +276,7 @@ msgstr ""
 "Vartaść \"%s\", znojdzienaja ŭ bazie źviestak kanfihuracyi, nie apisvaje "
 "pravilna klavišny skarot \"%s\"\n"

-#: ../src/core/prefs.c:2861
+#: ../src/core/prefs.c:2863
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Pamyłka pry vyznačeńni rabočaha abšaru %d na \"%s\": %s\n"
@@ -338,7 +344,6 @@ msgid "Failed to parse saved session file: %s\n"
 msgstr "Niemahčyma razabrać zapisany fajł sesii: %s\n"

 #: ../src/core/session.c:1159
-#, c-format
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "Znojdzieny atrybut <metacity_session>, kali ID sesii byŭ užo akreśleny"

@@ -349,7 +354,6 @@ msgstr "Nieviadomy atrybut %s unutry elementu <metacity_session>"

 # #FIXME nia ŭpeŭnieny ŭ terminie
 #: ../src/core/session.c:1189
-#, c-format
 msgid "nested <window> tag"
 msgstr "zahnieždžany značnik <window>"

@@ -398,25 +402,24 @@ msgid "Opened log file %s\n"
 msgstr "Adčynieny fajł historyi %s\n"

 #: ../src/core/util.c:133 ../src/tools/metacity-message.c:176
-#, c-format
 msgid "Metacity was compiled without support for verbose mode\n"
 msgstr ""
 "Prahrama Metacity skampilavanaja biez absłuhoŭvańnia režymu z pašyranaj "
 "infarmacyjaj\n"

-#: ../src/core/util.c:231
+#: ../src/core/util.c:233
 msgid "Window manager: "
 msgstr "Kiraŭnik voknaŭ: "

-#: ../src/core/util.c:379
+#: ../src/core/util.c:385
 msgid "Bug in window manager: "
 msgstr "Pamyłka ŭ prahramie kiraŭnika voknaŭ: "

-#: ../src/core/util.c:408
+#: ../src/core/util.c:418
 msgid "Window manager warning: "
 msgstr "Aściaroha kiraŭnika voknaŭ: "

-#: ../src/core/util.c:432
+#: ../src/core/util.c:446
 msgid "Window manager error: "
 msgstr "Pamyłka kiraŭnika voknaŭ: "

@@ -2559,7 +2562,6 @@ msgid "_Close"
 msgstr "Za_čyni"

 #: ../src/ui/menu.c:208
-#, c-format
 msgid "Workspace 1_0"
 msgstr "Rabočy abšar 1_0"

@@ -3374,7 +3376,6 @@ msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisekund(y) dziela stvareńnia adnoj ramki vakna"

 #: ../src/ui/theme-viewer.c:797
-#, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Užyćcio: methacity-theme-viewer [NAZVA_MATYVU]\n"

@@ -3462,48 +3463,46 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "vyraz kaardynataŭ %d praanalizavany ŭ %g sekund (u siarednim %g sekund(y))\n"

-#: ../src/ui/theme.c:208
+#: ../src/ui/theme.c:256
 msgid "top"
 msgstr "vierch"

-#: ../src/ui/theme.c:210
+#: ../src/ui/theme.c:258
 msgid "bottom"
 msgstr "niz"

-#: ../src/ui/theme.c:212
+#: ../src/ui/theme.c:260
 msgid "left"
 msgstr "levy"

-#: ../src/ui/theme.c:214
+#: ../src/ui/theme.c:262
 msgid "right"
 msgstr "pravy"

-#: ../src/ui/theme.c:228
+#: ../src/ui/theme.c:289
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "Pamier ramki nie akreślivaje pamieru \"%s\""

-#: ../src/ui/theme.c:247
+#: ../src/ui/theme.c:308
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "Pamier ramki nie akreślivaje pamieru \"%s\" dla kraju \"%s\""

-#: ../src/ui/theme.c:284
+#: ../src/ui/theme.c:345
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Kaeficyjent praporcyjaŭ knopki %g nie źmiaščajecca ŭ rezonnych miežach"

-#: ../src/ui/theme.c:296
-#, c-format
+#: ../src/ui/theme.c:357
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Pamier ramki nie akreślivaje ličby knopak"

-#: ../src/ui/theme.c:927
-#, c-format
+#: ../src/ui/theme.c:988
 msgid "Gradients should have at least two colors"
 msgstr "Hradyjenty pavinny składacca prynamsi z dvuch koleraŭ"

-#: ../src/ui/theme.c:1053
+#: ../src/ui/theme.c:1114
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -3513,7 +3512,7 @@ msgstr ""
 "napr. gtk:fg[NORMAL], dzie NORMAL źjaŭlajecca nazvaj stanu; niemahčyma "
 "praanalizavać \"%s\""

-#: ../src/ui/theme.c:1067
+#: ../src/ui/theme.c:1128
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -3523,17 +3522,17 @@ msgstr ""
 "dužku, napr. gtk:fg[NORMAL], dzie NORMAL heta nazva stanu; niemahčyma "
 "praanalizavać \"%s\""

-#: ../src/ui/theme.c:1078
+#: ../src/ui/theme.c:1139
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Niezrazumieły stan \"%s\" u specyfikacyi koleru"

-#: ../src/ui/theme.c:1091
+#: ../src/ui/theme.c:1152
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Niezrazumiełaje aznačeńnie koleru \"%s\" ŭ specyfikacyi"

-#: ../src/ui/theme.c:1121
+#: ../src/ui/theme.c:1182
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -3542,18 +3541,18 @@ msgstr ""
 "Farmatam pranikańnia źjaŭlajecca \"blend/bg_color/fg_color/alpha\", \"%s\" "
 "nie pasuje da farmatu"

-#: ../src/ui/theme.c:1132
+#: ../src/ui/theme.c:1193
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Niemahčyma razabrać vartaść alfa \"%s\" koleru pranikańnia"

-#: ../src/ui/theme.c:1142
+#: ../src/ui/theme.c:1203
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "Vartaść alfa \"%s\" koleru pranikańnia nie źmiaščajecca pamiž 0,0 i 1,0"

-#: ../src/ui/theme.c:1190
+#: ../src/ui/theme.c:1251
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -3561,28 +3560,28 @@ msgstr ""
 "Farmatam pranikańnia źjaŭlajecca \"shade/base_color/factor\", \"%s\" nie "
 "pasuje da farmatu"

-#: ../src/ui/theme.c:1201
+#: ../src/ui/theme.c:1262
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Niemahčyma razabrać kaeficyjent pranikańnia \"%s\" koleru pranikańnia"

-#: ../src/ui/theme.c:1211
+#: ../src/ui/theme.c:1272
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Kaeficyjent pranikańnia \"%s\" koleru pranikańnia admoŭny"

-#: ../src/ui/theme.c:1241
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Niemahčyma razabrać koler \"%s\""

-#: ../src/ui/theme.c:1462
+#: ../src/ui/theme.c:1560
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 "Vyraz, jaki akreślivaje kaardynaty, maje ŭ sabie niedazvoleny znak '%s'"

-#: ../src/ui/theme.c:1489
+#: ../src/ui/theme.c:1587
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -3591,13 +3590,13 @@ msgstr ""
 "Vyraz, jaki akreślivaje kaardynaty, maje nierazborlivy numar niefiksavanaj "
 "koski '%s'"

-#: ../src/ui/theme.c:1503
+#: ../src/ui/theme.c:1601
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Vyraz, jaki akreślivaje kaardynaty, maje nierazborlivuju cełuju ličbu '%s'"

-#: ../src/ui/theme.c:1610
+#: ../src/ui/theme.c:1723
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -3606,44 +3605,39 @@ msgstr ""
 "Vyraz, jaki akreślivaje kaardynaty, maje nieviadomy aperatar na pačatku "
 "tekstu: \"%s\""

-#: ../src/ui/theme.c:1667
-#, c-format
+#: ../src/ui/theme.c:1780
 msgid "Coordinate expression was empty or not understood"
 msgstr "Vyraz, jaki akreślivaje kaardynaty, pusty albo niezrazumieły"

-#: ../src/ui/theme.c:1764 ../src/ui/theme.c:1774 ../src/ui/theme.c:1808
-#, c-format
+#: ../src/ui/theme.c:1891 ../src/ui/theme.c:1901 ../src/ui/theme.c:1935
 msgid "Coordinate expression results in division by zero"
 msgstr "Vyraz, jaki akreślivaje kaardynaty, maje dzialeńnie praz nul"

-#: ../src/ui/theme.c:1816
-#, c-format
+#: ../src/ui/theme.c:1943
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Vyraz, jaki akreślivaje kaardynaty, užyvaje aperatara dzialeńnia pa moduli z "
 "arhumentam niefiksavanaj koski"

-#: ../src/ui/theme.c:1872
+#: ../src/ui/theme.c:1999
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Vyraz maje aperatar \"%s\" u miescy, dzie čakali arhumentu"

-#: ../src/ui/theme.c:1881
-#, c-format
+#: ../src/ui/theme.c:2008
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, maje arhument u miescy, dzie čakali "
 "aperatara"

-#: ../src/ui/theme.c:1889
-#, c-format
+#: ../src/ui/theme.c:2016
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, zakančvajecca aperataram zamiest arhumentu"

-#: ../src/ui/theme.c:1899
+#: ../src/ui/theme.c:2026
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -3652,45 +3646,41 @@ msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, maje arhument \"%c\" adrazu paśla arhumentu "
 "\"%c\" biez aperatara pamiž imi"

-#: ../src/ui/theme.c:2023 ../src/ui/theme.c:2064
+#: ../src/ui/theme.c:2173 ../src/ui/theme.c:2214
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, maje nieviadomuju źmiennuju albo stałuju \"%"
 "s\""

-#: ../src/ui/theme.c:2108
-#, c-format
+#: ../src/ui/theme.c:2268
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr ""
 "Parser vyrazaŭ, jakija akreślivajuć kaardynaty, pierapoŭniŭ svoj bufer."

-#: ../src/ui/theme.c:2137
-#, c-format
+#: ../src/ui/theme.c:2297
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, začyniaje dužka biez adpaviednaj dužki na "
 "pačatku"

-#: ../src/ui/theme.c:2201
-#, c-format
+#: ../src/ui/theme.c:2361
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, adčyniaje dužka biez adpaviednaj dužki na "
 "kancy"

-#: ../src/ui/theme.c:2212
-#, c-format
+#: ../src/ui/theme.c:2372
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Vyraz, jaki apisvaje pałažeńnie, nia maje ani aperataraŭ, ani arhumentaŭ"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2418 ../src/ui/theme.c:2438
+#: ../src/ui/theme.c:2574 ../src/ui/theme.c:2594 ../src/ui/theme.c:2614
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Matyŭ źmiaščaŭ vyraz, jaki staŭ pryčynaj pamyłki: %s\n"

-#: ../src/ui/theme.c:3942
+#: ../src/ui/theme.c:4133
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3699,25 +3689,25 @@ msgstr ""
 "Pry hetym styli ramki treba padać <button function=\"%s\" state=\"%s\" "
 "draw_ops=\"niešta\"/>"

-#: ../src/ui/theme.c:4418 ../src/ui/theme.c:4443
+#: ../src/ui/theme.c:4609 ../src/ui/theme.c:4634
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Niama <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"niešta\"/>"

-#: ../src/ui/theme.c:4487
+#: ../src/ui/theme.c:4678
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Niemahčyma adčytać matyŭ \"%s\": %s\n"

-#: ../src/ui/theme.c:4613 ../src/ui/theme.c:4620 ../src/ui/theme.c:4627
-#: ../src/ui/theme.c:4634 ../src/ui/theme.c:4641
+#: ../src/ui/theme.c:4804 ../src/ui/theme.c:4811 ../src/ui/theme.c:4818
+#: ../src/ui/theme.c:4825 ../src/ui/theme.c:4832
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Nie akreśleny element <%s> dla matyvu \"%s\""

-#: ../src/ui/theme.c:4649
+#: ../src/ui/theme.c:4840
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -3726,7 +3716,7 @@ msgstr ""
 "Pry typie vakna \"%s\" u matyvie \"%s\" nia vyznačany styl ramki. Dadaj "
 "element <window type=\"%s\" style_set=\"niešta\"/>"

-#: ../src/ui/theme.c:5016 ../src/ui/theme.c:5078 ../src/ui/theme.c:5141
+#: ../src/ui/theme.c:5207 ../src/ui/theme.c:5269 ../src/ui/theme.c:5332
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -3734,7 +3724,7 @@ msgstr ""
 "Stałyja, aznačanyja karystalnikam, pavinny pačynacca vialikaj litaraj, a \"%s"
 "\" nie vykonvaje hetaj umovy"

-#: ../src/ui/theme.c:5024 ../src/ui/theme.c:5086 ../src/ui/theme.c:5149
+#: ../src/ui/theme.c:5215 ../src/ui/theme.c:5277 ../src/ui/theme.c:5340
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Stałaja \"%s\" užo aznačanaja"
--- a/po/bg.po
+++ b/po/bg.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/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/ha.po
+++ b/po/ha.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/ig.po
+++ b/po/ig.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/la.po
+++ b/po/la.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/ne.po
+++ b/po/ne.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/oc.po
+++ b/po/oc.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/sq.po
+++ b/po/sq.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/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/yo.po
+++ b/po/yo.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/.cvsignore
+++ b/src/.cvsignore
@@ -9,6 +9,7 @@ testboxes
 testgradient
 inlinepixbufs.h
 metacity.desktop
+metacity-wm.desktop
 metacity.schemas
 libmetacity-private.pc
 testasyncgetprop
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,11 @@ lib_LTLIBRARIES = libmetacity-private.la

 SUBDIRS=wm-tester tools themes

-INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
+if WITH_CLUTTER
+SUBDIRS += compositor/mutter/plugins
+endif
+
+INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMETACITY_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"

 metacity_SOURCES= 				\
 	core/async-getprop.c			\
@@ -11,14 +15,18 @@ metacity_SOURCES= 				\
 	core/bell.h				\
 	core/boxes.c				\
 	include/boxes.h				\
-	core/compositor.c			\
-	core/compositor.h			\
+	compositor/compositor.c			\
+	compositor/compositor-private.h		\
+	compositor/compositor-xrender.c		\
+	compositor/compositor-xrender.h		\
+	include/compositor.h			\
 	core/constraints.c			\
 	core/constraints.h			\
 	core/core.c				\
 	core/delete.c				\
 	core/display.c				\
-	core/display.h				\
+	core/display-private.h			\
+	include/display.h			\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
@@ -26,22 +34,23 @@ metacity_SOURCES= 				\
 	core/effects.c				\
 	core/effects.h				\
 	core/errors.c				\
-	core/errors.h				\
+	include/errors.h			\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
-	core/frame.h				\
+	core/frame-private.h			\
+	include/frame.h				\
 	ui/gradient.c				\
 	ui/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	core/group.h				\
+	include/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
-	core/keybindings.h			\
+	core/keybindings-private.h		\
 	core/main.c				\
 	include/main.h				\
 	core/metacity-Xatomtype.h		\
@@ -50,11 +59,11 @@ metacity_SOURCES= 				\
 	core/prefs.c				\
 	include/prefs.h				\
 	core/screen.c				\
-	core/screen.h				\
+	core/screen-private.h			\
+	include/screen.h			\
+	include/types.h                         \
 	core/session.c				\
 	core/session.h				\
-	core/spring-model.c			\
-	core/spring-model.h			\
 	core/stack.c				\
 	core/stack.h				\
 	core/util.c				\
@@ -62,11 +71,12 @@ metacity_SOURCES= 				\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
-	core/window.h				\
+	core/window-private.h			\
+	include/window.h			\
 	core/workspace.c			\
-	core/workspace.h			\
+	core/workspace-private.h		\
 	core/xprops.c				\
-	core/xprops.h				\
+	include/xprops.h			\
 	include/common.h			\
 	include/core.h				\
 	include/ui.h				\
@@ -89,7 +99,24 @@ metacity_SOURCES= 				\
 	ui/theme.h				\
 	ui/themewidget.c			\
 	ui/themewidget.h			\
-	ui/ui.c
+	ui/ui.c					\
+	include/all-keybindings.h
+
+if WITH_CLUTTER
+metacity_SOURCES += 					\
+	compositor/mutter/compositor-mutter.c		\
+	compositor/mutter/mutter-shaped-texture.c	\
+	compositor/mutter/mutter-shaped-texture.h	\
+	compositor/mutter/mutter-plugin-manager.c	\
+	compositor/mutter/mutter-plugin-manager.h	\
+	compositor/mutter/tidy/tidy-texture-frame.c	\
+	compositor/mutter/tidy/tidy-texture-frame.h	\
+	compositor/mutter/mutter-module.c		\
+	compositor/mutter/mutter-module.h		\
+	compositor/mutter/mutter-plugin.c		\
+	include/mutter-plugin.h				\
+	include/compositor-mutter.h
+endif

 # by setting libmetacity_private_la_CFLAGS, the files shared with
 # metacity proper will be compiled with different names.
@@ -121,7 +148,19 @@ libmetacityinclude_HEADERS =			\
 	include/common.h			\
 	ui/preview-widget.h			\
 	ui/theme-parser.h			\
-	ui/theme.h
+	ui/theme.h				\
+	include/atomnames.h			\
+	include/prefs.h				\
+	include/window.h			\
+	include/workspace.h			\
+	include/compositor.h			\
+	include/compositor-mutter.h		\
+	include/types.h				\
+	include/screen.h			\
+	include/display.h			\
+	include/group.h				\
+	include/keybindings.h			\
+	include/mutter-plugin.h

 metacity_theme_viewer_SOURCES=  \
 	ui/theme-viewer.c
@@ -129,11 +168,21 @@ metacity_theme_viewer_SOURCES=  \
 metacity_dialog_SOURCES= 	\
 	ui/metacity-dialog.c

+schema_bindings_SOURCES =       \
+        core/schema-bindings.c			\
+	metacity.schemas.in.in
+
+schema_bindings_LDADD = @METACITY_LIBS@
+metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
+	@echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
+	${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
+
 bin_PROGRAMS=metacity metacity-theme-viewer
 libexec_PROGRAMS=metacity-dialog

 EFENCE=
 metacity_LDADD=@METACITY_LIBS@ $(EFENCE)
+metacity_LDFLAGS=-export-dynamic
 metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
 metacity_dialog_LDADD=@METACITY_LIBS@

@@ -141,17 +190,23 @@ testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/t
 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
+noinst_PROGRAMS=testboxes testgradient testasyncgetprop schema_bindings

 testboxes_LDADD= @METACITY_LIBS@
 testgradient_LDADD= @METACITY_LIBS@
 testasyncgetprop_LDADD= @METACITY_LIBS@

-desktopfilesdir=$(datadir)/gnome/wm-properties
+@INTLTOOL_DESKTOP_RULE@
+
+desktopfilesdir=$(datadir)/applications
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
-@INTLTOOL_DESKTOP_RULE@
+
+wmpropertiesdir=$(datadir)/gnome/wm-properties
+wmproperties_in_files=metacity-wm.desktop.in
+wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+wmproperties_DATA = $(wmproperties_files)

 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = metacity.schemas.in
@@ -172,26 +227,28 @@ else
 install-data-local:
 endif

-IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
-VARIABLES=default_icon_data $(srcdir)/default_icon.png \
-          stock_maximize_data $(srcdir)/stock_maximize.png \
+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 metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-desktop-key.xml 50-metacity-key.xml

 inlinepixbufs.h: $(IMAGES)
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h

 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = libmetacity-private.pc
+pkgconfig_DATA = libmetacity-private.pc metacity-plugins.pc

 EXTRA_DIST=$(desktopfiles_files) 	\
+	$(wmproperties_files)		\
 	$(IMAGES) $(schema_DATA) 	\
 	$(desktopfiles_in_files)	\
+	$(wmproperties_in_files)	\
 	$(schema_in_files)		\
 	$(xml_in_files)			\
-	libmetacity-private.pc.in
+	libmetacity-private.pc.in	\
+	metacity-plugins.pc.in

--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -0,0 +1,90 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2008 Iain Holmes
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_COMPOSITOR_PRIVATE_H
+#define META_COMPOSITOR_PRIVATE_H
+
+#include "compositor.h"
+
+struct _MetaCompositor
+{
+  void (* destroy) (MetaCompositor *compositor);
+
+  void (*manage_screen) (MetaCompositor *compositor,
+                         MetaScreen     *screen);
+  void (*unmanage_screen) (MetaCompositor *compositor,
+                           MetaScreen     *screen);
+  void (*add_window) (MetaCompositor    *compositor,
+                      MetaWindow        *window);
+  void (*remove_window) (MetaCompositor *compositor,
+                         MetaWindow     *window);
+  void (*set_updates) (MetaCompositor *compositor,
+                       MetaWindow     *window,
+                       gboolean        update);
+  gboolean (*process_event) (MetaCompositor *compositor,
+                             XEvent         *event,
+                             MetaWindow     *window);
+  Pixmap (*get_window_pixmap) (MetaCompositor *compositor,
+                               MetaWindow     *window);
+  void (*set_active_window) (MetaCompositor *compositor,
+                             MetaScreen     *screen,
+                             MetaWindow     *window);
+  void (*map_window) (MetaCompositor *compositor,
+                      MetaWindow     *window);
+  void (*unmap_window) (MetaCompositor *compositor,
+			MetaWindow     *window);
+  void (*minimize_window) (MetaCompositor *compositor,
+                           MetaWindow     *window,
+			   MetaRectangle  *window_rect,
+			   MetaRectangle  *icon_rect);
+  void (*unminimize_window) (MetaCompositor *compositor,
+			     MetaWindow     *window,
+			     MetaRectangle  *window_rect,
+			     MetaRectangle  *icon_rect);
+  void (*maximize_window) (MetaCompositor    *compositor,
+                           MetaWindow        *window,
+			   MetaRectangle     *window_rect);
+  void (*unmaximize_window) (MetaCompositor    *compositor,
+                             MetaWindow        *window,
+			     MetaRectangle     *window_rect);
+  void (*update_workspace_geometry) (MetaCompositor *compositor,
+                                     MetaWorkspace   *workspace);
+  void (*switch_workspace) (MetaCompositor     *compositor,
+                            MetaScreen         *screen,
+                            MetaWorkspace      *from,
+                            MetaWorkspace      *to,
+                            MetaMotionDirection direction);
+  void (*sync_stack) (MetaCompositor *compositor,
+		      MetaScreen     *screen,
+		      GList	     *stack);
+  void (*set_window_hidden) (MetaCompositor *compositor,
+			     MetaScreen	    *screen,
+			     MetaWindow	    *window,
+			     gboolean	     hidden);
+  void (*sync_window_geometry) (MetaCompositor	*compositor,
+				MetaWindow	*window);
+  void (*sync_screen_size) (MetaCompositor *compositor,
+			    MetaScreen	   *screen,
+			    guint	    width,
+			    guint	    height);
+};
+
+#endif
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
--- a/src/compositor/compositor-xrender.h
+++ b/src/compositor/compositor-xrender.h
@@ -1,9 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/* Metacity RGB color stuff */
-
 /* 
- * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2007 Iain Holmes
+ * Based on xcompmgr - (c) 2003 Keith Packard
+ *          xfwm4    - (c) 2005-2007 Olivier Fourdan
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@@ -21,26 +21,11 @@
 * 02111-1307, USA.
 */

-#ifndef META_COLORS_H
-#define META_COLORS_H
+#ifndef META_COMPOSITOR_XRENDER_H_
+#define META_COMPOSITOR_XRENDER_H_

-/* Colors/state stuff matches GTK.
- */
-typedef struct _MetaUIColors MetaUIColors;
-
-/* This stuff will all just be XlibRGB eventually. Right now
- * it has a stub implementation.
- */
-
-#include "screen.h"
-#include "util.h"
-
-gulong              meta_screen_get_x_pixel      (MetaScreen         *screen,
-                                                  const PangoColor   *color);
-void                meta_screen_init_visual_info (MetaScreen         *screen);
-void                meta_screen_set_ui_colors    (MetaScreen         *screen,
-                                                  const MetaUIColors *colors);
-void                meta_screen_init_ui_colors   (MetaScreen         *screen);
+#include "types.h"

+MetaCompositor *meta_compositor_xrender_new (MetaDisplay *display);

 #endif
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -0,0 +1,301 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2008 Iain Holmes
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "compositor-private.h"
+#include "compositor-xrender.h"
+#include "prefs.h"
+
+#ifdef WITH_CLUTTER
+#include "compositor-mutter.h"
+int meta_compositor_can_use_clutter__ = 0;
+#endif
+
+MetaCompositor *
+meta_compositor_new (MetaDisplay *display)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+#ifdef WITH_CLUTTER
+  /* At some point we would have a way to select between backends */
+  /* return meta_compositor_xrender_new (display); */
+  if (meta_compositor_can_use_clutter__ && !meta_prefs_get_clutter_disabled ())
+    return mutter_new (display);
+  else
+#endif
+  return meta_compositor_xrender_new (display);
+#else
+  return NULL;
+#endif
+}
+
+void
+meta_compositor_destroy (MetaCompositor *compositor)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->destroy)
+    compositor->destroy (compositor);
+#endif
+}
+
+void
+meta_compositor_add_window (MetaCompositor    *compositor,
+                            MetaWindow        *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->add_window)
+    compositor->add_window (compositor, window);
+#endif
+}
+
+void
+meta_compositor_remove_window (MetaCompositor *compositor,
+                               MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->remove_window)
+    compositor->remove_window (compositor, window);
+#endif
+}
+
+void
+meta_compositor_manage_screen (MetaCompositor *compositor,
+                               MetaScreen     *screen)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->manage_screen)
+    compositor->manage_screen (compositor, screen);
+#endif
+}
+
+void
+meta_compositor_unmanage_screen (MetaCompositor *compositor,
+                                 MetaScreen     *screen)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->unmanage_screen)
+    compositor->unmanage_screen (compositor, screen);
+#endif
+}
+
+void
+meta_compositor_set_updates (MetaCompositor *compositor,
+                             MetaWindow     *window,
+                             gboolean        updates)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->set_updates)
+    compositor->set_updates (compositor, window, updates);
+#endif
+}
+
+gboolean
+meta_compositor_process_event (MetaCompositor *compositor,
+                               XEvent         *event,
+                               MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->process_event)
+    return compositor->process_event (compositor, event, window);
+  else
+    return FALSE;
+#endif
+}
+
+Pixmap
+meta_compositor_get_window_pixmap (MetaCompositor *compositor,
+                                   MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->get_window_pixmap)
+    return compositor->get_window_pixmap (compositor, window);
+  else
+    return None;
+#else
+  return None;
+#endif
+}
+
+void
+meta_compositor_set_active_window (MetaCompositor *compositor,
+                                   MetaScreen     *screen,
+                                   MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->set_active_window)
+    compositor->set_active_window (compositor, screen, window);
+#endif
+}
+
+/* These functions are unused at the moment */
+void meta_compositor_begin_move (MetaCompositor *compositor,
+                                 MetaWindow     *window,
+                                 MetaRectangle  *initial,
+                                 int             grab_x,
+                                 int             grab_y)
+{
+}
+
+void meta_compositor_update_move (MetaCompositor *compositor,
+                                  MetaWindow     *window,
+                                  int             x,
+                                  int             y)
+{
+}
+
+void meta_compositor_end_move (MetaCompositor *compositor,
+                               MetaWindow     *window)
+{
+}
+
+void
+meta_compositor_map_window (MetaCompositor *compositor,
+			    MetaWindow	   *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->map_window)
+    compositor->map_window (compositor, window);
+#endif
+}
+
+void
+meta_compositor_unmap_window (MetaCompositor *compositor,
+			      MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->unmap_window)
+    compositor->unmap_window (compositor, window);
+#endif
+}
+
+void
+meta_compositor_minimize_window (MetaCompositor *compositor,
+                                 MetaWindow     *window,
+				 MetaRectangle	*window_rect,
+				 MetaRectangle	*icon_rect)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->minimize_window)
+    compositor->minimize_window (compositor, window, window_rect, icon_rect);
+#endif
+}
+
+void
+meta_compositor_unminimize_window (MetaCompositor    *compositor,
+                                   MetaWindow        *window,
+				   MetaRectangle     *window_rect,
+				   MetaRectangle     *icon_rect)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->unminimize_window)
+    compositor->unminimize_window (compositor, window, window_rect, icon_rect);
+#endif
+}
+
+void
+meta_compositor_maximize_window (MetaCompositor    *compositor,
+                                 MetaWindow        *window,
+				 MetaRectangle	   *window_rect)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->maximize_window)
+    compositor->maximize_window (compositor, window, window_rect);
+#endif
+}
+
+void
+meta_compositor_unmaximize_window (MetaCompositor    *compositor,
+                                   MetaWindow        *window,
+				   MetaRectangle     *window_rect)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->unmaximize_window)
+    compositor->unmaximize_window (compositor, window, window_rect);
+#endif
+}
+
+void
+meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
+                                           MetaWorkspace  *workspace)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->update_workspace_geometry)
+    compositor->update_workspace_geometry (compositor, workspace);
+#endif
+}
+
+void
+meta_compositor_switch_workspace (MetaCompositor     *compositor,
+                                  MetaScreen         *screen,
+                                  MetaWorkspace      *from,
+                                  MetaWorkspace      *to,
+                                  MetaMotionDirection direction)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->switch_workspace)
+    compositor->switch_workspace (compositor, screen, from, to, direction);
+#endif
+}
+
+void
+meta_compositor_sync_stack (MetaCompositor  *compositor,
+			    MetaScreen	    *screen,
+			    GList	    *stack)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->sync_stack)
+    compositor->sync_stack (compositor, screen, stack);
+#endif
+}
+
+void
+meta_compositor_set_window_hidden (MetaCompositor *compositor,
+				   MetaScreen	  *screen,
+				   MetaWindow	  *window,
+				   gboolean	   hidden)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->set_window_hidden)
+    compositor->set_window_hidden (compositor, screen, window, hidden);
+#endif
+}
+
+void
+meta_compositor_sync_window_geometry (MetaCompositor *compositor,
+				      MetaWindow *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->sync_window_geometry)
+    compositor->sync_window_geometry (compositor, window);
+#endif
+}
+
+void
+meta_compositor_sync_screen_size (MetaCompositor  *compositor,
+				  MetaScreen	  *screen,
+				  guint		   width,
+				  guint		   height)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->sync_screen_size)
+    compositor->sync_screen_size (compositor, screen, width, height);
+#endif
+}
+
--- a/src/compositor/mutter/README
+++ b/src/compositor/mutter/README
@@ -0,0 +1,10 @@
+Intro
+=====
+
+Fix me.
+
+
+Env Vars
+========
+
+MUTTER_DISABLE_MIPMAPS - set to disable use of mipmaped windows.
--- a/src/compositor/mutter/compositor-mutter.c
+++ b/src/compositor/mutter/compositor-mutter.c
--- a/src/compositor/mutter/mutter-module.c
+++ b/src/compositor/mutter/mutter-module.c
@@ -0,0 +1,207 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "mutter-plugin.h"
+#include "mutter-module.h"
+
+#include <gmodule.h>
+
+enum
+{
+  PROP_0,
+  PROP_PATH,
+};
+
+struct _MutterModulePrivate
+{
+  GModule      *lib;
+  gchar        *path;
+  GType         plugin_type;
+};
+
+#define MUTTER_MODULE_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_MODULE, MutterModulePrivate))
+
+G_DEFINE_TYPE (MutterModule, mutter_module, G_TYPE_TYPE_MODULE);
+
+static gboolean
+mutter_module_load (GTypeModule *gmodule)
+{
+  MutterModulePrivate  *priv = MUTTER_MODULE (gmodule)->priv;
+  MutterPluginVersion  *info = NULL;
+  GType                (*register_type) (GTypeModule *) = NULL;
+
+  if (priv->lib && priv->plugin_type)
+    return TRUE;
+
+  g_assert (priv->path);
+
+  if (!priv->lib &&
+      !(priv->lib = g_module_open (priv->path, G_MODULE_BIND_LOCAL)))
+    {
+      g_warning ("Could not load library [%s (%s)]",
+                 priv->path, g_module_error ());
+      return FALSE;
+    }
+
+  if (g_module_symbol (priv->lib, "mutter_plugin_version", (gpointer *)&info) &&
+      g_module_symbol (priv->lib, "mutter_plugin_register_type",
+		       (gpointer *)&register_type) &&
+      info && register_type)
+    {
+      if (info->version_api != METACITY_CLUTTER_PLUGIN_API_VERSION)
+	g_warning ("Plugin API mismatch for [%s]", priv->path);
+      else
+        {
+          GType plugin_type;
+
+          if (!(plugin_type = register_type (gmodule)))
+            {
+              g_warning ("Could not register type for plugin %s",
+                         priv->path);
+              return FALSE;
+            }
+          else
+            {
+              priv->plugin_type =  plugin_type;
+            }
+
+          return TRUE;
+        }
+    }
+  else
+    g_warning ("Broken plugin module [%s]", priv->path);
+
+  return FALSE;
+}
+
+static void
+mutter_module_unload (GTypeModule *gmodule)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (gmodule)->priv;
+
+  g_module_close (priv->lib);
+
+  priv->lib = NULL;
+  priv->plugin_type = 0;
+}
+
+static void
+mutter_module_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (mutter_module_parent_class)->dispose (object);
+}
+
+static void
+mutter_module_finalize (GObject *object)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  g_free (priv->path);
+  priv->path = NULL;
+
+  G_OBJECT_CLASS (mutter_module_parent_class)->finalize (object);
+}
+
+static void
+mutter_module_set_property (GObject      *object,
+			    guint         prop_id,
+			    const GValue *value,
+			    GParamSpec   *pspec)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      g_free (priv->path);
+      priv->path = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_module_get_property (GObject    *object,
+			    guint       prop_id,
+			    GValue     *value,
+			    GParamSpec *pspec)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PATH:
+      g_value_set_string (value, priv->path);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_module_class_init (MutterModuleClass *klass)
+{
+  GObjectClass     *gobject_class = G_OBJECT_CLASS (klass);
+  GTypeModuleClass *gmodule_class = G_TYPE_MODULE_CLASS (klass);
+
+  gobject_class->finalize     = mutter_module_finalize;
+  gobject_class->dispose      = mutter_module_dispose;
+  gobject_class->set_property = mutter_module_set_property;
+  gobject_class->get_property = mutter_module_get_property;
+
+  gmodule_class->load         = mutter_module_load;
+  gmodule_class->unload       = mutter_module_unload;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_PATH,
+				   g_param_spec_string ("path",
+							"Path",
+							"Load path",
+							NULL,
+							G_PARAM_READWRITE |
+						      G_PARAM_CONSTRUCT_ONLY));
+
+  g_type_class_add_private (gobject_class, sizeof (MutterModulePrivate));
+}
+
+static void
+mutter_module_init (MutterModule *self)
+{
+  MutterModulePrivate *priv;
+
+  self->priv = priv = MUTTER_MODULE_GET_PRIVATE (self);
+
+}
+
+GType
+mutter_module_get_plugin_type (MutterModule *module)
+{
+  MutterModulePrivate *priv = MUTTER_MODULE (module)->priv;
+
+  return priv->plugin_type;
+}
+
--- a/src/compositor/mutter/mutter-module.h
+++ b/src/compositor/mutter/mutter-module.h
@@ -0,0 +1,57 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef MUTTER_MODULE_H_
+#define MUTTER_MODULE_H_
+
+#include <glib-object.h>
+
+#define MUTTER_TYPE_MODULE            (mutter_module_get_type ())
+#define MUTTER_MODULE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_MODULE, MutterModule))
+#define MUTTER_MODULE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_MODULE, MutterModuleClass))
+#define MUTTER_IS_MODULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_MODULE_TYPE))
+#define MUTTER_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_MODULE))
+#define MUTTER_MODULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_MODULE, MutterModuleClass))
+
+typedef struct _MutterModule        MutterModule;
+typedef struct _MutterModuleClass   MutterModuleClass;
+typedef struct _MutterModulePrivate MutterModulePrivate;
+
+struct _MutterModule
+{
+  GTypeModule parent;
+
+  MutterModulePrivate *priv;
+};
+
+struct _MutterModuleClass
+{
+  GTypeModuleClass parent_class;
+};
+
+
+GType mutter_module_get_type (void);
+
+GType mutter_module_get_plugin_type (MutterModule *module);
+
+#endif
--- a/src/compositor/mutter/mutter-plugin-manager.c
+++ b/src/compositor/mutter/mutter-plugin-manager.c
@@ -0,0 +1,590 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "mutter-plugin-manager.h"
+#include "prefs.h"
+#include "errors.h"
+#include "workspace.h"
+#include "mutter-module.h"
+
+#include <string.h>
+
+/*
+ * There is only one instace of each module per the process.
+ */
+static GHashTable *plugin_modules = NULL;
+
+static gboolean mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr);
+
+struct MutterPluginManager
+{
+  MetaScreen   *screen;
+
+  GList        *plugins;
+  GList        *unload;  /* Plugins that are disabled and pending unload */
+
+  guint         idle_unload_id;
+};
+
+
+/*
+ * Checks that the plugin is compatible with the WM and sets up the plugin
+ * struct.
+ */
+static MutterPlugin *
+mutter_plugin_load (MutterPluginManager *mgr,
+                    MutterModule        *module,
+                    const gchar         *params)
+{
+  MutterPlugin *plugin = NULL;
+  GType         plugin_type = mutter_module_get_plugin_type (module);
+
+  if (!plugin_type)
+    {
+      g_warning ("Plugin type not registered !!!");
+      return NULL;
+    }
+
+  plugin = g_object_new (plugin_type,
+                         "screen", mgr->screen,
+                         "params", params,
+                         NULL);
+
+  return plugin;
+}
+
+/*
+ * Attempst to unload a plugin; returns FALSE if plugin cannot be unloaded at
+ * present (e.g., and effect is in progress) and should be scheduled for
+ * removal later.
+ */
+static gboolean
+mutter_plugin_unload (MutterPlugin *plugin)
+{
+  if (mutter_plugin_running (plugin))
+    {
+      g_object_set (plugin, "disabled", TRUE, NULL);
+      return FALSE;
+    }
+
+  g_object_unref (plugin);
+
+  return TRUE;
+}
+
+/*
+ * Iddle callback to remove plugins that could not be removed directly and are
+ * pending for removal.
+ */
+static gboolean
+mutter_plugin_manager_idle_unload (MutterPluginManager *plugin_mgr)
+{
+  GList *l = plugin_mgr->unload;
+  gboolean dont_remove = TRUE;
+
+  while (l)
+    {
+      MutterPlugin *plugin = l->data;
+
+      if (mutter_plugin_unload (plugin))
+        {
+          /* Remove from list */
+          GList *p = l->prev;
+          GList *n = l->next;
+
+          if (!p)
+            plugin_mgr->unload = n;
+          else
+            p->next = n;
+
+          if (n)
+            n->prev = p;
+
+          g_list_free_1 (l);
+
+          l = n;
+        }
+      else
+        l = l->next;
+    }
+
+  if (!plugin_mgr->unload)
+    {
+      /* If no more unloads are pending, remove the handler as well */
+      dont_remove = FALSE;
+      plugin_mgr->idle_unload_id = 0;
+    }
+
+  return dont_remove;
+}
+
+/*
+ * Unloads all plugins
+ */
+static void
+mutter_plugin_manager_unload (MutterPluginManager *plugin_mgr)
+{
+  GList *plugins = plugin_mgr->plugins;
+
+  while (plugins)
+    {
+      MutterPlugin *plugin = plugins->data;
+
+      /* If the plugin could not be removed, move it to the unload list */
+      if (!mutter_plugin_unload (plugin))
+        {
+          plugin_mgr->unload = g_list_prepend (plugin_mgr->unload, plugin);
+
+          if (!plugin_mgr->idle_unload_id)
+            {
+              plugin_mgr->idle_unload_id = g_idle_add ((GSourceFunc)
+                            mutter_plugin_manager_idle_unload,
+                            plugin_mgr);
+            }
+        }
+
+      plugins = plugins->next;
+    }
+
+  g_list_free (plugin_mgr->plugins);
+  plugin_mgr->plugins = NULL;
+}
+
+static void
+prefs_changed_callback (MetaPreference pref,
+                        void          *data)
+{
+  MutterPluginManager *plugin_mgr = data;
+
+  if (pref == META_PREF_CLUTTER_PLUGINS)
+    {
+      mutter_plugin_manager_reload (plugin_mgr);
+    }
+}
+
+static MutterModule *
+mutter_plugin_manager_get_module (const gchar *path)
+{
+  MutterModule *module = g_hash_table_lookup (plugin_modules, path);
+
+  if (!module &&
+      (module = g_object_new (MUTTER_TYPE_MODULE, "path", path, NULL)))
+    {
+      g_hash_table_insert (plugin_modules, g_strdup (path), module);
+    }
+
+  return module;
+}
+
+/*
+ * Loads all plugins listed in gconf registry.
+ */
+static gboolean
+mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
+{
+  const gchar *dpath = MUTTER_PLUGIN_DIR "/";
+  GSList      *plugins, *fallback = NULL;
+
+  plugins = meta_prefs_get_clutter_plugins ();
+
+  if (!plugins)
+    {
+      /*
+       * If no plugins are specified, try to load the default plugin.
+       */
+      fallback = g_slist_append (fallback, "default");
+      plugins = fallback;
+    }
+
+  while (plugins)
+    {
+      gchar   *plugin_string;
+      gchar   *params;
+
+      plugin_string = g_strdup (plugins->data);
+
+      if (plugin_string)
+        {
+          MutterModule *module;
+          gchar        *path;
+
+          params = strchr (plugin_string, ':');
+
+          if (params)
+            {
+              *params = 0;
+              ++params;
+            }
+
+          if (g_path_is_absolute (plugin_string))
+            path = g_strdup (plugin_string);
+          else
+            path = g_strconcat (dpath, plugin_string, ".so", NULL);
+
+          module = mutter_plugin_manager_get_module (path);
+
+          if (module)
+            {
+              MutterPlugin *p;
+              gboolean      use_succeeded;
+
+              /*
+               * This dlopens the module and registers the plugin type with the
+               * GType system, if the module is not already loaded.  When we
+               * create a plugin, the type system also calls g_type_module_use()
+               * to guarantee the module will not be unloaded during the plugin
+               * life time. Consequently we can unuse() the module again.
+               */
+              use_succeeded = g_type_module_use (G_TYPE_MODULE (module));
+
+              if (use_succeeded &&
+                  (p = mutter_plugin_load (plugin_mgr, module, params)))
+                {
+                  plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, p);
+                }
+              else
+                {
+                  g_warning ("Plugin load for [%s] failed", path);
+                }
+
+              if (use_succeeded)
+                g_type_module_unuse (G_TYPE_MODULE (module));
+            }
+          else
+            g_warning ("Unable to load plugin module [%s]: %s",
+                       path, g_module_error());
+
+          g_free (path);
+          g_free (plugin_string);
+        }
+
+      plugins = plugins->next;
+    }
+
+
+  if (fallback)
+    g_slist_free (fallback);
+
+  if (plugin_mgr->plugins != NULL)
+    {
+      meta_prefs_add_listener (prefs_changed_callback, plugin_mgr);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/*
+ * Reloads all plugins
+ */
+static gboolean
+mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr)
+{
+  /* TODO -- brute force; should we build a list of plugins to load and list of
+   * plugins to unload? We are probably not going to have large numbers of
+   * plugins loaded at the same time, so it might not be worth it.
+   */
+  mutter_plugin_manager_unload (plugin_mgr);
+  return mutter_plugin_manager_load (plugin_mgr);
+}
+
+static gboolean
+mutter_plugin_manager_init (MutterPluginManager *plugin_mgr)
+{
+  return mutter_plugin_manager_load (plugin_mgr);
+}
+
+MutterPluginManager *
+mutter_plugin_manager_new (MetaScreen *screen)
+{
+  MutterPluginManager *plugin_mgr;
+
+  if (!plugin_modules)
+    {
+      plugin_modules = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                              NULL);
+    }
+
+  plugin_mgr = g_new0 (MutterPluginManager, 1);
+
+  plugin_mgr->screen        = screen;
+
+  if (!mutter_plugin_manager_init (plugin_mgr))
+    {
+      g_free (plugin_mgr);
+      plugin_mgr = NULL;
+    }
+
+  return plugin_mgr;
+}
+
+static void
+mutter_plugin_manager_kill_effect (MutterPluginManager *plugin_mgr,
+                                   MutterWindow        *actor,
+                                   unsigned long        events)
+{
+  GList *l = plugin_mgr->plugins;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin)
+	  && (mutter_plugin_features (plugin) & events)
+	  && klass->kill_effect)
+        klass->kill_effect (plugin, actor, events);
+
+      l = l->next;
+    }
+}
+
+#define ALL_BUT_SWITCH \
+  MUTTER_PLUGIN_ALL_EFFECTS & \
+  ~MUTTER_PLUGIN_SWITCH_WORKSPACE
+/*
+ * Public method that the compositor hooks into for events that require
+ * no additional parameters.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_event_simple (MutterPluginManager *plugin_mgr,
+                                    MutterWindow        *actor,
+                                    unsigned long        event)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & event))
+        {
+          retval = TRUE;
+
+          switch (event)
+            {
+            case MUTTER_PLUGIN_MINIMIZE:
+              if (klass->minimize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->minimize (plugin, actor);
+                }
+              break;
+            case MUTTER_PLUGIN_MAP:
+              if (klass->map)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->map (plugin, actor);
+                }
+              break;
+            case MUTTER_PLUGIN_DESTROY:
+              if (klass->destroy)
+                {
+                  _mutter_plugin_effect_started (plugin);
+                  klass->destroy (plugin, actor);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for maximize and unmaximize
+ * events.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_event_maximize (MutterPluginManager *plugin_mgr,
+                                      MutterWindow        *actor,
+                                      unsigned long        event,
+                                      gint                 target_x,
+                                      gint                 target_y,
+                                      gint                 target_width,
+                                      gint                 target_height)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & event))
+        {
+          retval = TRUE;
+
+          switch (event)
+            {
+            case MUTTER_PLUGIN_MAXIMIZE:
+              if (klass->maximize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->maximize (plugin, actor,
+                                   target_x, target_y,
+                                   target_width, target_height);
+                }
+              break;
+            case MUTTER_PLUGIN_UNMAXIMIZE:
+              if (klass->unmaximize)
+                {
+                  mutter_plugin_manager_kill_effect (
+		      plugin_mgr,
+		      actor,
+		      ALL_BUT_SWITCH);
+
+                  _mutter_plugin_effect_started (plugin);
+                  klass->unmaximize (plugin, actor,
+                                     target_x, target_y,
+                                     target_width, target_height);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for desktop switching.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_switch_workspace (MutterPluginManager *plugin_mgr,
+                                        const GList        **actors,
+                                        gint                 from,
+                                        gint                 to,
+                                        MetaMotionDirection  direction)
+{
+  GList *l = plugin_mgr->plugins;
+  gboolean retval = FALSE;
+
+  while (l)
+    {
+      MutterPlugin        *plugin = l->data;
+      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (!mutter_plugin_disabled (plugin) &&
+          (mutter_plugin_features (plugin) & MUTTER_PLUGIN_SWITCH_WORKSPACE) &&
+          (actors && *actors))
+        {
+          if (klass->switch_workspace)
+            {
+              retval = TRUE;
+              mutter_plugin_manager_kill_effect (
+		  plugin_mgr,
+		  MUTTER_WINDOW ((*actors)->data),
+		  MUTTER_PLUGIN_SWITCH_WORKSPACE);
+
+              _mutter_plugin_effect_started (plugin);
+              klass->switch_workspace (plugin, actors, from, to, direction);
+            }
+        }
+
+      l = l->next;
+    }
+
+  return retval;
+}
+
+/*
+ * The public method that the compositor hooks into for desktop switching.
+ *
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
+gboolean
+mutter_plugin_manager_xevent_filter (MutterPluginManager *plugin_mgr,
+                                     XEvent              *xev)
+{
+  GList *l;
+
+  if (!plugin_mgr)
+    return FALSE;
+
+  l = plugin_mgr->plugins;
+
+  while (l)
+    {
+      MutterPlugin      *plugin = l->data;
+      MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+      if (klass->xevent_filter)
+        {
+          if (klass->xevent_filter (plugin, xev) == TRUE)
+            return TRUE;
+        }
+
+      l = l->next;
+    }
+
+  return FALSE;
+}
+
--- a/src/compositor/mutter/mutter-plugin-manager.h
+++ b/src/compositor/mutter/mutter-plugin-manager.h
@@ -0,0 +1,61 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef MUTTER_PLUGIN_MANAGER_H_
+#define MUTTER_PLUGIN_MANAGER_H_
+
+#include "types.h"
+#include "screen.h"
+
+#define  MUTTER_PLUGIN_FROM_MANAGER_
+#include "mutter-plugin.h"
+#undef   MUTTER_PLUGIN_FROM_MANAGER_
+
+typedef struct MutterPluginManager MutterPluginManager;
+
+MutterPluginManager * mutter_plugin_manager_new (MetaScreen *screen);
+gboolean mutter_plugin_manager_event_simple (MutterPluginManager *mgr,
+					     MutterWindow  *actor,
+					     unsigned long    event);
+
+gboolean mutter_plugin_manager_event_maximize (MutterPluginManager *mgr,
+					       MutterWindow  *actor,
+					       unsigned long    event,
+					       gint             target_x,
+					       gint             target_y,
+					       gint             target_width,
+					       gint		target_height);
+void mutter_plugin_manager_update_workspaces (MutterPluginManager *mgr);
+
+void mutter_plugin_manager_update_workspace (MutterPluginManager *mgr, MetaWorkspace *w);
+
+gboolean mutter_plugin_manager_switch_workspace (MutterPluginManager *mgr,
+						 const GList **actors,
+						 gint          from,
+						 gint          to,
+						 MetaMotionDirection direction);
+
+gboolean mutter_plugin_manager_xevent_filter (MutterPluginManager *mgr,
+					      XEvent *xev);
+
+#endif
--- a/src/compositor/mutter/mutter-plugin.c
+++ b/src/compositor/mutter/mutter-plugin.c
@@ -0,0 +1,515 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "mutter-plugin.h"
+#include "screen.h"
+#include "display.h"
+
+#include <string.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/shape.h>
+#include <clutter/x11/clutter-x11.h>
+
+G_DEFINE_ABSTRACT_TYPE (MutterPlugin, mutter_plugin, G_TYPE_OBJECT);
+
+#define MUTTER_PLUGIN_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_PLUGIN, MutterPluginPrivate))
+
+enum
+{
+  PROP_0,
+  PROP_SCREEN,
+  PROP_PARAMS,
+  PROP_FEATURES,
+  PROP_DISABLED,
+  PROP_DEBUG_MODE,
+};
+
+struct _MutterPluginPrivate
+{
+  MetaScreen   *screen;
+  gchar        *params;
+  gulong        features;
+
+  gint          running;
+
+  gboolean      disabled : 1;
+  gboolean      debug    : 1;
+};
+
+static void
+mutter_plugin_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (mutter_plugin_parent_class)->dispose (object);
+}
+
+static void
+mutter_plugin_finalize (GObject *object)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+
+  g_free (priv->params);
+  priv->params = NULL;
+
+  G_OBJECT_CLASS (mutter_plugin_parent_class)->finalize (object);
+}
+
+static void
+mutter_plugin_parse_params (MutterPlugin *plugin)
+{
+  char                  *p;
+  gulong                features = 0;
+  MutterPluginPrivate  *priv     = plugin->priv;
+  MutterPluginClass    *klass    = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+/*
+ * Feature flags: identify events that the plugin can handle; a plugin can
+ * handle one or more events.
+ */
+  if (klass->minimize)
+    features |= MUTTER_PLUGIN_MINIMIZE;
+
+  if (klass->maximize)
+    features |= MUTTER_PLUGIN_MAXIMIZE;
+
+  if (klass->unmaximize)
+    features |= MUTTER_PLUGIN_UNMAXIMIZE;
+
+  if (klass->map)
+    features |= MUTTER_PLUGIN_MAP;
+
+  if (klass->destroy)
+    features |= MUTTER_PLUGIN_DESTROY;
+
+  if (klass->switch_workspace)
+    features |= MUTTER_PLUGIN_SWITCH_WORKSPACE;
+
+  if (priv->params)
+    {
+      gboolean debug = FALSE;
+
+      if ((p = strstr (priv->params, "disable:")))
+        {
+          gchar *d = g_strdup (p+8);
+
+          p = strchr (d, ';');
+
+          if (p)
+            *p = 0;
+
+          if (strstr (d, "minimize"))
+            features &= ~ MUTTER_PLUGIN_MINIMIZE;
+
+          if (strstr (d, "maximize"))
+            features &= ~ MUTTER_PLUGIN_MAXIMIZE;
+
+          if (strstr (d, "unmaximize"))
+            features &= ~ MUTTER_PLUGIN_UNMAXIMIZE;
+
+          if (strstr (d, "map"))
+            features &= ~ MUTTER_PLUGIN_MAP;
+
+          if (strstr (d, "destroy"))
+            features &= ~ MUTTER_PLUGIN_DESTROY;
+
+          if (strstr (d, "switch-workspace"))
+            features &= ~MUTTER_PLUGIN_SWITCH_WORKSPACE;
+
+          g_free (d);
+        }
+
+      if (strstr (priv->params, "debug"))
+        debug = TRUE;
+
+      if (debug != priv->debug)
+        {
+          priv->debug = debug;
+
+          g_object_notify (G_OBJECT (plugin), "debug-mode");
+        }
+    }
+
+  if (features != priv->features)
+    {
+      priv->features = features;
+
+      g_object_notify (G_OBJECT (plugin), "features");
+    }
+}
+
+static void
+mutter_plugin_set_property (GObject      *object,
+			    guint         prop_id,
+			    const GValue *value,
+			    GParamSpec   *pspec)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_SCREEN:
+      priv->screen = g_value_get_object (value);
+      break;
+    case PROP_PARAMS:
+      priv->params = g_value_dup_string (value);
+      mutter_plugin_parse_params (MUTTER_PLUGIN (object));
+      break;
+    case PROP_DISABLED:
+      priv->disabled = g_value_get_boolean (value);
+      break;
+    case PROP_DEBUG_MODE:
+      priv->debug = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_plugin_get_property (GObject    *object,
+			    guint       prop_id,
+			    GValue     *value,
+			    GParamSpec *pspec)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_SCREEN:
+      g_value_set_object (value, priv->screen);
+      break;
+    case PROP_PARAMS:
+      g_value_set_string (value, priv->params);
+      break;
+    case PROP_DISABLED:
+      g_value_set_boolean (value, priv->disabled);
+      break;
+    case PROP_DEBUG_MODE:
+      g_value_set_boolean (value, priv->debug);
+      break;
+    case PROP_FEATURES:
+      g_value_set_ulong (value, priv->features);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+static void
+mutter_plugin_class_init (MutterPluginClass *klass)
+{
+  GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize        = mutter_plugin_finalize;
+  gobject_class->dispose         = mutter_plugin_dispose;
+  gobject_class->set_property    = mutter_plugin_set_property;
+  gobject_class->get_property    = mutter_plugin_get_property;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SCREEN,
+                                   g_param_spec_object ("screen",
+                                                        "MetaScreen",
+                                                        "MetaScreen",
+                                                        META_TYPE_SCREEN,
+                                                        G_PARAM_READWRITE |
+                                                      G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (gobject_class,
+				   PROP_PARAMS,
+				   g_param_spec_string ("params",
+							"Parameters",
+							"Plugin Parameters",
+							NULL,
+							G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (gobject_class,
+				   PROP_FEATURES,
+				   g_param_spec_ulong ("features",
+                                                       "Features",
+                                                       "Plugin Features",
+                                                       0 , G_MAXULONG, 0,
+                                                       G_PARAM_READABLE));
+
+  g_object_class_install_property (gobject_class,
+				   PROP_DISABLED,
+				   g_param_spec_boolean ("disabled",
+                                                      "Plugin disabled",
+                                                      "Plugin disabled",
+                                                      FALSE,
+                                                      G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+				   PROP_DEBUG_MODE,
+				   g_param_spec_boolean ("debug-mode",
+                                                      "Debug Mode",
+                                                      "Debug Mode",
+                                                      FALSE,
+                                                      G_PARAM_READABLE));
+
+  g_type_class_add_private (gobject_class, sizeof (MutterPluginPrivate));
+}
+
+static void
+mutter_plugin_init (MutterPlugin *self)
+{
+  MutterPluginPrivate *priv;
+
+  self->priv = priv = MUTTER_PLUGIN_GET_PRIVATE (self);
+}
+
+gulong
+mutter_plugin_features (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return priv->features;
+}
+
+gboolean
+mutter_plugin_disabled (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return priv->disabled;
+}
+
+gboolean
+mutter_plugin_running  (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return (priv->running > 0);
+}
+
+gboolean
+mutter_plugin_debug_mode (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return priv->debug;
+}
+
+const MutterPluginInfo *
+mutter_plugin_get_info (MutterPlugin *plugin)
+{
+  MutterPluginClass  *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+
+  if (klass && klass->plugin_info)
+    return klass->plugin_info (plugin);
+
+  return NULL;
+}
+
+ClutterActor *
+mutter_plugin_get_overlay_group (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return mutter_get_overlay_group_for_screen (priv->screen);
+}
+
+ClutterActor *
+mutter_plugin_get_stage (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return mutter_get_stage_for_screen (priv->screen);
+}
+
+ClutterActor *
+mutter_plugin_get_window_group (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return mutter_get_window_group_for_screen (priv->screen);
+}
+
+/**
+ * _mutter_plugin_effect_started:
+ * @plugin: the plugin
+ *
+ * Mark that an effect has started for the plugin. This is called
+ * internally by MutterPluginManager.
+ */
+void
+_mutter_plugin_effect_started (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  priv->running++;
+}
+
+void
+mutter_plugin_effect_completed (MutterPlugin *plugin,
+                                MutterWindow *actor,
+                                unsigned long event)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  if (priv->running-- < 0)
+    {
+      g_warning ("Error in running effect accounting, adjusting.");
+      priv->running = 0;
+    }
+
+  if (!actor)
+    {
+      const MutterPluginInfo *info;
+      const gchar            *name = NULL;
+
+      if (plugin && (info = mutter_plugin_get_info (plugin)))
+        name = info->name;
+
+      g_warning ("Plugin [%s] passed NULL for actor!",
+                 name ? name : "unknown");
+    }
+
+  mutter_window_effect_completed (actor, event);
+}
+
+void
+mutter_plugin_query_screen_size (MutterPlugin *plugin,
+                                 int          *width,
+                                 int          *height)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  meta_screen_get_size (priv->screen, width, height);
+}
+
+void
+mutter_plugin_set_stage_reactive (MutterPlugin *plugin,
+                                  gboolean      reactive)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaScreen  *screen  = priv->screen;
+  MetaDisplay *display = meta_screen_get_display (screen);
+  Display     *xdpy    = meta_display_get_xdisplay (display);
+  Window       xstage, xoverlay;
+  ClutterActor *stage;
+
+  stage = mutter_get_stage_for_screen (screen);
+  xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+  xoverlay = mutter_get_overlay_window (screen);
+
+  static XserverRegion region = None;
+
+  if (region == None)
+    region = XFixesCreateRegion (xdpy, NULL, 0);
+
+  if (reactive)
+    {
+      XFixesSetWindowShapeRegion (xdpy, xstage,
+                                  ShapeInput, 0, 0, None);
+      XFixesSetWindowShapeRegion (xdpy, xoverlay,
+                                  ShapeInput, 0, 0, None);
+    }
+  else
+    {
+      XFixesSetWindowShapeRegion (xdpy, xstage,
+                                  ShapeInput, 0, 0, region);
+      XFixesSetWindowShapeRegion (xdpy, xoverlay,
+                                  ShapeInput, 0, 0, region);
+    }
+}
+
+void
+mutter_plugin_set_stage_input_area (MutterPlugin *plugin,
+                                    gint x, gint y, gint width, gint height)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaScreen   *screen  = priv->screen;
+  MetaDisplay  *display = meta_screen_get_display (screen);
+  Display      *xdpy    = meta_display_get_xdisplay (display);
+  Window        xstage, xoverlay;
+  ClutterActor *stage;
+  XRectangle    rect;
+  XserverRegion region;
+
+  stage = mutter_get_stage_for_screen (screen);
+  xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+  xoverlay = mutter_get_overlay_window (screen);
+
+  rect.x = x;
+  rect.y = y;
+  rect.width = width;
+  rect.height = height;
+
+  region = XFixesCreateRegion (xdpy, &rect, 1);
+
+  XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
+  XFixesSetWindowShapeRegion (xdpy, xoverlay, ShapeInput, 0, 0, region);
+
+  XFixesDestroyRegion (xdpy, region);
+}
+
+void
+mutter_plugin_set_stage_input_region (MutterPlugin *plugin,
+                                      XserverRegion region)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaScreen   *screen  = priv->screen;
+  MetaDisplay  *display = meta_screen_get_display (screen);
+  Display      *xdpy    = meta_display_get_xdisplay (display);
+  Window        xstage, xoverlay;
+  ClutterActor *stage;
+
+  stage = mutter_get_stage_for_screen (screen);
+  xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+  xoverlay = mutter_get_overlay_window (screen);
+
+  XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
+  XFixesSetWindowShapeRegion (xdpy, xoverlay, ShapeInput, 0, 0, region);
+}
+
+GList *
+mutter_plugin_get_windows (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return mutter_get_windows (priv->screen);
+}
+
+Display *
+mutter_plugin_get_xdisplay (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv    = MUTTER_PLUGIN (plugin)->priv;
+  MetaDisplay         *display = meta_screen_get_display (priv->screen);
+  Display             *xdpy    = meta_display_get_xdisplay (display);
+
+  return xdpy;
+}
+
+MetaScreen *
+mutter_plugin_get_screen (MutterPlugin *plugin)
+{
+  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+
+  return priv->screen;
+}
+
--- a/src/compositor/mutter/mutter-shaped-texture.c
+++ b/src/compositor/mutter/mutter-shaped-texture.c
@@ -0,0 +1,466 @@
+/*
+ * shaped texture
+ *
+ * An actor to draw a texture clipped to a list of rectangles
+ *
+ * Authored By Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2008 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#include "mutter-shaped-texture.h"
+
+#include <clutter/clutter.h>
+#include <cogl/cogl.h>
+#include <string.h>
+
+
+static void mutter_shaped_texture_dispose (GObject *object);
+static void mutter_shaped_texture_finalize (GObject *object);
+
+static void mutter_shaped_texture_paint (ClutterActor *actor);
+static void mutter_shaped_texture_pick (ClutterActor *actor,
+					const ClutterColor *color);
+
+static void mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex);
+
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+G_DEFINE_TYPE (MutterShapedTexture, mutter_shaped_texture,
+               CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
+#else /* HAVE_GLX_TEXTURE_PIXMAP */
+G_DEFINE_TYPE (MutterShapedTexture, mutter_shaped_texture,
+               CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */
+
+#define MUTTER_SHAPED_TEXTURE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_SHAPED_TEXTURE, \
+                                MutterShapedTexturePrivate))
+
+struct _MutterShapedTexturePrivate
+{
+  CoglHandle mask_texture;
+  CoglHandle material;
+#if 1 /* see workaround comment in mutter_shaped_texture_paint */
+  CoglHandle material_workaround;
+#endif
+
+  guint mask_width, mask_height;
+
+  GArray *rectangles;
+};
+
+static void
+mutter_shaped_texture_class_init (MutterShapedTextureClass *klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  ClutterActorClass *actor_class = (ClutterActorClass *) klass;
+
+  gobject_class->dispose = mutter_shaped_texture_dispose;
+  gobject_class->finalize = mutter_shaped_texture_finalize;
+
+  actor_class->paint = mutter_shaped_texture_paint;
+  actor_class->pick = mutter_shaped_texture_pick;
+
+  g_type_class_add_private (klass, sizeof (MutterShapedTexturePrivate));
+}
+
+static void
+mutter_shaped_texture_init (MutterShapedTexture *self)
+{
+  MutterShapedTexturePrivate *priv;
+
+  priv = self->priv = MUTTER_SHAPED_TEXTURE_GET_PRIVATE (self);
+
+  priv->rectangles = g_array_new (FALSE, FALSE, sizeof (XRectangle));
+
+  priv->mask_texture = COGL_INVALID_HANDLE;
+}
+
+static void
+mutter_shaped_texture_dispose (GObject *object)
+{
+  MutterShapedTexture *self = (MutterShapedTexture *) object;
+  MutterShapedTexturePrivate *priv = self->priv;
+
+  mutter_shaped_texture_dirty_mask (self);
+
+  if (priv->material != COGL_INVALID_HANDLE)
+    {
+      cogl_material_unref (priv->material);
+      priv->material = COGL_INVALID_HANDLE;
+    }
+#if 1 /* see comment in mutter_shaped_texture_paint */
+  if (priv->material_workaround != COGL_INVALID_HANDLE)
+    {
+      cogl_material_unref (priv->material_workaround);
+      priv->material_workaround = COGL_INVALID_HANDLE;
+    }
+#endif
+
+  G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->dispose (object);
+}
+
+static void
+mutter_shaped_texture_finalize (GObject *object)
+{
+  MutterShapedTexture *self = (MutterShapedTexture *) object;
+  MutterShapedTexturePrivate *priv = self->priv;
+
+  g_array_free (priv->rectangles, TRUE);
+
+  G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->finalize (object);
+}
+
+static void
+mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex)
+{
+  MutterShapedTexturePrivate *priv = stex->priv;
+
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
+    {
+      GLuint mask_gl_tex;
+      GLenum mask_gl_target;
+
+      cogl_texture_get_gl_texture (priv->mask_texture,
+                                   &mask_gl_tex, &mask_gl_target);
+
+      if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
+        glDeleteTextures (1, &mask_gl_tex);
+
+      cogl_texture_unref (priv->mask_texture);
+      priv->mask_texture = COGL_INVALID_HANDLE;
+    }
+}
+
+static void
+mutter_shaped_texture_ensure_mask (MutterShapedTexture *stex)
+{
+  MutterShapedTexturePrivate *priv = stex->priv;
+  CoglHandle paint_tex;
+  guint tex_width, tex_height;
+
+  paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+
+  if (paint_tex == COGL_INVALID_HANDLE)
+    return;
+
+  tex_width = cogl_texture_get_width (paint_tex);
+  tex_height = cogl_texture_get_height (paint_tex);
+
+  /* If the mask texture we have was created for a different size then
+     recreate it */
+  if (priv->mask_texture != COGL_INVALID_HANDLE
+      && (priv->mask_width != tex_width || priv->mask_height != tex_height))
+    mutter_shaped_texture_dirty_mask (stex);
+
+  /* If we don't have a mask texture yet then create one */
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
+    {
+      guchar *mask_data;
+      const XRectangle *rect;
+      GLenum paint_gl_target;
+
+      /* Create data for an empty image */
+      mask_data = g_malloc0 (tex_width * tex_height);
+
+      /* Cut out a hole for each rectangle */
+      for (rect = (XRectangle *) priv->rectangles->data
+             + priv->rectangles->len;
+           rect-- > (XRectangle *) priv->rectangles->data;)
+        {
+          gint x1 = rect->x, x2 = x1 + rect->width;
+          gint y1 = rect->y, y2 = y1 + rect->height;
+          guchar *p;
+
+          /* Clip the rectangle to the size of the texture */
+          x1 = CLAMP (x1, 0, (gint) tex_width - 1);
+          x2 = CLAMP (x2, x1, (gint) tex_width);
+          y1 = CLAMP (y1, 0, (gint) tex_height - 1);
+          y2 = CLAMP (y2, y1, (gint) tex_height);
+
+          /* Fill the rectangle */
+          for (p = mask_data + y1 * tex_width + x1;
+               y1 < y2;
+               y1++, p += tex_width)
+            memset (p, 255, x2 - x1);
+        }
+
+      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
+
+      if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
+        {
+          GLuint tex;
+
+          glGenTextures (1, &tex);
+          glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex);
+          glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width);
+          glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+          glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+          glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+          glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0,
+                        GL_ALPHA, tex_width, tex_height,
+                        0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data);
+
+          priv->mask_texture
+            = cogl_texture_new_from_foreign (tex,
+                                             CGL_TEXTURE_RECTANGLE_ARB,
+                                             tex_width, tex_height,
+                                             0, 0,
+                                             COGL_PIXEL_FORMAT_A_8);
+        }
+      else
+        priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                         -1, FALSE,
+                                                         COGL_PIXEL_FORMAT_A_8,
+                                                         COGL_PIXEL_FORMAT_ANY,
+                                                         tex_width,
+                                                         mask_data);
+
+      g_free (mask_data);
+
+      priv->mask_width = tex_width;
+      priv->mask_height = tex_height;
+    }
+}
+
+static void
+mutter_shaped_texture_paint (ClutterActor *actor)
+{
+  MutterShapedTexture *stex = (MutterShapedTexture *) actor;
+  MutterShapedTexturePrivate *priv = stex->priv;
+  CoglHandle paint_tex;
+  guint tex_width, tex_height;
+  ClutterActorBox alloc;
+  CoglHandle material;
+#if 1 /* please see comment below about workaround */
+  guint depth;
+#endif
+
+  if (!CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR (stex)))
+    clutter_actor_realize (CLUTTER_ACTOR (stex));
+
+  paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+
+  tex_width = cogl_texture_get_width (paint_tex);
+  tex_height = cogl_texture_get_height (paint_tex);
+
+  if (tex_width == 0 || tex_width == 0) /* no contents yet */
+    return;
+
+  /* If there are no rectangles fallback to the regular paint
+     method */
+  if (priv->rectangles->len < 1)
+    {
+      CLUTTER_ACTOR_CLASS (mutter_shaped_texture_parent_class)
+        ->paint (actor);
+      return;
+    }
+
+  if (paint_tex == COGL_INVALID_HANDLE)
+    return;
+
+  mutter_shaped_texture_ensure_mask (stex);
+
+  if (priv->material == COGL_INVALID_HANDLE)
+    {
+      priv->material = cogl_material_new ();
+
+      /* Replace the RGB from layer 1 with the RGB from layer 0 */
+      cogl_material_set_layer_combine_function
+        (priv->material, 1,
+         COGL_MATERIAL_LAYER_COMBINE_CHANNELS_RGB,
+         COGL_MATERIAL_LAYER_COMBINE_FUNC_REPLACE);
+      cogl_material_set_layer_combine_arg_src
+        (priv->material, 1, 0,
+         COGL_MATERIAL_LAYER_COMBINE_CHANNELS_RGB,
+         COGL_MATERIAL_LAYER_COMBINE_SRC_PREVIOUS);
+
+      /* Modulate the alpha in layer 1 with the alpha from the
+         previous layer */
+      cogl_material_set_layer_combine_function
+        (priv->material, 1,
+         COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+         COGL_MATERIAL_LAYER_COMBINE_FUNC_MODULATE);
+      cogl_material_set_layer_combine_arg_src
+        (priv->material, 1, 0,
+         COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+         COGL_MATERIAL_LAYER_COMBINE_SRC_PREVIOUS);
+      cogl_material_set_layer_combine_arg_src
+        (priv->material, 1, 1,
+         COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+         COGL_MATERIAL_LAYER_COMBINE_SRC_TEXTURE);
+    }
+  material = priv->material;
+
+#if 1
+  /* This was added as a workaround. It seems that with the intel
+   * drivers when multi-texturing using an RGB TFP texture, the
+   * texture is actually setup internally as an RGBA texture, where
+   * the alpha channel is mostly 0.0 so you only see a shimmer of the
+   * window. This workaround forcibly defines the alpha channel as
+   * 1.0. Maybe there is some clutter/cogl state that is interacting
+   * with this that is being overlooked, but for now this seems to
+   * work. */
+  g_object_get (stex, "pixmap-depth", &depth, NULL);
+  if (depth == 24)
+    {
+      if (priv->material_workaround == COGL_INVALID_HANDLE)
+        {
+          material = priv->material_workaround = cogl_material_new ();
+
+          /* Replace the RGB from layer 1 with the RGB from layer 0 */
+          cogl_material_set_layer_combine_function
+            (material, 1,
+             COGL_MATERIAL_LAYER_COMBINE_CHANNELS_RGB,
+             COGL_MATERIAL_LAYER_COMBINE_FUNC_REPLACE);
+          cogl_material_set_layer_combine_arg_src
+            (material, 1, 0,
+             COGL_MATERIAL_LAYER_COMBINE_CHANNELS_RGB,
+             COGL_MATERIAL_LAYER_COMBINE_SRC_PREVIOUS);
+
+          /* Use the alpha from layer 1 modulated with the alpha from
+             the primary color */
+          cogl_material_set_layer_combine_function
+            (material, 1,
+             COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+             COGL_MATERIAL_LAYER_COMBINE_FUNC_MODULATE);
+          cogl_material_set_layer_combine_arg_src
+            (material, 1, 0,
+             COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+             COGL_MATERIAL_LAYER_COMBINE_SRC_PRIMARY_COLOR);
+          cogl_material_set_layer_combine_arg_src
+            (material, 1, 1,
+             COGL_MATERIAL_LAYER_COMBINE_CHANNELS_ALPHA,
+             COGL_MATERIAL_LAYER_COMBINE_SRC_TEXTURE);
+        }
+
+      material = priv->material_workaround;
+    }
+#endif
+
+  cogl_material_set_layer (material, 0, paint_tex);
+  cogl_material_set_layer (material, 1, priv->mask_texture);
+
+  {
+    CoglColor color;
+    cogl_color_set_from_4ub (&color, 255, 255, 255,
+                             clutter_actor_get_paint_opacity (actor));
+    cogl_material_set_color (material, &color);
+  }
+
+  cogl_set_source (material);
+
+  clutter_actor_get_allocation_box (actor, &alloc);
+  cogl_rectangle (0, 0,
+                  CLUTTER_UNITS_TO_FLOAT (alloc.x2 - alloc.x1),
+                  CLUTTER_UNITS_TO_FLOAT (alloc.y2 - alloc.y1));
+}
+
+static void
+mutter_shaped_texture_pick (ClutterActor *actor,
+			    const ClutterColor *color)
+{
+  MutterShapedTexture *stex = (MutterShapedTexture *) actor;
+  MutterShapedTexturePrivate *priv = stex->priv;
+
+  /* If there are no rectangles then use the regular pick */
+  if (priv->rectangles->len < 1)
+    CLUTTER_ACTOR_CLASS (mutter_shaped_texture_parent_class)
+      ->pick (actor, color);
+  else if (clutter_actor_should_pick_paint (actor))
+    {
+      CoglHandle paint_tex;
+      ClutterActorBox alloc;
+      guint tex_width, tex_height;
+
+      paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+
+      if (paint_tex == COGL_INVALID_HANDLE)
+        return;
+
+      tex_width = cogl_texture_get_width (paint_tex);
+      tex_height = cogl_texture_get_height (paint_tex);
+
+      if (tex_width == 0 || tex_width == 0) /* no contents yet */
+	return;
+
+      mutter_shaped_texture_ensure_mask (stex);
+
+      cogl_set_source_color4ub (color->red, color->green, color->blue,
+                                 color->alpha);
+
+      clutter_actor_get_allocation_box (actor, &alloc);
+
+      /* Paint the mask rectangle in the given color */
+      cogl_set_source_texture (priv->mask_texture);
+      cogl_rectangle_with_texture_coords (0, 0,
+                                          CLUTTER_UNITS_TO_FLOAT (alloc.x2 - alloc.x1),
+                                          CLUTTER_UNITS_TO_FLOAT (alloc.y2 - alloc.y1),
+                                          0, 0, 1, 1);
+    }
+}
+
+ClutterActor *
+mutter_shaped_texture_new (void)
+{
+  ClutterActor *self = g_object_new (MUTTER_TYPE_SHAPED_TEXTURE, NULL);
+
+  return self;
+}
+
+void
+mutter_shaped_texture_clear_rectangles (MutterShapedTexture *stex)
+{
+  MutterShapedTexturePrivate *priv;
+
+  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  g_array_set_size (priv->rectangles, 0);
+  mutter_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+}
+
+void
+mutter_shaped_texture_add_rectangle (MutterShapedTexture *stex,
+				     const XRectangle *rect)
+{
+  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+
+  mutter_shaped_texture_add_rectangles (stex, 1, rect);
+}
+
+void
+mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
+				      size_t num_rects,
+				      const XRectangle *rects)
+{
+  MutterShapedTexturePrivate *priv;
+
+  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  g_array_append_vals (priv->rectangles, rects, num_rects);
+
+  mutter_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+}
--- a/src/compositor/mutter/mutter-shaped-texture.h
+++ b/src/compositor/mutter/mutter-shaped-texture.h
@@ -0,0 +1,95 @@
+/*
+ * shaped texture
+ *
+ * An actor to draw a texture clipped to a list of rectangles
+ *
+ * Authored By Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2008 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __MUTTER_SHAPED_TEXTURE_H__
+#define __MUTTER_SHAPED_TEXTURE_H__
+
+#include <clutter/clutter.h>
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+#include <clutter/glx/clutter-glx.h>
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */
+
+G_BEGIN_DECLS
+
+#define MUTTER_TYPE_SHAPED_TEXTURE			    \
+  (mutter_shaped_texture_get_type())
+#define MUTTER_SHAPED_TEXTURE(obj)                          \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                       \
+                               MUTTER_TYPE_SHAPED_TEXTURE,  \
+                               MutterShapedTexture))
+#define MUTTER_SHAPED_TEXTURE_CLASS(klass)                  \
+  (G_TYPE_CHECK_CLASS_CAST ((klass),			    \
+                            MUTTER_TYPE_SHAPED_TEXTURE,	    \
+                            MutterShapedTextureClass))
+#define MUTTER_IS_SHAPED_TEXTURE(obj)                       \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),			    \
+                               MUTTER_TYPE_SHAPED_TEXTURE))
+#define MUTTER_IS_SHAPED_TEXTURE_CLASS(klass)		    \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass),			    \
+                            MUTTER_TYPE_SHAPED_TEXTURE))
+#define MUTTER_SHAPED_TEXTURE_GET_CLASS(obj)                \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj),                        \
+                              MUTTER_TYPE_SHAPED_TEXTURE,   \
+                              MutterShapedTextureClass))
+
+typedef struct _MutterShapedTexture        MutterShapedTexture;
+typedef struct _MutterShapedTextureClass   MutterShapedTextureClass;
+typedef struct _MutterShapedTexturePrivate MutterShapedTexturePrivate;
+
+struct _MutterShapedTextureClass
+{
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmapClass parent_class;
+#else
+  ClutterX11TexturePixmapClass parent_class;
+#endif
+};
+
+struct _MutterShapedTexture
+{
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmap parent;
+#else
+  ClutterX11TexturePixmap parent;
+#endif
+
+  MutterShapedTexturePrivate *priv;
+};
+
+GType mutter_shaped_texture_get_type (void) G_GNUC_CONST;
+
+ClutterActor *mutter_shaped_texture_new (void);
+
+void mutter_shaped_texture_clear_rectangles (MutterShapedTexture *stex);
+
+void mutter_shaped_texture_add_rectangle (MutterShapedTexture *stex,
+					  const XRectangle *rect);
+void mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
+					   size_t num_rects,
+					   const XRectangle *rects);
+
+G_END_DECLS
+
+#endif /* __MUTTER_SHAPED_TEXTURE_H__ */
--- a/src/compositor/mutter/plugins/Makefile.am
+++ b/src/compositor/mutter/plugins/Makefile.am
@@ -0,0 +1,22 @@
+
+pkglibdir=@MUTTER_PLUGIN_DIR@
+
+if WITH_CLUTTER
+
+INCLUDES=@METACITY_CFLAGS@ -I $(top_srcdir)/src/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -DMETACITY_MAJOR_VERSION=$(METACITY_MAJOR_VERSION) -DMETACITY_MINOR_VERSION=$(METACITY_MINOR_VERSION) -DMETACITY_MICRO_VERSION=$(METACITY_MICRO_VERSION) -DMETACITY_CLUTTER_PLUGIN_API_VERSION=$(METACITY_CLUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"
+
+default_la_CFLAGS   = -fPIC
+default_la_SOURCES  = default.c
+default_la_LDFLAGS  = -module -avoid-version -no-undefined
+default_la_LIBADD   = @CLUTTER_LIBS@
+
+pkglib_LTLIBRARIES = default.la
+
+# post-install hook to remove the .la and .a files we are not interested in
+# (There is no way to stop libtool generating static libs locally, and we
+# cannot do this globally because of libmetacity-private.so).
+install-exec-hook:
+	-rm $(DESTDIR)$(pkglibdir)/*.a
+	-rm $(DESTDIR)$(pkglibdir)/*.la
+
+endif
--- a/src/compositor/mutter/plugins/README
+++ b/src/compositor/mutter/plugins/README
@@ -0,0 +1,41 @@
+
+Plugins implement effects associated with WM events, such as window map,
+minimizing, maximizing, unmaximizing, destruction and workspace switching. The
+plugin API is documented in src/include/compositor-clutter-plugin.h; in
+addition the simple plugin can be used as a reference implementation.
+
+The API is intended to be generic, exposing no implementation details of the WM
+to the plugins; this will facilitate reuse without modification with another WM
+(there are plans to use the same plugin API with Matchbox 2).
+
+Multiple plugins can implement the same effect and be loaded at the same time;
+however, stacking arbitrary effects in this way might not work as expected;
+this is particularly true of more complex effects, such as those for workspace
+switching.
+
+Plugins are installed in ${prefix}/lib/metacity/plugins/clutter; from there the
+WM will load plugins listed in the clutter_plugins key in the Metacity gconf
+general preferences group. Each entry in preferences has the format
+
+  'name: optional parameters'
+
+where 'name' is the name of the library without the .so suffix.
+
+As noted above, additional parameters can be passed to the plugin via the
+preference key. In such case, the plugin name is immediately followed by a
+colon, separating it from the parameters. Two common parameters should be
+handled by all plugins:
+
+  'debug'   indicates that the plugin is run in a debug mode (what exactly that
+            means is left to the plugin to determine).
+
+  'disable' parameter indicates which effects within the plugin should be
+            disabled; the format of the disable parameter is
+
+              'disable: effect1[, effect2];'
+
+            where effect1, etc., matches the effects listed in the
+            compositor-clutter-plugin.h file (currently one of 'map', 'destroy',
+            'maximize', 'unmaximize', 'switch-workspace'). Example 'disable:
+            minimize, maximize;'.
+
--- a/src/compositor/mutter/plugins/default.c
+++ b/src/compositor/mutter/plugins/default.c
@@ -0,0 +1,803 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "mutter-plugin.h"
+
+#include <libintl.h>
+#define _(x) dgettext (GETTEXT_PACKAGE, x)
+#define N_(x) x
+
+#include <clutter/clutter.h>
+#include <gmodule.h>
+#include <string.h>
+
+#define DESTROY_TIMEOUT   250
+#define MINIMIZE_TIMEOUT  250
+#define MAXIMIZE_TIMEOUT  250
+#define MAP_TIMEOUT       250
+#define SWITCH_TIMEOUT    500
+
+#define ACTOR_DATA_KEY "MCCP-Default-actor-data"
+
+#define MUTTER_TYPE_DEFAULT_PLUGIN            (mutter_default_plugin_get_type ())
+#define MUTTER_DEFAULT_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPlugin))
+#define MUTTER_DEFAULT_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginClass))
+#define MUTTER_IS_DEFAULT_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_DEFAULT_PLUGIN_TYPE))
+#define MUTTER_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_DEFAULT_PLUGIN))
+#define MUTTER_DEFAULT_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginClass))
+
+#define MUTTER_DEFAULT_PLUGIN_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginPrivate))
+
+typedef struct _MutterDefaultPlugin        MutterDefaultPlugin;
+typedef struct _MutterDefaultPluginClass   MutterDefaultPluginClass;
+typedef struct _MutterDefaultPluginPrivate MutterDefaultPluginPrivate;
+
+struct _MutterDefaultPlugin
+{
+  MutterPlugin parent;
+
+  MutterDefaultPluginPrivate *priv;
+};
+
+struct _MutterDefaultPluginClass
+{
+  MutterPluginClass parent_class;
+};
+
+static GQuark actor_data_quark = 0;
+
+static void     minimize   (MutterPlugin *plugin,
+                            MutterWindow *actor);
+static void     map        (MutterPlugin *plugin,
+                            MutterWindow *actor);
+static void     destroy    (MutterPlugin *plugin,
+                            MutterWindow *actor);
+static void     maximize   (MutterPlugin *plugin,
+                            MutterWindow *actor,
+                            gint x, gint y, gint width, gint height);
+static void     unmaximize (MutterPlugin *plugin,
+                            MutterWindow *actor,
+                            gint x, gint y, gint width, gint height);
+
+static void switch_workspace (MutterPlugin *plugin,
+                              const GList **actors, gint from, gint to,
+                              MetaMotionDirection direction);
+
+static void kill_effect (MutterPlugin *plugin,
+                         MutterWindow *actor, gulong event);
+
+static const MutterPluginInfo * plugin_info (MutterPlugin *plugin);
+
+MUTTER_PLUGIN_DECLARE(MutterDefaultPlugin, mutter_default_plugin);
+
+/*
+ * Plugin private data that we store in the .plugin_private member.
+ */
+struct _MutterDefaultPluginPrivate
+{
+  /* Valid only when switch_workspace effect is in progress */
+  ClutterTimeline       *tml_switch_workspace1;
+  ClutterTimeline       *tml_switch_workspace2;
+  GList                **actors;
+  ClutterActor          *desktop1;
+  ClutterActor          *desktop2;
+
+  MutterPluginInfo       info;
+
+  gboolean               debug_mode : 1;
+};
+
+/*
+ * Per actor private data we attach to each actor.
+ */
+typedef struct _ActorPrivate
+{
+  ClutterActor *orig_parent;
+
+  ClutterTimeline *tml_minimize;
+  ClutterTimeline *tml_maximize;
+  ClutterTimeline *tml_destroy;
+  ClutterTimeline *tml_map;
+
+  gboolean      is_minimized : 1;
+  gboolean      is_maximized : 1;
+} ActorPrivate;
+
+/* callback data for when animations complete */
+typedef struct
+{
+  ClutterActor *actor;
+  MutterPlugin *plugin;
+} EffectCompleteData;
+
+
+static void
+mutter_default_plugin_dispose (GObject *object)
+{
+  /* MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (object)->priv;
+  */
+  G_OBJECT_CLASS (mutter_default_plugin_parent_class)->dispose (object);
+}
+
+static void
+mutter_default_plugin_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (mutter_default_plugin_parent_class)->finalize (object);
+}
+
+static void
+mutter_default_plugin_set_property (GObject      *object,
+			    guint         prop_id,
+			    const GValue *value,
+			    GParamSpec   *pspec)
+{
+  switch (prop_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_default_plugin_get_property (GObject    *object,
+			    guint       prop_id,
+			    GValue     *value,
+			    GParamSpec *pspec)
+{
+  switch (prop_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+mutter_default_plugin_constructed (GObject *object)
+{
+  MutterPlugin               *plugin = MUTTER_PLUGIN (object);
+  MutterDefaultPluginPrivate *priv   = MUTTER_DEFAULT_PLUGIN (object)->priv;
+
+  guint destroy_timeout  = DESTROY_TIMEOUT;
+  guint minimize_timeout = MINIMIZE_TIMEOUT;
+  guint maximize_timeout = MAXIMIZE_TIMEOUT;
+  guint map_timeout      = MAP_TIMEOUT;
+  guint switch_timeout   = SWITCH_TIMEOUT;
+
+  if (mutter_plugin_debug_mode (plugin))
+    {
+      g_debug ("Plugin %s: Entering debug mode.", priv->info.name);
+
+      priv->debug_mode = TRUE;
+
+      /*
+       * Double the effect duration to make them easier to observe.
+       */
+      destroy_timeout  *= 2;
+      minimize_timeout *= 2;
+      maximize_timeout *= 2;
+      map_timeout      *= 2;
+      switch_timeout   *= 2;
+    }
+
+}
+
+static void
+mutter_default_plugin_class_init (MutterDefaultPluginClass *klass)
+{
+  GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
+  MutterPluginClass *plugin_class  = MUTTER_PLUGIN_CLASS (klass);
+
+  gobject_class->finalize        = mutter_default_plugin_finalize;
+  gobject_class->dispose         = mutter_default_plugin_dispose;
+  gobject_class->constructed     = mutter_default_plugin_constructed;
+  gobject_class->set_property    = mutter_default_plugin_set_property;
+  gobject_class->get_property    = mutter_default_plugin_get_property;
+
+  plugin_class->map              = map;
+  plugin_class->minimize         = minimize;
+  plugin_class->maximize         = maximize;
+  plugin_class->unmaximize       = unmaximize;
+  plugin_class->destroy          = destroy;
+  plugin_class->switch_workspace = switch_workspace;
+  plugin_class->kill_effect      = kill_effect;
+  plugin_class->plugin_info      = plugin_info;
+
+  g_type_class_add_private (gobject_class, sizeof (MutterDefaultPluginPrivate));
+}
+
+static void
+mutter_default_plugin_init (MutterDefaultPlugin *self)
+{
+  MutterDefaultPluginPrivate *priv;
+
+  self->priv = priv = MUTTER_DEFAULT_PLUGIN_GET_PRIVATE (self);
+
+  priv->info.name        = "Default Effects";
+  priv->info.version     = "0.1";
+  priv->info.author      = "Intel Corp.";
+  priv->info.license     = "GPL";
+  priv->info.description = "This is an example of a plugin implementation.";
+}
+
+/*
+ * Actor private data accessor
+ */
+static void
+free_actor_private (gpointer data)
+{
+  if (G_LIKELY (data != NULL))
+    g_slice_free (ActorPrivate, data);
+}
+
+static ActorPrivate *
+get_actor_private (MutterWindow *actor)
+{
+  ActorPrivate *priv = g_object_get_qdata (G_OBJECT (actor), actor_data_quark);
+
+  if (G_UNLIKELY (actor_data_quark == 0))
+    actor_data_quark = g_quark_from_static_string (ACTOR_DATA_KEY);
+
+  if (G_UNLIKELY (!priv))
+    {
+      priv = g_slice_new0 (ActorPrivate);
+
+      g_object_set_qdata_full (G_OBJECT (actor),
+                               actor_data_quark, priv,
+                               free_actor_private);
+    }
+
+  return priv;
+}
+
+typedef struct SwitchWorkspaceData
+{
+  MutterPlugin  *plugin;
+  const GList  **actors;
+} SwitchWorkspaceData;
+
+static void
+on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
+{
+  SwitchWorkspaceData        *sw_data = data;
+  MutterPlugin               *plugin  = sw_data->plugin;
+  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  GList        *l     = *((GList**)sw_data->actors);
+  MutterWindow *actor_for_cb = l->data;
+
+  while (l)
+    {
+      ClutterActor *a = l->data;
+      MutterWindow *mc_window = MUTTER_WINDOW (a);
+      ActorPrivate *apriv = get_actor_private (mc_window);
+
+      if (apriv->orig_parent)
+        {
+          clutter_actor_reparent (a, apriv->orig_parent);
+          apriv->orig_parent = NULL;
+        }
+
+      l = l->next;
+    }
+
+  clutter_actor_destroy (priv->desktop1);
+  clutter_actor_destroy (priv->desktop2);
+
+  priv->actors = NULL;
+  priv->tml_switch_workspace1 = NULL;
+  priv->tml_switch_workspace2 = NULL;
+  priv->desktop1 = NULL;
+  priv->desktop2 = NULL;
+
+  g_free (data);
+
+  mutter_plugin_effect_completed (plugin, actor_for_cb,
+                                  MUTTER_PLUGIN_SWITCH_WORKSPACE);
+}
+
+static void
+switch_workspace (MutterPlugin *plugin,
+                  const GList **actors, gint from, gint to,
+                  MetaMotionDirection direction)
+{
+  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  GList        *l;
+  gint          n_workspaces;
+  ClutterActor *workspace0  = clutter_group_new ();
+  ClutterActor *workspace1  = clutter_group_new ();
+  ClutterActor *stage;
+  int           screen_width, screen_height;
+  MetaScreen   *screen = mutter_plugin_get_screen (plugin);
+  SwitchWorkspaceData *sw_data = g_new (SwitchWorkspaceData, 1);
+  ClutterAnimation *animation;
+
+  sw_data->plugin = plugin;
+  sw_data->actors = actors;
+
+  stage = mutter_plugin_get_stage (plugin);
+
+  mutter_plugin_query_screen_size (plugin,
+					      &screen_width,
+					      &screen_height);
+  clutter_actor_set_anchor_point (workspace1,
+                                  screen_width,
+                                  screen_height);
+  clutter_actor_set_position (workspace1,
+                              screen_width,
+                              screen_height);
+
+  clutter_actor_set_scale (workspace1, 0.0, 0.0);
+
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace1);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace0);
+
+  if (from == to)
+    {
+      mutter_plugin_effect_completed (plugin, NULL,
+                           MUTTER_PLUGIN_SWITCH_WORKSPACE);
+      return;
+    }
+
+  n_workspaces = meta_screen_get_n_workspaces (screen);
+
+  l = g_list_last (*((GList**) actors));
+
+  while (l)
+    {
+      MutterWindow *mc_window	= l->data;
+      ActorPrivate *apriv	= get_actor_private (mc_window);
+      ClutterActor *window	= CLUTTER_ACTOR (mc_window);
+      gint          win_workspace;
+
+      win_workspace = mutter_window_get_workspace (mc_window);
+
+      if (win_workspace == to || win_workspace == from)
+        {
+          gint x, y;
+          guint w, h;
+
+          clutter_actor_get_position (window, &x, &y);
+          clutter_actor_get_size (window, &w, &h);
+
+          apriv->orig_parent = clutter_actor_get_parent (window);
+
+          clutter_actor_reparent (window,
+				  win_workspace == to ? workspace1 : workspace0);
+          clutter_actor_show_all (window);
+          clutter_actor_raise_top (window);
+        }
+      else if (win_workspace < 0)
+        {
+          /* Sticky window */
+          apriv->orig_parent = NULL;
+        }
+      else
+        {
+          /* Window on some other desktop */
+          clutter_actor_hide (window);
+          apriv->orig_parent = NULL;
+        }
+
+      l = l->prev;
+    }
+
+  priv->actors   = (GList **)actors;
+  priv->desktop1 = workspace0;
+  priv->desktop2 = workspace1;
+
+  animation = clutter_actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 1.0,
+                                     "scale-y", 1.0,
+                                     NULL);
+  priv->tml_switch_workspace1 = clutter_animation_get_timeline (animation);
+  g_signal_connect (priv->tml_switch_workspace1,
+                    "completed",
+                    G_CALLBACK (on_switch_workspace_effect_complete),
+                    sw_data);
+
+  animation = clutter_actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 0.0,
+                                     "scale-y", 0.0,
+                                     NULL);
+  priv->tml_switch_workspace2 = clutter_animation_get_timeline (animation);
+}
+
+
+/*
+ * Minimize effect completion callback; this function restores actor state, and
+ * calls the manager callback function.
+ */
+static void
+on_minimize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
+{
+  /*
+   * Must reverse the effect of the effect; must hide it first to ensure
+   * that the restoration will not be visible.
+   */
+  MutterPlugin *plugin = data->plugin;
+  ActorPrivate *apriv;
+  MutterWindow *mc_window = MUTTER_WINDOW (data->actor);
+
+  apriv = get_actor_private (MUTTER_WINDOW (data->actor));
+  apriv->tml_minimize = NULL;
+
+  clutter_actor_hide (data->actor);
+
+  /* FIXME - we shouldn't assume the original scale, it should be saved
+   * at the start of the effect */
+  clutter_actor_set_scale (data->actor, 1.0, 1.0);
+  clutter_actor_move_anchor_point_from_gravity (data->actor,
+                                                CLUTTER_GRAVITY_NORTH_WEST);
+
+  /* Now notify the manager that we are done with this effect */
+  mutter_plugin_effect_completed (plugin, mc_window,
+                                  MUTTER_PLUGIN_MINIMIZE);
+
+  g_free (data);
+}
+
+/*
+ * Simple minimize handler: it applies a scale effect (which must be reversed on
+ * completion).
+ */
+static void
+minimize (MutterPlugin *plugin, MutterWindow *mc_window)
+{
+  MetaCompWindowType          type;
+  ClutterActor               *actor  = CLUTTER_ACTOR (mc_window);
+
+  type = mutter_window_get_window_type (mc_window);
+
+  if (type == META_COMP_WINDOW_NORMAL)
+    {
+      ClutterAnimation *animation;
+      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
+      ActorPrivate *apriv = get_actor_private (mc_window);
+
+      apriv->is_minimized = TRUE;
+
+      clutter_actor_move_anchor_point_from_gravity (actor,
+                                                    CLUTTER_GRAVITY_CENTER);
+
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         MINIMIZE_TIMEOUT,
+                                         "scale-x", 0.0,
+                                         "scale-y", 0.0,
+                                         NULL);
+      apriv->tml_minimize = clutter_animation_get_timeline (animation);
+      data->plugin = plugin;
+      data->actor = actor;
+      g_signal_connect (apriv->tml_minimize, "completed",
+                        G_CALLBACK (on_minimize_effect_complete),
+                        data);
+
+    }
+  else
+    mutter_plugin_effect_completed (plugin, mc_window,
+                                    MUTTER_PLUGIN_MINIMIZE);
+}
+
+/*
+ * Minimize effect completion callback; this function restores actor state, and
+ * calls the manager callback function.
+ */
+static void
+on_maximize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
+{
+  /*
+   * Must reverse the effect of the effect.
+   */
+  MutterPlugin * plugin = data->plugin;
+  MutterWindow  *mc_window = MUTTER_WINDOW (data->actor);
+  ActorPrivate  *apriv     = get_actor_private (mc_window);
+
+  apriv->tml_maximize = NULL;
+
+  /* FIXME - don't assume the original scale was 1.0 */
+  clutter_actor_set_scale (data->actor, 1.0, 1.0);
+  clutter_actor_move_anchor_point_from_gravity (data->actor,
+                                                CLUTTER_GRAVITY_NORTH_WEST);
+
+  /* Now notify the manager that we are done with this effect */
+  mutter_plugin_effect_completed (plugin, mc_window,
+                                  MUTTER_PLUGIN_MAXIMIZE);
+
+  g_free (data);
+}
+
+/*
+ * The Nature of Maximize operation is such that it is difficult to do a visual
+ * effect that would work well. Scaling, the obvious effect, does not work that
+ * well, because at the end of the effect we end up with window content bigger
+ * and differently laid out than in the real window; this is a proof concept.
+ *
+ * (Something like a sound would be more appropriate.)
+ */
+static void
+maximize (MutterPlugin *plugin,
+          MutterWindow *mc_window,
+          gint end_x, gint end_y, gint end_width, gint end_height)
+{
+  MetaCompWindowType  type;
+  ClutterActor	     *actor = CLUTTER_ACTOR (mc_window);
+
+  gdouble  scale_x    = 1.0;
+  gdouble  scale_y    = 1.0;
+  gint     anchor_x   = 0;
+  gint     anchor_y   = 0;
+
+  type = mutter_window_get_window_type (mc_window);
+
+  if (type == META_COMP_WINDOW_NORMAL)
+    {
+      ClutterAnimation *animation;
+      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
+      ActorPrivate *apriv = get_actor_private (mc_window);
+      guint width, height;
+      gint  x, y;
+
+      apriv->is_maximized = TRUE;
+
+      clutter_actor_get_size (actor, &width, &height);
+      clutter_actor_get_position (actor, &x, &y);
+
+      /*
+       * Work out the scale and anchor point so that the window is expanding
+       * smoothly into the target size.
+       */
+      scale_x = (gdouble)end_width / (gdouble) width;
+      scale_y = (gdouble)end_height / (gdouble) height;
+
+      anchor_x = (gdouble)(x - end_x)*(gdouble)width /
+        ((gdouble)(end_width - width));
+      anchor_y = (gdouble)(y - end_y)*(gdouble)height /
+        ((gdouble)(end_height - height));
+
+      clutter_actor_move_anchor_point (actor, anchor_x, anchor_y);
+
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         MAXIMIZE_TIMEOUT,
+                                         "scale-x", scale_x,
+                                         "scale-y", scale_y,
+                                         NULL);
+      apriv->tml_maximize = clutter_animation_get_timeline (animation);
+      data->plugin = plugin;
+      data->actor = actor;
+      g_signal_connect (apriv->tml_maximize, "completed",
+                        G_CALLBACK (on_maximize_effect_complete),
+                        data);
+      return;
+    }
+
+  mutter_plugin_effect_completed (plugin, mc_window,
+                                  MUTTER_PLUGIN_MAXIMIZE);
+}
+
+/*
+ * See comments on the maximize() function.
+ *
+ * (Just a skeleton code.)
+ */
+static void
+unmaximize (MutterPlugin *plugin,
+            MutterWindow *mc_window,
+            gint end_x, gint end_y, gint end_width, gint end_height)
+{
+  MetaCompWindowType type = mutter_window_get_window_type (mc_window);
+
+  if (type == META_COMP_WINDOW_NORMAL)
+    {
+      ActorPrivate *apriv = get_actor_private (mc_window);
+
+      apriv->is_maximized = FALSE;
+    }
+
+  /* Do this conditionally, if the effect requires completion callback. */
+  mutter_plugin_effect_completed (plugin, mc_window,
+                                  MUTTER_PLUGIN_UNMAXIMIZE);
+}
+
+static void
+on_map_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
+{
+  /*
+   * Must reverse the effect of the effect.
+   */
+  MutterPlugin  *plugin = data->plugin;
+  MutterWindow  *mc_window = MUTTER_WINDOW (data->actor);
+  ActorPrivate  *apriv     = get_actor_private (mc_window);
+
+  apriv->tml_map = NULL;
+
+  clutter_actor_move_anchor_point_from_gravity (data->actor,
+                                                CLUTTER_GRAVITY_NORTH_WEST);
+
+  /* Now notify the manager that we are done with this effect */
+  mutter_plugin_effect_completed (plugin, mc_window, MUTTER_PLUGIN_MAP);
+
+  g_free (data);
+}
+
+/*
+ * Simple map handler: it applies a scale effect which must be reversed on
+ * completion).
+ */
+static void
+map (MutterPlugin *plugin, MutterWindow *mc_window)
+{
+  MetaCompWindowType  type;
+  ClutterActor       *actor = CLUTTER_ACTOR (mc_window);
+
+  type = mutter_window_get_window_type (mc_window);
+
+  if (type == META_COMP_WINDOW_NORMAL)
+    {
+      ClutterAnimation *animation;
+      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
+      ActorPrivate *apriv = get_actor_private (mc_window);
+
+      clutter_actor_move_anchor_point_from_gravity (actor,
+                                                    CLUTTER_GRAVITY_CENTER);
+
+      clutter_actor_set_scale (actor, 0.0, 0.0);
+      clutter_actor_show (actor);
+
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         MAP_TIMEOUT,
+                                         "scale-x", 1.0,
+                                         "scale-y", 1.0,
+                                         NULL);
+      apriv->tml_map = clutter_animation_get_timeline (animation);
+      data->actor = actor;
+      data->plugin = plugin;
+      g_signal_connect (apriv->tml_map, "completed",
+                        G_CALLBACK (on_map_effect_complete),
+                        data);
+
+      apriv->is_minimized = FALSE;
+
+    }
+  else
+    mutter_plugin_effect_completed (plugin, mc_window,
+                                    MUTTER_PLUGIN_MAP);
+}
+
+/*
+ * Destroy effect completion callback; this is a simple effect that requires no
+ * further action than notifying the manager that the effect is completed.
+ */
+static void
+on_destroy_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
+{
+  MutterPlugin *plugin = data->plugin;
+  MutterWindow *mc_window = MUTTER_WINDOW (data->actor);
+  ActorPrivate *apriv = get_actor_private (mc_window);
+
+  apriv->tml_destroy = NULL;
+
+  mutter_plugin_effect_completed (plugin, mc_window,
+                                  MUTTER_PLUGIN_DESTROY);
+}
+
+/*
+ * Simple TV-out like effect.
+ */
+static void
+destroy (MutterPlugin *plugin, MutterWindow *mc_window)
+{
+  MetaCompWindowType   type;
+  ClutterActor	      *actor = CLUTTER_ACTOR (mc_window);
+
+  type = mutter_window_get_window_type (mc_window);
+
+  if (type == META_COMP_WINDOW_NORMAL)
+    {
+      ClutterAnimation *animation;
+      EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
+      ActorPrivate *apriv = get_actor_private (mc_window);
+
+      clutter_actor_move_anchor_point_from_gravity (actor,
+                                                    CLUTTER_GRAVITY_CENTER);
+
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         DESTROY_TIMEOUT,
+                                         "scale-x", 0.0,
+                                         "scale-y", 1.0,
+                                         NULL);
+      apriv->tml_destroy = clutter_animation_get_timeline (animation);
+      data->plugin = plugin;
+      data->actor = actor;
+      g_signal_connect (apriv->tml_destroy, "completed",
+                        G_CALLBACK (on_destroy_effect_complete),
+                        data);
+    }
+  else
+    mutter_plugin_effect_completed (plugin, mc_window,
+                                    MUTTER_PLUGIN_DESTROY);
+}
+
+static void
+kill_effect (MutterPlugin *plugin, MutterWindow *mc_window, gulong event)
+{
+  ActorPrivate *apriv;
+
+  if (event & MUTTER_PLUGIN_SWITCH_WORKSPACE)
+    {
+      MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+
+      if (priv->tml_switch_workspace1)
+        {
+          clutter_timeline_stop (priv->tml_switch_workspace1);
+          clutter_timeline_stop (priv->tml_switch_workspace2);
+          g_signal_emit_by_name (priv->tml_switch_workspace1, "completed", NULL);
+        }
+
+      if (!(event & ~MUTTER_PLUGIN_SWITCH_WORKSPACE))
+        {
+          /* Workspace switch only, nothing more to do */
+          return;
+        }
+    }
+
+  apriv = get_actor_private (mc_window);
+
+  if ((event & MUTTER_PLUGIN_MINIMIZE) && apriv->tml_minimize)
+    {
+      clutter_timeline_stop (apriv->tml_minimize);
+      g_signal_emit_by_name (apriv->tml_minimize, "completed", NULL);
+    }
+
+  if ((event & MUTTER_PLUGIN_MAXIMIZE) && apriv->tml_maximize)
+    {
+      clutter_timeline_stop (apriv->tml_maximize);
+      g_signal_emit_by_name (apriv->tml_maximize, "completed", NULL);
+    }
+
+  if ((event & MUTTER_PLUGIN_MAP) && apriv->tml_map)
+    {
+      clutter_timeline_stop (apriv->tml_map);
+      g_signal_emit_by_name (apriv->tml_map, "completed", NULL);
+    }
+
+  if ((event & MUTTER_PLUGIN_DESTROY) && apriv->tml_destroy)
+    {
+      clutter_timeline_stop (apriv->tml_destroy);
+      g_signal_emit_by_name (apriv->tml_destroy, "completed", NULL);
+    }
+}
+
+static const MutterPluginInfo *
+plugin_info (MutterPlugin *plugin)
+{
+  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+
+  return &priv->info;
+}
--- a/src/compositor/mutter/tidy/tidy-texture-frame.c
+++ b/src/compositor/mutter/tidy/tidy-texture-frame.c
@@ -0,0 +1,610 @@
+/* tidy-texture-frame.h: Expandible texture actor
+ *
+ * Copyright (C) 2007 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * SECTION:tidy-texture-frame
+ * @short_description: Stretch a texture to fit the entire allocation
+ *
+ * #TidyTextureFrame
+ *
+ */
+
+#include <cogl/cogl.h>
+
+#include "tidy-texture-frame.h"
+
+#define TIDY_PARAM_READABLE     \
+        (G_PARAM_READABLE |     \
+         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
+
+#define TIDY_PARAM_READWRITE    \
+        (G_PARAM_READABLE | G_PARAM_WRITABLE | \
+         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
+
+enum
+{
+  PROP_0,
+
+  PROP_PARENT_TEXTURE,
+
+  PROP_LEFT,
+  PROP_TOP,
+  PROP_RIGHT,
+  PROP_BOTTOM
+};
+
+G_DEFINE_TYPE (TidyTextureFrame, tidy_texture_frame, CLUTTER_TYPE_ACTOR);
+
+#define TIDY_TEXTURE_FRAME_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFramePrivate))
+
+struct _TidyTextureFramePrivate
+{
+  ClutterTexture *parent_texture;
+
+  gfloat left;
+  gfloat top;
+  gfloat right;
+  gfloat bottom;
+
+  CoglHandle material;
+};
+
+static void
+tidy_texture_frame_get_preferred_width (ClutterActor *self,
+                                        ClutterUnit   for_height,
+                                        ClutterUnit  *min_width_p,
+                                        ClutterUnit  *natural_width_p)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
+
+  if (G_UNLIKELY (priv->parent_texture == NULL))
+    {
+      if (min_width_p)
+        *min_width_p = 0;
+
+      if (natural_width_p)
+        *natural_width_p = 0;
+    }
+  else
+    {
+      ClutterActorClass *klass;
+
+      /* by directly querying the parent texture's class implementation
+       * we are going around any override mechanism the parent texture
+       * might have in place, and we ask directly for the original
+       * preferred width
+       */
+      klass = CLUTTER_ACTOR_GET_CLASS (priv->parent_texture);
+      klass->get_preferred_width (CLUTTER_ACTOR (priv->parent_texture),
+                                  for_height,
+                                  min_width_p,
+                                  natural_width_p);
+    }
+}
+
+static void
+tidy_texture_frame_get_preferred_height (ClutterActor *self,
+                                         ClutterUnit   for_width,
+                                         ClutterUnit  *min_height_p,
+                                         ClutterUnit  *natural_height_p)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
+
+  if (G_UNLIKELY (priv->parent_texture == NULL))
+    {
+      if (min_height_p)
+        *min_height_p = 0;
+
+      if (natural_height_p)
+        *natural_height_p = 0;
+    }
+  else
+    {
+      ClutterActorClass *klass;
+
+      /* by directly querying the parent texture's class implementation
+       * we are going around any override mechanism the parent texture
+       * might have in place, and we ask directly for the original
+       * preferred height
+       */
+      klass = CLUTTER_ACTOR_GET_CLASS (priv->parent_texture);
+      klass->get_preferred_height (CLUTTER_ACTOR (priv->parent_texture),
+                                   for_width,
+                                   min_height_p,
+                                   natural_height_p);
+    }
+}
+
+static void
+tidy_texture_frame_realize (ClutterActor *self)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
+
+  if (priv->material != COGL_INVALID_HANDLE)
+    return;
+
+  priv->material = cogl_material_new ();
+
+  CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
+}
+
+static void
+tidy_texture_frame_unrealize (ClutterActor *self)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
+
+  if (priv->material == COGL_INVALID_HANDLE)
+    return;
+
+  cogl_material_unref (priv->material);
+  priv->material = COGL_INVALID_HANDLE;
+
+  CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
+}
+
+static void
+tidy_texture_frame_paint (ClutterActor *self)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
+  CoglHandle cogl_texture = COGL_INVALID_HANDLE;
+  ClutterActorBox box = { 0, };
+  gfloat width, height;
+  gfloat tex_width, tex_height;
+  gfloat ex, ey;
+  gfloat tx1, ty1, tx2, ty2;
+  guint8 opacity;
+
+  /* no need to paint stuff if we don't have a texture */
+  if (G_UNLIKELY (priv->parent_texture == NULL))
+    return;
+
+  /* parent texture may have been hidden, so need to make sure it gets
+   * realized
+   */
+  if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_texture))
+    clutter_actor_realize (CLUTTER_ACTOR (priv->parent_texture));
+
+  cogl_texture = clutter_texture_get_cogl_texture (priv->parent_texture);
+  if (cogl_texture == COGL_INVALID_HANDLE)
+    return;
+
+  tex_width  = cogl_texture_get_width (cogl_texture);
+  tex_height = cogl_texture_get_height (cogl_texture);
+
+  clutter_actor_get_allocation_box (self, &box);
+  width = box.x2 - box.x1;
+  height = box.y2 - box.y1;
+
+  tx1 = priv->left / tex_width;
+  tx2 = (tex_width - priv->right) / tex_width;
+  ty1 = priv->top / tex_height;
+  ty2 = (tex_height - priv->bottom) / tex_height;
+
+  ex = width - priv->right;
+  if (ex < 0)
+    ex = priv->right; 		/* FIXME ? */
+
+  ey = height - priv->bottom;
+  if (ey < 0)
+    ey = priv->bottom; 		/* FIXME ? */
+
+  opacity = clutter_actor_get_paint_opacity (self);
+
+  g_assert (priv->material != COGL_INVALID_HANDLE);
+
+  /* set the source material using the parent texture's COGL handle */
+  cogl_material_set_color4ub (priv->material, 255, 255, 255, opacity);
+  cogl_material_set_layer (priv->material, 0, cogl_texture);
+  cogl_set_source (priv->material);
+
+  /* top left corner */
+  cogl_rectangle_with_texture_coords (0, 0, priv->left, priv->top,
+                                      0.0, 0.0,
+                                      tx1, ty1);
+
+  /* top middle */
+  cogl_rectangle_with_texture_coords (priv->left, 0, ex, priv->top,
+                                      tx1, 0.0,
+                                      tx2, ty1);
+
+  /* top right */
+  cogl_rectangle_with_texture_coords (ex, 0, width, priv->top,
+                                      tx2, 0.0,
+                                      1.0, ty1);
+
+  /* mid left */
+  cogl_rectangle_with_texture_coords (0, priv->top, priv->left, ey,
+                                      0.0, ty1,
+                                      tx1, ty2);
+
+  /* center */
+  cogl_rectangle_with_texture_coords (priv->left, priv->top, ex, ey,
+                                      tx1, ty1,
+                                      tx2, ty2);
+
+  /* mid right */
+  cogl_rectangle_with_texture_coords (ex, priv->top, width, ey,
+                                      tx2, ty1,
+                                      1.0, ty2);
+  
+  /* bottom left */
+  cogl_rectangle_with_texture_coords (0, ey, priv->left, height,
+                                      0.0, ty2,
+                                      tx1, 1.0);
+
+  /* bottom center */
+  cogl_rectangle_with_texture_coords (priv->left, ey, ex, height,
+                                      tx1, ty2,
+                                      tx2, 1.0);
+
+  /* bottom right */
+  cogl_rectangle_with_texture_coords (ex, ey, width, height,
+                                      tx2, ty2,
+                                      1.0, 1.0);
+}
+
+static inline void
+tidy_texture_frame_set_frame_internal (TidyTextureFrame *frame,
+                                       gfloat            left,
+                                       gfloat            top,
+                                       gfloat            right,
+                                       gfloat            bottom)
+{
+  TidyTextureFramePrivate *priv = frame->priv;
+  GObject *gobject = G_OBJECT (frame);
+  gboolean changed = FALSE;
+
+  g_object_freeze_notify (gobject);
+
+  if (priv->top != top)
+    {
+      priv->top = top;
+      g_object_notify (gobject, "top");
+      changed = TRUE;
+    }
+
+  if (priv->right != right)
+    {
+      priv->right = right;
+      g_object_notify (gobject, "right");
+      changed = TRUE;
+    }
+
+  if (priv->bottom != bottom)
+    {
+      priv->bottom = bottom;
+      g_object_notify (gobject, "bottom");
+      changed = TRUE;
+    }
+
+  if (priv->left != left)
+    {
+      priv->left = left;
+      g_object_notify (gobject, "left");
+      changed = TRUE;
+    }
+
+  if (changed && CLUTTER_ACTOR_IS_VISIBLE (frame))
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (frame));
+
+  g_object_thaw_notify (gobject);
+}
+
+static void
+tidy_texture_frame_set_property (GObject      *gobject,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
+{
+  TidyTextureFrame *frame = TIDY_TEXTURE_FRAME (gobject);
+  TidyTextureFramePrivate *priv = frame->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PARENT_TEXTURE:
+      tidy_texture_frame_set_parent_texture (frame,
+                                             g_value_get_object (value));
+      break;
+
+    case PROP_TOP:
+      tidy_texture_frame_set_frame_internal (frame,
+                                             priv->left,
+                                             g_value_get_float (value),
+                                             priv->right,
+                                             priv->bottom);
+      break;
+
+    case PROP_RIGHT:
+      tidy_texture_frame_set_frame_internal (frame,
+                                             priv->top,
+                                             g_value_get_float (value),
+                                             priv->bottom,
+                                             priv->left);
+      break;
+
+    case PROP_BOTTOM:
+      tidy_texture_frame_set_frame_internal (frame,
+                                             priv->top,
+                                             priv->right,
+                                             g_value_get_float (value),
+                                             priv->left);
+      break;
+
+    case PROP_LEFT:
+      tidy_texture_frame_set_frame_internal (frame,
+                                             priv->top,
+                                             priv->right,
+                                             priv->bottom,
+                                             g_value_get_float (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+tidy_texture_frame_get_property (GObject    *gobject,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_PARENT_TEXTURE:
+      g_value_set_object (value, priv->parent_texture);
+      break;
+
+    case PROP_LEFT:
+      g_value_set_float (value, priv->left);
+      break;
+
+    case PROP_TOP:
+      g_value_set_float (value, priv->top);
+      break;
+
+    case PROP_RIGHT:
+      g_value_set_float (value, priv->right);
+      break;
+
+    case PROP_BOTTOM:
+      g_value_set_float (value, priv->bottom);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+tidy_texture_frame_dispose (GObject *gobject)
+{
+  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (gobject)->priv;
+
+  if (priv->parent_texture)
+    {
+      g_object_unref (priv->parent_texture);
+      priv->parent_texture = NULL;
+    }
+
+  if (priv->material)
+    {
+      cogl_material_unref (priv->material);
+      priv->material = COGL_INVALID_HANDLE;
+    }
+
+  G_OBJECT_CLASS (tidy_texture_frame_parent_class)->dispose (gobject);
+}
+
+static void
+tidy_texture_frame_class_init (TidyTextureFrameClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private (gobject_class, sizeof (TidyTextureFramePrivate));
+
+  actor_class->get_preferred_width =
+    tidy_texture_frame_get_preferred_width;
+  actor_class->get_preferred_height =
+    tidy_texture_frame_get_preferred_height;
+  actor_class->realize = tidy_texture_frame_realize;
+  actor_class->unrealize = tidy_texture_frame_unrealize;
+  actor_class->paint = tidy_texture_frame_paint;
+
+  gobject_class->set_property = tidy_texture_frame_set_property;
+  gobject_class->get_property = tidy_texture_frame_get_property;
+  gobject_class->dispose = tidy_texture_frame_dispose;
+
+  pspec = g_param_spec_object ("parent-texture",
+                               "Parent Texture",
+                               "The parent ClutterTexture",
+                               CLUTTER_TYPE_TEXTURE,
+                               TIDY_PARAM_READWRITE |
+                               G_PARAM_CONSTRUCT);
+  g_object_class_install_property (gobject_class, PROP_PARENT_TEXTURE, pspec);
+
+  pspec = g_param_spec_float ("left",
+                              "Left",
+                              "Left offset",
+			      0, G_MAXFLOAT,
+                              0,
+                              TIDY_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_LEFT, pspec);
+
+  pspec = g_param_spec_float ("top",
+                              "Top",
+                              "Top offset",
+                              0, G_MAXFLOAT,
+                              0,
+                              TIDY_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_TOP, pspec);
+
+  pspec = g_param_spec_float ("bottom",
+                              "Bottom",
+                              "Bottom offset",
+                              0, G_MAXFLOAT,
+                              0,
+                              TIDY_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_BOTTOM, pspec);
+
+  pspec = g_param_spec_float ("right",
+                              "Right",
+                              "Right offset",
+                              0, G_MAXFLOAT,
+                              0,
+                              TIDY_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_RIGHT, pspec);
+}
+
+static void
+tidy_texture_frame_init (TidyTextureFrame *self)
+{
+  TidyTextureFramePrivate *priv;
+
+  self->priv = priv = TIDY_TEXTURE_FRAME_GET_PRIVATE (self);
+
+  priv->material = COGL_INVALID_HANDLE;
+}
+
+/**
+ * tidy_texture_frame_new:
+ * @texture: a #ClutterTexture or %NULL
+ * @left: left margin preserving its content
+ * @top: top margin preserving its content
+ * @right: right margin preserving its content
+ * @bottom: bottom margin preserving its content
+ *
+ * A #TidyTextureFrame is a specialized texture that efficiently clones
+ * an area of the given @texture while keeping preserving portions of the
+ * same texture.
+ *
+ * A #TidyTextureFrame can be used to make a rectangular texture fit a
+ * given size without stretching its borders.
+ *
+ * Return value: the newly created #TidyTextureFrame
+ */
+ClutterActor*
+tidy_texture_frame_new (ClutterTexture *texture, 
+			gfloat          left,
+			gfloat          top,
+			gfloat          right,
+			gfloat          bottom)
+{
+  g_return_val_if_fail (texture == NULL || CLUTTER_IS_TEXTURE (texture), NULL);
+
+  return g_object_new (TIDY_TYPE_TEXTURE_FRAME,
+ 		       "parent-texture", texture,
+		       "left", left,
+		       "top", top,
+		       "right", right,
+		       "bottom", bottom,
+		       NULL);
+}
+
+ClutterTexture *
+tidy_texture_frame_get_parent_texture (TidyTextureFrame *frame)
+{
+  g_return_val_if_fail (TIDY_IS_TEXTURE_FRAME (frame), NULL);
+
+  return frame->priv->parent_texture;
+}
+
+void
+tidy_texture_frame_set_parent_texture (TidyTextureFrame *frame,
+                                       ClutterTexture   *texture)
+{
+  TidyTextureFramePrivate *priv;
+  gboolean was_visible;
+
+  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
+  g_return_if_fail (texture == NULL || CLUTTER_IS_TEXTURE (texture));
+
+  priv = frame->priv;
+
+  was_visible = CLUTTER_ACTOR_IS_VISIBLE (frame);
+
+  if (priv->parent_texture == texture)
+    return;
+
+  if (priv->parent_texture)
+    {
+      g_object_unref (priv->parent_texture);
+      priv->parent_texture = NULL;
+
+      if (was_visible)
+        clutter_actor_hide (CLUTTER_ACTOR (frame));
+    }
+
+  if (texture)
+    {
+      priv->parent_texture = g_object_ref (texture);
+
+      if (was_visible && CLUTTER_ACTOR_IS_VISIBLE (priv->parent_texture))
+        clutter_actor_show (CLUTTER_ACTOR (frame));
+    }
+
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
+
+  g_object_notify (G_OBJECT (frame), "parent-texture");
+}
+
+void
+tidy_texture_frame_set_frame (TidyTextureFrame *frame,
+                              gfloat            top,
+                              gfloat            right,
+                              gfloat            bottom,
+                              gfloat            left)
+{
+  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
+
+  tidy_texture_frame_set_frame_internal (frame, top, right, bottom, left);
+}
+
+void
+tidy_texture_frame_get_frame (TidyTextureFrame *frame,
+                              gfloat           *top,
+                              gfloat           *right,
+                              gfloat           *bottom,
+                              gfloat           *left)
+{
+  TidyTextureFramePrivate *priv;
+
+  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
+
+  priv = frame->priv;
+
+  if (top)
+    *top = priv->top;
+
+  if (right)
+    *right = priv->right;
+
+  if (bottom)
+    *bottom = priv->bottom;
+
+  if (left)
+    *left = priv->left;
+}
--- a/src/compositor/mutter/tidy/tidy-texture-frame.h
+++ b/src/compositor/mutter/tidy/tidy-texture-frame.h
@@ -0,0 +1,81 @@
+/* tidy-texture-frame.h: Expandible texture actor
+ *
+ * Copyright (C) 2007, 2008 OpenedHand Ltd
+ * Copyright (C) 2009 Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _HAVE_TIDY_TEXTURE_FRAME_H
+#define _HAVE_TIDY_TEXTURE_FRAME_H
+
+#include <clutter/clutter.h>
+
+G_BEGIN_DECLS
+
+#define TIDY_TYPE_TEXTURE_FRAME                 (tidy_texture_frame_get_type ())
+#define TIDY_TEXTURE_FRAME(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrame))
+#define TIDY_TEXTURE_FRAME_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrameClass))
+#define TIDY_IS_TEXTURE_FRAME(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TIDY_TYPE_TEXTURE_FRAME))
+#define TIDY_IS_TEXTURE_FRAME_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TIDY_TYPE_TEXTURE_FRAME))
+#define TIDY_TEXTURE_FRAME_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrameClass))
+
+typedef struct _TidyTextureFrame                TidyTextureFrame;
+typedef struct _TidyTextureFramePrivate         TidyTextureFramePrivate;
+typedef struct _TidyTextureFrameClass           TidyTextureFrameClass;
+
+struct _TidyTextureFrame
+{
+  /*< private >*/
+  ClutterActor parent_instance;
+  
+  TidyTextureFramePrivate    *priv;
+};
+
+struct _TidyTextureFrameClass
+{
+  ClutterActorClass parent_class;
+
+  /* padding for future expansion */
+  void (*_clutter_box_1) (void);
+  void (*_clutter_box_2) (void);
+  void (*_clutter_box_3) (void);
+  void (*_clutter_box_4) (void);
+};
+
+GType           tidy_texture_frame_get_type           (void) G_GNUC_CONST;
+ClutterActor *  tidy_texture_frame_new                (ClutterTexture   *texture,
+                                                       gfloat            top,
+                                                       gfloat            right,
+                                                       gfloat            bottom,
+                                                       gfloat            left);
+void            tidy_texture_frame_set_parent_texture (TidyTextureFrame *frame,
+                                                       ClutterTexture   *texture);
+ClutterTexture *tidy_texture_frame_get_parent_texture (TidyTextureFrame *frame);
+void            tidy_texture_frame_set_frame          (TidyTextureFrame *frame,
+                                                       gfloat            top,
+                                                       gfloat            right,
+                                                       gfloat            bottom,
+                                                       gfloat            left);
+void            tidy_texture_frame_get_frame          (TidyTextureFrame *frame,
+                                                       gfloat           *top,
+                                                       gfloat           *right,
+                                                       gfloat           *bottom,
+                                                       gfloat           *left);
+
+G_END_DECLS
+
+#endif /* _HAVE_TIDY_TEXTURE_FRAME_H */
--- a/src/core/async-getprop.c
+++ b/src/core/async-getprop.c
@@ -586,7 +586,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                            int                *actual_format,
                            unsigned long      *nitems,
                            unsigned long      *bytesafter,
-                            char              **prop)
+                            unsigned char     **prop)
 {
  Display *dpy;

@@ -615,7 +615,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask  *task,
  *nitems = task->n_items;
  *bytesafter = task->bytes_after;

-  *prop = task->data; /* pass out ownership of task->data */
+  *prop = (unsigned char*) task->data; /* pass out ownership of task->data */

  SyncHandle ();

--- a/src/core/async-getprop.h
+++ b/src/core/async-getprop.h
@@ -47,7 +47,7 @@ Status             ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                                               int                *actual_format,
                                               unsigned long      *nitems,
                                               unsigned long      *bytesafter,
-                                               char              **prop);
+                                               unsigned char     **prop);

 Bool     ag_task_have_reply   (AgGetPropertyTask *task);
 Atom     ag_task_get_property (AgGetPropertyTask *task);
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -23,7 +23,7 @@
 */

 /**
- * \file core/bell.c Ring the bell or flash the screen
+ * \file bell.c Ring the bell or flash the screen
 *
 * Sometimes, X programs "ring the bell", whatever that means. Metacity lets
 * the user configure the bell to be audible or visible (aka visual), and
@@ -31,13 +31,13 @@
 * We never get told about audible bells; X handles them just fine by itself.
 *
 * Visual bells come in at meta_bell_notify(), which checks we are actually
- * in visual mode and calls through to meta_bell_visual_notify(). That
+ * in visual mode and calls through to bell_visual_notify(). That
 * function then checks what kind of visual flash you like, and calls either
- * meta_bell_flash_fullscreen()-- which calls meta_bell_flash_screen() to do
- * its work-- or meta_bell_flash_frame(), which flashes the focussed window
- * using meta_bell_flash_window_frame(), unless there is no such window, in
- * which case it flashes the screen instead. meta_bell_flash_window_frame()
- * flashes the frame and calls meta_bell_unflash_frame() as a timeout to
+ * bell_flash_fullscreen()-- which calls bell_flash_screen() to do
+ * its work-- or bell_flash_frame(), which flashes the focussed window
+ * using bell_flash_window_frame(), unless there is no such window, in
+ * which case it flashes the screen instead. bell_flash_window_frame()
+ * flashes the frame and calls bell_unflash_frame() as a timeout to
 * remove the flash.
 *
 * The visual bell was the result of a discussion in Bugzilla here:
@@ -46,13 +46,11 @@
 * Several of the functions in this file are ifdeffed out entirely if we are
 * found not to have the XKB extension, which is required to do these clever
 * things with bells; some others are entirely no-ops in that case.
- *
- * \bug Static functions should not be called meta_*.
 */

 #include <config.h>
 #include "bell.h"
-#include "screen.h"
+#include "screen-private.h"
 #include "prefs.h"

 /**
@@ -74,7 +72,7 @@
 * \bug This appears to destroy our current XSync status.
 */
 static void
-meta_bell_flash_screen (MetaDisplay *display, 
+bell_flash_screen (MetaDisplay *display, 
 			MetaScreen  *screen)
 {
  Window root = screen->xroot;
@@ -147,7 +145,7 @@ meta_bell_flash_screen (MetaDisplay *display,
 */
 #ifdef HAVE_XKB
 static void
-meta_bell_flash_fullscreen (MetaDisplay *display, 
+bell_flash_fullscreen (MetaDisplay *display, 
 			    XkbAnyEvent *xkb_ev)
 {
  XkbBellNotifyEvent *xkb_bell_ev = (XkbBellNotifyEvent *) xkb_ev;
@@ -158,7 +156,7 @@ meta_bell_flash_fullscreen (MetaDisplay *display,
    {
      screen = meta_display_screen_for_xwindow (display, xkb_bell_ev->window);
      if (screen)
-	meta_bell_flash_screen (display, screen);
+	bell_flash_screen (display, screen);
    }
  else 
    {
@@ -166,7 +164,7 @@ meta_bell_flash_fullscreen (MetaDisplay *display,
      while (screen_list) 
 	{
 	  screen = (MetaScreen *) screen_list->data;
-	  meta_bell_flash_screen (display, screen);
+	  bell_flash_screen (display, screen);
 	  screen_list = screen_list->next;
 	}
    }
@@ -174,7 +172,7 @@ meta_bell_flash_fullscreen (MetaDisplay *display,

 /**
 * Makes a frame be not flashed; this is the timeout half of
- * meta_bell_flash_window_frame(). This is done simply by clearing the
+ * bell_flash_window_frame(). This is done simply by clearing the
 * flash flag and queuing a redraw of the frame.
 *
 * If the configure script found we had no XKB, this does not exist.
@@ -183,11 +181,11 @@ meta_bell_flash_fullscreen (MetaDisplay *display,
 *              a callback function.
 * \return Always FALSE, so we don't get called again.
 *
- * \bug This is the parallel to meta_bell_flash_window_frame(), so it should
+ * \bug This is the parallel to bell_flash_window_frame(), so it should
 * really be called meta_bell_unflash_window_frame().
 */
 static gboolean 
-meta_bell_unflash_frame (gpointer data)
+bell_unflash_frame (gpointer data)
 {
  MetaFrame *frame = (MetaFrame *) data;
  frame->is_flashing = 0;
@@ -207,13 +205,13 @@ meta_bell_unflash_frame (gpointer data)
 * \param window  The window to flash
 */
 static void
-meta_bell_flash_window_frame (MetaWindow *window)
+bell_flash_window_frame (MetaWindow *window)
 {
  g_assert (window->frame != NULL);
  window->frame->is_flashing = 1;
  meta_frame_queue_draw (window->frame);
  g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE, 100, 
-      meta_bell_unflash_frame, window->frame, NULL);
+      bell_unflash_frame, window->frame, NULL);
 }

 /**
@@ -224,7 +222,7 @@ meta_bell_flash_window_frame (MetaWindow *window)
 * \param xkb_ev   The bell event we just received
 */
 static void
-meta_bell_flash_frame (MetaDisplay *display, 
+bell_flash_frame (MetaDisplay *display, 
 		       XkbAnyEvent *xkb_ev)
 {
  XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent *) xkb_ev;
@@ -238,11 +236,11 @@ meta_bell_flash_frame (MetaDisplay *display,
    }
  if (window)
    {
-      meta_bell_flash_window_frame (window);
+      bell_flash_window_frame (window);
    }
  else /* revert to fullscreen flash if there's no focussed window */
    {
-      meta_bell_flash_fullscreen (display, xkb_ev);
+      bell_flash_fullscreen (display, xkb_ev);
    }
 }

@@ -258,16 +256,16 @@ meta_bell_flash_frame (MetaDisplay *display,
 * \bug This should be merged with meta_bell_notify().
 */
 static void
-meta_bell_visual_notify (MetaDisplay *display, 
+bell_visual_notify (MetaDisplay *display, 
 			 XkbAnyEvent *xkb_ev)
 {
  switch (meta_prefs_get_visual_bell_type ()) 
    {
    case META_VISUAL_BELL_FULLSCREEN_FLASH:
-      meta_bell_flash_fullscreen (display, xkb_ev);
+      bell_flash_fullscreen (display, xkb_ev);
      break;
    case META_VISUAL_BELL_FRAME_FLASH:
-      meta_bell_flash_frame (display, xkb_ev); /* does nothing yet */
+      bell_flash_frame (display, xkb_ev); /* does nothing yet */
      break;
    case META_VISUAL_BELL_INVALID:
      /* do nothing */
@@ -275,35 +273,16 @@ meta_bell_visual_notify (MetaDisplay *display,
    }
 }

-/**
- * Gives the user some kind of visual bell; in fact, this is our response
- * to any kind of bell request, but we set it up so that we only get
- * notified about visual bells, and X deals with audible ones.
- *
- * If the configure script found we had no XKB, this does not exist.
- *
- * \param display  The display the bell event came in on
- * \param xkb_ev   The bell event we just received
- */
 void
 meta_bell_notify (MetaDisplay *display, 
 		  XkbAnyEvent *xkb_ev)
 {
  /* flash something */
  if (meta_prefs_get_visual_bell ()) 
-    meta_bell_visual_notify (display, xkb_ev);
+    bell_visual_notify (display, xkb_ev);
 }
 #endif /* HAVE_XKB */

-/**
- * Turns the bell to audible or visual. This tells X what to do, but
- * not Metacity; you will need to set the "visual bell" pref for that.
- *
- * If the configure script found we had no XKB, this is a no-op.
- *
- * \param display  The display we're configuring
- * \param audible  True for an audible bell, false for a visual bell
- */
 void
 meta_bell_set_audible (MetaDisplay *display, gboolean audible)
 {
@@ -315,27 +294,6 @@ meta_bell_set_audible (MetaDisplay *display, gboolean audible)
 #endif  
 }

-/**
- * Initialises the bell subsystem. This involves intialising
- * XKB (which, despite being a keyboard extension, is the
- * place to look for bell notifications), then asking it
- * to send us bell notifications, and then also switching
- * off the audible bell if we're using a visual one ourselves.
- *
- * Unlike most X extensions we use, we only initialise XKB here
- * (rather than in main()). It's possible that XKB is not
- * installed at all, but if that was known at build time
- * we will have HAVE_XKB undefined, which will cause this
- * function to be a no-op.
- *
- * \param display  The display which is opening
- *
- * \bug There is a line of code that's never run that tells
- * XKB to reset the bell status after we quit. Bill H said
- * (<http://bugzilla.gnome.org/show_bug.cgi?id=99886#c12>)
- * that XFree86's implementation is broken so we shouldn't
- * call it, but that was in 2002. Is it working now?
- */
 gboolean
 meta_bell_init (MetaDisplay *display)
 {
@@ -377,15 +335,6 @@ meta_bell_init (MetaDisplay *display)
  return FALSE;
 }

-/**
- * Shuts down the bell subsystem.
- *
- * \param display  The display which is closing
- *
- * \bug This is never called! If we had XkbSetAutoResetControls
- * enabled in meta_bell_init(), this wouldn't be a problem, but
- * we don't.
- */
 void
 meta_bell_shutdown (MetaDisplay *display)
 {
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -1,6 +1,17 @@
-/* Metacity visual bell */
-
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file bell.h Ring the bell or flash the screen
+ *
+ * Sometimes, X programs "ring the bell", whatever that means. Metacity lets
+ * the user configure the bell to be audible or visible (aka visual), and
+ * if it's visual it can be configured to be frame-flash or fullscreen-flash.
+ * We never get told about audible bells; X handles them just fine by itself.
+ *
+ * The visual bell was the result of a discussion in Bugzilla here:
+ * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
+ */
+
 /* 
 * Copyright (C) 2002 Sun Microsystems Inc.
 * 
@@ -24,13 +35,74 @@
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
-#include "display.h"
-#include "frame.h"
+#include "display-private.h"
+#include "frame-private.h"

 #ifdef HAVE_XKB
+/**
+ * Gives the user some kind of visual bell; in fact, this is our response
+ * to any kind of bell request, but we set it up so that we only get
+ * notified about visual bells, and X deals with audible ones.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the bell event came in on
+ * \param xkb_ev   The bell event we just received
+ */
 void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);
 #endif
+
+/**
+ * Turns the bell to audible or visual. This tells X what to do, but
+ * not Metacity; you will need to set the "visual bell" pref for that.
+ *
+ * If the configure script found we had no XKB, this is a no-op.
+ *
+ * \param display  The display we're configuring
+ * \param audible  True for an audible bell, false for a visual bell
+ */
 void meta_bell_set_audible (MetaDisplay *display, gboolean audible);
+
+/**
+ * Initialises the bell subsystem. This involves intialising
+ * XKB (which, despite being a keyboard extension, is the
+ * place to look for bell notifications), then asking it
+ * to send us bell notifications, and then also switching
+ * off the audible bell if we're using a visual one ourselves.
+ *
+ * Unlike most X extensions we use, we only initialise XKB here
+ * (rather than in main()). It's possible that XKB is not
+ * installed at all, but if that was known at build time
+ * we will have HAVE_XKB undefined, which will cause this
+ * function to be a no-op.
+ *
+ * \param display  The display which is opening
+ *
+ * \bug There is a line of code that's never run that tells
+ * XKB to reset the bell status after we quit. Bill H said
+ * (<http://bugzilla.gnome.org/show_bug.cgi?id=99886#c12>)
+ * that XFree86's implementation is broken so we shouldn't
+ * call it, but that was in 2002. Is it working now?
+ */
 gboolean meta_bell_init (MetaDisplay *display);
+
+/**
+ * Shuts down the bell subsystem.
+ *
+ * \param display  The display which is closing
+ *
+ * \bug This is never called! If we had XkbSetAutoResetControls
+ * enabled in meta_bell_init(), this wouldn't be a problem, but
+ * we don't.
+ */
 void meta_bell_shutdown (MetaDisplay *display);
+
+/**
+ * Deals with a frame being destroyed. This is important because if we're
+ * using a visual bell, we might be flashing the edges of the frame, and
+ * so we'd have a timeout function waiting ready to un-flash them. If the
+ * frame's going away, we can tell the timeout not to bother.
+ *
+ * \param frame  The frame which is being destroyed
+ */
 void meta_bell_notify_frame_destroy (MetaFrame *frame);
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -29,7 +29,6 @@
 #include "boxes.h"
 #include "util.h"
 #include <X11/Xutil.h>  /* Just for the definition of the various gravities */
-#include <stdio.h>      /* For snprintf */

 char*
 meta_rectangle_to_string (const MetaRectangle *rect,
@@ -61,7 +60,7 @@ meta_rectangle_region_to_string (GList      *region,
  char *cur = output;

  if (region == NULL)
-    snprintf (output, 10, "(EMPTY)");
+    g_snprintf (output, 10, "(EMPTY)");

  while (tmp)
    {
@@ -114,7 +113,7 @@ meta_rectangle_edge_list_to_string (GList      *edge_list,
  GList *tmp = edge_list;

  if (edge_list == NULL)
-    snprintf (output, 10, "(EMPTY)");
+    g_snprintf (output, 10, "(EMPTY)");

  while (tmp)
    {
@@ -198,6 +197,40 @@ meta_rectangle_equal (const MetaRectangle *src1,
          (src1->height == src2->height));
 }

+void
+meta_rectangle_union (const MetaRectangle *rect1,
+                      const MetaRectangle *rect2,
+                      MetaRectangle       *dest)
+{
+  int dest_x, dest_y;
+  int dest_w, dest_h;
+
+  dest_x = rect1->x;
+  dest_y = rect1->y;
+  dest_w = rect1->width;
+  dest_h = rect1->height;
+
+  if (rect2->x < dest_x)
+    {
+      dest_w += dest_x - rect2->x;
+      dest_x = rect2->x;
+    }
+  if (rect2->y < dest_y)
+    {
+      dest_h += dest_y - rect2->y;
+      dest_y = rect2->y;
+    }
+  if (rect2->x + rect2->width > dest_x + dest_w)
+    dest_w = rect2->x + rect2->width - dest_x;
+  if (rect2->y + rect2->height > dest_y + dest_h)
+    dest_h = rect2->y + rect2->height - dest_y;
+
+  dest->x = dest_x;
+  dest->y = dest_y;
+  dest->width = dest_w;
+  dest->height = dest_h;
+}
+
 gboolean
 meta_rectangle_overlap (const MetaRectangle *rect1,
                        const MetaRectangle *rect2)
--- a/src/core/compositor.h
+++ b/src/core/compositor.h
@@ -1,69 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity compositing manager */
-
-/* 
- * Copyright (C) 2003 Red Hat, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_COMPOSITOR_H
-#define META_COMPOSITOR_H
-
-#include "util.h"
-#include "display.h"
-#include "spring-model.h"
-
-MetaCompositor* meta_compositor_new           (MetaDisplay       *display);
-void            meta_compositor_process_event (MetaCompositor    *compositor,
-                                               XEvent            *xevent,
-                                               MetaWindow        *window);
-void            meta_compositor_add_window    (MetaCompositor    *compositor,
-                                               MetaWindow        *window,
-                                               Window             xwindow,
-                                               XWindowAttributes *attrs);
-void            meta_compositor_remove_window (MetaCompositor    *compositor,
-                                               Window             xwindow);
-void		meta_compositor_set_debug_updates (MetaCompositor *compositor,
-						   gboolean	   debug_updates);
-
-void meta_compositor_manage_screen   (MetaCompositor *compositor,
-                                      MetaScreen     *screen);
-void meta_compositor_unmanage_screen (MetaCompositor *compositor,
-                                      MetaScreen     *screen);
-
-void meta_compositor_set_updates (MetaCompositor *compositor,
-                                  MetaWindow     *window,
-                                  gboolean        updates);
-
-void meta_compositor_destroy (MetaCompositor *compositor);
-
-void meta_compositor_begin_move (MetaCompositor *compositor,
-				 MetaWindow *window,
-				 MetaRectangle *initial,
-				 int grab_x, int grab_y);
-void meta_compositor_update_move (MetaCompositor *compositor,
-				  MetaWindow *window,
-				  int x, int y);
-void meta_compositor_end_move (MetaCompositor *compositor,
-			       MetaWindow *window);
-void meta_compositor_free_window (MetaCompositor *compositor,
-				  MetaWindow *window);
-Pixmap meta_compositor_get_window_pixmap (MetaCompositor *compositor,
-                                          MetaWindow     *window);
-
-#endif /* META_COMPOSITOR_H */
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -25,7 +25,7 @@

 #include <config.h>
 #include "constraints.h"
-#include "workspace.h"
+#include "workspace-private.h"
 #include "place.h"

 #include <stdlib.h>
@@ -91,7 +91,7 @@

 typedef enum
 {
-  PRIORITY_MINIMUM = 0, // Dummy value used for loop start = min(all priorities)
+  PRIORITY_MINIMUM = 0, /* Dummy value used for loop start = min(all priorities) */
  PRIORITY_ASPECT_RATIO = 0,
  PRIORITY_ENTIRELY_VISIBLE_ON_SINGLE_XINERAMA = 0,
  PRIORITY_ENTIRELY_VISIBLE_ON_WORKAREA = 1,
@@ -101,7 +101,7 @@ typedef enum
  PRIORITY_SIZE_HINTS_LIMITS = 3,
  PRIORITY_TITLEBAR_VISIBLE = 4,
  PRIORITY_PARTIALLY_VISIBLE_ON_WORKAREA = 4,
-  PRIORITY_MAXIMUM = 4  // Dummy value used for loop end = max(all priorities)
+  PRIORITY_MAXIMUM = 4 /* Dummy value used for loop end = max(all priorities) */
 } ConstraintPriority;

 typedef enum
@@ -392,7 +392,27 @@ setup_constraint_info (ConstraintInfo      *info,
  meta_window_get_work_area_for_xinerama (window,
                                          xinerama_info->number,
                                          &info->work_area_xinerama);
-  info->entire_xinerama = xinerama_info->rect;
+
+  if (!window->fullscreen || window->fullscreen_monitors[0] == -1)
+    {
+      info->entire_xinerama = xinerama_info->rect;
+    }
+  else
+    {
+      int i = 0;
+      long monitor;
+
+      monitor = window->fullscreen_monitors[i];
+      info->entire_xinerama =
+        window->screen->xinerama_infos[monitor].rect;
+      for (i = 1; i <= 3; i++)
+        {
+          monitor = window->fullscreen_monitors[i];
+          meta_rectangle_union (&info->entire_xinerama,
+                                &window->screen->xinerama_infos[monitor].rect,
+                                &info->entire_xinerama);
+        }
+    }

  cur_workspace = window->screen->active_workspace;
  info->usable_screen_region   = 
@@ -784,7 +804,9 @@ constrain_fullscreen (MetaWindow         *window,
  /* Determine whether constraint applies; exit if it doesn't */
  if (!window->fullscreen)
    return TRUE;
+
  xinerama = info->entire_xinerama;
+
  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
  too_big =   !meta_rectangle_could_fit_rect (&xinerama, &min_size);
  too_small = !meta_rectangle_could_fit_rect (&max_size, &xinerama);
@@ -811,6 +833,7 @@ constrain_size_increments (MetaWindow         *window,
  int bh, hi, bw, wi, extra_height, extra_width;
  int new_width, new_height;
  gboolean constraint_already_satisfied;
+  MetaRectangle *start_rect;

  if (priority > PRIORITY_SIZE_HINTS_INCREMENTS)
    return TRUE;
@@ -852,8 +875,16 @@ constrain_size_increments (MetaWindow         *window,
  if (new_height < window->size_hints.min_height)
    new_height += ((window->size_hints.min_height - new_height)/hi + 1)*hi;

+  /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+   * See bug 448183
+   */
+  if (info->action_type == ACTION_MOVE_AND_RESIZE)
+    start_rect = &info->current;
+  else
+    start_rect = &info->orig;
+    
  /* Resize to the new size */
-  meta_rectangle_resize_with_gravity (&info->orig,
+  meta_rectangle_resize_with_gravity (start_rect,
                                      &info->current, 
                                      info->resize_gravity,
                                      new_width,
@@ -870,6 +901,7 @@ constrain_size_limits (MetaWindow         *window,
  MetaRectangle min_size, max_size;
  gboolean too_big, too_small, constraint_already_satisfied;
  int new_width, new_height;
+  MetaRectangle *start_rect;

  if (priority > PRIORITY_SIZE_HINTS_LIMITS)
    return TRUE;
@@ -898,7 +930,16 @@ constrain_size_limits (MetaWindow         *window,
  /*** Enforce constraint ***/
  new_width  = CLAMP (info->current.width,  min_size.width,  max_size.width);
  new_height = CLAMP (info->current.height, min_size.height, max_size.height);
-  meta_rectangle_resize_with_gravity (&info->orig,
+  
+  /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+   * See bug 448183
+   */
+  if (info->action_type == ACTION_MOVE_AND_RESIZE)
+    start_rect = &info->current;
+  else
+    start_rect = &info->orig;
+  
+  meta_rectangle_resize_with_gravity (start_rect,
                                      &info->current, 
                                      info->resize_gravity,
                                      new_width,
@@ -917,6 +958,7 @@ constrain_aspect_ratio (MetaWindow         *window,
  int fudge, new_width, new_height;
  double best_width, best_height;
  double alt_width, alt_height;
+  MetaRectangle *start_rect;

  if (priority > PRIORITY_ASPECT_RATIO)
    return TRUE;
@@ -1022,7 +1064,15 @@ constrain_aspect_ratio (MetaWindow         *window,
      break;
    }

-  meta_rectangle_resize_with_gravity (&info->orig,
+  /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+   * See bug 448183
+   */
+  if (info->action_type == ACTION_MOVE_AND_RESIZE)
+    start_rect = &info->current;
+  else
+    start_rect = &info->orig;
+
+  meta_rectangle_resize_with_gravity (start_rect,
                                      &info->current, 
                                      info->resize_gravity,
                                      new_width,
@@ -1042,13 +1092,16 @@ do_screen_and_xinerama_relative_constraints (
  MetaRectangle how_far_it_can_be_smushed, min_size, max_size;

 #ifdef WITH_VERBOSE_MODE
-  /* First, log some debugging information */
-  char spanning_region[1 + 28 * g_list_length (region_spanning_rectangles)];
+  if (meta_is_verbose ())
+    {
+      /* First, log some debugging information */
+      char spanning_region[1 + 28 * g_list_length (region_spanning_rectangles)];

-  meta_topic (META_DEBUG_GEOMETRY,
-              "screen/xinerama constraint; region_spanning_rectangles: %s\n",
-              meta_rectangle_region_to_string (region_spanning_rectangles, ", ", 
-                                               spanning_region));
+      meta_topic (META_DEBUG_GEOMETRY,
+             "screen/xinerama constraint; region_spanning_rectangles: %s\n",
+             meta_rectangle_region_to_string (region_spanning_rectangles, ", ",
+                                              spanning_region));
+    }
 #endif

  /* Determine whether constraint applies; exit if it doesn't */
--- a/src/core/constraints.h
+++ b/src/core/constraints.h
@@ -26,8 +26,8 @@
 #define META_CONSTRAINTS_H

 #include "util.h"
-#include "window.h"
-#include "frame.h"
+#include "window-private.h"
+#include "frame-private.h"

 typedef enum
 {
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -25,8 +25,8 @@

 #include <config.h>
 #include "core.h"
-#include "frame.h"
-#include "workspace.h"
+#include "frame-private.h"
+#include "workspace-private.h"
 #include "prefs.h"

 /* Looks up the MetaWindow representing the frame of the given X window.
@@ -145,6 +145,13 @@ meta_core_get (Display *xdisplay,
            case META_WINDOW_DOCK:
            case META_WINDOW_TOOLBAR:
            case META_WINDOW_SPLASHSCREEN:
+	    case META_WINDOW_DROPDOWN_MENU:
+	    case META_WINDOW_POPUP_MENU:
+	    case META_WINDOW_TOOLTIP:
+	    case META_WINDOW_NOTIFICATION:
+	    case META_WINDOW_COMBO:
+	    case META_WINDOW_DND:
+	    case META_WINDOW_OVERRIDE_OTHER:
              /* No frame */
              base_type = META_FRAME_TYPE_LAST;
              break;
@@ -328,6 +335,40 @@ meta_core_maximize (Display *xdisplay,
                        META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
 }

+void
+meta_core_toggle_maximize_vertically (Display *xdisplay,
+				      Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
+
+  if (META_WINDOW_MAXIMIZED_VERTICALLY (window))
+    meta_window_unmaximize (window, 
+                            META_MAXIMIZE_VERTICAL);
+  else
+    meta_window_maximize (window,
+    			    META_MAXIMIZE_VERTICAL);
+}
+
+void
+meta_core_toggle_maximize_horizontally (Display *xdisplay,
+				        Window   frame_xwindow)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  if (meta_prefs_get_raise_on_click ())
+    meta_window_raise (window);
+
+  if (META_WINDOW_MAXIMIZED_HORIZONTALLY (window))
+    meta_window_unmaximize (window, 
+                            META_MAXIMIZE_HORIZONTAL);
+  else
+    meta_window_maximize (window,
+    			    META_MAXIMIZE_HORIZONTAL);
+}
+
 void
 meta_core_toggle_maximize (Display *xdisplay,
                           Window   frame_xwindow)
@@ -486,87 +527,87 @@ meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
  switch (menu_op)
    {
    case META_MENU_OP_DELETE:
-      name = META_KEYBINDING_CLOSE;
+      name = "close";
      break;
    case META_MENU_OP_MINIMIZE:
-      name = META_KEYBINDING_MINIMIZE;
+      name = "minimize";
      break;
    case META_MENU_OP_UNMAXIMIZE:
-      name = META_KEYBINDING_UNMAXIMIZE;
+      name = "unmaximize";
      break;
    case META_MENU_OP_MAXIMIZE:
-      name = META_KEYBINDING_MAXIMIZE;
+      name = "maximize";
      break;
    case META_MENU_OP_UNSHADE:
    case META_MENU_OP_SHADE:
-      name = META_KEYBINDING_TOGGLE_SHADE;
+      name = "toggle_shaded";
      break;
    case META_MENU_OP_UNSTICK:
    case META_MENU_OP_STICK:
-      name = META_KEYBINDING_TOGGLE_STICKY;
+      name = "toggle_on_all_workspaces";
      break;
    case META_MENU_OP_ABOVE:
    case META_MENU_OP_UNABOVE:
-      name = META_KEYBINDING_TOGGLE_ABOVE;
+      name = "toggle_above";
      break;
    case META_MENU_OP_WORKSPACES:
      switch (workspace)
        {
        case 1:
-          name = META_KEYBINDING_MOVE_WORKSPACE_1;
+          name = "move_to_workspace_1";
          break;
        case 2:
-          name = META_KEYBINDING_MOVE_WORKSPACE_2;
+          name = "move_to_workspace_2";
          break;
        case 3:
-          name = META_KEYBINDING_MOVE_WORKSPACE_3;
+          name = "move_to_workspace_3";
          break; 
        case 4:
-          name = META_KEYBINDING_MOVE_WORKSPACE_4;
+          name = "move_to_workspace_4";
          break; 
        case 5:
-          name = META_KEYBINDING_MOVE_WORKSPACE_5;
+          name = "move_to_workspace_5";
          break; 
        case 6:
-          name = META_KEYBINDING_MOVE_WORKSPACE_6;
+          name = "move_to_workspace_6";
          break; 
        case 7:
-          name = META_KEYBINDING_MOVE_WORKSPACE_7;
+          name = "move_to_workspace_7";
          break; 
        case 8:
-          name = META_KEYBINDING_MOVE_WORKSPACE_8;
+          name = "move_to_workspace_8";
          break; 
        case 9:
-          name = META_KEYBINDING_MOVE_WORKSPACE_9;
+          name = "move_to_workspace_9";
          break; 
        case 10:
-          name = META_KEYBINDING_MOVE_WORKSPACE_10;
+          name = "move_to_workspace_10";
          break;
        case 11:
-          name = META_KEYBINDING_MOVE_WORKSPACE_11;
+          name = "move_to_workspace_11";
          break;
        case 12:
-          name = META_KEYBINDING_MOVE_WORKSPACE_12;
+          name = "move_to_workspace_12";
          break;
        }
      break;
    case META_MENU_OP_MOVE:
-      name = META_KEYBINDING_BEGIN_MOVE;
+      name = "begin_move";
      break;
    case META_MENU_OP_RESIZE:
-      name = META_KEYBINDING_BEGIN_RESIZE;
+      name = "begin_resize";
      break;
    case META_MENU_OP_MOVE_LEFT:
-      name = META_KEYBINDING_MOVE_WORKSPACE_LEFT;
+      name = "move_to_workspace_left";
      break;
    case META_MENU_OP_MOVE_RIGHT:
-      name = META_KEYBINDING_MOVE_WORKSPACE_RIGHT;
+      name = "move_to_workspace_right";
      break;
    case META_MENU_OP_MOVE_UP:
-      name = META_KEYBINDING_MOVE_WORKSPACE_UP;
+      name = "move_to_workspace_up";
      break;
    case META_MENU_OP_MOVE_DOWN:
-      name = META_KEYBINDING_MOVE_WORKSPACE_DOWN;
+      name = "move_to_workspace_down";
      break;
    case META_MENU_OP_RECOVER:
      /* No keybinding for this one */
@@ -718,27 +759,25 @@ meta_core_increment_event_serial (Display *xdisplay)
 void
 meta_invalidate_default_icons (void)
 {
-  GSList *displays;
+  MetaDisplay *display = meta_get_display ();
+  GSList *windows;
+  GSList *l;

-  for (displays = meta_displays_list ();
-       displays != NULL;
-       displays = displays->next)
+  if (display == NULL)
+    return; /* We can validly be called before the display is opened. */
+
+  windows = meta_display_list_windows (display);
+  for (l = windows; l != NULL; l = l->next)
    {
-      GSList *windows, *l;
+      MetaWindow *window = (MetaWindow*)l->data;

-      windows = meta_display_list_windows (displays->data);
-      for (l = windows; l != NULL; l = l->next)
+      if (window->icon_cache.origin == USING_FALLBACK_ICON)
        {
-          MetaWindow *window = (MetaWindow*)l->data;
-
-          if (window->icon_cache.origin == USING_FALLBACK_ICON)
-            {
-              meta_icon_cache_free (&(window->icon_cache));
-              meta_window_update_icon_now (window);
-            }
+          meta_icon_cache_free (&(window->icon_cache));
+          meta_window_update_icon_now (window);
        }
-
-      g_slist_free (windows);
    }
+
+  g_slist_free (windows);
 }

--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -22,9 +22,12 @@
 * 02111-1307, USA.
 */

+#define _GNU_SOURCE
+#define _SVID_SOURCE /* for gethostname() */
+
 #include <config.h>
 #include "util.h"
-#include "window.h"
+#include "window-private.h"
 #include "errors.h"
 #include "workspace.h"

@@ -144,7 +147,8 @@ search_and_destroy_window (int    pid,
   * kill the window.
   */
  GSList *tmp;
-  gboolean found;
+  gboolean found = FALSE;
+  GSList *windows;

  if (xwindow == None)
    {
@@ -153,39 +157,31 @@ search_and_destroy_window (int    pid,
      return;
    }

-  found = FALSE;
-  tmp = meta_displays_list ();
+  windows = meta_display_list_windows (meta_get_display ());
+  tmp = windows;
+
  while (tmp != NULL)
    {
-      GSList *windows = meta_display_list_windows (tmp->data);
-      GSList *tmp2;
+      MetaWindow *w = tmp->data;

-      tmp2 = windows;
-      while (tmp2 != NULL)
+      if (w->dialog_pid == pid)
        {
-          MetaWindow *w = tmp2->data;
-
-          if (w->dialog_pid == pid)
+          if (w->xwindow != xwindow)
+            meta_topic (META_DEBUG_PING,
+                        "Dialog pid matches but not xwindow (0x%lx vs. 0x%lx)\n",
+                        w->xwindow, xwindow);
+          else
            {
-              if (w->xwindow != xwindow)
-                meta_topic (META_DEBUG_PING,
-                            "Dialog pid matches but not xwindow (0x%lx vs. 0x%lx)\n",
-                            w->xwindow, xwindow);
-              else
-                {
-                  meta_window_kill (w);
-                  found = TRUE;
-                }
+              meta_window_kill (w);
+              found = TRUE;
            }
-          
-          tmp2 = tmp2->next;
        }
-
-      g_slist_free (windows);
-      
+          
      tmp = tmp->next;
    }

+  g_slist_free (windows);
+  
  if (!found)
    meta_topic (META_DEBUG_PING,
                "Did not find a window with dialog pid %d xwindow 0x%lx\n",
@@ -199,40 +195,30 @@ release_window_with_fd (int fd)
   * double check that it matches "xwindow", then
   * kill the window.
   */
-  GSList *tmp;
-  gboolean found;
-
-  found = FALSE;
+  gboolean found = FALSE;
  
-  tmp = meta_displays_list ();
+  GSList *windows = meta_display_list_windows (meta_get_display ());
+  GSList *tmp = windows;
+
  while (tmp != NULL)
    {
-      GSList *windows = meta_display_list_windows (tmp->data);
-      GSList *tmp2;
+      MetaWindow *w = tmp->data;

-      tmp2 = windows;
-      while (tmp2 != NULL)
+      if (w->dialog_pid >= 0 &&
+          w->dialog_pipe == fd)
        {
-          MetaWindow *w = tmp2->data;
-
-          if (w->dialog_pid >= 0 &&
-              w->dialog_pipe == fd)
-            {
-              meta_topic (META_DEBUG_PING,
-                          "Removing dialog with fd %d pid %d from window %s\n",
-                          fd, w->dialog_pid, w->desc);
-              meta_window_free_delete_dialog (w);
-              found = TRUE;
-            }
-          
-          tmp2 = tmp2->next;
+          meta_topic (META_DEBUG_PING,
+                      "Removing dialog with fd %d pid %d from window %s\n",
+                      fd, w->dialog_pid, w->desc);
+          meta_window_free_delete_dialog (w);
+          found = TRUE;
        }
-
-      g_slist_free (windows);
-      
+       
      tmp = tmp->next;
    }

+  g_slist_free (windows);
+      
  if (!found)
    meta_topic (META_DEBUG_PING,
                "Did not find a window with a dialog pipe %d\n",
@@ -251,7 +237,7 @@ io_from_ping_dialog (GIOChannel   *channel,
  if (condition & G_IO_IN)
    {
      char *str;
-      unsigned int len;
+      gsize len;
      GError *err;

      /* Go ahead and block for all data from child */
@@ -270,7 +256,7 @@ io_from_ping_dialog (GIOChannel   *channel,
        }

      meta_topic (META_DEBUG_PING,
-                  "Read %d bytes strlen %d \"%s\" from child\n",
+                  "Read %" G_GSIZE_FORMAT " bytes strlen %d \"%s\" from child\n",
                  len, str ? (int) strlen (str) : 0, str ? str : "NULL");
      
      if (len > 0)
@@ -379,7 +365,7 @@ meta_window_delete (MetaWindow  *window,
                  "Deleting %s with delete_window request\n",
                  window->desc);
      meta_window_send_icccm_message (window,
-                                      window->display->atom_wm_delete_window,
+                                      window->display->atom_WM_DELETE_WINDOW,
                                      timestamp);
    }
  else
@@ -505,7 +491,7 @@ meta_window_present_delete_dialog (MetaWindow *window, guint32 timestamp)

          if (w->xtransient_for == window->xwindow &&
              w->res_class &&
-              g_strcasecmp (w->res_class, "metacity-dialog") == 0)
+              g_ascii_strcasecmp (w->res_class, "metacity-dialog") == 0)
            {
              meta_window_activate (w, timestamp);
              break;
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -24,8 +24,8 @@
 * 02111-1307, USA.
 */

-#ifndef META_DISPLAY_H
-#define META_DISPLAY_H
+#ifndef META_DISPLAY_PRIVATE_H
+#define META_DISPLAY_PRIVATE_H

 #ifndef PACKAGE
 #error "config.h not included"
@@ -36,6 +36,8 @@
 #include "eventqueue.h"
 #include "common.h"
 #include "boxes.h"
+#include "display.h"
+#include "keybindings-private.h"

 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
@@ -45,19 +47,9 @@
 #include <X11/extensions/sync.h>
 #endif

-#define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0)
-
-typedef struct _MetaCompositor  MetaCompositor;
-typedef struct _MetaDisplay    MetaDisplay;
-typedef struct _MetaFrame      MetaFrame;
-typedef struct _MetaKeyBinding MetaKeyBinding;
-typedef struct _MetaScreen     MetaScreen;
 typedef struct _MetaStack      MetaStack;
 typedef struct _MetaUISlave    MetaUISlave;
-typedef struct _MetaWindow     MetaWindow;
-typedef struct _MetaWorkspace  MetaWorkspace;

-typedef struct _MetaWindowPropHooks MetaWindowPropHooks;
 typedef struct _MetaGroupPropHooks  MetaGroupPropHooks;

 typedef struct MetaEdgeResistanceData MetaEdgeResistanceData;
@@ -81,109 +73,20 @@ typedef void (* MetaWindowPingFunc) (MetaDisplay *display,

 struct _MetaDisplay
 {
+  GObject parent_instance;
+  
  char *name;
  Display *xdisplay;

  Window leader_window;
  Window timestamp_pinging_window;
  
-  Atom atom_net_wm_name;
-  Atom atom_wm_protocols;
-  Atom atom_wm_take_focus;
-  Atom atom_wm_delete_window;
-  Atom atom_wm_state;
-  Atom atom_net_close_window;
-  Atom atom_net_wm_state;
-  Atom atom_motif_wm_hints;
-  Atom atom_net_wm_state_shaded;
-  Atom atom_net_wm_state_maximized_horz;
-  Atom atom_net_wm_state_maximized_vert;
-  Atom atom_net_wm_desktop;
-  Atom atom_net_number_of_desktops;
-  Atom atom_wm_change_state;
-  Atom atom_sm_client_id;
-  Atom atom_wm_client_leader;
-  Atom atom_wm_window_role;
-  Atom atom_net_current_desktop;
-  Atom atom_net_supporting_wm_check;
-  Atom atom_net_supported;
-  Atom atom_net_wm_window_type;
-  Atom atom_net_wm_window_type_desktop;
-  Atom atom_net_wm_window_type_dock;
-  Atom atom_net_wm_window_type_toolbar;
-  Atom atom_net_wm_window_type_menu;
-  Atom atom_net_wm_window_type_dialog;
-  Atom atom_net_wm_window_type_normal;
-  Atom atom_net_wm_state_modal;
-  Atom atom_net_client_list;
-  Atom atom_net_client_list_stacking;
-  Atom atom_net_wm_state_skip_taskbar;
-  Atom atom_net_wm_state_skip_pager;
-  Atom atom_net_wm_icon_name;
-  Atom atom_net_wm_icon;
-  Atom atom_net_wm_icon_geometry;
-  Atom atom_utf8_string;
-  Atom atom_wm_icon_size;
-  Atom atom_kwm_win_icon;
-  Atom atom_net_wm_moveresize;
-  Atom atom_net_active_window;
-  Atom atom_metacity_restart_message;
-  Atom atom_net_wm_strut;
-  Atom atom_metacity_reload_theme_message;
-  Atom atom_metacity_set_keybindings_message;
-  Atom atom_net_wm_state_hidden;
-  Atom atom_net_wm_window_type_utility;
-  Atom atom_net_wm_window_type_splash;
-  Atom atom_net_wm_ping;
-  Atom atom_net_wm_pid;
-  Atom atom_wm_client_machine;
-  Atom atom_net_wm_state_fullscreen;
-  Atom atom_net_workarea;
-  Atom atom_net_showing_desktop;
-  Atom atom_net_desktop_layout;
-  Atom atom_manager;
-  Atom atom_targets;
-  Atom atom_multiple;
-  Atom atom_timestamp;
-  Atom atom_version;
-  Atom atom_atom_pair;
-  Atom atom_net_desktop_names;
-  Atom atom_net_wm_allowed_actions;
-  Atom atom_net_wm_action_move;
-  Atom atom_net_wm_action_resize;
-  Atom atom_net_wm_action_fullscreen;
-  Atom atom_net_wm_action_minimize;
-  Atom atom_net_wm_action_shade;
-  Atom atom_net_wm_action_stick;
-  Atom atom_net_wm_action_maximize_horz;
-  Atom atom_net_wm_action_maximize_vert;
-  Atom atom_net_wm_action_change_desktop;
-  Atom atom_net_wm_action_close;
-  Atom atom_net_wm_action_above;
-  Atom atom_net_wm_action_below;
-  Atom atom_net_wm_state_above;
-  Atom atom_net_wm_state_below;
-  Atom atom_net_startup_id;
-  Atom atom_metacity_toggle_verbose;
-  Atom atom_net_wm_sync_request;
-  Atom atom_net_wm_sync_request_counter;
-  Atom atom_gnome_panel_action;
-  Atom atom_gnome_panel_action_main_menu;
-  Atom atom_gnome_panel_action_run_dialog;
-  Atom atom_metacity_sentinel;
-  Atom atom_net_wm_strut_partial;
-  Atom atom_net_frame_extents;
-  Atom atom_net_request_frame_extents;
-  Atom atom_net_wm_user_time;
-  Atom atom_net_wm_state_demands_attention;
-  Atom atom_net_restack_window;
-  Atom atom_net_moveresize_window;
-  Atom atom_net_desktop_geometry;
-  Atom atom_net_desktop_viewport;
-  Atom atom_metacity_version;
-  Atom atom_net_wm_visible_name;
-  Atom atom_net_wm_visible_icon_name;
-  Atom atom_net_wm_user_time_window;
+  /* Pull in all the names of atoms as fields; we will intern them when the
+   * class is constructed.
+   */
+#define item(x)  Atom atom_##x;
+#include "atomnames.h"
+#undef item

  /* This is the actual window from focus events,
   * not the one we last set
@@ -298,10 +201,8 @@ struct _MetaDisplay
  int	      grab_resize_timeout_id;

  /* Keybindings stuff */
-  MetaKeyBinding *screen_bindings;
-  int             n_screen_bindings;
-  MetaKeyBinding *window_bindings;
-  int             n_window_bindings;
+  MetaKeyBinding *key_bindings;
+  int             n_key_bindings;
  int             min_keycode;
  int             max_keycode;
  KeySym *keymap;
@@ -331,7 +232,8 @@ struct _MetaDisplay
  MetaWindow *window_with_menu;

  /* Managed by window-props.c */
-  MetaWindowPropHooks *prop_hooks;
+  gpointer *prop_hooks_table;
+  GHashTable *prop_hooks;

  /* Managed by group-props.c */
  MetaGroupPropHooks *group_prop_hooks;
@@ -396,6 +298,11 @@ struct _MetaDisplay
 #endif
 };

+struct _MetaDisplayClass
+{
+  GObjectClass parent_class;
+};
+
 /* Xserver time can wraparound, thus comparing two timestamps needs to take
 * this into account.  Here's a little macro to help out.  If no wraparound
 * has occurred, this is equivalent to
@@ -421,8 +328,6 @@ struct _MetaDisplay
 gboolean      meta_display_open                (void);
 void          meta_display_close               (MetaDisplay *display,
                                                guint32      timestamp);
-MetaScreen*   meta_display_screen_for_root     (MetaDisplay *display,
-                                                Window       xroot);
 MetaScreen*   meta_display_screen_for_x_screen (MetaDisplay *display,
                                                Screen      *screen);
 MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
@@ -459,7 +364,7 @@ gboolean    meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display,
 GSList*     meta_display_list_windows        (MetaDisplay *display);

 MetaDisplay* meta_display_for_x_display  (Display     *xdisplay);
-GSList*      meta_displays_list          (void);
+MetaDisplay* meta_get_display            (void);

 Cursor         meta_display_create_x_cursor (MetaDisplay *display,
                                             MetaCursor   cursor);
@@ -507,9 +412,6 @@ void     meta_display_increment_event_serial (MetaDisplay *display);

 void     meta_display_update_active_window_hint (MetaDisplay *display);

-guint32  meta_display_get_current_time           (MetaDisplay *display);
-guint32  meta_display_get_current_time_roundtrip (MetaDisplay *display);
-
 /* utility goo */
 const char* meta_event_mode_to_string   (int m);
 const char* meta_event_detail_to_string (int d);
@@ -529,36 +431,6 @@ void meta_display_ping_window      (MetaDisplay        *display,
 gboolean meta_display_window_has_pending_pings (MetaDisplay        *display,
 						MetaWindow         *window);

-typedef enum
-{
-  META_TAB_LIST_NORMAL,
-  META_TAB_LIST_DOCKS,
-  META_TAB_LIST_GROUP
-} MetaTabList;
-
-typedef enum
-{
-  META_TAB_SHOW_ICON,      /* Alt-Tab mode */
-  META_TAB_SHOW_INSTANTLY  /* Alt-Esc mode */
-} MetaTabShowType;
-
-GList* meta_display_get_tab_list (MetaDisplay   *display,
-                                  MetaTabList    type,
-                                  MetaScreen    *screen,
-                                  MetaWorkspace *workspace);
-
-MetaWindow* meta_display_get_tab_next (MetaDisplay   *display,
-                                       MetaTabList    type,
-				       MetaScreen    *screen,
-                                       MetaWorkspace *workspace,
-                                       MetaWindow    *window,
-                                       gboolean       backward);
-
-MetaWindow* meta_display_get_tab_current (MetaDisplay   *display,
-                                          MetaTabList    type,
-                                          MetaScreen    *screen,
-                                          MetaWorkspace *workspace);
-
 int meta_resize_gravity_from_grab_op (MetaGrabOp op);

 gboolean meta_grab_op_is_moving   (MetaGrabOp op);
--- a/Show More
+++ b/Show More