2.23.89 release.

svn path=/trunk/; revision=3800
Updated Japanese translation.
2008-08-04 17:41:03 +00:00 · 2008-08-02 01:42:13 +00:00 · 2008-07-29 01:35:18 +00:00 · 2008-07-28 23:27:07 +00:00 · 2008-07-27 03:47:47 +00:00 · 2008-07-25 21:50:12 +00:00
190 changed files with 88290 additions and 62566 deletions
--- a/1205
+++ b/1205
--- a/1297
+++ b/1297
--- a/21
+++ b/21
@@ -42,18 +42,17 @@ Minimal Building/Testing Environment
  build a development version of Metacity -- odds are, you may be able
  to build metacity from CVS without building any other modules.

-  As long as you have gtk+ >= 2.10 with your distro (gtk+ >= 2.6 if
-  you manually revert the change from bug 348633), you should be able
-  to install your distro's development packages (e.g. gtk2-devel,
-  GConf2-devel, startup-notification-devel on Fedora; also, remember
-  to install the gnome-common package which is needed for building cvs
-  versions of Gnome modules like Metacity) as well as the standard
-  development tools (gcc, autoconf, automake, pkg-config, intltool,
-  and libtool) and be ready to build and test Metacity.  Steps to do
-  so:
+  As long as you have gtk+ >= 2.10 and GConf with your distro (gtk+ >=
+  2.6 if you manually revert the change from bug 348633), you should
+  be able to install your distro's development packages
+  (e.g. gtk2-devel, GConf2-devel, startup-notification-devel on
+  Fedora; also, remember to install the gnome-common package which is
+  needed for building cvs versions of Gnome modules like Metacity) as
+  well as the standard development tools (gcc, autoconf, automake,
+  pkg-config, intltool, and libtool) and be ready to build and test
+  Metacity.  Steps to do so:

-  $ cvs -q -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome \
-                  checkout metacity
+  $ svn checkout http://svn.gnome.org/svn/metacity/trunk metacity
  $ cd metacity
  $ ./autogen.sh --prefix /usr
  $ make
--- a/17
+++ b/17
@@ -1,13 +1,20 @@
 Currently active maintainers
 --------------------------------
-Elijah Newren (newren  gmail com)
+
+Elijah Newren
+Email: newren gmail com
+Userid: newren
+
  - Usually won't touch the theme bugs (isn't interested) or the
    compositor (until open source nvidia drivers are up to snuff).
    Tends to be most interested in libwnck/gtk interactions, focus
    issues, constraints problems, and raising/stacking, but works on
    just about anything other than themes and the compositor.

-Thomas Thurman (thomas  thurman org uk)
+Thomas Thurman
+Email: thomas thurman org uk
+Userid: tthurman
+
  - Responsible for all theme bugs and the compositor (thank goodness
    Thomas got involved, eh?).  I'm sure he'll replace this sentence
    with his interests when he reads it.  ;-)
@@ -15,7 +22,10 @@ Thomas Thurman (thomas  thurman org uk)

 Semi-active maintainers
 --------------------------------
-Havoc Pennington (hp  redhat com)
+
+Havoc Pennington
+Email: hp  redhat com
+Userid: hp
  - Original author.  Doesn't patch metacity anymore, but is active in
    answering questions, responding to bugs, providing very helpful
    suggestions and insight, and even assisting with debugging.
@@ -23,6 +33,7 @@ Havoc Pennington (hp  redhat com)

 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/368
+++ b/368
@@ -1,3 +1,371 @@
+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
+=======
+
+Thanks to Michael Meeks and Thomas Thurman for improvements in this version.
+
+  - Only use compositor version if we have a compositor (Thomas) (#514453)
+  - Remove workaround for a problem in an ancient GTK version (Thomas) (#513737)
+  - Compositor efficiency fixes (Michael)
+  - Various tools added (Thomas)
+
+Translations
+  Amitakhya Phukan (as), Rhys Jones (cy), Andre Klapper (de), Takeshi AIHANA (ja),
+  Arangel Angov (mk), Tomasz Dominikowski (pl), Duarte Loreto (pt)
+
+2.21.8
+======
+
+Thanks to Paolo Borelli, Iain Holmes, Havoc Pennington, Christian Persch, Thomas
+Thurman, and Alex R.M. Turner for improvements in this version.
+
+  - Windows on other workspaces which need attention appear in the alt-tab
+    list too (Alex) (#333548)
+  - Remove deprecated function call (Christian) (#512561)
+  - New release script (Thomas)
+  - Made a start at improving the general number of comments (Thomas)
+  - Updated copyright year to 2008, and some other tiny fixes (Thomas)
+  - Don't do anything unusual when the compositor frees a window (Iain)
+  - Mapping windows doesn't mark them as damaged (Iain)
+  - Compositor uses the overlay window and not the root window (Iain)
+  - Fixed several list leaks (Paolo)
+  - Fixed warnings about printf formats (Havoc)
+  - Move source files into subdirectories of the src directory (Havoc)
+
+Translations
+  Khaled Hosny (ar), Ihar Hrachyshka (be@latin), Petr Kovar (cs), Andre
+  Klapper (de), Jorge González (es), Iñaki Larrañaga Murgoitio (eu), Seán de
+  Búrca (ga), Yuval Tanny (he), Luca Ferretti (it), Takeshi AIHANA (ja), Arangel
+  Angov (mk), sandeep shedmake (mr), Kjartan Maraas (nb), Yannig
+  Marchegay (Kokoyaya) (oc), Daniel Nylander (sv), Theppitak Karoonboonyanan (th),
+  Baris Cicek (tr), Clytie Siddall (vi)
+2.21.5
+======
+
+Thanks to Iain Holmes and Thomas Thurman for improvements in this version.
+This contains the new compositor; downstream maintainers should note that
+its GConf key is initially turned off in src/metacity.schemas.in and consider
+whether to turn it on by default in their packages.
+
+  - merge compositor branch! (Iain) (499081)
+  - print "Subversion" and not "CVS" when building (Thomas)
+
+Translations
+  Jorge González (es), Kjartan Maraas (nb), Daniel Nylander (sv)
+
+2.21.3
+======
+
+Thanks to Matthias Clasen, Martin Meyer, Kjartan Maraas, Thomas Thurman,
+and Lucas Rocha for improvements in this version.
+
+  - remove dead code (pointed out by Kjartan) (501365)
+  - rewrote long key binding description for the sake of
+    the translators (Thomas) (474889)
+  - check for null before adding menu (Matthias) (496054)
+  - let keys which end a grab also begin a grab (Thomas) (112560)
+  - check the right variable in theme sanity check (Martin) (501362)
+  - get session ID from environment if it's not passed in on the command
+    line (Lucas) (498033)
+
+Translations
+  Ihar Hrachyshka (be@latin), Petr Kovar (cs), Jorge González (es),
+  Ignacio Casal Quinteiro (gl), Rodrigo Flores (pt_BR), Pavol Šimo (sk),
+  Matej Urbančič (sl)
+
+2.21.2
+======
+
+Thanks to Benjamin Gramlich, Thomas Thurman, and Peter Bloomfield
+for improvements in this release.
+
+ - Theme parser is compliant to XDG Base Directory Specification
+   in searching for theme files. (Benjamin) (#480026)
+ - Some source files which didn't get used were removed (Thomas)
+   (#496947)
+ - Fullscreen and maximise windows don't try to save their position
+   (Peter) (#461927)
+
+Translations
+  Matej Urbančič (sl)
+
+2.21.1
+======
+
+Thanks to Elijah Newren, Alex R.M. Turner, Peter Bloomfield, Iain Holmes,
+Jans Granseuer, Federico Mena Quintero and Thomas Thurman for improvements
+in this release.
+
+ - Add --sync option, like all other GTK apps (Iain)
+ - Don't save window's position if it's maximised (Peter) (#461927)
+ - Memory leak fix in preview (Jans) (#469682)
+ - Truncate tab popup string correctly, and refactor function (Alex)
+ - Windows which pop up under always-on-top windows don't get the
+   focus, but do get the "needs attention" hint (Thomas) (#486445)
+ - Fix error in function call which caused focus problems (Federico)
+   (partial fix of #488468)
+
+Translations
+  Djihed Afifi (ar), Metin Amiroff (az), Alexander Shopov (bg),
+  Jordi Mallach (ca), David Lodge (en_GB), Jorge González (es),
+  Iñaki Larrañaga Murgoitio (eu), Vincent Untz (fr), Alastair McKinstry (ga),
+  Ankit Patel (gu), Rajesh Ranjan (hi), auto (hr), Changwoo Ryu (ko),
+  Raivis Dejus (lv), Wouter Bolsterlee (nl), Gora Mohanty (or),
+  ASB (pa), wadim dziedzic (pl), Duarte Loreto (pt),
+  Og Maciel (pt_BR), Peter Tuhársky (sk), Matej Urbančič (sl),
+  Daniel Nylander (sv), Maxim Dziumanenko (uk), Funda Wang (zh_CN)
+
+2.20.0
+======
+
+Thanks to Alexey Rusakov for the fix in this release.
+
+ - prevent a crash on logout with metacity subsequently not being
+   restored in future sessions (Alexey) [#433253]
+
+Translations
+  Khaled Hosny (ar), Ihar Hrachyshka (be@latin), Ask Hjorth Larsen (da),
+  Adam Weinberger (en_CA), Iñaki Larrañaga Murgoitio (eu), Ilkka
+  Tuohela (fi), Vincent Untz (fr), Ankit Patel (gu), Gabor Kelemen (hu),
+  Luca Ferretti (it), Takeshi AIHANA (ja), Žygimantas Beručka (lt), Jovan
+  Naumovski (mk), Ani Peter (ml), Og Maciel (pt_BR), Duarte Loreto (pt),
+  Mugurel Tudor (ro), Nickolay V. Shmyrev (ru), Peter Tuhársky (sk), Горан
+  Ракић (sr), Daniel Nylander (sv), Dr.T.Vasudevan (ta), Maxim
+  Dziumanenko (uk), Clytie Siddall (vi)
+
+2.19.55
+=======
+
+Thanks to Frederic Crozat, Matthias Clasen, and Thomas Thurman for improvements
+in this release.
+
+ - Noninteger auto-raise delay is not assumed to be zero (Thomas) (#377491)
+ - Fix mangled window title in "Force Quit" (Frederic) (#462734)
+ - "Close" can appear at any point in the window menu, and now appears
+   at the bottom (Thomas) (#104026)
+ - Windows which are always on top have "stick" insensitive (Thomas) (#460997)
+ - All bitfields in window structure are together for optimisation (Thomas)
+   (#450271)
+ - Use the correct directory when installing keybindings (Matthias) (#454055)
+
+Translations
+  Alexander Shopov (bg), Jorge González (es), Iñaki Larrañaga Murgoitio (eu),
+  Ilkka Tuohela (fi), Theppitak Karoonboonyanan (th)
+
 2.19.34
 =======

--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

 PKG_NAME="metacity"
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.10

 (test -f $srcdir/configure.in \
  && test -d $srcdir/src) || {
--- a/configure.in
+++ b/configure.in
@@ -1,17 +1,17 @@
 AC_PREREQ(2.50)

 m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [19])
+m4_define([metacity_minor_version], [23])
 # 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], [34])
+m4_define([metacity_micro_version], [89])

 m4_define([metacity_version],
          [metacity_major_version.metacity_minor_version.metacity_micro_version])
 AC_INIT([metacity], [metacity_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])

-AC_CONFIG_SRCDIR(src/display.c)
+AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)

 AM_INIT_AUTOMAKE
@@ -120,7 +120,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)

@@ -176,6 +176,10 @@ else
   AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
 fi

+# Unconditionally use this dir to avoid a circular dep with gnomecc
+GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
+AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
+
 STARTUP_NOTIFICATION_VERSION=0.7
 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
@@ -219,15 +223,15 @@ if test x$enable_compositor = xyes; then
   have_xcomposite=yes
   echo "CompositeExt support forced on"
 elif test x$enable_compositor = xauto; then
-   echo "Not building compositing manager by default now, must enable explicitly to get it."
-   have_xcomposite=no
+   echo "Building compositing manager by default now."
+   have_xcomposite=yes
 else
   have_xcomposite=no
 fi

 if test x$have_xcomposite = xyes; then
  echo "Building with CompositeExt"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage cm"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])

  ## force on render also
@@ -422,7 +426,7 @@ case "$METACITY_LIBS" in
 *)
  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
@@ -455,12 +459,6 @@ fi

 AC_SUBST(GDK_PIXBUF_CSOURCE)

-## hack to work with old GTK versions for now 
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$METACITY_LIBS $LDFLAGS"
-AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream)
-LDFLAGS=$save_LDFLAGS
-
 if test x$enable_gconf = xyes; then 
   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
   if test x"$GCONFTOOL" = xno; then
@@ -473,6 +471,12 @@ else
  GCONF_SCHEMAS_INSTALL_FALSE=
 fi

+AC_ARG_ENABLE(debug,
+	[  --enable-debug		enable debugging],,
+	enable_debug=no)
+if test "x$enable_debug" = "xyes"; then
+	CFLAGS="$CFLAGS -g -O -Wall"
+fi
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
@@ -528,7 +532,7 @@ if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
   stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
   echo "This is the UNSTABLE branch of metacity"
   echo -n "Use 2.$stable_version.x for stable "
-   echo    "(gnome-2-$stable_version branch in CVS)"
+   echo    "(gnome-2-$stable_version branch in Subversion)"
 else
   echo "This is the stable branch of metacity"
 fi
--- a/metacity.doap
+++ b/metacity.doap
@@ -0,0 +1,71 @@
+<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">
+A simple GTK+ window manager that tries not to get in your way.
+</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/trunk" />
+     <browse rdf:resource="http://svn.gnome.org/viewvc/metacity/" />
+   </SVNRepository>
+ </repository> 
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Havoc Pennington</foaf:name>
+  </foaf:Person>
+ </maintainer>
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Elijah Newren</foaf:name>
+  </foaf:Person>
+ </maintainer>
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Thomas Thurman</foaf:name>
+  </foaf:Person>
+ </maintainer>
+
+ <!-- Releases would go here, but there have been dozens.
+      Maybe another time.
+   -->
+
+</Project>
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,598 @@
+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.
+
+2008-02-09  Hendrik Brandt  <heb@gnome-de.org>
+	
+	* de.po: Updated German translation.
+
+2008-02-07  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2008-02-05  Rhys Jones <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2008-02-03  Amitakhya Phukan <amitakhya@svn.gnome.org>
+
+	* LINGUAS: Added as to LINGUAS.
+	* as.po: Updated assamese translations.
+
+2008-02-03  Arangel Angov <arangel@linux.net.mk>
+
+	* mk.po: Updated Macedonian translation.
+
+2008-02-03  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2008-02-02  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-02-01  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-01-31  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-01-30  Rahul Bhalerao <b.rahul.pm@gmail.com>
+	
+	* mr.po: Updated Marathi translations by Sandeep Shedmake.
+
+2008-01-27  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Fixed typo in Turkish translation.
+
+2008-01-25  Petr Kovar <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2008-01-22  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Sync "beep" translation.
+
+2008-01-15  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-01-14  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-01-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-01-13  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-01-09  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2008-01-06  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2008-01-05  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2007-12-31  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
+2007-12-31  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2007-12-22  Seán de Búrca  <sdeburca@svn.gnome.org>
+
+	* ga.po: Updated Irish translation.
+
+2007-12-22  Seán de Búrca  <sdeburca@svn.gnome.org>
+
+	* POTFILES.in: Remove dead files.
+
+2007-12-20  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Rearrange after stuff moved around.
+	* nb.po: Update
+
+2007-12-19  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2007-12-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2007-12-17  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2007-12-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation, fixes bug #500562 and bug #500831
+
+2007-12-10  Matej Urbančič  <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian Translation.
+
+2007-12-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* 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
+
+2007-12-08  Jakub Friedl  <jfriedl@suse.cz>
+
+	* cs.po: Czech Translation updated by Petr Kovar.
+
+2007-12-08  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2007-12-08  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
+
+	* pt_BR.po: Fixes in Brazilian Portuguese translation by Luiz Armesto.
+
+2007-12-07  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
+
+	* pt_BR.po: Fixed attributes in Brazilian Portuguese translation by
+	Rodrigo Flores.
+
+2007-12-02  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation by Pavol Šimo.
+
+2007-11-28  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2007-11-12  Matej Urbančič <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian translation.
+
+2007-11-08  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2007-11-01  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2007-10-25  Matej Urbančič  <mateju@svn.gnome.org>
+
+	* sl.po: Updated Slovenian translation.
+
+2007-10-23  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2007-10-21  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2007-09-30  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Fixed French translation.
+
+2007-09-27  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2007-09-25  Gil Forcada  <gforcada@svn.gnome.org>
+
+	* ca.po: Fixed a string in Catalan translation thanks to Sílvia Miranda.
+
+2007-09-21  Gil Forcada  <gforcada@svn.gnome.org>
+
+	* ca.po: Updated Catalan translation by Joan Duran.
+
+2007-09-17  Artur Flinta  <aflinta@svn.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2007-09-17  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2007-09-17  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Translation updated by Wouter Bolsterlee.
+
+2007-09-17  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Djihed Afifi.
+
+2007-09-16  Gil Forcada  <gforcada@svn.gnome.org>
+
+	* ca.po: Updated Catalan translation.
+
+2007-09-16  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Translation improved.
+
+2007-09-16  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation
+
+2007-09-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2007-09-15  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Fixed French translation by Vincent Untz and Stéphane
+	Raimbault.
+
+2007-09-15  Andre Klapper  <a9016009@gmx.de>
+
+	* sk.po: Updated Slovak translation on behalf of Peter Tuharsky
+	<tuharsky@misbb.sk>.
+
+2007-09-14  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2007-09-14  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2007-09-13  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2007-09-14 Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2007-09-13  Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
+
+	* be@latin.po: Updated Belarusian Latin translation.
+
+2007-09-12 Maxim Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: Update Ukrainian translation.
+
+2007-09-12  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2007-09-09  Kenneth Nielsen  <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation
+
+2007-09-08  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
+
+	* eu.po: Fixed some typos in Basque translation.
+
+2007-09-05  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Updated Macedonian translation.
+
+2007-09-03  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2007-09-03  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2007-09-03  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Updated Macedonian translation.
+
+2007-09-01  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Updated Macedonian translation.
+
+2007-09-01  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation.
+
+2007-08-30  Ani Peter <peter.ani@gmail.com>
+
+	* ml.po: Updated Malayalam Translation
+
+2007-08-29  I. Felix <ifelix@svn.gnome.org>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2007-08-26  Raphael Higino  <raphaelh@svn.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation
+	by Og Maciel <ogmaciel@ubuntu.com>.
+
+2007-08-15  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2007-08-13  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2007-08-13  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2007-08-11  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2007-08-10  I. Felix <ifelix@svn.gnome.org>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2007-08-10  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2007-08-09  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2007-08-08  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2007-08-07  Jorge Gonzalez <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2007-08-07  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2007-08-06  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2007-08-05  Inaki Laranaga Murgoitio  <dooteo@zundan.com>
+
+	* eu.po: Updated Basque translation.
+
+2007-07-25  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
 2007-07-21 Gabor Kelemen  <kelemeng@gnome.hu>

 	* hu.po: Translation updated.
@@ -32,7 +627,7 @@

 2007-06-25  Jorge Gonzalez <jorgegonz@svn.gnome.org>

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

 2007-06-24  Kjartan Maraas  <kmaraas@gnome.org>

@@ -41,7 +636,7 @@

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

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

 2007-06-16  Funda Wang  <fundawang@gmail.com>

@@ -49,7 +644,7 @@

 2007-06-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>

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

 2007-06-13  Pema Geyleg <pema.geyleg@gmail.com>

@@ -60,10 +655,10 @@
 	* th.po: Updated Thai translation.

 2007-05-09  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.

-2007-05-2  Djihed Afifi <djihed@gmail.com> 
+	* mk.po: Updated Macedonian translation.
+
+2007-05-2  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation by Khaled Hosny.

@@ -87,7 +682,7 @@

 	* sv.po: Updated Swedish translation.

-2007-04-14  Djihed Afifi <djihed@gmail.com> 
+2007-04-14  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation by Khaled Hosny.

@@ -101,7 +696,7 @@

 2007-04-05  Raivis Dejus <orvils@gmail.com>

-        * lv.po: Updated Latvian Translation.
+	* lv.po: Updated Latvian Translation.

 2007-04-02  Alessio Frusciante  <algol@firenze.linux.it>

@@ -255,7 +850,7 @@

 	* et.po: Updated Estonian translation by Ivar Smolin <okul@linux.ee>.

-2007-01-22  Jakub Friedl <jfriedl@suse.cz> 
+2007-01-22  Jakub Friedl <jfriedl@suse.cz>

 	* cs.po: Updated Czech translation.

@@ -263,7 +858,7 @@

 	* de.po: Updated German translation.

-2007-01-15  Djihed Afifi <djihed@gmail.com> 
+2007-01-15  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation by Khaled Hosny.

@@ -271,11 +866,11 @@

 	* sv.po: Updated Swedish translation.

-2007-01-05  Jakub Friedl <jfriedl@suse.cz> 
+2007-01-05  Jakub Friedl <jfriedl@suse.cz>

 	* cs.po: Updated Czech translation.

-2007-01-3  Djihed Afifi <djihed@gmail.com> 
+2007-01-3  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation by Djihed Afifi.

@@ -291,11 +886,11 @@

 	* th.po: Updated Thai translation.

-2006-12-27  Djihed Afifi <djihed@gmail.com> 
+2006-12-27  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation.

-2006-12-24  Djihed Afifi <djihed@gmail.com> 
+2006-12-24  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation.

@@ -307,7 +902,7 @@

 	* nb.po: Updated Norwegian bokmål translation.

-2006-12-18  Djihed Afifi <djihed@gmail.com> 
+2006-12-18  Djihed Afifi <djihed@gmail.com>

 	* ar.po: Updated Arabic Translation.

@@ -428,7 +1023,7 @@
 2006-09-13  Ilkka Tuohela  <hile@iki.fi>

 	* fi.po: Updated Finnish translation.
-	- concistency fixes with libwnck 
+	- concistency fixes with libwnck

 2006-09-13  Rajesh Ranjan <rajeshkajha@yahoo.com>

@@ -676,7 +1271,7 @@

 2006-04-26  Gora Mohanty  <gmohanty@cvs.gnome.org>

-        * lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>
+	* lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>

 2006-04-21  Theppitak Karoonboonyanan  <thep@linux.thai.net>

@@ -684,11 +1279,11 @@

 2006-04-20  Ankit Patel  <ankit644@yahoo.com>

-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.

 2006-04-19  Ankit Patel  <ankit644@yahoo.com>

-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.

 2006-04-17  Clytie Siddall <clytie@riverland.net.au>

@@ -877,7 +1472,7 @@

 2006-03-03  Maxim Dziumanenko <mvd@mylinux.ua>

-        * uk.po: Updated Ukrainian translation.
+	* uk.po: Updated Ukrainian translation.

 2006-03-02  Hendrik Richter  <hendrikr@gnome.org>

@@ -1456,7 +2051,7 @@

 	* xh.po: Updated Xhosa translation.

-2005-04-28   Kostas Papadimas <pkst@gnome.org>
+2005-04-28  Kostas Papadimas <pkst@gnome.org>

 	* el.po: Updated Greek translation

@@ -1466,7 +2061,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>

@@ -1636,7 +2231,7 @@

 2005-02-07  David Lodge <dave@cirt.net>

-        * en_GB.po: Updated British translation.
+	* en_GB.po: Updated British translation.

 2005-02-06  Adam Weinberger  <adamw@gnome.org>

@@ -1653,7 +2248,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>

@@ -1846,7 +2441,7 @@

 2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>

-        * or.po: Updated Oriya translation.
+	* or.po: Updated Oriya translation.

 2004-09-12  Paisa Seeluangsawat  <paisa@users.sf.net>

@@ -2042,7 +2637,7 @@

 2004-07-21  Guntupalli Karunakar  <karunakar@freedomink.org>

-        * hi.po: Updated Hindi translation.
+	* hi.po: Updated Hindi translation.

 2004-07-14  Christian Rose  <menthos@menthos.com>

@@ -2115,8 +2710,8 @@

 2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>

-        * gu.po: Added Gujurati translation by
-        Gujarati Team <magnet@magnet-i.com>.
+	* gu.po: Added Gujurati translation by
+	Gujarati Team <magnet@magnet-i.com>.

 2004-04-06  Mohammad DAMT  <mdamt@bisnisweb.com>

@@ -2136,8 +2731,8 @@

 2004-03-24  Guntupalli Karunakar  <karunakar@freedomink.org>

-        * pa.po: Added Punjabi translation by
-        Jaswinder Singh Phulewala <jaswinderlinux@netscape.net>.
+	* pa.po: Added Punjabi translation by
+	Jaswinder Singh Phulewala <jaswinderlinux@netscape.net>.

 2004-03-20  Mugurel Tudor  <mugurelu@go.ro>

@@ -2268,7 +2863,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>

@@ -2426,14 +3021,14 @@

 	* da.po: Updated Danish translation.

-2003-11-26   Vincent van Adrighem  <adrighem@gnome.org>
+2003-11-26  Vincent van Adrighem  <adrighem@gnome.org>

 	* nl.po: Dutch translation updated by Vincent van Adrighem.

 2003-11-10  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>

-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.

 2003-11-08  Danilo Šegan  <dsegan@gmx.net>

@@ -2565,8 +3160,8 @@

 2003-08-27  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>

-        * es.po: Revision of Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Revision of Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.

 2003-08-26  Guntupalli Karunakar  <karunakar@freedomink.org>

@@ -2587,7 +3182,7 @@

 2003-08-22  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>

-        * sk.po: Update Slovak translation.
+	* sk.po: Update Slovak translation.

 2003-08-20  Kjartan Maraas  <kmaraas@gnome.org>

@@ -2637,7 +3232,7 @@

 2003-08-06  Metin Amiroff  <metin@karegen.com>

-        * az.po: Updated Azerbaijani translation.
+	* az.po: Updated Azerbaijani translation.

 2003-08-05  Ole Laursen  <olau@hardworking.dk>

@@ -2645,7 +3240,7 @@

 2003-08-05  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>

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

 2003-07-29  Andras Timar  <timar@gnome.hu>

@@ -2670,7 +3265,7 @@

 2003-07-18  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation.
+	* pt.po: Updated Portuguese translation.

 2002-07-17  Kostas Papadimas <pkst@gmx.net>

@@ -2781,7 +3376,7 @@

 2003-05-30  Paul Duffy <dubhthach@frink.nuigalway.ie>

-        * ga.po: Updated Irish Translation.
+	* ga.po: Updated Irish Translation.

 2003-05-30  Abel Cheung  <maddog@linux.org.hk>

@@ -2789,7 +3384,7 @@

 2003-05-26  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation.
+	* pt.po: Updated Portuguese translation.

 2003-05-21  Miloslav Trmac  <mitr@volny.cz>

@@ -2819,7 +3414,7 @@

 2003-05-12  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation.
+	* pt.po: Updated Portuguese translation.

 2003-05-10  KAMAGASAKO Masatoshi  <emerald@gnome.gr.jp>

@@ -2831,7 +3426,7 @@

 2003-05-09  Evandro Fernandes Giovanini <evandrofg@ig.com.br>

-        * pt_BR.po: Updated Brazilian Portuguese translation.
+	* pt_BR.po: Updated Brazilian Portuguese translation.

 2003-05-08  Christian Rose  <menthos@menthos.com>

@@ -2870,7 +3465,7 @@

 2003-03-11  Paul Duffy <dubhthach@zion.nuigalway.ie>

-        * ga.po: Added Irish translation
+	* ga.po: Added Irish translation

 2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>

@@ -2935,8 +3530,8 @@

 2003-01-23  He Qiangqiang  <carton@linux.net.cn>

-        * zh_CN.po: Updated Simplified Chinese translation by
-        Xiong Jiang <jxiong@offtopic.org>.
+	* zh_CN.po: Updated Simplified Chinese translation by
+	Xiong Jiang <jxiong@offtopic.org>.

 2003-01-23  Dmitry G. Mastrukov  <dmitry@taurussoft.org>

@@ -3792,7 +4387,7 @@

 2002-05-06  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation and converted to UTF-8.
+	* pt.po: Updated Portuguese translation and converted to UTF-8.

 2002-04-26  Zbigniew Chyla  <cyba@gnome.pl>

@@ -3862,7 +4457,7 @@

 2002-02-11  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation.
+	* pt.po: Updated Portuguese translation.

 2002-02-10  Hasbullah Bin Pit <sebol@ikhlas.com>

@@ -3923,7 +4518,7 @@

 2002-01-08  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation.
+	* pt.po: Updated Portuguese translation.

 2002-01-06  Fatih Demir <kabalak@gtranslator.org>

@@ -3936,7 +4531,7 @@

 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Added portuguese translation
+	* pt.po: Added portuguese translation

 2001-12-27  Jesus Bravo Alvarez  <jba@pobox.com>

@@ -3970,11 +4565,11 @@

 2001-10-29  Yuriy Syrota <rasta@renome.rovno.ua>

-        * uk.po: Added Ukrainian translation file.
+	* uk.po: Added Ukrainian translation file.

 2001-10-28  HÃ¯Â¿Åtor GarcÃ¯Â¿Å Ã¯Â¿Åvarez <hector@scouts-es.org>

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

 2001-10-14  HÃ¯Â¿Åtor GarcÃ¯Â¿Å Ã¯Â¿Åvarez <hector@scouts-es.org>

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,6 +2,7 @@
 #
 am
 ar
+as
 az
 be
 be@latin
@@ -37,6 +38,7 @@ is
 it
 ja
 ka
+kn
 ko
 ku
 lt
@@ -60,6 +62,7 @@ pt_BR
 ro
 ru
 rw
+si
 sk
 sl
 sq
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,28 +2,28 @@
 # Please keep this file sorted alphabetically.
 src/50-metacity-desktop-key.xml.in
 src/50-metacity-key.xml.in
-src/tools/metacity-message.c
-src/core.c
-src/delete.c
-src/display.c
-src/errors.c
-src/frames.c
-src/keybindings.c
-src/main.c
-src/menu.c
-src/metaaccellabel.c
-src/metacity-dialog.c
+src/core/core.c
+src/core/delete.c
+src/core/display.c
+src/core/errors.c
+src/core/keybindings.c
+src/core/main.c
+src/core/prefs.c
+src/core/screen.c
+src/core/session.c
+src/core/util.c
+src/core/window-props.c
+src/core/window.c
+src/core/xprops.c
 src/metacity.desktop.in
 src/metacity.schemas.in
-src/prefs.c
-src/resizepopup.c
-src/screen.c
-src/session.c
-src/theme-parser.c
-src/theme-viewer.c
-src/theme.c
-src/util.c
-src/window-props.c
-src/window.c
-src/workspace.c
-src/xprops.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-parser.c
+src/ui/theme-viewer.c
+src/ui/theme.c
+src/tools/metacity-message.c
+
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/be@latin.po
+++ b/po/be@latin.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/cy.po
+++ b/po/cy.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/en_CA.po
+++ b/po/en_CA.po
--- a/po/es.po
+++ b/po/es.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/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ka.po
+++ b/po/ka.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/mk.po
+++ b/po/mk.po
--- a/po/ml.po
+++ b/po/ml.po
--- a/po/mr.po
+++ b/po/mr.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/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/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/si.po
+++ b/po/si.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.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/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/Makefile.am
+++ b/src/Makefile.am
@@ -2,136 +2,139 @@ lib_LTLIBRARIES = libmetacity-private.la

 SUBDIRS=wm-tester tools themes

-INCLUDES=@METACITY_CFLAGS@ -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
+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

 metacity_SOURCES= 				\
-	async-getprop.c				\
-	async-getprop.h				\
-	bell.h					\
-	bell.c					\
-	boxes.h					\
-	boxes.c					\
-	common.h				\
-	c-screen.c				\
-	c-screen.h				\
-	c-window.c				\
-	c-window.h				\
-	compositor.c				\
-	compositor.h				\
-	constraints.c				\
-	constraints.h				\
-	core.c					\
-	core.h					\
-	delete.c				\
-	display.c				\
-	display.h				\
-	draw-workspace.c			\
-	draw-workspace.h			\
-	edge-resistance.c			\
-	edge-resistance.h			\
-	effects.c				\
-	effects.h				\
-	errors.c				\
-	errors.h				\
-	eventqueue.c				\
-	eventqueue.h				\
-	fixedtip.c				\
-	fixedtip.h				\
-	frame.c					\
-	frame.h					\
-	frames.c				\
-	frames.h				\
-	gradient.c				\
-	gradient.h				\
-	group.c					\
-	group.h					\
-	group-private.h				\
-	group-props.c				\
-	group-props.h				\
-	iconcache.c				\
-	iconcache.h				\
+	core/async-getprop.c			\
+	core/async-getprop.h			\
+	core/atomnames.h                        \
+	core/bell.c				\
+	core/bell.h				\
+	core/boxes.c				\
+	include/boxes.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-private.h			\
+	include/display.h			\
+	ui/draw-workspace.c			\
+	ui/draw-workspace.h			\
+	core/edge-resistance.c			\
+	core/edge-resistance.h			\
+	core/effects.c				\
+	core/effects.h				\
+	core/errors.c				\
+	include/errors.h			\
+	core/eventqueue.c			\
+	core/eventqueue.h			\
+	core/frame.c				\
+	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				\
+	core/iconcache.c			\
+	core/iconcache.h			\
+	core/keybindings.c			\
+	core/keybindings.h			\
+	core/main.c				\
+	include/main.h				\
+	core/metacity-Xatomtype.h		\
+	core/place.c				\
+	core/place.h				\
+	core/prefs.c				\
+	include/prefs.h				\
+	core/screen.c				\
+	core/screen-private.h			\
+	include/screen.h			\
+	include/types.h                         \
+	core/session.c				\
+	core/session.h				\
+	core/stack.c				\
+	core/stack.h				\
+	core/util.c				\
+	include/util.h				\
+	core/window-props.c			\
+	core/window-props.h			\
+	core/window.c				\
+	core/window-private.h			\
+	include/window.h			\
+	core/workspace.c			\
+	core/workspace.h			\
+	core/xprops.c				\
+	include/xprops.h			\
+	include/common.h			\
+	include/core.h				\
+	include/ui.h				\
 	inlinepixbufs.h				\
-	keybindings.c				\
-	keybindings.h				\
-	main.c					\
-	main.h					\
-	menu.c					\
-	menu.h					\
-	metaaccellabel.c			\
-	metaaccellabel.h			\
-	metacity-Xatomtype.h			\
-	place.c					\
-	place.h					\
-	prefs.c					\
-	prefs.h					\
-	resizepopup.c				\
-	resizepopup.h				\
-	screen.c				\
-	screen.h				\
-	session.c				\
-	session.h				\
-	spring-model.c				\
-	spring-model.h				\
-	stack.c					\
-	stack.h					\
-	tabpopup.c				\
-	tabpopup.h				\
-	theme.c					\
-	theme.h					\
-	theme-parser.c				\
-	theme-parser.h				\
-	themewidget.c				\
-	themewidget.h				\
-	ui.c					\
-	ui.h					\
-	util.c					\
-	util.h					\
-	window.c				\
-	window.h				\
-	window-props.c				\
-	window-props.h				\
-	workspace.c				\
-	workspace.h				\
-	xprops.c				\
-	xprops.h
+	ui/fixedtip.c				\
+	ui/fixedtip.h				\
+	ui/frames.c				\
+	ui/frames.h				\
+	ui/menu.c				\
+	ui/menu.h				\
+	ui/metaaccellabel.c			\
+	ui/metaaccellabel.h			\
+	ui/resizepopup.c			\
+	include/resizepopup.h			\
+	ui/tabpopup.c				\
+	include/tabpopup.h				\
+	ui/theme-parser.c			\
+	ui/theme-parser.h			\
+	ui/theme.c				\
+	ui/theme.h				\
+	ui/themewidget.c			\
+	ui/themewidget.h			\
+	ui/ui.c

 # by setting libmetacity_private_la_CFLAGS, the files shared with
 # metacity proper will be compiled with different names.
 libmetacity_private_la_CFLAGS =
-libmetacity_private_la_SOURCES=	\
-	boxes.c			\
-	boxes.h			\
-	gradient.c		\
-	gradient.h		\
-	preview-widget.c	\
-	preview-widget.h	\
-	theme.c			\
-	theme.h			\
-	theme-parser.c		\
-	theme-parser.h		\
-	util.c			\
-	util.h			\
-	common.h
+libmetacity_private_la_SOURCES=			\
+	core/boxes.c				\
+	include/boxes.h				\
+	ui/gradient.c				\
+	ui/gradient.h				\
+	core/util.c				\
+	include/util.h				\
+	include/common.h			\
+	ui/preview-widget.c			\
+	ui/preview-widget.h			\
+	ui/theme-parser.c			\
+	ui/theme-parser.h			\
+	ui/theme.c				\
+	ui/theme.h

 libmetacity_private_la_LDFLAGS = -no-undefined
 libmetacity_private_la_LIBADD  = @METACITY_LIBS@

 libmetacityincludedir = $(includedir)/metacity-1/metacity-private

-libmetacityinclude_HEADERS =	\
-	boxes.h			\
-	common.h		\
-	gradient.h		\
-	preview-widget.h	\
-	theme.h			\
-	theme-parser.h		\
-	util.h
+libmetacityinclude_HEADERS =			\
+	include/boxes.h				\
+	ui/gradient.h				\
+	include/util.h				\
+	include/common.h			\
+	ui/preview-widget.h			\
+	ui/theme-parser.h			\
+	ui/theme.h

 metacity_theme_viewer_SOURCES=  \
-	theme-viewer.c
+	ui/theme-viewer.c

 metacity_dialog_SOURCES= 	\
-	metacity-dialog.c
+	ui/metacity-dialog.c

 bin_PROGRAMS=metacity metacity-theme-viewer
 libexec_PROGRAMS=metacity-dialog
@@ -141,9 +144,9 @@ metacity_LDADD=@METACITY_LIBS@ $(EFENCE)
 metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
 metacity_dialog_LDADD=@METACITY_LIBS@

-testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c
-testgradient_SOURCES=gradient.h gradient.c testgradient.c
-testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c
+testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
+testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
+testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c

 noinst_PROGRAMS=testboxes testgradient testasyncgetprop

@@ -155,6 +158,7 @@ desktopfilesdir=$(datadir)/gnome/wm-properties
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
+
@INTLTOOL_DESKTOP_RULE@

 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -163,7 +167,7 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)

@INTLTOOL_XML_NOMERGE_RULE@

-xmldir       = $(datadir)/control-center/keybindings
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)

@@ -186,7 +190,7 @@ BUILT_SOURCES = inlinepixbufs.h
 CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml

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

 pkgconfigdir = $(libdir)/pkgconfig

--- a/src/api.c
+++ b/src/api.c
@@ -1,55 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity misc. public entry points */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * 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 "api.h"
-#include "display.h"
-#include "colors.h"
-
-PangoContext*
-meta_get_pango_context (Screen                     *xscreen,
-                        const PangoFontDescription *desc)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  g_return_val_if_fail (screen != NULL, NULL);
-
-  return meta_screen_get_pango_context (screen,
-                                        desc,
-                                        /* FIXME, from the frame window */
-                                        PANGO_DIRECTION_LTR);
-}
-
-gulong
-meta_get_x_pixel (Screen *xscreen, const PangoColor *color)
-{
-  MetaScreen *screen;
-
-  screen = meta_screen_for_x_screen (xscreen);
-
-  g_return_val_if_fail (screen != NULL, 0);
-  
-  return meta_screen_get_x_pixel (screen, color);
-}
-
--- a/src/api.h
+++ b/src/api.h
@@ -1,64 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity misc. public entry points */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * 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_API_H
-#define META_API_H
-
-/* don't add any internal headers here; api.h is an installed/public
- * header. Only theme.h is also installed.
- */
-#include <X11/Xlib.h>
-#include <pango/pangox.h>
-
-/* Colors/state stuff matches GTK since we get the info from
- * the GTK UI slave
- */
-typedef struct _MetaUIColors MetaUIColors;
-
-typedef enum
-{
-  META_STATE_NORMAL,
-  META_STATE_ACTIVE,
-  META_STATE_PRELIGHT,
-  META_STATE_SELECTED,
-  META_STATE_INSENSITIVE
-} MetaUIState;
-
-struct _MetaUIColors
-{
-  PangoColor fg[5];
-  PangoColor bg[5];
-  PangoColor light[5];
-  PangoColor dark[5];
-  PangoColor mid[5];
-  PangoColor text[5];
-  PangoColor base[5];
-  PangoColor text_aa[5];
-};
-
-PangoContext*       meta_get_pango_context (Screen                     *xscreen,
-                                            const PangoFontDescription *desc);
-gulong              meta_get_x_pixel       (Screen                     *xscreen,
-                                            const PangoColor           *color);
-
-#endif
--- a/src/c-screen.c
+++ b/src/c-screen.c
@@ -1,677 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* 
- * Copyright (C) 2006 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.
- */
-
-#include <config.h>
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-#include <cm/ws.h>
-#include <cm/stacker.h>
-#include <cm/wsint.h>
-#include <cm/drawable-node.h>
-#include <cm/state.h>
-#include <cm/magnifier.h>
-#include <cm/square.h>
-#include <string.h>
-
-#include "screen.h"
-#include "c-screen.h"
-#include "c-window.h"
-
-struct MetaCompScreen
-{
-  WsDisplay *display;
-  CmStacker *stacker;
-  CmMagnifier *magnifier;
-  
-  WsWindow *gl_window;
-  WsWindow *root_window;
-  
-  WsScreen *screen;
-  MetaScreen *meta_screen;
-  
-  int repaint_id;
-  int idle_id;
-  
-  WsWindow *selection_window;
-
-  GHashTable *windows_by_xid;
-};
-
-static MetaCompWindow *
-meta_comp_window_lookup (MetaCompScreen *info,
-			 Window xid)
-{
-    MetaCompWindow *window;
-    
-    window = g_hash_table_lookup (info->windows_by_xid, (gpointer)xid);
-    
-    return window;
-}
-
-MetaCompWindow *
-meta_comp_screen_lookup_window   (MetaCompScreen *info,
-				  Window          xwindow)
-{
-    return meta_comp_window_lookup (info, xwindow);
-}
-
-#if 0
-static void
-update_frame_counter (void)
-{
-#define BUFSIZE 128
-  static GTimer *timer;
-  static double buffer [BUFSIZE];
-  static int next = 0;
-  
-  if (!timer)
-    timer = g_timer_new ();
-  
-  buffer[next++] = g_timer_elapsed (timer, NULL);
-  
-  if (next == BUFSIZE)
-    {
-      int i;
-      double total;
-      
-      next = 0;
-      
-      total = 0.0;
-      for (i = 1; i < BUFSIZE; ++i)
-	total += buffer[i] - buffer[i - 1];
-      
-      g_print ("frames per second: %f\n", 1 / (total / (BUFSIZE - 1)));
-    }
-}
-#endif
-
-static void
-dump_stacking_order (GList *nodes)
-{
-  GList *list;
-  
-  for (list = nodes; list != NULL; list = list->next)
-    {
-      CmDrawableNode *node = list->data;
-      
-      if (node)
-	g_print ("%lx, ", WS_RESOURCE_XID (node->drawable));
-    }
-  g_print ("\n");
-}
-
-static gboolean
-repaint (gpointer data)
-{
-  MetaCompScreen *info = data;
-  CmState *state;
-#if 0
-  g_print ("repaint\n");
-#endif
-  glViewport (0, 0,
-	      info->meta_screen->rect.width,
-	      info->meta_screen->rect.height);
-  
-  glLoadIdentity();
-  
-#if 0
-  glClearColor (0, 0, 0, 1.0);
-  glClear (GL_COLOR_BUFFER_BIT);
-#endif
-  
-  ws_window_raise (info->gl_window);
-  
-#if 0
-  glDisable (GL_TEXTURE_2D);
-  glDisable (GL_TEXTURE_RECTANGLE_ARB);
-  glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-  glColor4f (0.0, 1.0, 0.0, 1.0);
-  glRectf (-1.0, -1.0, 1.0, 1.0);
-  glFinish();
-#endif
-  
-  state = cm_state_new ();
-  
-  cm_state_disable_depth_buffer_update (state);
-  
-  cm_node_render (CM_NODE (info->magnifier), state);
-  
-  cm_state_enable_depth_buffer_update (state);
-  
-  g_object_unref (state);
-
-  ws_window_gl_swap_buffers (info->gl_window);
-  glFinish();
-  
-#if 0
-  dump_stacking_order (info->stacker->children);
-#endif
-  
-  info->idle_id = 0;
-  return FALSE;
-}
-
-static MetaCompWindow *
-find_comp_window (MetaCompScreen *info,
-		  Window	       xwindow)
-{
-  return meta_comp_window_lookup (info, xwindow);
-}
-
-static CmNode *
-find_node (MetaCompScreen *info,
-	   Window	   xwindow)
-{
-  MetaCompWindow *window = meta_comp_window_lookup (info, xwindow);
-  
-  if (window)
-    return meta_comp_window_get_node (window);
-  
-  return NULL;
-}
-
-static GList *all_screen_infos;
-
-MetaCompScreen *
-meta_comp_screen_get_by_xwindow (Window xwindow)
-{
-  GList *list;
-  
-  for (list = all_screen_infos; list != NULL; list = list->next)
-    {
-      MetaCompScreen *info = list->data;
-      
-      if (find_node (info, xwindow))
-	return info;
-    }
-  
-  return NULL;
-}
-
-MetaCompScreen *
-meta_comp_screen_new (WsDisplay *display,
-		      MetaScreen *screen)
-{
-  MetaCompScreen *scr_info = g_new0 (MetaCompScreen, 1);
-  
-  scr_info->screen = ws_display_get_screen_from_number (
-							display, screen->number);
-  scr_info->root_window = ws_screen_get_root_window (scr_info->screen);
-  scr_info->display = display;
-  scr_info->meta_screen = screen;
-  scr_info->windows_by_xid = g_hash_table_new (g_direct_hash, g_direct_equal);
-  
-  all_screen_infos = g_list_prepend (all_screen_infos, scr_info);
-  
-  return scr_info;
-}
-
-static char *
-make_selection_name (MetaCompScreen *info)
-{
-  char *buffer;
-  
-  buffer = g_strdup_printf ("_NET_WM_CM_S%d", info->meta_screen->number);
-  
-  return buffer;
-}
-
-static void
-on_selection_clear (WsWindow *window,
-		    WsSelectionClearEvent *event,
-		    gpointer data)
-{
-  MetaCompScreen *info = data;
-  char *buffer = make_selection_name (info);
-  
-  if (strcmp (event->selection, buffer))
-    {
-      /* We lost the selection */
-      meta_comp_screen_unredirect (info);
-    }
-}
-
-static WsWindow *
-claim_selection (MetaCompScreen *info)
-{
-  WsWindow *window = ws_window_new (info->root_window);
-  char *buffer = make_selection_name (info);
-  
-#if 0
-  g_print ("selection window: %lx\n", WS_RESOURCE_XID (window));
-#endif
-  
-  ws_window_own_selection (window, buffer, WS_CURRENT_TIME);
-  
-  g_signal_connect (window, "selection_clear_event", G_CALLBACK (on_selection_clear), info);
-  
-  g_free (buffer);
-  
-  return window;
-}
-
-static void
-queue_paint (CmNode *node,
-	     MetaCompScreen *info)
-{
-#if 0
-  g_print ("queueing %s\n", G_OBJECT_TYPE_NAME (node));
-#endif
-  meta_comp_screen_queue_paint (info);
-}
-
-void
-meta_comp_screen_redirect (MetaCompScreen *info)
-{
-  WsWindow *root = ws_screen_get_root_window (info->screen);
-  WsRectangle source;
-  WsRectangle target;
-  WsServerRegion *region;
-  int screen_w;
-  int screen_h;
-  CmSquare *square;
-  
-#if 0
-  g_print ("redirecting %lx\n", WS_RESOURCE_XID (root));
-#endif
-  
-  ws_window_redirect_subwindows (root);
-  info->gl_window = ws_screen_get_gl_window (info->screen);
-  /* FIXME: This should probably happen in libcm */
-  ws_window_set_override_redirect (info->gl_window, TRUE);
-  region = ws_server_region_new (info->display);
-  ws_window_set_input_shape (info->gl_window, region);
-  g_object_unref (G_OBJECT (region));
-  
-  ws_display_begin_error_trap (info->display);
-  
-  ws_window_unredirect (info->gl_window);
-  
-  ws_display_end_error_trap (info->display);
-  
-  info->selection_window = claim_selection (info);
-  
-  ws_window_map (info->gl_window);
-  
-  info->stacker = cm_stacker_new ();
-  
-  square = cm_square_new (0.3, 0.3, 0.8, 1.0);
-  
-  cm_stacker_add_child (info->stacker, CM_NODE (square));
-  
-  g_object_unref (square);
-  
-  screen_w = ws_screen_get_width (info->screen);
-  screen_h = ws_screen_get_height (info->screen);
-  
-#if 0
-  g_print ("width: %d height %d\n", screen_w, screen_h);
-#endif
-  
-  source.x = (screen_w - (screen_w / 4)) / 2;
-  source.y = screen_h / 16;
-  source.width = screen_w / 4;
-  source.height = screen_h / 16;
-  
-  target.x = 0;
-  target.y = screen_h - screen_h / 4;
-  target.width = screen_w;
-  target.height = screen_h / 4;
-  
-  info->magnifier = cm_magnifier_new (CM_NODE (info->stacker), &source, &target);
-  
-  if (g_getenv ("USE_MAGNIFIER"))
-    cm_magnifier_set_active (info->magnifier, TRUE);
-  else
-    cm_magnifier_set_active (info->magnifier, FALSE);
-  
-  info->repaint_id =
-    g_signal_connect (info->magnifier, "need_repaint",
-		      G_CALLBACK (queue_paint), info);
-  
-  ws_display_sync (info->display);
-}
-
-static void
-listify (gpointer key,
-	 gpointer value,
-	 gpointer data)
-{
-    GList **windows = data;
-
-    *windows = g_list_prepend (*windows, (gpointer)value);
-}
-
-static void
-free_all_windows (MetaCompScreen *info)
-{
-    GList *windows = NULL, *list;
-    
-    g_hash_table_foreach (info->windows_by_xid, listify, &windows);
-
-    for (list = windows; list != NULL; list = list->next)
-    {
-	MetaCompWindow *window = list->data;
-
-	meta_comp_window_free (window);
-    }
-
-    g_list_free (windows);
-}
-
-void
-meta_comp_screen_unredirect (MetaCompScreen *info)
-{
-  WsScreen *ws_screen = info->screen;
-  WsWindow *root = ws_screen_get_root_window (ws_screen);
-  
-  g_signal_handler_disconnect (info->magnifier, info->repaint_id);
-  g_object_unref (info->magnifier);
-  
-  ws_window_unredirect_subwindows (root);
-  ws_screen_release_gl_window (ws_screen);
-
-  free_all_windows (info);
-  
-  ws_display_sync (info->display);
-  
-  /* FIXME: libcm needs a way to guarantee that a window is destroyed,
-   * without relying on ref counting having it as a side effect
-   */
-  g_object_unref (info->selection_window);
-}
-
-void
-meta_comp_screen_queue_paint (MetaCompScreen *info)
-{
-#if 0
-  g_print ("queuing\n");
-#endif
-  if (!info->idle_id)
-    info->idle_id = g_idle_add (repaint, info);
-}
-
-void
-meta_comp_screen_restack (MetaCompScreen *info,
-			  Window	  window,
-			  Window	  above_this)
-{
-  MetaCompWindow *comp_window = find_comp_window (info, window);
-  MetaCompWindow *above_comp_window = find_comp_window (info, above_this);
-  CmNode *window_node = find_node (info, window);
-  CmNode *above_node  = find_node (info, above_this);
-
-  if ((comp_window && meta_comp_window_stack_frozen (comp_window)) ||
-      (above_comp_window && meta_comp_window_stack_frozen (above_comp_window)))
-  {
-      return;
-  }
-  
-#if 0
-  dump_stacking_order (info->stacker->children);
-#endif
-  
-  if (window_node == above_node)
-    return;
-  
-  if (window_node && above_this == WS_RESOURCE_XID (info->gl_window))
-    {
-      cm_stacker_raise_child (info->stacker, window_node);
-    }
-  else if (window_node && above_this == None)
-    {
-      cm_stacker_lower_child (info->stacker, window_node);
-    }
-  else if (window_node && above_node)
-    {
-      cm_stacker_restack_child (info->stacker, window_node, above_node);
-    }
-#if 0
-  else
-    g_print ("nothing happened\n");
-#endif
-  
-#if 0
-  g_print ("done restacking; new order:\n");
-#endif
-#if 0
-  dump_stacking_order (info->stacker->children);
-#endif
-  
-}
-
-void
-meta_comp_screen_raise_window (MetaCompScreen  *info,
-			       Window           window)
-{
-  CmNode *node = find_node (info, window);
-  
-  if (node)
-    cm_stacker_raise_child (info->stacker, node);
-}
-
-void
-meta_comp_screen_set_size (MetaCompScreen *info,
-			   Window	   xwindow,
-			   gint		   x,
-			   gint		   y,
-			   gint		   width,
-			   gint		   height)
-{
-  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
-  
-  if (comp_window)
-    {
-      WsRectangle rect;
-      
-      rect.x = x;
-      rect.y = y;
-      rect.width = width;
-      rect.height = height;
-      
-      meta_comp_window_set_size (comp_window, &rect);
-    }
-}
-
-static void
-print_child_titles (WsWindow *window)
-{
-  GList *children = ws_window_query_subwindows (window);
-  GList *list;
-  int i;
-  
-  g_print ("window: %lx %s\n", WS_RESOURCE_XID (window), ws_window_query_title (window));
-  
-  i = 0;
-  for (list = children; list != NULL; list = list->next)
-    {
-      WsWindow *child = list->data;
-      
-      g_print ("  %d adding: %lx %s\n", i++, WS_RESOURCE_XID (child), ws_window_query_title (child));
-    }
-}
-
-typedef struct
-{
-    MetaCompScreen *cscreen;
-    XID		    xid;
-} DestroyData;
-
-static void
-on_window_destroy (MetaCompWindow *comp_window,
-		   gpointer        closure)
-{
-    DestroyData *data = closure;
-    CmNode *node = meta_comp_window_get_node (comp_window);
-    
-    cm_stacker_remove_child (data->cscreen->stacker, node);
-    g_hash_table_remove (data->cscreen->windows_by_xid, (gpointer)data->xid);
-}
-
-void
-meta_comp_screen_add_window (MetaCompScreen *info,
-			     Window	     xwindow)
-{
-  WsDrawable *drawable;
-  MetaCompWindow *comp_window;
-  DestroyData *data;
-  
-  ws_display_begin_error_trap (info->display);
-  
-  comp_window = meta_comp_window_lookup (info, xwindow);
-  
-  if (comp_window)
-    goto out;
-  
-  drawable = WS_DRAWABLE (ws_window_lookup (info->display, xwindow));
-  
-  if (ws_window_query_input_only (WS_WINDOW (drawable)))
-    goto out;
-  
-  if (WS_WINDOW (drawable) == info->gl_window ||
-      WS_WINDOW (drawable) == info->screen->overlay_window)
-    {
-#if 0
-      g_print ("gl window\n");
-#endif
-      goto out;
-    }
-
-  data = g_new (DestroyData, 1);
-  data->cscreen = info;
-  data->xid = WS_RESOURCE_XID (drawable);
-  
-  comp_window = meta_comp_window_new (info->meta_screen, drawable,
-				      on_window_destroy, data);
-  
-  g_hash_table_insert (info->windows_by_xid, (gpointer)WS_RESOURCE_XID (drawable), comp_window);
-  
-  cm_stacker_add_child (info->stacker, meta_comp_window_get_node (comp_window));
-  
- out:
-  if (comp_window)
-  {
-      /* This function is called both when windows are created and when they
-       * are mapped, so for now we have this silly function.
-       */
-      meta_comp_window_refresh_attrs (comp_window);
-  }
-  
-  ws_display_end_error_trap (info->display);
-  
-#if 0
-  g_print ("done checking\n");
-#endif
-  
-  return;
-}
-
-
-void
-meta_comp_screen_remove_window (MetaCompScreen *info,
-				Window	        xwindow)
-{
-  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
-  
-  if (comp_window)
-      meta_comp_window_free (comp_window);
-}
-
-void
-meta_comp_screen_set_updates (MetaCompScreen *info,
-			      Window	      xwindow,
-			      gboolean	      updates)
-{
-  MetaCompWindow *comp_window = meta_comp_window_lookup (info, xwindow);
-  
-  meta_comp_window_set_updates (comp_window, updates);
-}
-
-
-void
-meta_comp_screen_set_patch (MetaCompScreen *info,
-			    Window	    xwindow,
-			    CmPoint         points[4][4])
-{
-  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
-  
-  if (node)
-    cm_drawable_node_set_patch (node, points);
-}
-
-void
-meta_comp_screen_unset_patch (MetaCompScreen *info,
-			      Window	      xwindow)
-{
-  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
-  
-  if (node)
-    cm_drawable_node_unset_patch (node);
-}
-
-void
-meta_comp_screen_set_alpha (MetaCompScreen *info,
-			    Window	xwindow,
-			    gdouble alpha)
-{
-  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
-#if 0
-  g_print ("alpha: %f\n", alpha);
-#endif
-  cm_drawable_node_set_alpha (node, alpha);
-}
-
-void
-meta_comp_screen_get_real_size (MetaCompScreen *info,
-				Window xwindow,
-				WsRectangle *size)
-{
-  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
-  
-  if (!size)
-    return;
-  
-  cm_drawable_node_get_clipbox (node, size);
-}
-
-void
-meta_comp_screen_unmap (MetaCompScreen *info,
-			Window		xwindow)
-{
-    MetaCompWindow *window = find_comp_window (info, xwindow);
-
-    if (window)
-	meta_comp_window_hide (window);
-}
-
-void
-meta_comp_screen_set_target_rect (MetaCompScreen *info,
-				  Window xwindow,
-				  WsRectangle *rect)
-{
-  CmDrawableNode *node = CM_DRAWABLE_NODE (find_node (info, xwindow));
-  
-  if (node)
-    cm_drawable_node_set_scale_rect (node, rect);
-}
-
-#endif
-
--- a/src/c-screen.h
+++ b/src/c-screen.h
@@ -1,53 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#include "screen.h"
-#include "c-window.h"
-
-typedef struct MetaCompScreen MetaCompScreen;
-
-MetaCompScreen *meta_comp_screen_new             (WsDisplay      *display,
-						  MetaScreen     *screen);
-MetaCompScreen *meta_comp_screen_get_by_xwindow  (Window          xwindow);
-void            meta_comp_screen_destroy         (MetaCompScreen *scr_info);
-void            meta_comp_screen_redirect        (MetaCompScreen *info);
-void            meta_comp_screen_unredirect      (MetaCompScreen *info);
-void            meta_comp_screen_add_window      (MetaCompScreen *scr_info,
-						  Window          xwindow);
-void            meta_comp_screen_remove_window   (MetaCompScreen *scr_info,
-						  Window          xwindow);
-void            meta_comp_screen_restack         (MetaCompScreen *scr_info,
-						  Window          window,
-						  Window          above_this);
-void            meta_comp_screen_set_size        (MetaCompScreen *info,
-						  Window          window,
-						  gint            x,
-						  gint            y,
-						  gint            width,
-						  gint            height);
-void            meta_comp_screen_raise_window    (MetaCompScreen *scr_info,
-						  Window          window);
-void            meta_comp_screen_queue_paint     (MetaCompScreen *info);
-void            meta_comp_screen_set_updates     (MetaCompScreen *info,
-						  Window          xwindow,
-						  gboolean        updates);
-void            meta_comp_screen_set_patch       (MetaCompScreen *info,
-						  Window          xwindow,
-						  CmPoint         points[4][4]);
-void            meta_comp_screen_unset_patch     (MetaCompScreen *info,
-						  Window          xwindow);
-void            meta_comp_screen_set_alpha       (MetaCompScreen *info,
-						  Window          xwindow,
-						  gdouble         alpha);
-void            meta_comp_screen_get_real_size   (MetaCompScreen *info,
-						  Window          xwindow,
-						  WsRectangle    *size);
-void            meta_comp_screen_set_target_rect (MetaCompScreen *info,
-						  Window          xwindow,
-						  WsRectangle    *rect);
-void            meta_comp_screen_set_explode     (MetaCompScreen *info,
-						  Window          xwindow,
-						  gdouble         level);
-void            meta_comp_screen_unmap           (MetaCompScreen *info,
-						  Window          xwindow);
-MetaCompWindow *meta_comp_screen_lookup_window   (MetaCompScreen *info,
-						  Window          xwindow);
--- a/src/c-window.c
+++ b/src/c-window.c
--- a/src/c-window.h
+++ b/src/c-window.h
@@ -1,72 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* 
- * Copyright (C) 2006 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.
- */
-
-#include <cm/node.h>
-#include "display.h"
-#include "effects.h"
-
-#ifndef C_WINDOW_H
-#define C_WINDOW_H
-
-typedef struct _MetaCompWindow MetaCompWindow;
-
-typedef void (* MetaCompWindowDestroy) (MetaCompWindow *window,
-                                        gpointer        closure);
-
-MetaCompWindow *meta_comp_window_new (MetaScreen *screen,
-				      WsDrawable *drawable,
-				      MetaCompWindowDestroy destroy,
-				      gpointer data);
-CmNode	       *meta_comp_window_get_node (MetaCompWindow *window);
-gboolean        meta_comp_window_free (MetaCompWindow *window);
-void		meta_comp_window_set_size (MetaCompWindow *window,
-					   WsRectangle *size);
-
-void		meta_comp_window_hide (MetaCompWindow *comp_window);
-void		meta_comp_window_show (MetaCompWindow *comp_window);
-void		meta_comp_window_refresh_attrs (MetaCompWindow *comp_window);
-void		meta_comp_window_set_updates (MetaCompWindow *comp_window,
-					      gboolean updates);
-
-void		meta_comp_window_explode (MetaCompWindow *comp_window,
-					  MetaEffect *effect);
-void		meta_comp_window_shrink (MetaCompWindow *comp_window,
-					 MetaEffect *effect);
-void		meta_comp_window_unshrink (MetaCompWindow *comp_window,
-					   MetaEffect *effect);
-void		meta_comp_window_run_focus (MetaCompWindow *comp_window,
-					    MetaEffect *effect);
-void		meta_comp_window_restack (MetaCompWindow *comp_window,
-					  MetaCompWindow *above);
-void		meta_comp_window_freeze_stack (MetaCompWindow *comp_window);
-void		meta_comp_window_thaw_stack (MetaCompWindow *comp_window);
-gboolean	meta_comp_window_stack_frozen (MetaCompWindow *comp_window);
-void            meta_comp_window_run_minimize (MetaCompWindow *window,
-					       MetaEffect     *effect);
-void	        meta_comp_window_run_unminimize (MetaCompWindow *comp_window,
-						 MetaEffect     *effect);
-
-#if 0
-void		meta_comp_window_set_explode (MetaCompWindow *comp_window,
-					      double	      level);
-#endif
-
-#endif
-
--- a/src/colors.c
+++ b/src/colors.c
@@ -1,370 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity RGB color stuff */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * 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 "colors.h"
-
-
-static void
-visual_decompose_mask (gulong  mask,
-                       gint   *shift,
-                       gint   *prec)
-{
-  /* This code is from GTK+, (C) GTK+ Team */
-  *shift = 0;
-  *prec = 0;
-
-  while (!(mask & 0x1))
-    {
-      (*shift)++;
-      mask >>= 1;
-    }
-
-  while (mask & 0x1)
-    {
-      (*prec)++;
-      mask >>= 1;
-    }
-}
-
-void
-meta_screen_init_visual_info (MetaScreen *screen)
-{
-  Visual *xvisual;
-  int nxvisuals;
-  XVisualInfo *visual_list;
-  XVisualInfo visual_template;
-
-  /* root window visual */
-  xvisual = DefaultVisual (screen->display->xdisplay,
-                           screen->number);
-
-  visual_template.visualid = XVisualIDFromVisual (xvisual);
-  visual_list = XGetVisualInfo (screen->display->xdisplay,
-                                VisualIDMask, &visual_template, &nxvisuals);
-
-  if (nxvisuals != 1)
-    meta_warning ("Matched weird number of visuals %d\n", nxvisuals);
-
-  screen->visual_info = *visual_list;
-
-  meta_verbose ("Using visual class %d\n", screen->visual_info.class);
-  
-  XFree (visual_list);
-}
-
-gulong
-meta_screen_get_x_pixel (MetaScreen       *screen,
-                         const PangoColor *color)
-{
-  /* This code is derived from GTK+, (C) GTK+ Team */
-  gulong pixel;
-
-  if (screen->visual_info.class == TrueColor ||
-      screen->visual_info.class == DirectColor)
-    {
-      int red_prec, red_shift, green_prec, green_shift, blue_prec, blue_shift;
-
-      visual_decompose_mask (screen->visual_info.red_mask,
-                             &red_shift, &red_prec);
-      visual_decompose_mask (screen->visual_info.green_mask,
-                             &green_shift, &green_prec);
-      visual_decompose_mask (screen->visual_info.blue_mask,
-                             &blue_shift, &blue_prec);
-      
-      pixel = (((color->red >> (16 - red_prec)) << red_shift) +
-               ((color->green >> (16 - green_prec)) << green_shift) +
-               ((color->blue >> (16 - blue_prec)) << blue_shift));
-    }
-  else
-    {
-#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
-      double r, g, b;
-      
-      r = color->red / (double) 0xffff;
-      g = color->green / (double) 0xffff;
-      b = color->blue / (double) 0xffff;    
-      
-      /* Now this is a low-bloat GdkRGB replacement! */
-      if (INTENSITY (r, g, b) > 0.5)
-        pixel = WhitePixel (screen->display->xdisplay, screen->number);
-      else
-        pixel = BlackPixel (screen->display->xdisplay, screen->number);  
-#undef INTENSITY
-    }
-
-  return pixel;
-}
-
-void
-meta_screen_set_ui_colors (MetaScreen         *screen,
-                           const MetaUIColors *colors)
-{
-  screen->colors = *colors;
-  meta_screen_queue_frame_redraws (screen);
-}
-
-/* Straight out of gtkstyle.c */
-static PangoColor meta_default_normal_fg =      {      0,      0,      0 };
-static PangoColor meta_default_active_fg =      {      0,      0,      0 };
-static PangoColor meta_default_prelight_fg =    {      0,      0,      0 };
-static PangoColor meta_default_selected_fg =    { 0xffff, 0xffff, 0xffff };
-static PangoColor meta_default_insensitive_fg = { 0x7530, 0x7530, 0x7530 };
-
-static PangoColor meta_default_normal_bg =      { 0xd6d6, 0xd6d6, 0xd6d6 };
-static PangoColor meta_default_active_bg =      { 0xc350, 0xc350, 0xc350 };
-static PangoColor meta_default_prelight_bg =    { 0xea60, 0xea60, 0xea60 };
-static PangoColor meta_default_selected_bg =    {     0,      0, 0x9c40 };
-static PangoColor meta_default_insensitive_bg = { 0xd6d6, 0xd6d6, 0xd6d6 };
-
-static void
-rgb_to_hls (gdouble *r,
-            gdouble *g,
-            gdouble *b)
-{
-  gdouble min;
-  gdouble max;
-  gdouble red;
-  gdouble green;
-  gdouble blue;
-  gdouble h, l, s;
-  gdouble delta;
-  
-  red = *r;
-  green = *g;
-  blue = *b;
-  
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-      
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-      
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-  
-  l = (max + min) / 2;
-  s = 0;
-  h = 0;
-  
-  if (max != min)
-    {
-      if (l <= 0.5)
-        s = (max - min) / (max + min);
-      else
-        s = (max - min) / (2 - max - min);
-      
-      delta = max -min;
-      if (red == max)
-        h = (green - blue) / delta;
-      else if (green == max)
-        h = 2 + (blue - red) / delta;
-      else if (blue == max)
-        h = 4 + (red - green) / delta;
-      
-      h *= 60;
-      if (h < 0.0)
-        h += 360;
-    }
-  
-  *r = h;
-  *g = l;
-  *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-            gdouble *l,
-            gdouble *s)
-{
-  gdouble hue;
-  gdouble lightness;
-  gdouble saturation;
-  gdouble m1, m2;
-  gdouble r, g, b;
-  
-  lightness = *l;
-  saturation = *s;
-  
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-  
-  if (saturation == 0)
-    {
-      *h = lightness;
-      *l = lightness;
-      *s = lightness;
-    }
-  else
-    {
-      hue = *h + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        r = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        r = m2;
-      else if (hue < 240)
-        r = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        r = m1;
-      
-      hue = *h;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        g = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        g = m2;
-      else if (hue < 240)
-        g = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        g = m1;
-      
-      hue = *h - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-      
-      if (hue < 60)
-        b = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        b = m2;
-      else if (hue < 240)
-        b = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        b = m1;
-      
-      *h = r;
-      *l = g;
-      *s = b;
-    }
-}
-
-static void
-style_shade (PangoColor *a,
-             PangoColor *b,
-             gdouble     k)
-{
-  gdouble red;
-  gdouble green;
-  gdouble blue;
-  
-  red = (gdouble) a->red / 65535.0;
-  green = (gdouble) a->green / 65535.0;
-  blue = (gdouble) a->blue / 65535.0;
-  
-  rgb_to_hls (&red, &green, &blue);
-  
-  green *= k;
-  if (green > 1.0)
-    green = 1.0;
-  else if (green < 0.0)
-    green = 0.0;
-  
-  blue *= k;
-  if (blue > 1.0)
-    blue = 1.0;
-  else if (blue < 0.0)
-    blue = 0.0;
-  
-  hls_to_rgb (&red, &green, &blue);
-  
-  b->red = red * 65535.0;
-  b->green = green * 65535.0;
-  b->blue = blue * 65535.0;
-}
-
-#define LIGHTNESS_MULT  1.3
-#define DARKNESS_MULT   0.7
-void
-meta_screen_init_ui_colors (MetaScreen *screen)
-{
-  int i;
-  MetaUIColors *colors;
-
-  colors = &screen->colors;
-  
-  colors->fg[META_STATE_NORMAL] = meta_default_normal_fg;
-  colors->fg[META_STATE_ACTIVE] = meta_default_active_fg;
-  colors->fg[META_STATE_PRELIGHT] = meta_default_prelight_fg;
-  colors->fg[META_STATE_SELECTED] = meta_default_selected_fg;
-  colors->fg[META_STATE_INSENSITIVE] = meta_default_insensitive_fg;
-  
-  colors->bg[META_STATE_NORMAL] = meta_default_normal_bg;
-  colors->bg[META_STATE_ACTIVE] = meta_default_active_bg;
-  colors->bg[META_STATE_PRELIGHT] = meta_default_prelight_bg;
-  colors->bg[META_STATE_SELECTED] = meta_default_selected_bg;
-  colors->bg[META_STATE_INSENSITIVE] = meta_default_insensitive_bg;
-  
-  for (i = 0; i < 4; i++)
-    {
-      colors->text[i] = colors->fg[i];
-      colors->base[i].red = G_MAXUSHORT;
-      colors->base[i].green = G_MAXUSHORT;
-      colors->base[i].blue = G_MAXUSHORT;
-    }
-
-  colors->base[META_STATE_SELECTED] = meta_default_selected_bg;
-  colors->base[META_STATE_INSENSITIVE] = meta_default_prelight_bg;
-  colors->text[META_STATE_INSENSITIVE] = meta_default_insensitive_fg;
-
-  for (i = 0; i < 5; i++)
-    {
-      style_shade (&colors->bg[i], &colors->light[i], LIGHTNESS_MULT);
-      style_shade (&colors->bg[i], &colors->dark[i], DARKNESS_MULT);
-      
-      colors->mid[i].red = (colors->light[i].red + colors->dark[i].red) / 2;
-      colors->mid[i].green = (colors->light[i].green + colors->dark[i].green) / 2;
-      colors->mid[i].blue = (colors->light[i].blue + colors->dark[i].blue) / 2;
-
-      colors->text_aa[i].red = (colors->text[i].red + colors->base[i].red) / 2;
-      colors->text_aa[i].green = (colors->text[i].green + colors->base[i].green) / 2;
-      colors->text_aa[i].blue = (colors->text[i].blue + colors->base[i].blue) / 2;
-    }
-}
--- a/src/compositor.c
+++ b/src/compositor.c
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -1,92 +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"
-
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-#include "cm/deform.h"
-/* FIXME: Needs namespacing. */
-void get_patch_points (Model *model, CmPoint points[4][4]);
-#endif
-
-typedef void (* MetaAnimationFinishedFunc) (gpointer data);
-
-/* XXX namespace me */
-void compute_window_rect (MetaWindow *window, MetaRectangle *rect);
-
-MetaCompositor* meta_compositor_new           (MetaDisplay       *display);
-void            meta_compositor_unref         (MetaCompositor    *compositor);
-void            meta_compositor_process_event (MetaCompositor    *compositor,
-                                               XEvent            *xevent,
-                                               MetaWindow        *window);
-void            meta_compositor_add_window    (MetaCompositor    *compositor,
-                                               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);
-
-#if 0
-void meta_compositor_minimize (MetaCompositor            *compositor,
-			       MetaWindow                *window,
-			       int                        x,
-			       int                        y,
-			       int                        width,
-			       int                        height,
-			       MetaAnimationFinishedFunc  finished_cb,
-			       gpointer                   finished_data);
-#endif
-
-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);
-void meta_compositor_free_window (MetaCompositor *compositor,
-				  MetaWindow *window);
-
-#endif /* META_COMPOSITOR_H */
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -0,0 +1,54 @@
+/* -*- 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,
+                      Window             xwindow,
+                      XWindowAttributes *attrs);
+  void (*remove_window) (MetaCompositor *compositor,
+                         Window          xwindow);
+  void (*set_updates) (MetaCompositor *compositor,
+                       MetaWindow     *window,
+                       gboolean        update);
+  void (*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);
+};
+
+#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 fixed tooltip routine */
-
 /* 
- * 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,16 +21,11 @@
 * 02111-1307, USA.
 */

-#ifndef META_FIXED_TIP_H
-#define META_FIXED_TIP_H
+#ifndef META_COMPOSITOR_XRENDER_H_
+#define META_COMPOSITOR_XRENDER_H_

-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-void meta_fixed_tip_show (Display *xdisplay, int screen_number,
-                          int root_x, int root_y,
-                          const char *markup_text);
-void meta_fixed_tip_hide (void);
+#include "types.h"

+MetaCompositor *meta_compositor_xrender_new (MetaDisplay *display);

 #endif
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -0,0 +1,159 @@
+/* -*- 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"
+
+MetaCompositor *
+meta_compositor_new (MetaDisplay *display)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  /* At some point we would have a way to select between backends */
+  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,
+                            Window             xwindow,
+                            XWindowAttributes *attrs)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->add_window)
+    compositor->add_window (compositor, window, xwindow, attrs);
+#endif
+}
+
+void
+meta_compositor_remove_window (MetaCompositor *compositor,
+                               Window          xwindow)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->remove_window)
+    compositor->remove_window (compositor, xwindow);
+#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
+}
+
+void
+meta_compositor_process_event (MetaCompositor *compositor,
+                               XEvent         *event,
+                               MetaWindow     *window)
+{
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  if (compositor && compositor->process_event)
+    compositor->process_event (compositor, event, window);
+#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_free_window (MetaCompositor *compositor,
+                                  MetaWindow     *window)
+{
+}
--- a/src/core/async-getprop.c
+++ b/src/core/async-getprop.c
--- a/src/core/async-getprop.h
+++ b/src/core/async-getprop.h
--- a/src/core/atomnames.h
+++ b/src/core/atomnames.h
@@ -0,0 +1,164 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* 
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
+ * Copyright (C) 2003, 2004 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
+ * Copyright (C) 2008 Thomas Thurman
+ * 
+ * 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.
+ */
+
+/**
+ * \file atomnames.h  A list of atom names.
+ *
+ * This is a list of the names of all the X atoms that Metacity uses.
+ * Each is wrapped in a macro "item()" which is undefined here; the
+ * idea is that when you need to make a big list of all the X atoms,
+ * you can define item(), include this file, and then undefine it
+ * again.
+ *
+ * If you also define EWMH_ATOMS_ONLY then you will only get _NET_WM_*
+ * hints rather than all of them.
+ */
+
+#ifndef item
+#error "item(x) must be defined when you include atomnames.h"
+#endif
+
+#ifndef EWMH_ATOMS_ONLY
+
+item(WM_PROTOCOLS)
+item(WM_TAKE_FOCUS)
+item(WM_DELETE_WINDOW)
+item(WM_STATE)
+item(_MOTIF_WM_HINTS)
+item(WM_CHANGE_STATE)
+item(SM_CLIENT_ID)
+item(WM_CLIENT_LEADER)
+item(WM_WINDOW_ROLE)
+item(UTF8_STRING)
+item(WM_ICON_SIZE)
+item(_KWM_WIN_ICON)
+item(_METACITY_RESTART_MESSAGE)    
+item(_METACITY_RELOAD_THEME_MESSAGE)
+item(_METACITY_SET_KEYBINDINGS_MESSAGE)
+item(_METACITY_TOGGLE_VERBOSE)
+item(_GNOME_PANEL_ACTION)
+item(_GNOME_PANEL_ACTION_MAIN_MENU)
+item(_GNOME_PANEL_ACTION_RUN_DIALOG)
+item(_METACITY_SENTINEL)
+item(_METACITY_VERSION)
+item(WM_CLIENT_MACHINE)
+item(MANAGER)
+item(TARGETS)
+item(MULTIPLE)
+item(TIMESTAMP)
+item(VERSION)
+item(ATOM_PAIR)
+
+/* Oddities: These are used, and we need atoms for them,
+ * but when we need all _NET_WM hints (i.e. when we're making
+ * lists of which _NET_WM hints we support in order to advertise
+ * it) we haven't historically listed them.  I don't know what
+ * the reason for this is.  It may be a bug.
+ */
+item(_NET_WM_SYNC_REQUEST)
+item(_NET_WM_SYNC_REQUEST_COUNTER)
+item(_NET_WM_VISIBLE_NAME)
+item(_NET_WM_VISIBLE_ICON_NAME)
+item(_NET_SUPPORTING_WM_CHECK)
+
+/* But I suppose it's quite reasonable not to advertise using
+ * _NET_SUPPORTED that we support _NET_SUPPORTED :)
+ */
+item(_NET_SUPPORTED)
+
+#endif /* !EWMH_ATOMS_ONLY */
+
+/**************************************************************************/
+
+item(_NET_WM_NAME)
+item(_NET_CLOSE_WINDOW)
+item(_NET_WM_STATE)
+item(_NET_WM_STATE_SHADED)
+item(_NET_WM_STATE_MAXIMIZED_HORZ)
+item(_NET_WM_STATE_MAXIMIZED_VERT)
+item(_NET_WM_DESKTOP)
+item(_NET_NUMBER_OF_DESKTOPS)
+item(_NET_CURRENT_DESKTOP)
+item(_NET_WM_WINDOW_TYPE)
+item(_NET_WM_WINDOW_TYPE_DESKTOP)
+item(_NET_WM_WINDOW_TYPE_DOCK)
+item(_NET_WM_WINDOW_TYPE_TOOLBAR)
+item(_NET_WM_WINDOW_TYPE_MENU)
+item(_NET_WM_WINDOW_TYPE_DIALOG)
+item(_NET_WM_WINDOW_TYPE_NORMAL)
+item(_NET_WM_STATE_MODAL)
+item(_NET_CLIENT_LIST)
+item(_NET_CLIENT_LIST_STACKING)
+item(_NET_WM_STATE_SKIP_TASKBAR)
+item(_NET_WM_STATE_SKIP_PAGER)
+item(_NET_WM_ICON_NAME)
+item(_NET_WM_ICON)
+item(_NET_WM_ICON_GEOMETRY)
+item(_NET_WM_MOVERESIZE)
+item(_NET_ACTIVE_WINDOW)
+item(_NET_WM_STRUT)
+item(_NET_WM_STATE_HIDDEN)
+item(_NET_WM_WINDOW_TYPE_UTILITY)
+item(_NET_WM_WINDOW_TYPE_SPLASH)
+item(_NET_WM_STATE_FULLSCREEN)
+item(_NET_WM_PING)
+item(_NET_WM_PID)
+item(_NET_WORKAREA)
+item(_NET_SHOWING_DESKTOP)
+item(_NET_DESKTOP_LAYOUT)
+item(_NET_DESKTOP_NAMES)
+item(_NET_WM_ALLOWED_ACTIONS)
+item(_NET_WM_ACTION_MOVE)
+item(_NET_WM_ACTION_RESIZE)
+item(_NET_WM_ACTION_SHADE)
+item(_NET_WM_ACTION_STICK)
+item(_NET_WM_ACTION_MAXIMIZE_HORZ)
+item(_NET_WM_ACTION_MAXIMIZE_VERT)
+item(_NET_WM_ACTION_CHANGE_DESKTOP)
+item(_NET_WM_ACTION_CLOSE)
+item(_NET_WM_STATE_ABOVE)
+item(_NET_WM_STATE_BELOW)
+item(_NET_STARTUP_ID)
+item(_NET_WM_STRUT_PARTIAL)
+item(_NET_WM_ACTION_FULLSCREEN)
+item(_NET_WM_ACTION_MINIMIZE)
+item(_NET_FRAME_EXTENTS)
+item(_NET_REQUEST_FRAME_EXTENTS)
+item(_NET_WM_USER_TIME)
+item(_NET_WM_STATE_DEMANDS_ATTENTION)
+item(_NET_MOVERESIZE_WINDOW)
+item(_NET_DESKTOP_GEOMETRY)
+item(_NET_DESKTOP_VIEWPORT)
+item(_NET_WM_USER_TIME_WINDOW)
+item(_NET_WM_ACTION_ABOVE)
+item(_NET_WM_ACTION_BELOW)
+
+#if 0
+/* We apparently never use: */
+/* item(_NET_RESTACK_WINDOW) */
+#endif
+
+/* eof atomnames.h */
+
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -22,13 +22,57 @@
 * 02111-1307, USA.
 */

+/**
+ * \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
+ * 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.
+ *
+ * Visual bells come in at meta_bell_notify(), which checks we are actually
+ * in visual mode and calls through to bell_visual_notify(). That
+ * function then checks what kind of visual flash you like, and calls either
+ * 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:
+ * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
+ *
+ * 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.
+ */
+
 #include <config.h>
 #include "bell.h"
-#include "screen.h"
+#include "screen-private.h"
 #include "prefs.h"

+/**
+ * Flashes one entire screen.  This is done by making a window the size of the
+ * whole screen (or reusing the old one, if it's still around), mapping it,
+ * painting it white and then black, and then unmapping it. We set saveunder so
+ * that all the windows behind it come back immediately.
+ *
+ * Unlike frame flashes, we don't do fullscreen flashes with a timeout; rather,
+ * we do them in one go, because we don't have to rely on the theme code
+ * redrawing the frame for us in order to do the flash.
+ *
+ * \param display  The display which owns the screen (rather redundant)
+ * \param screen   The screen to flash
+ *
+ * \bug The way I read it, this appears not to do the flash
+ * the first time we flash a particular display. Am I wrong?
+ *
+ * \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;
@@ -89,9 +133,19 @@ meta_bell_flash_screen (MetaDisplay *display,
  XFlush (display->xdisplay);
 }

+/**
+ * Flashes one screen, or all screens, in response to a bell event.
+ * If the event is on a particular window, flash the screen that
+ * window is on. Otherwise, flash every screen on this display.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the event came in on
+ * \param xkb_ev   The bell event
+ */
 #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;
@@ -102,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 
    {
@@ -110,14 +164,28 @@ 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;
 	}
    }
 }

+/**
+ * Makes a frame be not flashed; this is the timeout half of
+ * 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.
+ *
+ * \param data  The frame to unflash, cast to a gpointer so it can go into
+ *              a callback function.
+ * \return Always FALSE, so we don't get called again.
+ *
+ * \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;
@@ -125,18 +193,36 @@ meta_bell_unflash_frame (gpointer data)
  return FALSE;
 }

+/**
+ * Makes a frame flash and then return to normal shortly afterwards.
+ * This is done by setting a flag so that the theme
+ * code will temporarily draw the frame as focussed if it's unfocussed and
+ * vice versa, and then queueing a redraw. Lastly, we create a timeout so
+ * that the flag can be unset and the frame re-redrawn.
+ *
+ * If the configure script found we had no XKB, this does not exist.
+ *
+ * \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);
 }

+/**
+ * Flashes the frame of the focussed window. If there is no focussed window,
+ * flashes the screen.
+ *
+ * \param display  The display the bell event came in on
+ * \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;
@@ -150,25 +236,36 @@ 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);
    }
 }

+/**
+ * Gives the user some kind of visual bell substitute, in response to a
+ * bell event. What this is depends on the "visual bell type" pref.
+ *
+ * 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
+ *
+ * \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 */
@@ -182,9 +279,9 @@ meta_bell_notify (MetaDisplay *display,
 {
  /* flash something */
  if (meta_prefs_get_visual_bell ()) 
-    meta_bell_visual_notify (display, xkb_ev);
+    bell_visual_notify (display, xkb_ev);
 }
-#endif
+#endif /* HAVE_XKB */

 void
 meta_bell_set_audible (MetaDisplay *display, gboolean audible)
@@ -250,6 +347,14 @@ meta_bell_shutdown (MetaDisplay *display)
 #endif
 }

+/**
+ * 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/bell.h
+++ b/src/core/bell.h
@@ -0,0 +1,108 @@
+/* -*- 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.
+ * 
+ * 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 <X11/Xlib.h>
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+#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)
    {
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -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
@@ -811,6 +811,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 +853,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 +879,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 +908,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 +936,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 +1042,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 +1070,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,7 +25,7 @@

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

@@ -328,6 +328,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)
@@ -718,28 +752,25 @@ meta_core_increment_event_serial (Display *xdisplay)
 void
 meta_invalidate_default_icons (void)
 {
-  GSList *displays, *windows;
+  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)
    {
+      MetaWindow *window = (MetaWindow*)l->data;

-      for (windows = meta_display_list_windows (displays->data);
-           windows != NULL;
-           windows = windows->next)
+      if (window->icon_cache.origin == USING_FALLBACK_ICON)
        {
-
-          MetaWindow *window = (MetaWindow*)windows->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,8 +256,8 @@ io_from_ping_dialog (GIOChannel   *channel,
        }

      meta_topic (META_DEBUG_PING,
-                  "Read %d bytes strlen %d \"%s\" from child\n",
-                  len, str ? strlen (str) : 0, str ? str : "NULL");
+                  "Read %" G_GSIZE_FORMAT " bytes strlen %d \"%s\" from child\n",
+                  len, str ? (int) strlen (str) : 0, str ? str : "NULL");
      
      if (len > 0)
        {
@@ -306,6 +292,7 @@ delete_ping_timeout_func (MetaDisplay *display,
  char numbuf[32];
  char timestampbuf[32];
  char *window_id_str;
+  char *window_title;
  GIOChannel *channel;
  
  meta_topic (META_DEBUG_PING,
@@ -319,6 +306,7 @@ delete_ping_timeout_func (MetaDisplay *display,
    }
  
  window_id_str = g_strdup_printf ("0x%lx", window->xwindow);
+  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);

  sprintf (numbuf, "%d", window->screen->number);
  sprintf (timestampbuf, "%u", timestamp);
@@ -329,7 +317,7 @@ delete_ping_timeout_func (MetaDisplay *display,
  argv[3] = "--timestamp";
  argv[4] = timestampbuf;
  argv[5] = "--kill-window-question";
-  argv[6] = window->title;
+  argv[6] = window_title;
  argv[7] = window_id_str;
  argv[8] = NULL;
  
@@ -362,6 +350,7 @@ delete_ping_timeout_func (MetaDisplay *display,
  g_io_channel_unref (channel);
  
 out:
+  g_free (window_title);
  g_free (window_id_str);
 }

@@ -376,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
--- 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,7 @@
 #include "eventqueue.h"
 #include "common.h"
 #include "boxes.h"
+#include "display.h"

 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
@@ -45,16 +46,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;
@@ -87,103 +81,12 @@ struct _MetaDisplay
  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
@@ -354,6 +257,16 @@ struct _MetaDisplay
  int render_event_base;
  int render_error_base;
 #endif
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  int composite_event_base;
+  int composite_error_base;
+  int composite_major_version;
+  int composite_minor_version;
+  int damage_event_base;
+  int damage_error_base;
+  int xfixes_event_base;
+  int xfixes_error_base;
+#endif
 #ifdef HAVE_XSYNC
  unsigned int have_xsync : 1;
 #define META_DISPLAY_HAS_XSYNC(display) ((display)->have_xsync)
@@ -372,6 +285,18 @@ struct _MetaDisplay
 #else
 #define META_DISPLAY_HAS_RENDER(display) FALSE
 #endif
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+  unsigned int have_composite : 1;
+  unsigned int have_damage : 1;
+  unsigned int have_xfixes : 1;
+#define META_DISPLAY_HAS_COMPOSITE(display) ((display)->have_composite)
+#define META_DISPLAY_HAS_DAMAGE(display) ((display)->have_damage)
+#define META_DISPLAY_HAS_XFIXES(display) ((display)->have_xfixes)
+#else
+#define META_DISPLAY_HAS_COMPOSITE(display) FALSE
+#define META_DISPLAY_HAS_DAMAGE(display) FALSE
+#define META_DISPLAY_HAS_XFIXES(display) FALSE
+#endif
 };

 /* Xserver time can wraparound, thus comparing two timestamps needs to take
@@ -399,8 +324,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,
@@ -437,7 +360,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);
--- a/src/core/display.c
+++ b/src/core/display.c
--- a/src/core/edge-resistance.c
+++ b/src/core/edge-resistance.c
@@ -21,9 +21,10 @@
 * 02111-1307, USA.
 */

+#include <config.h>
 #include "edge-resistance.h"
 #include "boxes.h"
-#include "display.h"
+#include "display-private.h"
 #include "workspace.h"

 /* A simple macro for whether a given window's edges are potentially
@@ -1091,6 +1092,7 @@ meta_display_compute_resistance_and_snapping_edges (MetaDisplay *display)
  /*
   * 4th: Free the extra memory not needed and sort the list
   */
+  g_list_free (stacked_windows);
  /* Free the memory used by the obscuring windows/docks lists */
  g_slist_free (window_stacking);
  /* FIXME: Shouldn't there be a helper function to make this one line of code
--- a/src/core/edge-resistance.h
+++ b/src/core/edge-resistance.h
@@ -24,7 +24,7 @@
 #ifndef META_EDGE_RESISTANCE_H
 #define META_EDGE_RESISTANCE_H

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

 void        meta_window_edge_resistance_for_move   (MetaWindow  *window,
                                                    int          old_x,
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -1,6 +1,40 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/* Metacity animation effects */
+/**
+ * \file effects.c "Special effects" other than compositor effects.
+ * 
+ * Before we had a serious compositor, we supported swooping
+ * rectangles for minimising and so on.  These are still supported
+ * today, even when the compositor is enabled.  The file contains two
+ * parts:
+ *
+ *  1) A set of functions, each of which implements a special effect.
+ *     (Only the minimize function does anything interesting; we should
+ *      probably get rid of the rest.)
+ *
+ *  2) A set of functions for moving a highlighted wireframe box around
+ *     the screen, optionally with height and width shown in the middle.
+ *     This is used for moving and resizing when reduced_resources is set.
+ *
+ * There was formerly a system which allowed callers to drop in their
+ * own handlers for various things; it was never used (people who want
+ * their own handlers can just modify this file, after all) and it added
+ * a good deal of extra complexity, so it has been removed.  If you want it,
+ * it can be found in svn r3769.
+ *
+ * Once upon a time there were three different ways of drawing the box
+ * animation: window wireframe, window opaque, and root. People who had
+ * the shape extension theoretically had the choice of all three, and
+ * people who didn't weren't given the choice of the wireframe option.
+ * In practice, though, the opaque animation was never perfect, so it came
+ * down to the wireframe option for those who had the extension and
+ * the root option for those who didn't; there was actually no way of choosing
+ * any other option anyway.  Work on the opaque animation stopped in 2002;
+ * anyone who wants something like that these days will be using the
+ * compositor anyway.
+ *
+ * In svn r3769 this was made explicit.
+ */

 /* 
 * Copyright (C) 2001 Anders Carlsson, Havoc Pennington
@@ -23,23 +57,22 @@

 #include <config.h>
 #include "effects.h"
-#include "display.h"
+#include "display-private.h"
 #include "ui.h"
-#include "window.h"
+#include "window-private.h"
+#include "prefs.h"

 #ifdef HAVE_SHAPE
 #include <X11/extensions/shape.h>
 #endif

+#define META_MINIMIZE_ANIMATION_LENGTH 0.25
+#define META_SHADE_ANIMATION_LENGTH 0.2
+
 #include <string.h>

-typedef enum
-{
-  META_ANIMATION_DRAW_ROOT,
-  META_ANIMATION_WINDOW_WIREFRAME,
-  META_ANIMATION_WINDOW_OPAQUE
-
-} MetaAnimationStyle;
+typedef struct MetaEffect MetaEffect;
+typedef struct MetaEffectPriv MetaEffectPriv;

 typedef struct
 {
@@ -48,65 +81,85 @@ typedef struct
  double millisecs_duration;
  GTimeVal start_time;

+#ifdef HAVE_SHAPE
+  /** For wireframe window */
+  Window wireframe_xwindow;
+#else
+  /** Rectangle to erase */
+  MetaRectangle last_rect;
+
+  /** First time we've plotted anything in this animation? */
  gboolean first_time;

+  /** For wireframe drawn on root window */
+  GC gc;
+#endif
+
  MetaRectangle start_rect;
  MetaRectangle end_rect;
-
-  /* rect to erase */
-  MetaRectangle last_rect;
-
-  /* used instead of the global flag, since
-   * we don't want to change midstream.
-   */
-  MetaAnimationStyle style;
-  
-  /* For wireframe drawn on root window */
-  GC gc;
-
-  /* For wireframe window */
-  Window wireframe_xwindow;
-  
-  /* For opaque */
-  MetaImageWindow *image_window;
-  GdkPixbuf       *orig_pixbuf;
-
-  MetaBoxAnimType anim_type;
  
 } BoxAnimationContext;

+/**
+ * Information we need to know during a maximise or minimise effect.
+ */
+typedef struct
+{
+  /** This is the normal-size window. */
+  MetaRectangle window_rect;
+  /** This is the size of the window when it's an icon. */
+  MetaRectangle icon_rect;
+} MetaMinimizeEffect, MetaUnminimizeEffect;
+
 struct MetaEffectPriv
 {
  MetaEffectFinished finished;
-  gpointer	     finished_data;
+  gpointer           finished_data;
+};
+
+struct MetaEffect
+{
+  /** The window the effect is applied to. */
+  MetaWindow *window;
+  /** Which effect is happening here. */
+  MetaEffectType type;
+  /** The effect handler can hang data here. */
+  gpointer info;
+
+  union
+  {
+    MetaMinimizeEffect      minimize;
+    /* ... and theoretically anything else */
+  } u;
+  
+  MetaEffectPriv *priv;
 };

 static void run_default_effect_handler (MetaEffect *effect);
 static void run_handler (MetaEffect *effect);
-
-static MetaEffectHandler effect_handler;
-static gpointer		 effect_handler_data;
-
-void
-meta_push_effect_handler (MetaEffectHandler   handler,
-			  gpointer            data)
-{
-    effect_handler = handler;
-    effect_handler_data = data;
-}
-
-void
-meta_pop_effect_handler (void)
-{
-    /* FIXME: not implemented yet */
-    g_assert_not_reached ();
-}
+static void effect_free (MetaEffect *effect);

 static MetaEffect *
 create_effect (MetaEffectType      type,
-	       MetaWindow         *window,
-	       MetaEffectFinished  finished,
-	       gpointer		   finished_data)
+               MetaWindow         *window,
+               MetaEffectFinished  finished,
+               gpointer            finished_data);
+
+static void
+draw_box_animation (MetaScreen     *screen,
+                    MetaRectangle  *initial_rect,
+                    MetaRectangle  *destination_rect,
+                    double          seconds_duration);
+
+/**
+ * Creates an effect.
+ *
+ */
+static MetaEffect*
+create_effect (MetaEffectType      type,
+               MetaWindow         *window,
+               MetaEffectFinished  finished,
+               gpointer            finished_data)
 {
    MetaEffect *effect = g_new (MetaEffect, 1);

@@ -119,14 +172,20 @@ create_effect (MetaEffectType      type,
    return effect;
 }

-void
-meta_effect_end (MetaEffect         *effect)
+/**
+ * Destroys an effect.  If the effect has a "finished" hook, it will be
+ * called before cleanup.
+ *
+ * \param effect  The effect.
+ */
+static void
+effect_free (MetaEffect *effect)
 {
-    if (effect->priv->finished)
-	effect->priv->finished (effect, effect->priv->finished_data);
+  if (effect->priv->finished)
+    effect->priv->finished (effect->priv->finished_data);
    
-    g_free (effect->priv);
-    g_free (effect);
+  g_free (effect->priv);
+  g_free (effect);
 }

 void
@@ -145,10 +204,10 @@ meta_effect_run_focus (MetaWindow	    *window,

 void
 meta_effect_run_minimize (MetaWindow         *window,
-			  MetaRectangle      *window_rect,
-			  MetaRectangle	     *icon_rect,
-			  MetaEffectFinished  finished,
-			  gpointer            data)
+                          MetaRectangle      *window_rect,
+                          MetaRectangle      *icon_rect,
+                          MetaEffectFinished  finished,
+                          gpointer            data)
 {
    MetaEffect *effect;

@@ -165,10 +224,10 @@ meta_effect_run_minimize (MetaWindow         *window,

 void
 meta_effect_run_unminimize (MetaWindow         *window,
-			    MetaRectangle      *window_rect,
-			    MetaRectangle      *icon_rect,
-			    MetaEffectFinished  finished,
-			    gpointer            data)
+                            MetaRectangle      *window_rect,
+                            MetaRectangle      *icon_rect,
+                            MetaEffectFinished  finished,
+                            gpointer            data)
 {
    MetaEffect *effect;

@@ -193,7 +252,7 @@ meta_effect_run_close (MetaWindow         *window,
    g_return_if_fail (window != NULL);

    effect = create_effect (META_EFFECT_CLOSE, window,
-			    finished, data);
+                            finished, data);

    run_handler (effect);
 }
@@ -201,6 +260,7 @@ meta_effect_run_close (MetaWindow         *window,

 /* old ugly minimization effect */

+#ifdef HAVE_SHAPE  
 static void
 update_wireframe_window (MetaDisplay         *display,
                         Window               xwindow,
@@ -211,8 +271,6 @@ update_wireframe_window (MetaDisplay         *display,
                     rect->x, rect->y,
                     rect->width, rect->height);

-#ifdef HAVE_SHAPE  
-
 #define OUTLINE_WIDTH 3
  
  if (rect->width > OUTLINE_WIDTH * 2 &&
@@ -253,21 +311,22 @@ update_wireframe_window (MetaDisplay         *display,
      XShapeCombineMask (display->xdisplay, xwindow,
                         ShapeBounding, 0, 0, None, ShapeSet);
    }
-#endif
 }
+#endif

+/**
+ * A hack to force the X server to synchronize with the
+ * graphics hardware.
+ */
 static void
 graphics_sync (BoxAnimationContext *context)
 {
  XImage *image;
  
-  /* A hack to force the X server to synchronize with the
-   * graphics hardware
-   */
  image = XGetImage (context->screen->display->xdisplay,
-		     context->screen->xroot,
-		     0, 0, 1, 1,
-		     AllPlanes, ZPixmap);
+                     context->screen->xroot,
+                     0, 0, 1, 1,
+                     AllPlanes, ZPixmap);

  XDestroyImage (image);
 }
@@ -280,20 +339,20 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
  MetaRectangle draw_rect;
  double fraction;
  
+#ifndef HAVE_SHAPE
  if (!context->first_time)
    {
-      if (context->style == META_ANIMATION_DRAW_ROOT)
-        {
-          /* Restore the previously drawn background */
-          XDrawRectangle (context->screen->display->xdisplay,
-                          context->screen->xroot,
-                          context->gc,
-                          context->last_rect.x, context->last_rect.y,
-                          context->last_rect.width, context->last_rect.height);
-        }
+       /* Restore the previously drawn background */
+       XDrawRectangle (context->screen->display->xdisplay,
+                       context->screen->xroot,
+                       context->gc,
+                       context->last_rect.x, context->last_rect.y,
+                       context->last_rect.width, context->last_rect.height);
    }
+  else
+    context->first_time = FALSE;

-  context->first_time = FALSE;
+#endif /* !HAVE_SHAPE */

  g_get_current_time (&current_time);
  
@@ -312,23 +371,15 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
  if (elapsed > context->millisecs_duration)
    {
      /* All done */
-      if (context->style == META_ANIMATION_WINDOW_OPAQUE)
-        {
-          g_object_unref (G_OBJECT (context->orig_pixbuf));
-          meta_image_window_free (context->image_window);
-        }
-      else if (context->style == META_ANIMATION_DRAW_ROOT)
-        {
-          meta_display_ungrab (context->screen->display);
-          meta_ui_pop_delay_exposes (context->screen->ui);
-          XFreeGC (context->screen->display->xdisplay,
-                   context->gc);
-        }
-      else if (context->style == META_ANIMATION_WINDOW_WIREFRAME)
-        {
-          XDestroyWindow (context->screen->display->xdisplay,
+#ifdef HAVE_SHAPE
+        XDestroyWindow (context->screen->display->xdisplay,
                          context->wireframe_xwindow);
-        }
+#else
+        meta_display_ungrab (context->screen->display);
+        meta_ui_pop_delay_exposes (context->screen->ui);
+        XFreeGC (context->screen->display->xdisplay,
+                 context->gc);
+#endif /* !HAVE_SHAPE */

      graphics_sync (context);
      
@@ -352,195 +403,99 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
    draw_rect.width = 1;
  if (draw_rect.height < 1)
    draw_rect.height = 1;
-  
+
+#ifdef HAVE_SHAPE
+  update_wireframe_window (context->screen->display,
+                           context->wireframe_xwindow,
+                           &draw_rect);
+#else
  context->last_rect = draw_rect;

-  if (context->style == META_ANIMATION_WINDOW_OPAQUE)
-    {
-      GdkPixbuf *scaled;
-
-      scaled = NULL;
-      switch (context->anim_type)
-        {
-        case META_BOX_ANIM_SCALE:
-          scaled = gdk_pixbuf_scale_simple (context->orig_pixbuf,
-                                            draw_rect.width,
-                                            draw_rect.height,
-                                            GDK_INTERP_BILINEAR);
-          break;
-        case META_BOX_ANIM_SLIDE_UP:
-          {
-            int x, y;
-
-            x = context->start_rect.width - draw_rect.width;
-            y = context->start_rect.height - draw_rect.height;
-
-            /* paranoia */
-            if (x < 0)
-              x = 0;
-            if (y < 0)
-              y = 0;
-            
-            scaled = gdk_pixbuf_new_subpixbuf (context->orig_pixbuf,
-                                               x, y,
-                                               draw_rect.width,
-                                               draw_rect.height);
-          }
-          break;
-        }
-
-      /* handle out-of-memory */
-      if (scaled != NULL)
-        {
-          meta_image_window_set (context->image_window,
-                                 scaled,
-                                 draw_rect.x, draw_rect.y);
-          
-          g_object_unref (G_OBJECT (scaled));
-        }
-    }
-  else if (context->style == META_ANIMATION_DRAW_ROOT)
-    {
-      /* Draw the rectangle */
-      XDrawRectangle (context->screen->display->xdisplay,
-                      context->screen->xroot,
-                      context->gc,
-                      draw_rect.x, draw_rect.y,
-                      draw_rect.width, draw_rect.height);
-    }
-  else if (context->style == META_ANIMATION_WINDOW_WIREFRAME)
-    {
-      update_wireframe_window (context->screen->display,
-                               context->wireframe_xwindow,
-                               &draw_rect);
-    }
+  /* Draw the rectangle */
+  XDrawRectangle (context->screen->display->xdisplay,
+                  context->screen->xroot,
+                  context->gc,
+                  draw_rect.x, draw_rect.y,
+                  draw_rect.width, draw_rect.height);
+    
+#endif /* !HAVE_SHAPE */

  /* kick changes onto the server */
  graphics_sync (context);
  
  return TRUE;
 }
-
-
-/* I really don't want this to be a configuration option, but I think
- * the wireframe is sucky from a UI standpoint (more confusing than
- * opaque), but the opaque is definitely still too slow on some
- * systems, and also doesn't look quite right due to the mapping
- * and unmapping of windows that's going on.
- */
 
-static MetaAnimationStyle animation_style = META_ANIMATION_WINDOW_WIREFRAME;
-
 void
-meta_effects_draw_box_animation (MetaScreen     *screen,
-                                 MetaRectangle  *initial_rect,
-                                 MetaRectangle  *destination_rect,
-                                 double          seconds_duration,
-                                 MetaBoxAnimType anim_type)
+draw_box_animation (MetaScreen     *screen,
+                    MetaRectangle  *initial_rect,
+                    MetaRectangle  *destination_rect,
+                    double          seconds_duration)
 {
  BoxAnimationContext *context;

+#ifdef HAVE_SHAPE
+  XSetWindowAttributes attrs;
+#else
+  XGCValues gc_values;
+#endif
+    
  g_return_if_fail (seconds_duration > 0.0);

  if (g_getenv ("METACITY_DEBUG_EFFECTS"))
    seconds_duration *= 10; /* slow things down */
  
  /* Create the animation context */
-  context = g_new0 (BoxAnimationContext, 1);	
+  context = g_new0 (BoxAnimationContext, 1);

  context->screen = screen;

  context->millisecs_duration = seconds_duration * 1000.0;
-  context->first_time = TRUE;
+
  context->start_rect = *initial_rect;
  context->end_rect = *destination_rect;
-  context->anim_type = anim_type;

-  context->style = animation_style;
+#ifdef HAVE_SHAPE

-#ifndef HAVE_SHAPE
-  if (context->style == META_ANIMATION_WINDOW_WIREFRAME)
-    context->style = META_ANIMATION_DRAW_ROOT;
+  attrs.override_redirect = True;
+  attrs.background_pixel = BlackPixel (screen->display->xdisplay,
+                                       screen->number);
+
+  context->wireframe_xwindow = XCreateWindow (screen->display->xdisplay,
+                                              screen->xroot,
+                                              initial_rect->x,
+                                              initial_rect->y,
+                                              initial_rect->width,
+                                              initial_rect->height,
+                                              0,
+                                              CopyFromParent,
+                                              CopyFromParent,
+                                              (Visual *)CopyFromParent,
+                                              CWOverrideRedirect | CWBackPixel,
+                                              &attrs);
+
+  update_wireframe_window (screen->display,
+                           context->wireframe_xwindow,
+                           initial_rect);
+
+  XMapWindow (screen->display->xdisplay,
+              context->wireframe_xwindow);
+
+#else /* !HAVE_SHAPE */
+
+  context->first_time = TRUE;
+  gc_values.subwindow_mode = IncludeInferiors;
+  gc_values.function = GXinvert;
+
+  context->gc = XCreateGC (screen->display->xdisplay,
+                           screen->xroot,
+                           GCSubwindowMode | GCFunction,
+                           &gc_values);
+      
+  /* Grab the X server to avoid screen dirt */
+  meta_display_grab (context->screen->display);
+  meta_ui_push_delay_exposes (context->screen->ui);
 #endif
-  
-  if (context->style == META_ANIMATION_WINDOW_OPAQUE)
-    {
-      GdkPixbuf *pix;
-      
-      pix = meta_gdk_pixbuf_get_from_window (NULL,
-                                             screen->xroot,
-                                             initial_rect->x,
-                                             initial_rect->y,
-                                             0, 0,
-                                             initial_rect->width,
-                                             initial_rect->height);
-
-      if (pix == NULL)
-        {
-          /* Fall back to wireframe */
-          context->style = META_ANIMATION_WINDOW_WIREFRAME;
-        }
-      else
-        {
-          context->image_window = meta_image_window_new (screen->display->xdisplay,
-                                                         screen->number,
-                                                         initial_rect->width,
-                                                         initial_rect->height);
-          context->orig_pixbuf = pix;
-          meta_image_window_set (context->image_window,
-                                 context->orig_pixbuf,
-                                 initial_rect->x,
-                                 initial_rect->y);
-          meta_image_window_set_showing (context->image_window, TRUE);
-        }
-    }
-
-  /* Not an else, so that fallback works */
-  if (context->style == META_ANIMATION_WINDOW_WIREFRAME)
-    {
-      XSetWindowAttributes attrs;
-
-      attrs.override_redirect = True;
-      attrs.background_pixel = BlackPixel (screen->display->xdisplay,
-                                           screen->number);
-
-      context->wireframe_xwindow = XCreateWindow (screen->display->xdisplay,
-                                                  screen->xroot,
-                                                  initial_rect->x,
-                                                  initial_rect->y,
-                                                  initial_rect->width,
-                                                  initial_rect->height,
-                                                  0,
-                                                  CopyFromParent,
-                                                  CopyFromParent,
-                                                  (Visual *)CopyFromParent,
-                                                  CWOverrideRedirect | CWBackPixel,
-                                                  &attrs);
-
-      update_wireframe_window (screen->display,
-                               context->wireframe_xwindow,
-                               initial_rect);
-
-      XMapWindow (screen->display->xdisplay,
-                  context->wireframe_xwindow);
-    }
-  
-  if (context->style == META_ANIMATION_DRAW_ROOT)
-    {
-      XGCValues gc_values;
-      
-      gc_values.subwindow_mode = IncludeInferiors;
-      gc_values.function = GXinvert;
-
-      context->gc = XCreateGC (screen->display->xdisplay,
-                               screen->xroot,
-                               GCSubwindowMode | GCFunction,
-                               &gc_values);
-      
-      /* Grab the X server to avoid screen dirt */
-      meta_display_grab (context->screen->display);
-      meta_ui_push_delay_exposes (context->screen->ui);
-    }

  /* Do this only after we get the pixbuf from the server,
   * so that the animation doesn't get truncated.
@@ -759,28 +714,22 @@ run_default_effect_handler (MetaEffect *effect)
    switch (effect->type)
    {
    case META_EFFECT_MINIMIZE:
-	meta_effects_draw_box_animation (effect->window->screen,
-					 &(effect->u.minimize.window_rect),
-					 &(effect->u.minimize.icon_rect),
-					 META_MINIMIZE_ANIMATION_LENGTH,
-					 META_BOX_ANIM_SCALE);
-	break;
+       draw_box_animation (effect->window->screen,
+                     &(effect->u.minimize.window_rect),
+                     &(effect->u.minimize.icon_rect),
+                     META_MINIMIZE_ANIMATION_LENGTH);
+       break;

    default:
-	break;
+       break;
    }
 }

 static void
 run_handler (MetaEffect *effect)
 {
-    if (effect_handler)
-    {
-	effect_handler (effect, effect_handler_data);
-    }
-    else
-    {
-	run_default_effect_handler (effect);
-	meta_effect_end (effect);
-    }
+  if (meta_prefs_get_gnome_animations ())
+    run_default_effect_handler (effect);
+
+  effect_free (effect);
 }
--- a/src/core/effects.h
+++ b/src/core/effects.h
@@ -0,0 +1,170 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file effects.h "Special effects" other than compositor effects.
+ * 
+ * Before we had a serious compositor, we supported swooping
+ * rectangles for minimising and so on.  These are still supported
+ * today, even when the compositor is enabled.  The file contains two
+ * parts:
+ *
+ *  1) A set of functions, each of which implements a special effect.
+ *     (Only the minimize function does anything interesting; we should
+ *      probably get rid of the rest.)
+ *
+ *  2) A set of functions for moving a highlighted wireframe box around
+ *     the screen, optionally with height and width shown in the middle.
+ *     This is used for moving and resizing when reduced_resources is set.
+ *
+ * There was formerly a system which allowed callers to drop in their
+ * own handlers for various things; it was never used (people who want
+ * their own handlers can just modify this file, after all) and it added
+ * a good deal of extra complexity, so it has been removed.  If you want it,
+ * it can be found in svn r3769.
+ */
+
+/* 
+ * Copyright (C) 2001 Anders Carlsson, Havoc Pennington
+ * 
+ * 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_EFFECTS_H
+#define META_EFFECTS_H
+
+#include "util.h"
+#include "screen-private.h"
+
+typedef enum
+{
+  META_EFFECT_MINIMIZE,
+  META_EFFECT_UNMINIMIZE,
+  META_EFFECT_FOCUS,
+  META_EFFECT_CLOSE,
+  META_NUM_EFFECTS
+} MetaEffectType;
+
+/**
+ * A callback which will be called when the effect has finished.
+ */
+typedef void (* MetaEffectFinished) (gpointer    data);
+
+/**
+ * Performs the minimize effect.
+ *
+ * \param window       The window we're moving
+ * \param window_rect  Its current state
+ * \param target       Where it should end up
+ * \param finished     Callback for when it's finished
+ * \param data         Data for callback
+ */
+void        meta_effect_run_minimize     (MetaWindow         *window,
+                                          MetaRectangle	     *window_rect,
+                                          MetaRectangle	     *target,
+                                          MetaEffectFinished  finished,
+                                          gpointer            data);
+
+/**
+ * Performs the unminimize effect.  There is no such effect.
+ * FIXME: delete this.
+ *
+ * \param window       The window we're moving
+ * \param icon_rect    Its current state
+ * \param window_rect  Where it should end up
+ * \param finished     Callback for when it's finished
+ * \param data         Data for callback
+ */
+void        meta_effect_run_unminimize (MetaWindow         *window,
+                                          MetaRectangle      *window_rect,
+                                          MetaRectangle      *icon_rect,
+                                          MetaEffectFinished  finished,
+                                          gpointer            data);
+
+/**
+ * Performs the close effect.  There is no such effect.
+ * FIXME: delete this.
+ *
+ * \param window       The window we're moving
+ * \param finished     Callback for when it's finished
+ * \param data         Data for callback
+ */
+void        meta_effect_run_close        (MetaWindow         *window,
+                                          MetaEffectFinished  finished,
+                                          gpointer            data);
+
+/**
+ * Performs the focus effect.  There is no such effect.
+ * FIXME: delete this.
+ *
+ * \param window       The window we're moving
+ * \param finished     Callback for when it's finished
+ * \param data         Data for callback
+ */
+void        meta_effect_run_focus        (MetaWindow         *window,
+                                          MetaEffectFinished  finished,
+                                          gpointer            data);
+
+/**
+ * Grabs the server and paints a wireframe rectangle on the screen.
+ * Since this involves starting a grab, please be considerate of other
+ * users and don't keep the grab for long.  You may move the wireframe
+ * around using meta_effects_update_wireframe() and remove it, and undo
+ * the grab, using meta_effects_end_wireframe().
+ *
+ * \param screen  The screen to draw the rectangle on.
+ * \param rect    The size of the rectangle to draw.
+ * \param width   The width to display in the middle (or 0 not to)
+ * \param height  The width to display in the middle (or 0 not to)
+ */
+void meta_effects_begin_wireframe  (MetaScreen          *screen,
+                                    const MetaRectangle *rect,
+                                    int                  width,
+                                    int                  height);
+
+/**
+ * Moves a wireframe rectangle around after its creation by
+ * meta_effects_begin_wireframe().  (Perhaps we ought to remember the old
+ * positions and not require people to pass them in?)
+ *
+ * \param old_rect  Where the rectangle is now
+ * \param old_width The width that was displayed on it (or 0 if there wasn't)
+ * \param old_height The height that was displayed on it (or 0 if there wasn't)
+ * \param new_rect  Where the rectangle is going
+ * \param new_width The width that will be displayed on it (or 0 not to)
+ * \param new_height The height that will be displayed on it (or 0 not to)
+ */
+void meta_effects_update_wireframe (MetaScreen          *screen,
+                                    const MetaRectangle *old_rect,
+                                    int                  old_width,
+                                    int                  old_height,
+                                    const MetaRectangle *new_rect,
+                                    int                  new_width,
+                                    int                  new_height);
+
+/**
+ * Removes a wireframe rectangle from the screen and ends the grab started by
+ * meta_effects_begin_wireframe().
+ *
+ * \param old_rect  Where the rectangle is now
+ * \param old_width The width that was displayed on it (or 0 if there wasn't)
+ * \param old_height The height that was displayed on it (or 0 if there wasn't)
+ */
+void meta_effects_end_wireframe    (MetaScreen          *screen,
+                                    const MetaRectangle *old_rect,
+                                    int                  width,
+                                    int                  height);
+
+#endif /* META_EFFECTS_H */
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -24,6 +24,7 @@

 #include <config.h>
 #include "errors.h"
+#include "display-private.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <gdk/gdk.h>
--- a/src/core/eventqueue.c
+++ b/src/core/eventqueue.c
--- a/src/core/eventqueue.h
+++ b/src/core/eventqueue.h
--- a/src/core/frame-private.h
+++ b/src/core/frame-private.h
@@ -21,10 +21,11 @@
 * 02111-1307, USA.
 */

-#ifndef META_FRAME_H
-#define META_FRAME_H
+#ifndef META_FRAME_PRIVATE_H
+#define META_FRAME_PRIVATE_H

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

 typedef struct _MetaFrameGeometry MetaFrameGeometry;

--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -24,7 +24,7 @@
 */

 #include <config.h>
-#include "frame.h"
+#include "frame-private.h"
 #include "bell.h"
 #include "errors.h"
 #include "keybindings.h"
@@ -413,3 +413,8 @@ meta_frame_set_screen_cursor (MetaFrame	*frame,
    }
 }

+Window
+meta_frame_get_xwindow (MetaFrame *frame)
+{
+  return frame->xwindow;
+}
--- a/src/core/group-private.h
+++ b/src/core/group-private.h
--- a/Show More
+++ b/Show More