Bump version to 3.2.2

Update NEWS
meta-window-actor: Add error traps in meta_window_actor_set_redirected
2012-01-18 10:25:16 -05:00 · 2012-01-17 16:24:53 -05:00 · 2012-01-17 16:23:54 -05:00 · 2011-10-25 17:36:35 +05:30
139 changed files with 38903 additions and 29312 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,6 @@ libtool
 ltmain.sh
 missing
 .deps
-src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop
 *.o
@ -49,8 +48,7 @@ libmutter.pc
 mutter
 mutter-theme-viewer
 mutter.desktop
-org.gnome.mutter.gschema.valid
-org.gnome.mutter.gschema.xml
+mutter.schemas
 testasyncgetprop
 testboxes
 testgradient
--- a/8
+++ b/8
@ -42,10 +42,10 @@ Minimal Building/Testing Environment
  build a development version of Metacity -- odds are, you may be able
  to build metacity from CVS without building any other modules.

-  As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro
-  (gtk+ >= 2.6 if you manually revert the change from bug 348633), you
-  should be able to install your distro's development packages
-  (e.g. gtk2-devel, glib-devel, startup-notification-devel on
+  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,
--- a/224
+++ b/224
@ -1,223 +1,13 @@
-3.5.4
+3.2.2
 =====
-* Make it possible to reimplement move-to-workspace keybindings from plugins
-  [Giovanni; #674104]
-* Add a preference to ignore hide-titlebar-when-maximized hint [Rico; #678947]
-* window: Also use hide-titlebar-when-maximized when tiled [Florian; #679290]
-* Center modal dialogs on their parent instead [Florian; #674499]
-* Reduce amount of markup in translated messages [Matthias; #679660]
-* Fix focus problem after closing a window with focus-follows-mouse
-  [Jasper; #675982]
-* Handle changes of the attach-modal-dialogs preference [Florian; #679904]
-* Do not restore tiling on unmaximize [Florian; #677565]
-* Misc. fixes and cleanups [Jasper Adriaanse, Jasper, Debarshi, Pavel;
-  #679153, 673824]
+* Fix a crash that could occur when unredirected full-screen windows [Adel]
+* Fix a memory leak [Jasper; #642652]

 Contributors:
- Jasper Lievisse Adriaanse, Giovanni Campagna, Matthias Clasen, Florian Müllner,
- Debarshi Ray, Jasper St. Pierre, Rico Tzschichholz, Pavel Vasin
+ Jasper St. Pierre, Adel Gadllah

-Translations:
- Alexander Shopov [bg], Kjartan Maraas [nb], Yaron Shahrabani [he],
- Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Daniel Mustieles [es]
-
-3.5.3
-=====
-* Simplify plugin system [Jasper; #676855]
-* meta-window-actor: Don't unredirect shaped windows [Jasper; #677657]
-* screen: Add new public meta_screen_get_current_monitor API [Tim; #642591]
-* frames: Increase the size of resize corners [Jasper; #677669]
-* window: Make some window methods public [Jasper; #678126]
-* Fix crash when running mutter stand-alone [Jasper; #678238]
-* meta-window-actor: Fix potential crash in shaping code [Jasper; #677977]
-* Misc. fixes [Jasper, Marc-Antoine, Rico]
-
-Contributors:
- Tim L, Marc-Antoine Perennou, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
-
- Daniel Mustieles [es], Matej Urbančič [sl], Khaled Hosny [ar],
- Bruno Brouard [fr], Fran Diéguez [gl]
-
-3.5.2
-=====
-* keybindings: Remove 'toggle-recording' binding [Florian; #674376]
-* Switch to gtk-doc syntax [Jasper; #673752]
-* shaped-texture: never slice shape mask texture [Robert; #674731]
-* Make Mutter stop relying on Cogl including a GL header [Neil; #672711]
-* Make support for "XFree86" Xinerama mandatory [Owen; #674727]
-* meta_window_move_frame(): fix crash when frame is NULL [Owen; #675254]
-* Fix memory leaks [Pavel; #672640]
-* Code cleanups [Jasper; #671104 #674876 #676052]
-* Look for themes in XDG user data dir [Jasper; #675316]
-* Remove frame pixel caching [Jasper; #675111]
-* stack: Ignore keep-on-top property on maximized windows [Florian; #673581]
-* Misc. fixes [Javier, Jasper, Owen, Rico]
-
-Contributors:
- Robert Bragg, Javier Járdon, Florian Müllner, Neil Roberts, Jasper St. Pierre, 
- Owen Taylor, Rico Tzschichholz, Pavel Vasin
-
-Translations:
- Praveen Illa [te], Luca Ferretti [it], Daniel Mustieles [es]
-
-3.4.1
-=====
-* API change: the meta_display_add_keybinding() function added in 3.4
-  wasn't usable from a GNOME Shell extension, so has been changed to take
-  a GSettings object rather than the name of a schema [Jasper; #673014]
-* Don't try to auto-maximize not-maximizable windows; this fixes the problem
-  with the Nautilus desktop window being mis-positioned when enabled
-  [Owen; #673566]
-* Fix a crash in the default plugin (not used in GNOME) [Giovanni; #673809]
-* Make the <Super> key work when set as the mouse button modifier
-  [Florian; #662476]
-
-Contributors:
- Giovanni Campagna, Florian Muellner, Jasper St. Pierre, Owen Taylor
-
-Translations:
- Khaled Hosny [ar], Jordi Serratosa [ca], Carles Ferrando [ca@valencia],
- Christian Kirbach [de], Kristjan Schmidt [eo], Arash Mousavi [fa],
- Jiro Matsuzawa [ja], Shankar Prasad [kn], Aurimas Černius [lt],
- Yinghua Wang [zh_CN]
-
-3.4.0
-=====
-* Fix crash when a full-screen window is opened [Jasper; #672797]
-* Fix memory leaks [Pavel; #672640]
-
-Contributors:
- Jasper St. Pierre, Pavel Vasin
-
-Translations:
- Marek Černocký, Petr Kovar [cz], Bruno Brouard [fr], Sweta Kothari [gu],
- Yaron Shahrabani [he], Changwoo Ryu [kr], Enrico Nicoletto [pt_BR],
- Yuri Myasoedov [ru], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi]
-
-3.3.92
-======
-* Automaximize large windows on map [Adel; #671677]
-* When unmaximizing windows, make sure the unminimized size
-  is signficantly less than the maximized size [Adel; #671677]
-* Don't offer maximize option for windows larger than the screen
-  [Jasper; #643606]
-* Always focus the window immediately underneath without restacking
-  when closing a window [Jasper; #620744]
-* Avoid drawing shadows when two windows are tiled together [Rui; #643075]
-* Remove tooltips for window decorations [Florian; #645101]
-* Add org.gnome.mutter.dynamic-workspaces GSetting - when this is set
-  to true, workspace counts are never saved to GSettings, avoiding
-  pointless disk traffic for GNOME dynamic workspaces [Florian; #671568]
-* Add ::grab-op-begin, ::grab-op-end signals to MetaDisplay [Jasper; #670658]
-* Add meta_display_get_ignored_modifier_mask() [Florian; #665215]
-* Remove pointless wrapper methods on MetaPlugin [Jasper; #671103]
-* Fix frame drawing with 3.3.x GTK+ releases [Florian; #671796]
-* Build fixes [Jasper, Rico, Rui]
-* Misc bug fixes [Damien, Jasper, Lionel, Marius, Owen, Rui;
-  #661256, #667437, #671601, #671087, #672374]
-
-Contributors:
- Stefano Facchini, Adel Gadllah, Lionel Landwerlin, Mariusz Libera,
- Rui Matos, Florian Müllner, Jasper St. Pierre, Damien Radtke, Owen Taylor,
- Rico Tzschichholz
-
-Translations:
- Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Alexander Shopov [bg],
- David Planella [ca], Carles Ferrando [ca@valencia], Kenneth Nielsen [dk],
- Bruce Cowan [en_GB], Daniel Mustieles [es], Mattias Põldaru [et],
- Inaki Larranaga Murgoitio [eu], Timo Jyrinki [fi], Fran Diéguez [gl],
- Gabor Kelemen [hu], Changwoo Ryu [ko], Anita Reitere [lv],
- Kjartan Maraas [nb], Wouter Bolsterlee [nl], A S Alam [pa], Piotr Drąg [pl],
- Duarte Loreto [pt], Yuri Myasoedov [ru], Daniel Nylander [se],
- Matej Urbančič [sl], Miroslav Nikolić [sr], Tirumurti Vasudevan [ta],
- Sasi Bhushan [te], Daniel Korostil [uk], Nguyễn Thái Ngọc Duy [vi],
- YunQiang Su [zh_CN], Chao-Hsiung Liao [zh_HK, zh_TW]
-
-3.3.90
-======
-* Update for Cogl API changes [Robert]
-* Bug fixes [Adel, Jasper;  #659643]
-* Build fixes [Jasper, Owen]
-
-Contributors:
- Robert Bragg, Adel Gadllah, Jasper St. Pierre, Owen Taylor
-
-Translations:
- Ask H. Larsen [dk], Miroslav Nikolić [sr]
-
-3.3.5
-=====
-* MetaShapedTexture no longer is a ClutterTexture subclass [Jasper; #660941]
-* Add meta_shaped_texture_get_image() [Jasper; #660941]
-* Cleanups [Rui, Jasper; #657639]
-* Depend on GTK+ 3.3.7 [Rico]
-
-Contributors:
- Rui Matos, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
- Kjartan Maraas [nb], Chao-Hsiung Liao [zh_HK, zh_TW]
-
-3.3.4
-=====
-* Adapt to changes in GtkStateFlags [Owen]
-* Redo properties for applications menu corresponding to GTK+ changes -
-  they are now _GTK_* not DBUS_*. [Ryan]
-* Fix crash on gnome-shell restart when a modal dialog is open [Owen; #668299]
-* Code cleanup [Florian; #666039]
-
-Contributors:
- Ryan Lortie, Florian Müllner, Owen Taylor
-
-Translations:
- Alexander Shopov [bg], Fran Diéguez [gl]
-
-3.3.3
-=====
-* Add keybindings for tiling to left or right [Florian; #648700]
-* Support GTK+'s hide-titlebar-when-maximized hint [Florian; #665617]
-* Load _DBUS_APPLICATION_ID, _DBUS_UNIQUE_NAME, _DBUS_OBJECT_PATH
-  property [Colin, Ryan; #664851]
-* Handle changes to workspaces-only-on-primary GSetting [Florian; #664853]
-* Don't use the Clutter default stage [Jasper; #664028]
-* Fix compilation with --disable-introspection [Lionel; #661871]
-* Fix problem where stage could end up mis-sized on startup with
-  multiple monitors [Lionel]
-* Misc bug fixes [Adel, Lionel, Jasper; #666015]
-
-Contributors:
- Adel Gadllah, Lionel Landwerlin, Florian Müllner, Jasper St. Pierre
-
-Translations:
- Daniel Mustieles [es], Yaron Shahrabani [he], Kjartan Maraas [nb],
- Matej Urbančič [sk], Muhammet Kara [tr]
-
-3.3.2
-=====
-
-* Move from GConf to GSettings for preferences [Florian; #635378]
-* Add meta_display_add_keybinding()/meta_display_remove_keybinding()
-  to allow creating new keybindings at runtime [Florian; #663428]
-* Add suport for new _NET_WM_STATE_FOCUSED atom in _NET_WM_STATE
-  to allow applications to draw unfocused windows differently
-  [Rui; #661427]
-* Add meta_window_move_resize_frame() to allow specifying the
-  size and position of a window via the outside dimensions of the
-  window frame.
-* Don't activate window tiling when moving in snap mode
-  [Rui; #662270]
-* Remove the ability to resize a window from the inner edge of
-  the titlebar [Jasper; #660129]
-* Fix for deprecations in GTK+ [Jasper, Rico; #662574, #662895]
-* Misc bug fixes [Jasper, Rico, Rui; #662895, #642652, #660941, #662225]
-
-Contributors:
- Tim Cuthbertson, Rui Matos, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
- Jorge González (es), Kjartan Maraas (nb), Krishnababu Krothapalli (te), Nguyễn Thái Ngọc Duy (vi)
+Translations
+ Krishnababu Krothapalli [te], Nguyễn Thái Ngọc Duy [vi]

 3.2.1
 =====
@ -237,7 +27,7 @@ Translations:
 * Misc bug fixes [Adel, Jasper, Rui; #660464, #660854, #662053]

 Contributors:
- Matthias Clasen, Sandro Mani, Rui Matos, Jasper St. Pierre, Owen Taylor
+ Matthias Clasen, Adel Gadllah, Sandro Mani, Rui Matos, Jasper St. Pierre, Owen Taylor

 Translations:
 Tommi Vainikainen [fi], Miroslav Nikolić [sr, sr@latin], Muhammet Kara [tr]
--- a/29
+++ b/29
@ -18,7 +18,8 @@ COMPILING MUTTER
 You need GTK+ 2.2.  For startup notification to work you need
 libstartup-notification at
 http://www.freedesktop.org/software/startup-notification/ or on the
-GNOME ftp site.
+GNOME ftp site. You also need GConf 1.2 (unless building a funky
+extra-small embedded metacity with --disable-gconf, see below).
 You need Clutter 1.0. You need gobject-introspection 0.6.3.

 REPORTING BUGS AND SUBMITTING PATCHES
@ -58,24 +59,25 @@ MUTTER FEATURES
   and should work with KWin, fvwm2, and other EWMH-compliant WMs.)

 - Has a simple theme system and a couple of extra themes come with it.
-   Change themes via gsettings:
-     gsettings set org.gnome.desktop.wm.preferences theme Crux
-     gsettings set org.gnome.desktop.wm.preferences theme Gorilla
-     gsettings set org.gnome.desktop.wm.preferences theme Atlanta
-     gsettings set org.gnome.desktop.wm.preferences theme Bright
+   Change themes via gconf-editor or gconftool or GNOME themes control
+   panel:
+     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
+     gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
+     gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
+     gconftool-2 --type=string --set /apps/metacity/general/theme Bright

   See theme-format.txt for docs on the theme format. Use 
   metacity-theme-viewer to preview themes.

- - Change number of workspaces via gsettings:
-     gsettings set org.gnome.desktop.wm.preferences num-workspaces 5
+ - Change number of workspaces via gconf-editor or gconftool:
+     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5

   Can also change workspaces from GNOME 2 pager.

 - Change focus mode:
-     gsettings set org.gnome.desktop.wm.preferences focus-mode mouse
-     gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy
-     gsettings set org.gnome.desktop.wm.preferences focus-mode click
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode click

 - Global keybinding defaults include:   

@ -90,9 +92,10 @@ MUTTER FEATURES

   Change keybindings for example:

-     gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 '[<Alt>F1]'
+     unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
   
-   Also try the GNOME keyboard shortcuts control panel.
+   Also try the GNOME keyboard shortcuts control panel, or
+   gconf-editor.

 - Window keybindings:

--- a/configure.in
+++ b/configure.in
@ -1,8 +1,8 @@
 AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [5])
-m4_define([mutter_micro_version], [4])
+m4_define([mutter_minor_version], [2])
+m4_define([mutter_micro_version], [2])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@ -61,23 +61,21 @@ AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN

+GTK_MIN_VERSION=2.91.7
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26

-CLUTTER_PACKAGE=clutter-1.0
+MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"

-MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.3.7
-   gio-2.0 >= 2.25.10
-   pango >= 1.2.0
-   cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.3.0
-   xcomposite >= 0.2 xfixes xrender xdamage
-   $CLUTTER_PACKAGE >= 1.9.10
-   cogl-1.0 >= 1.9.6
-"
+AC_ARG_ENABLE(gconf,
+  AC_HELP_STRING([--disable-gconf],
+                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
+  enable_gconf=yes)

-GLIB_GSETTINGS
+if test x$enable_gconf = xyes; then
+    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
+fi

 AC_ARG_ENABLE(verbose-mode,
  AC_HELP_STRING([--disable-verbose-mode],
@ -113,14 +111,17 @@ AC_ARG_ENABLE(shape,
                 [disable mutter's use of the shaped window extension]),,
  enable_shape=auto)

+## try definining HAVE_BACKTRACE
+AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
+
 AM_GLIB_GNU_GETTEXT

 ## here we get the flags we'll actually use
 # GRegex requires Glib-2.14.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
 # gtk_window_set_icon_name requires gtk2+-2.6.0
-PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0)
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0)
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)

 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@ -170,6 +171,31 @@ else
  fi
 fi

+XCOMPOSITE_VERSION=0.2
+
+AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
+if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
+  echo "Building with compositing manager"
+
+  ## force on render also
+  have_xrender=yes
+else
+  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
+fi
+
+CLUTTER_VERSION=1.7.5
+CLUTTER_PACKAGE=clutter-1.0
+AC_SUBST(CLUTTER_PACKAGE)
+if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
+  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
+  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
+else
+  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
+fi
+
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])

@ -201,39 +227,64 @@ fi

 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

-# This is used for plugins
-AC_SUBST(CLUTTER_PACKAGE)
-PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
-
 AC_PATH_XTRA

 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"

-# Check for Xinerama extension - we only support the "XFree86" style,
-# and not the older Solaris-only version; recent Solaris supports the
-# XFree86 style.
+# Check for Xinerama extension (Solaris impl or Xfree impl)
 mutter_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"

-have_xinerama=yes
-AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-    [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-		     [X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
-		     if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-			 X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-		     fi],
-		     have_xinerama=no,
-		     [#include <X11/Xlib.h>])],
-    have_xinerama=no, -lXext $ALL_X_LIBS)
-AC_MSG_CHECKING(for Xinerama support)
-AC_MSG_RESULT($have_xinerama)
+AC_ARG_ENABLE(xinerama,
+  AC_HELP_STRING([--disable-xinerama],
+                 [disable mutter's use of the Xinerama extension]),
+  try_xinerama=$enable_xinerama,try_xinerama=yes)
+
+use_solaris_xinerama=no
+use_xfree_xinerama=no
+if test "${try_xinerama}" != no; then
+    case "$host" in
+        *-*-solaris*)
+            # Check for solaris
+            use_solaris_xinerama=yes
+            AC_CHECK_LIB(Xext, XineramaGetInfo,
+                         use_solaris_xinerama=yes, use_solaris_xinerama=no,
+                         $ALL_X_LIBS)
+            if test "x$use_solaris_xinerama" = "xyes"; then
+                AC_CHECK_HEADER(X11/extensions/xinerama.h,
+                                if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+                                    X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+                                fi
+                                AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
+                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
+                                use_solaris_xinerama=no,
+                                [#include <X11/Xlib.h>])
+            fi
+            AC_MSG_CHECKING(for Xinerama support on Solaris)
+            AC_MSG_RESULT($use_solaris_xinerama);
+            ;;
+        *)
+            # Check for XFree
+            use_xfree_xinerama=yes
+            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
+                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+                                 fi
+                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
+                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
+                                 use_xfree_xinerama=no,
+                                 [#include <X11/Xlib.h>])],
+                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
+            AC_MSG_CHECKING(for Xinerama support on XFree86)
+            AC_MSG_RESULT($use_xfree_xinerama);
+            ;;
+    esac
+fi

 CPPFLAGS="$mutter_save_cppflags"

-if test x$have_xinerama = xno; then
-   AC_MSG_ERROR([Xinerama extension was not found])
-fi
-
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
@ -349,6 +400,18 @@ fi

 AC_SUBST(GDK_PIXBUF_CSOURCE)

+if test x$enable_gconf = xyes; then
+   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
+
+   AM_GCONF_SOURCE_2
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
+fi
+
 AC_PATH_PROG(ZENITY, zenity, no)
 if test x"$ZENITY" = xno; then
  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
@ -426,7 +489,7 @@ if test "$enable_compile_warnings" != no ; then
    if test "$enable_compile_warnings" = error; then
      case " $CFLAGS " in
      *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
+      *) CFLAGS="$CFLAGS -Werror" ;;
      esac
    fi
  fi
@ -448,6 +511,13 @@ po/Makefile.in

 AC_OUTPUT

+if test x$enable_gconf = xno; then
+        echo "*** WARNING WARNING WARNING WARNING WARNING"
+        echo "*** Building without GConf.  This means there's no"
+        echo "*** way to change prefs except hacking source code."
+        echo "*** This is intended for embedded systems etc., not for normal use."
+fi
+
 if test x$enable_verbose_mode = xno; then
        echo "*** WARNING WARNING WARNING WARNING WARNING"
        echo "*** Building without verbose mode"
@ -464,6 +534,9 @@ mutter-$VERSION
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}

+	GConf:                    ${enable_gconf}
+	XFree86 Xinerama:         ${use_xfree_xinerama}
+	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
@ -478,8 +551,8 @@ MUTTER_MINOR_VERSION=mutter_minor_version
 if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then
   stable_version=`expr $MUTTER_MINOR_VERSION - 1`
   echo "This is the UNSTABLE branch of mutter"
-   echo -n "Use 3.$stable_version.x for stable "
-   echo    "(gnome-3-$stable_version branch in git)"
+   echo -n "Use 2.$stable_version.x for stable "
+   echo    "(gnome-2-$stable_version branch in git)"
 else
   echo "This is the stable branch of mutter"
 fi
--- a/doc/how-to-get-focus-right.txt
+++ b/doc/how-to-get-focus-right.txt
@ -31,7 +31,8 @@ workspaces.  In these cases, there needs to be a rule consistent with
 the above about the new window to choose.

 Focus method  Behavior
-    click     Focus the window on top
+    click     Focus the most recently used window (same as the window
+              on top)
   sloppy     Focus the window containing the pointer if there is such
              a window, otherwise focus the most recently used window.
    mouse     Focus the non-DESKTOP window containing the pointer if
--- a/doc/man/mutter-message.1
+++ b/doc/man/mutter-message.1
@ -46,13 +46,13 @@ because the original program does not have a manual page.
 Restart \fBmutter\fP(1) which is running.
 .TP
 .B reload-theme
-Reload a theme which is specified on gsettings database.
+Reload a theme which is specified on gconf database.
 .TP
 .B enable-keybindings
-Enable all of keybindings which is specified on gsettings database.
+Enable all of keybindings which is specified on gconf database.
 .TP
 .B disable-keybindings
-Disable all of keybindings which is specified on gsettings database.
+Disable all of keybindings which is specified on gconf database.
 .SH SEE ALSO
 .BR mutter (1)
 .SH AUTHOR
--- a/doc/man/mutter.1
+++ b/doc/man/mutter.1
@ -51,7 +51,7 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gsettings.
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
 .SH SEE ALSO
 .BR mutter-message (1)
 .SH AUTHOR
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-mutter-windows.xml.in
 src/compositor/compositor.c
+src/core/all-keybindings.h
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@ -19,7 +19,7 @@ src/core/window-props.c
 src/core/xprops.c
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
-src/org.gnome.mutter.gschema.xml.in
+src/mutter.schemas.in
 src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
@ -7,39 +7,253 @@
 #
 # Tõivo Leedjärv <toivo linux ee>, 2004.
 # Ivar Smolin <okul linux ee>, 2005, 2006, 2009–2011.
-# Mattias Põldaru <mahfiaz@gmail.com>, 2008–2011, 2012.
+# Mattias Põldaru <mahfiaz gmail com>, 2008–2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-11 22:19+0000\n"
-"PO-Revision-Date: 2012-03-12 00:47+0200\n"
-"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
-"Language-Team: Estonian <>\n"
-"Language: et\n"
+"product=mutter&component=general\n"
+"POT-Creation-Date: 2011-03-07 23:35+0000\n"
+"PO-Revision-Date: 2011-03-09 06:41+0200\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

-msgid "Windows"
-msgstr "Aknad"
+msgid "Switch to workspace 1"
+msgstr "Lülitumine 1. tööalale"

-msgid "View split on left"
-msgstr "Vaade poolitatakse vasakult"
+msgid "Switch to workspace 2"
+msgstr "Lülitumine 2. tööalale"

-msgid "View split on right"
-msgstr "Vaade poolitatakse paremalt"
+msgid "Switch to workspace 3"
+msgstr "Lülitumine 3. tööalale"

-#. This probably means that a non-WM compositor like xcompmgr is running;
-#. * we have no way to get it to exit
-#, c-format
-msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
-msgstr "Teine komposiithaldur juba töötab ekraani %i kuval \"%s\"."
+msgid "Switch to workspace 4"
+msgstr "Lülitumine 4. tööalale"
+
+msgid "Switch to workspace 5"
+msgstr "Lülitumine 5. tööalale"
+
+msgid "Switch to workspace 6"
+msgstr "Lülitumine 6. tööalale"
+
+msgid "Switch to workspace 7"
+msgstr "Lülitumine 7. tööalale"
+
+msgid "Switch to workspace 8"
+msgstr "Lülitumine 8. tööalale"
+
+msgid "Switch to workspace 9"
+msgstr "Lülitumine 9. tööalale"
+
+msgid "Switch to workspace 10"
+msgstr "Lülitumine 10. tööalale"
+
+msgid "Switch to workspace 11"
+msgstr "Lülitumine 11. tööalale"
+
+msgid "Switch to workspace 12"
+msgstr "Lülitumine 12. tööalale"
+
+msgid "Switch to workspace on the left of the current workspace"
+msgstr "Lülitumine sellest tööalast vasakul olevale tööalale"
+
+msgid "Switch to workspace on the right of the current workspace"
+msgstr "Lülitumine sellest tööalast paremal olevale tööalale"
+
+msgid "Switch to workspace above the current workspace"
+msgstr "Lülitumine selle tööala kohal olevale tööalale"
+
+msgid "Switch to workspace below the current workspace"
+msgstr "Lülitumine selle tööala all olevale tööalale"
+
+msgid "Move between windows of an application, using a popup window"
+msgstr "Liigu rakenduse akende vahel, hüpikaknaga"
+
+msgid "Move backward between windows of an application, using a popup window"
+msgstr "Liigu rakenduse akende vahel tagasisuunas, hüpikaknaga"
+
+msgid "Move between windows, using a popup window"
+msgstr "Liigu akende vahel, hüpikaknaga"
+
+msgid "Move backward between windows, using a popup window"
+msgstr "Liigu akende vahel tagasisuunas, hüpikaknaga"
+
+msgid "Move between panels and the desktop, using a popup window"
+msgstr "Liigu paneelide ja töölaua vahel, hüpikaknaga"
+
+msgid "Move backward between panels and the desktop, using a popup window"
+msgstr "Liigu tagasisuunas paneelide ja töölaua vahel, hüpikaknaga"
+
+msgid "Move between windows of an application immediately"
+msgstr "Liigu koheselt rakenduse akende vahel"
+
+msgid "Move backward between windows of an application immediately"
+msgstr "Liigu koheselt rakenduse akende vahel tagasisuunas"
+
+msgid "Move between windows immediately"
+msgstr "Liigu koheselt akende vahel"
+
+msgid "Move backward between windows immediately"
+msgstr "Liigu koheselt akende vahel tagasisuunas"
+
+msgid "Move between panels and the desktop immediately"
+msgstr "Liigu koheselt paneeli ja töölaua vahel"
+
+msgid "Move backward between panels and the desktop immediately"
+msgstr "Liigu koheselt tagasisuunas paneelide ja töölaua vahel"
+
+msgid "Hide all normal windows and set focus to the desktop"
+msgstr "Peida kõik tavalised aknad ja fokuseeri töölaud"
+
+msgid "Show the panel's main menu"
+msgstr "Paneeli peamenüü näitamine"
+
+msgid "Show the panel's \"Run Application\" dialog box"
+msgstr "Paneeli dialoogi \"Käivita rakendus\" näitamine"
+
+msgid "Start or stop recording the session"
+msgstr "Seansi salvestamise käivitamine või seiskamine"
+
+msgid "Take a screenshot"
+msgstr "Kuvatõmmise võtmine"
+
+msgid "Take a screenshot of a window"
+msgstr "Kuvatõmmise võtmine aknast"
+
+msgid "Run a terminal"
+msgstr "Terminali käivitamine"
+
+msgid "Activate the window menu"
+msgstr "Aknamenüü aktiveerimine"
+
+msgid "Toggle fullscreen mode"
+msgstr "Täisekraanivaate sisse- ja väljalülitamine"
+
+msgid "Toggle maximization state"
+msgstr "Maksimeeritud oleku sisse- ja väljalülitamine"
+
+msgid "Toggle whether a window will always be visible over other windows"
+msgstr "Lüliti määrab, kas aken on alati teiste akende kohal nähtav"
+
+msgid "Maximize window"
+msgstr "Akna maksimeerimine"
+
+msgid "Restore window"
+msgstr "Taasta akna suurus"
+
+msgid "Toggle shaded state"
+msgstr "Varjatud oleku lüliti"
+
+msgid "Minimize window"
+msgstr "Akna minimeerimine"
+
+msgid "Close window"
+msgstr "Akna sulgemine"
+
+msgid "Move window"
+msgstr "Teisalda aken"
+
+msgid "Resize window"
+msgstr "Muuda akna suurust"
+
+msgid "Toggle whether window is on all workspaces or just one"
+msgstr "Lüliti määrab, kas aken on kõigil tööaladel või ainult ühel"
+
+msgid "Move window to workspace 1"
+msgstr "Akna tõstmine 1. tööalale"
+
+msgid "Move window to workspace 2"
+msgstr "Akna tõstmine 2. tööalale"
+
+msgid "Move window to workspace 3"
+msgstr "Akna tõstmine 3. tööalale"
+
+msgid "Move window to workspace 4"
+msgstr "Akna tõstmine 4. tööalale"
+
+msgid "Move window to workspace 5"
+msgstr "Akna tõstmine 5. tööalale"
+
+msgid "Move window to workspace 6"
+msgstr "Akna tõstmine 6. tööalale"
+
+msgid "Move window to workspace 7"
+msgstr "Akna tõstmine 7. tööalale"
+
+msgid "Move window to workspace 8"
+msgstr "Akna tõstmine 8. tööalale"
+
+msgid "Move window to workspace 9"
+msgstr "Akna tõstmine 9. tööalale"
+
+msgid "Move window to workspace 10"
+msgstr "Akna tõstmine 10. tööalale"
+
+msgid "Move window to workspace 11"
+msgstr "Akna tõstmine 11. tööalale"
+
+msgid "Move window to workspace 12"
+msgstr "Akna tõstmine 12. tööalale"
+
+msgid "Move window one workspace to the left"
+msgstr "Akna tõstmine ühe tööala võrra vasakule"
+
+msgid "Move window one workspace to the right"
+msgstr "Akna tõstmine ühe tööala võrra paremale"
+
+msgid "Move window one workspace up"
+msgstr "Akna tõstmine ühe tööala võrra ülespoole"
+
+msgid "Move window one workspace down"
+msgstr "Akna tõstmine ühe tööala võrra allapoole"
+
+msgid "Raise window if it's covered by another window, otherwise lower it"
+msgstr "Tõsta aken, kui seda katab teine aken, muul juhul vii tahapoole"
+
+msgid "Raise window above other windows"
+msgstr "Akna tõstmine teiste akende kohale"
+
+msgid "Lower window below other windows"
+msgstr "Saada aken teiste taha"
+
+msgid "Maximize window vertically"
+msgstr "Maksimeeri aken vertikaalselt"
+
+msgid "Maximize window horizontally"
+msgstr "Maksimeeri aken horisontaalselt"
+
+msgid "Move window to north-west (top left) corner"
+msgstr "Akna tõstmine ekraani loodepoolsesse (ülemisse vasakusse) nurka"
+
+msgid "Move window to north-east (top right) corner"
+msgstr "Akna tõstmine ekraani kirdepoolsesse (ülemisse paremasse) nurka"
+
+msgid "Move window to south-west (bottom left) corner"
+msgstr "Akna tõstmine ekraani edelapoolsesse (alumisse vasakusse) nurka"
+
+msgid "Move window to south-east (bottom right) corner"
+msgstr "Akna tõstmine ekraani kagupoolsesse (alumisse paremasse) nurka"
+
+msgid "Move window to north (top) side of screen"
+msgstr "Akna tõstmine ekraani põhjapoolsesse (ülemisse) serva"
+
+msgid "Move window to south (bottom) side of screen"
+msgstr "Akna tõstmine ekraani lõunapoolsesse (alumisse) serva"
+
+msgid "Move window to east (right) side of screen"
+msgstr "Akna tõstmine ekraani idapoolsesse (paremasse) serva"
+
+msgid "Move window to west (left) side of screen"
+msgstr "Akna tõstmine ekraani läänepoolsesse (vasakusse) serva"
+
+msgid "Move window to center of screen"
+msgstr "Akna tõstmine ekraani keskele"

 msgid "Bell event"
 msgstr "Helina sündmus"
@ -48,13 +262,11 @@ msgstr "Helina sündmus"
 msgid "Unknown window information request: %d"
 msgstr "Tundmatu aknateabe päring: %d"

+#. Translators: %s is a window title
 #, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> ei vasta."

-msgid "Application is not responding."
-msgstr "Rakendus ei vasta."
-
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -82,6 +294,27 @@ msgstr ""
 "Mõni teine programm juba kasutab klahvi %s koos muuteklahvidega %x "
 "kiirklahvina\n"

+#. Displayed when a keybinding which is
+#. * supposed to launch a program fails.
+#.
+#, c-format
+msgid ""
+"There was an error running <tt>%s</tt>:\n"
+"\n"
+"%s"
+msgstr ""
+"<tt>%s</tt> käivitamisel esines viga:\n"
+"\n"
+"%s"
+
+#, c-format
+msgid "No command %d has been defined.\n"
+msgstr "Käsku %d pole defineeritud.\n"
+
+#, c-format
+msgid "No terminal command has been defined.\n"
+msgstr "Terminalikäsku pole defineeritud.\n"
+
 msgid "Disable connection to session manager"
 msgstr "Seansihalduriga ühendumise keelamine"

@ -131,6 +364,39 @@ msgstr "Versiooni printimine"
 msgid "Comma-separated list of compositor plugins"
 msgstr "Komaga eraldatud nimekiri komposiitmontaaži pluginatest"

+#.
+#. * We found it, but it was invalid.  Complain.
+#. *
+#. * FIXME: This replicates the original behaviour, but in the future
+#. * we might consider reverting invalid keys to their original values.
+#. * (We know the old value, so we can look up a suitable string in
+#. * the symtab.)
+#. *
+#. * (Empty comment follows so the translators don't see this.)
+#.
+#.
+#, c-format
+msgid "GConf key '%s' is set to an invalid value\n"
+msgstr "GConf võtme '%s' väärtus on vigane\n"
+
+#, c-format
+msgid "%d stored in GConf key %s is out of range %d to %d\n"
+msgstr ""
+"%d, mis on salvestatud GConf võtmes %s, on väljaspool piirkonda %d - %d\n"
+
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr "GConf-i võti \"%s\" on määratud vigase tüübiga\n"
+
+#, c-format
+msgid "GConf key %s is already in use and can't be used to override %s\n"
+msgstr ""
+"GConfi võti %s on juba kasutusel ja sellega ei saa tühistada võtit %s\n"
+
+#, c-format
+msgid "Can't override GConf key, %s not found\n"
+msgstr "GConfi võtit pole võimalik tühistada, võtit %s ei leitud\n"
+
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -139,8 +405,8 @@ msgstr ""
 "ei pruugi õigesti käituda.\n"

 #, c-format
-msgid "Could not parse font description \"%s\" from GSettings key %s\n"
-msgstr "Fondi kirjeldust \"%s\" GSettings võtmest %s pole võimalik töödelda\n"
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr "Fondi kirjeldust \"%s\" GConf võtmest %s ei saa töödelda\n"

 #, c-format
 msgid ""
@ -150,6 +416,14 @@ msgstr ""
 "Seadistuste andmebaasist leitud \"%s\" ei ole sobiv väärtus hiireklahvi "
 "modifikaatoriks\n"

+#, c-format
+msgid "Error setting number of workspaces to %d: %s\n"
+msgstr "Viga tööalade arvuks %d määramisel: %s\n"
+
+#, c-format
+msgid "Workspace %d"
+msgstr "Tööala %d"
+
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -159,8 +433,16 @@ msgstr ""
 "\"\n"

 #, c-format
-msgid "Workspace %d"
-msgstr "Tööala %d"
+msgid "Error setting name for workspace %d to \"%s\": %s\n"
+msgstr "Viga tööalale %d nime \"%s\" määramisel: %s\n"
+
+#, c-format
+msgid "Error setting live hidden windows status status: %s\n"
+msgstr "Viga varjus elushoitavate akende oleku määramisel: %s\n"
+
+#, c-format
+msgid "Error setting no tab popup status: %s\n"
+msgstr ""

 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
@ -258,6 +540,10 @@ msgstr "Aknahalduri hoiatus: "
 msgid "Window manager error: "
 msgstr "Aknahalduri viga: "

+#. Translators: This is the title used on dialog boxes
+msgid "Mutter"
+msgstr "Mutter"
+
 #. first time through
 #, c-format
 msgid ""
@ -295,12 +581,6 @@ msgstr "%s (masinas %s)"
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Vigane WM_TRANSIENT_FOR aknale 0x%lx määratud %s jaoks.\n"

-#, c-format
-msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
-msgstr ""
-"WM_TRANSIENT_FOR aknale 0x%lx määratud %s jaoks tekitaks tsüklilise "
-"korduse.\n"
-
 #, c-format
 msgid ""
 "Window 0x%lx has property %s\n"
@ -324,8 +604,18 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr "Omadus %s aknal 0x%lx sisaldab vigast UTF-8 %d kirjele nimekirjas\n"

-msgid "Mutter"
-msgstr "Mutter"
+msgid "Attach modal dialogs"
+msgstr "Modaaldialoogide kinnistamine"
+
+msgid ""
+"Determines whether hidden windows (i.e., minimized windows and windows on "
+"other workspaces than the current one) should be kept alive."
+msgstr ""
+"Määrab, kas varjatud aknaid (nt minimeeritud ja teistel tööaladel aknad) "
+"hoitakse elus."
+
+msgid "Live Hidden Windows"
+msgstr "Varjatud akende aktiivsus"

 msgid "Modifier to use for extended window management operations"
 msgstr "Laiendatud aknaoperatsioonide korral kasutatav muuteklahv"
@ -342,9 +632,6 @@ msgstr ""
 "klahv\". Eeldatavasti määratakse selle seose väärtuseks vaikimisi või tühi "
 "sõne."

-msgid "Attach modal dialogs"
-msgstr "Modaaldialoogide kinnistamine"
-
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@ -353,75 +640,6 @@ msgstr ""
 "Kui märgitud, siis eraldi tiitliribade asemel on moodaalsed dialoogid "
 "emaakna tiitliribade küljes ning liiguvad koos emaaknaga."

-msgid "Live Hidden Windows"
-msgstr "Varjatud akende aktiivsus"
-
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"Määrab, kas varjatud aknaid (nt minimeeritud ja teistel tööaladel aknad) "
-"hoitakse elus."
-
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Akna ümberpaigutamine selle lohistamisel ekraani serva"
-
-msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them "
-"vertically and resizes them horizontally to cover half of the available "
-"area. Dropping windows on the top screen edge maximizes them completely."
-msgstr ""
-"Kui märgitud, siis akna lohistamine ekraani külgservale maksimeerib selle "
-"vertikaalselt ja laius katab pool saadaolevast laiusest. Akna lohistamine "
-"ekraani ülaserva maksimeerib akna täielikult."
-
-msgid "Workspaces are managed dynamically"
-msgstr "Tööalade dünaamiline haldus"
-
-msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
-"static number of workspaces (determined by the num-workspaces key in org."
-"gnome.desktop.wm.preferences)."
-msgstr ""
-"Määrab, kas tööalasid hallatakse dünaamiliselt või on nende arv staatiline "
-"(arvu määrab org.gnome.desktop.wm.preferences all võti num-workspaces)."
-
-msgid "Workspaces only on primary"
-msgstr "Tööalad ainult peamisel"
-
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Määrab, kas tööalade vahetamine mõjutab kõiki aknaid kõigil monitoridel või "
-"ainult aknaid peamisel monitoril."
-
-msgid "No tab popup"
-msgstr "Tabulaatoril pole hüpikakent"
-
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr ""
-"Kui märgitud, siis on hüpikaken ja esiletõstmise raam keelatud akende "
-"vahetamisel."
-
-msgid "Draggable border width"
-msgstr "Lohistatava äärise laius."
-
-msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
-"not enough, invisible borders will be added to meet this value."
-msgstr ""
-"Lohistatava äärise laius. Kui kujunduse nähtavatest ääristest ei piisa, "
-"lisatakse puuduoleva osa jaoks nähtamatu ääris."
-
-msgid "Select window from tab popup"
-msgstr "Akna valimine tabulaatori hüpikaknalt"
-
-msgid "Cancel tab popup"
-msgstr "Tabulaatori hüpikakna katkestamine"
-
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kasutamine: %s\n"
@ -659,30 +877,6 @@ msgstr "Raami geomeetria ei määra nuppude suurust"
 msgid "Gradients should have at least two colors"
 msgstr "Värviüleminekus peaks olema vähemalt kaks värvi"

-#, c-format
-msgid ""
-"GTK custom color specification must have color name and fallback in "
-"parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
-msgstr ""
-"GTK kohandatud värvi määrang peab sisaldama sulgudes värvi nimetust ning "
-"varuvärvi, nt gtk:custom(foo,bar); väärtust \"%s\" pole võimalik töödelda"
-
-#, c-format
-msgid ""
-"Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
-"_ are valid"
-msgstr ""
-"gtk:custom color_name parameetris sobimatu märk '%c', lubatud on ainult A-Za-"
-"z0-9-_"
-
-#, c-format
-msgid ""
-"Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
-"fit the format"
-msgstr ""
-"Gtk:custom vorming on \"gtk:custom(värvi_nimi,varuvärv)\", \"%s\" ei sobi "
-"selle vorminguga"
-
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -1317,3 +1511,25 @@ msgstr "y väärtus oli %d, oodati väärtust %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n"
+
+#~ msgid ""
+#~ "Don't make fullscreen windows that are maximized and have no decorations"
+#~ msgstr "Ei tehta maksimeeritud ilma raamita täisekraanaknaid."
+
+#~ msgid "Whether window popup/frame should be shown when cycling windows."
+#~ msgstr "Kas hüpikakent/raami näidatakse akende vahetamisel."
+
+#~ msgid "Internal argument for GObject introspection"
+#~ msgstr "GObject enesevaatluse siseargument"
+
+#~ msgid "Failed to restart: %s\n"
+#~ msgstr "Tõrge taaskäivitamisel: %s\n"
+
+#~ msgid "Error setting clutter plugin list: %s\n"
+#~ msgstr "Viga clutteri pluginate nimekirja määramisel: %s\n"
+
+#~ msgid "Clutter Plugins"
+#~ msgstr "Clutteri pluginad"
+
+#~ msgid "Plugins to load for the Clutter-based compositing manager."
+#~ msgstr "Clutteril põhineva komposiitmontaažihalduri laadimise pluginad."
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.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/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/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/50-mutter-windows.xml.in
+++ b/src/50-mutter-windows.xml.in
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.keybindings"
-                group="system"
-                _name="Windows"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="toggle-tiled-left"
-                      _description="View split on left"/>
-
-	<KeyListEntry name="toggle-tiled-right"
-                      _description="View split on right"/>
-
-</KeyListEntries>
-
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -27,6 +27,8 @@ INCLUDES=								\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"

 mutter_built_sources = \
+	mutter-marshal.h \
+	mutter-marshal.c \
 	mutter-enum-types.h \
 	mutter-enum-types.c

@ -52,6 +54,7 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
+	compositor/meta-shaped-texture.h	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@ -130,6 +133,8 @@ libmutter_la_SOURCES =				\
 	core/core.h				\
 	ui/ui.h					\
 	inlinepixbufs.h				\
+	ui/fixedtip.c				\
+	ui/fixedtip.h				\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@ -147,6 +152,7 @@ libmutter_la_SOURCES =				\
 	meta/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
+	core/all-keybindings.h			\
 	meta/preview-widget.h			\
 	ui/preview-widget.c			\
 	$(mutter_built_sources)
@ -169,7 +175,6 @@ libmutterinclude_base_headers =		\
 	meta/main.h				\
 	meta/meta-background-actor.h		\
 	meta/meta-plugin.h			\
-	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
 	meta/prefs.h				\
@ -221,8 +226,8 @@ typelib_DATA = Meta-$(api_version).typelib
 INTROSPECTION_GIRS = Meta-$(api_version).gir

 Meta-$(api_version).gir: libmutter.la
-@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
-@META_GIR@_EXPORT_PACKAGES = libmutter
+@META_GIR@_INCLUDES = GObject-2.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
+@META_GIR@_PACKAGES = clutter-1.0 gtk+-3.0
@META_GIR@_CFLAGS = $(INCLUDES)
@META_GIR@_LIBS = libmutter.la
@META_GIR@_FILES =				\
@ -257,17 +262,20 @@ wmproperties_in_files=mutter-wm.desktop.in
 wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
 wmproperties_DATA = $(wmproperties_files)

-xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = \
-        50-mutter-windows.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = mutter.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)

-gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@

-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = mutter-schemas.convert
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+else
+install-data-local:
+endif

 IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
@ -279,8 +287,7 @@ CLEANFILES =					\
 	inlinepixbufs.h				\
 	mutter.desktop				\
 	mutter-wm.desktop			\
-	org.gnome.mutter.gschema.xml		\
-	$(xml_DATA)				\
+	mutter.schemas				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
@ -297,18 +304,37 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
-	$(xml_in_files)			\
-	org.gnome.mutter.gschema.xml.in \
-	mutter-schemas.convert \
+	$(schema_in_files)		\
 	libmutter.pc.in \
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
-	mutter-enum-types.c.in
+	mutter-enum-types.c.in \
+	mutter-marshal.list

 BUILT_SOURCES += $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)

+mutter-marshal.h: stamp-mutter-marshal.h
+	@true
+stamp-mutter-marshal.h: Makefile mutter-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--header \
+	$(srcdir)/mutter-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
+	rm -f xgen-tmh && \
+	echo timestamp > $(@F)
+
+mutter-marshal.c: Makefile mutter-marshal.list
+	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--body \
+	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc mutter-marshal.c && \
+	rm -f xgen-tmc
+
 mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@ -55,6 +55,9 @@ struct _MetaCompScreen
 };

 void meta_switch_workspace_completed (MetaScreen    *screen);
+void meta_set_stage_input_region     (MetaScreen    *screen,
+                                      XserverRegion  region);
+void meta_empty_stage_input_region   (MetaScreen    *screen);

 gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
                                      MetaPlugin       *plugin,
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@ -515,15 +515,13 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  meta_screen_set_cm_selection (screen);

-  info->stage = clutter_stage_new ();
+  info->stage = clutter_stage_get_default ();

  meta_screen_get_size (screen, &width, &height);
-  clutter_actor_realize (info->stage);
+  clutter_actor_set_size (info->stage, width, height);

  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));

-  XResizeWindow (xdisplay, xwin, width, height);
-
  event_mask = FocusChangeMask |
               ExposureMask |
               EnterWindowMask | LeaveWindowMask |
@ -557,7 +555,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  clutter_actor_hide (info->hidden_group);

-  info->plugin_mgr = meta_plugin_manager_new (screen);
+  info->plugin_mgr =
+    meta_plugin_manager_get (screen);
+  meta_plugin_manager_initialize (info->plugin_mgr);

  /*
   * Delay the creation of the overlay window as long as we can, to avoid
@ -869,6 +869,29 @@ meta_compositor_unmaximize_window (MetaCompositor    *compositor,
  meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
 }

+void
+meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
+                                           MetaWorkspace  *workspace)
+{
+#if 0
+  /* FIXME -- should do away with this function in favour of MetaWorkspace
+   * signal.
+   */
+  MetaScreen     *screen = meta_workspace_get_screen (workspace);
+  MetaCompScreen *info;
+  MetaPluginManager *mgr;
+
+  DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
+  info = meta_screen_get_compositor_data (screen);
+  mgr  = info->plugin_mgr;
+
+  if (!mgr || !workspace)
+    return;
+
+  meta_plugin_manager_update_workspace (mgr, workspace);
+#endif
+}
+
 void
 meta_compositor_switch_workspace (MetaCompositor     *compositor,
                                  MetaScreen         *screen,
@ -1116,18 +1139,12 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
 				  guint		   width,
 				  guint		   height)
 {
-  MetaDisplay    *display = meta_screen_get_display (screen);
-  MetaCompScreen *info    = meta_screen_get_compositor_data (screen);
-  Display        *xdisplay;
-  Window          xwin;
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);

  DEBUG_TRACE ("meta_compositor_sync_screen_size\n");
  g_return_if_fail (info);

-  xdisplay = meta_display_get_xdisplay (display);
-  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
-
-  XResizeWindow (xdisplay, xwin, width, height);
+  clutter_actor_set_size (info->stage, width, height);

  meta_background_actor_screen_size_changed (screen);

--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@ -28,9 +28,6 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>

-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#include <clutter/clutter.h>
-
 #include <X11/Xatom.h>

 #include "cogl-utils.h"
@ -255,8 +252,6 @@ meta_background_actor_dispose (GObject *object)
      cogl_handle_unref (priv->material);
      priv->material = COGL_INVALID_HANDLE;
    }
-
-  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }

 static void
@ -542,11 +537,9 @@ meta_background_actor_update (MetaScreen *screen)
  if (root_pixmap_id != None)
    {
      CoglHandle texture;
-      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      GError *error = NULL;

      meta_error_trap_push (display);
-      texture = cogl_texture_pixmap_x11_new (ctx, root_pixmap_id, FALSE, &error);
+      texture = cogl_texture_pixmap_x11_new (root_pixmap_id, FALSE);
      meta_error_trap_pop (display);

      if (texture != COGL_INVALID_HANDLE)
@ -557,12 +550,6 @@ meta_background_actor_update (MetaScreen *screen)
          background->have_pixmap = True;
          return;
        }
-      else
-        {
-          g_warning ("Failed to create background texture from pixmap: %s",
-                     error->message);
-          g_error_free (error);
-        }
    }

  background->have_pixmap = False;
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@ -35,32 +35,34 @@

 #include <clutter/x11/clutter-x11.h>

-static GType plugin_type = G_TYPE_NONE;
+static GSList *plugin_types;
+
+/*
+ * We have one "default plugin manager" that acts for the first screen,
+ * but also can be used before we open any screens, and additional
+ * plugin managers for each screen. (This is ugly. Probably we should
+ * have one plugin manager and only make the plugins per-screen.)
+ */
+static MetaPluginManager *default_plugin_manager;

 struct MetaPluginManager
 {
-  MetaScreen *screen;
-  MetaPlugin *plugin;
+  MetaScreen   *screen;
+
+  GList /* MetaPlugin */ *plugins;  /* TODO -- maybe use hash table */
 };

-void
-meta_plugin_manager_set_plugin_type (GType gtype)
-{
-  if (plugin_type != G_TYPE_NONE)
-    meta_fatal ("Mutter plugin already set: %s", g_type_name (plugin_type));
-
-  plugin_type = gtype;
-}
-
 /*
 * Loads the given plugin.
 */
 void
-meta_plugin_manager_load (const gchar       *plugin_name)
+meta_plugin_manager_load (MetaPluginManager *plugin_mgr,
+                          const gchar       *plugin_name)
 {
  const gchar *dpath = MUTTER_PLUGIN_DIR "/";
  gchar       *path;
  MetaModule  *module;
+  GType        plugin_type;

  if (g_path_is_absolute (plugin_name))
    path = g_strdup (plugin_name);
@ -79,57 +81,162 @@ meta_plugin_manager_load (const gchar       *plugin_name)
      exit (1);
    }

-  meta_plugin_manager_set_plugin_type (meta_module_get_plugin_type (module));
+  plugin_type = meta_module_get_plugin_type (module);
+  meta_plugin_manager_register (plugin_mgr, plugin_type);

  g_type_module_unuse (G_TYPE_MODULE (module));
  g_free (path);
 }

-MetaPluginManager *
+/*
+ * Registers the given plugin type
+ */
+void
+meta_plugin_manager_register (MetaPluginManager *plugin_mgr,
+                              GType              plugin_type)
+{
+  MetaPlugin  *plugin;
+
+  plugin_types = g_slist_prepend (plugin_types, GSIZE_TO_POINTER (plugin_type));
+
+  plugin = g_object_new (plugin_type, NULL);
+  plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
+}
+
+void
+meta_plugin_manager_initialize (MetaPluginManager *plugin_mgr)
+{
+  GList *iter;
+
+  if (!plugin_mgr->plugins)
+    {
+      /*
+       * If no plugins are specified, load the default plugin.
+       */
+      meta_plugin_manager_load (plugin_mgr, "default");
+    }
+
+  for (iter = plugin_mgr->plugins; iter; iter = iter->next)
+    {
+      MetaPlugin *plugin = (MetaPlugin*) iter->data;
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      g_object_set (plugin,
+                    "screen", plugin_mgr->screen,
+                    NULL);
+
+      if (klass->start)
+        klass->start (plugin);
+    }
+}
+
+static MetaPluginManager *
 meta_plugin_manager_new (MetaScreen *screen)
 {
  MetaPluginManager *plugin_mgr;
-  MetaPluginClass *klass;
-  MetaPlugin *plugin;

  plugin_mgr = g_new0 (MetaPluginManager, 1);
  plugin_mgr->screen = screen;
-  plugin_mgr->plugin = plugin = g_object_new (plugin_type, "screen", screen, NULL);

-  klass = META_PLUGIN_GET_CLASS (plugin);
-
-  if (klass->start)
-    klass->start (plugin);
+  if (screen)
+    g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", plugin_mgr);

  return plugin_mgr;
 }

+MetaPluginManager *
+meta_plugin_manager_get_default (void)
+{
+  if (!default_plugin_manager)
+    {
+      default_plugin_manager = meta_plugin_manager_new (NULL);
+    }
+
+  return default_plugin_manager;
+}
+
+MetaPluginManager *
+meta_plugin_manager_get (MetaScreen *screen)
+{
+  MetaPluginManager *plugin_mgr;
+
+  plugin_mgr = g_object_get_data (G_OBJECT (screen), "meta-plugin-manager");
+  if (plugin_mgr)
+    return plugin_mgr;
+
+  if (!default_plugin_manager)
+    meta_plugin_manager_get_default ();
+
+  if (!default_plugin_manager->screen)
+    {
+      /* The default plugin manager is so far unused, we can recycle it */
+      default_plugin_manager->screen = screen;
+      g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", default_plugin_manager);
+
+      return default_plugin_manager;
+    }
+  else
+    {
+      GSList *iter;
+      GType plugin_type;
+      MetaPlugin *plugin;
+
+      plugin_mgr = meta_plugin_manager_new (screen);
+
+      for (iter = plugin_types; iter; iter = iter->next)
+        {
+          plugin_type = (GType)GPOINTER_TO_SIZE (iter->data);
+          plugin = g_object_new (plugin_type, "screen", screen,  NULL);
+          plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
+        }
+
+      return plugin_mgr;
+    }
+}
+
 static void
 meta_plugin_manager_kill_window_effects (MetaPluginManager *plugin_mgr,
                                         MetaWindowActor   *actor)
 {
-  MetaPlugin        *plugin = plugin_mgr->plugin;
-  MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+  GList *l = plugin_mgr->plugins;

-  if (klass->kill_window_effects)
-    klass->kill_window_effects (plugin, actor);
+  while (l)
+    {
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      if (!meta_plugin_disabled (plugin)
+	  && klass->kill_window_effects)
+        klass->kill_window_effects (plugin, actor);
+
+      l = l->next;
+    }
 }

 static void
 meta_plugin_manager_kill_switch_workspace (MetaPluginManager *plugin_mgr)
 {
-  MetaPlugin        *plugin = plugin_mgr->plugin;
-  MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+  GList *l = plugin_mgr->plugins;

-  if (klass->kill_switch_workspace)
-    klass->kill_switch_workspace (plugin);
+  while (l)
+    {
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      if (!meta_plugin_disabled (plugin)
+          && (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE)
+	  && klass->kill_switch_workspace)
+        klass->kill_switch_workspace (plugin);
+
+      l = l->next;
+    }
 }

 /*
 * Public method that the compositor hooks into for events that require
 * no additional parameters.
 *
- * Returns TRUE if the plugin handled the event type (i.e.,
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
 * if the return value is FALSE, there will be no subsequent call to the
 * manager completed() callback, and the compositor must ensure that any
 * appropriate post-effect cleanup is carried out.
@ -139,48 +246,60 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
                                  MetaWindowActor   *actor,
                                  unsigned long      event)
 {
-  MetaPlugin *plugin = plugin_mgr->plugin;
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
+  GList *l = plugin_mgr->plugins;
  gboolean retval = FALSE;
+  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);

  if (display->display_opening)
    return FALSE;

-  switch (event)
+  while (l)
    {
-    case META_PLUGIN_MINIMIZE:
-      if (klass->minimize)
-        {
-          retval = TRUE;
-          meta_plugin_manager_kill_window_effects (plugin_mgr,
-                                                   actor);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);

-          _meta_plugin_effect_started (plugin);
-          klass->minimize (plugin, actor);
-        }
-      break;
-    case META_PLUGIN_MAP:
-      if (klass->map)
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & event))
        {
          retval = TRUE;
-          meta_plugin_manager_kill_window_effects (plugin_mgr,
-                                                   actor);

-          _meta_plugin_effect_started (plugin);
-          klass->map (plugin, actor);
+          switch (event)
+            {
+            case META_PLUGIN_MINIMIZE:
+              if (klass->minimize)
+                {
+                  meta_plugin_manager_kill_window_effects (
+		      plugin_mgr,
+		      actor);
+
+                  _meta_plugin_effect_started (plugin);
+                  klass->minimize (plugin, actor);
+                }
+              break;
+            case META_PLUGIN_MAP:
+              if (klass->map)
+                {
+                  meta_plugin_manager_kill_window_effects (
+		      plugin_mgr,
+		      actor);
+
+                  _meta_plugin_effect_started (plugin);
+                  klass->map (plugin, actor);
+                }
+              break;
+            case META_PLUGIN_DESTROY:
+              if (klass->destroy)
+                {
+                  _meta_plugin_effect_started (plugin);
+                  klass->destroy (plugin, actor);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
        }
-      break;
-    case META_PLUGIN_DESTROY:
-      if (klass->destroy)
-        {
-          retval = TRUE;
-          _meta_plugin_effect_started (plugin);
-          klass->destroy (plugin, actor);
-        }
-      break;
-    default:
-      g_warning ("Incorrect handler called for event %lu", event);
+
+      l = l->next;
    }

  return retval;
@ -190,7 +309,7 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
 * The public method that the compositor hooks into for maximize and unmaximize
 * events.
 *
- * Returns TRUE if the plugin handled the event type (i.e.,
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
 * if the return value is FALSE, there will be no subsequent call to the
 * manager completed() callback, and the compositor must ensure that any
 * appropriate post-effect cleanup is carried out.
@ -204,44 +323,57 @@ meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
                                    gint               target_width,
                                    gint               target_height)
 {
-  MetaPlugin *plugin = plugin_mgr->plugin;
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-  MetaDisplay *display = meta_screen_get_display (plugin_mgr->screen);
+  GList *l = plugin_mgr->plugins;
  gboolean retval = FALSE;
+  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);

  if (display->display_opening)
    return FALSE;

-  switch (event)
+  while (l)
    {
-    case META_PLUGIN_MAXIMIZE:
-      if (klass->maximize)
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & event))
        {
          retval = TRUE;
-          meta_plugin_manager_kill_window_effects (plugin_mgr,
-                                                   actor);

-          _meta_plugin_effect_started (plugin);
-          klass->maximize (plugin, actor,
-                           target_x, target_y,
-                           target_width, target_height);
-        }
-      break;
-    case META_PLUGIN_UNMAXIMIZE:
-      if (klass->unmaximize)
-        {
-          retval = TRUE;
-          meta_plugin_manager_kill_window_effects (plugin_mgr,
-                                                   actor);
+          switch (event)
+            {
+            case META_PLUGIN_MAXIMIZE:
+              if (klass->maximize)
+                {
+                  meta_plugin_manager_kill_window_effects (
+		      plugin_mgr,
+		      actor);

-          _meta_plugin_effect_started (plugin);
-          klass->unmaximize (plugin, actor,
-                             target_x, target_y,
-                             target_width, target_height);
+                  _meta_plugin_effect_started (plugin);
+                  klass->maximize (plugin, actor,
+                                   target_x, target_y,
+                                   target_width, target_height);
+                }
+              break;
+            case META_PLUGIN_UNMAXIMIZE:
+              if (klass->unmaximize)
+                {
+                  meta_plugin_manager_kill_window_effects (
+		      plugin_mgr,
+		      actor);
+
+                  _meta_plugin_effect_started (plugin);
+                  klass->unmaximize (plugin, actor,
+                                     target_x, target_y,
+                                     target_width, target_height);
+                }
+              break;
+            default:
+              g_warning ("Incorrect handler called for event %lu", event);
+            }
        }
-      break;
-    default:
-      g_warning ("Incorrect handler called for event %lu", event);
+
+      l = l->next;
    }

  return retval;
@ -250,7 +382,7 @@ meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
 /*
 * The public method that the compositor hooks into for desktop switching.
 *
- * Returns TRUE if the plugin handled the event type (i.e.,
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
 * if the return value is FALSE, there will be no subsequent call to the
 * manager completed() callback, and the compositor must ensure that any
 * appropriate post-effect cleanup is carried out.
@ -261,21 +393,32 @@ meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
                                      gint                 to,
                                      MetaMotionDirection  direction)
 {
-  MetaPlugin *plugin = plugin_mgr->plugin;
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-  MetaDisplay *display = meta_screen_get_display (plugin_mgr->screen);
+  GList *l = plugin_mgr->plugins;
  gboolean retval = FALSE;
+  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);

  if (display->display_opening)
    return FALSE;

-  if (klass->switch_workspace)
+  while (l)
    {
-      retval = TRUE;
-      meta_plugin_manager_kill_switch_workspace (plugin_mgr);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);

-      _meta_plugin_effect_started (plugin);
-      klass->switch_workspace (plugin, from, to, direction);
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE))
+        {
+          if (klass->switch_workspace)
+            {
+              retval = TRUE;
+              meta_plugin_manager_kill_switch_workspace (plugin_mgr);
+
+              _meta_plugin_effect_started (plugin);
+              klass->switch_workspace (plugin, from, to, direction);
+            }
+        }
+
+      l = l->next;
    }

  return retval;
@ -284,7 +427,7 @@ meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
 /*
 * The public method that the compositor hooks into for desktop switching.
 *
- * Returns TRUE if the plugin handled the event type (i.e.,
+ * Returns TRUE if at least one of the plugins handled the event type (i.e.,
 * if the return value is FALSE, there will be no subsequent call to the
 * manager completed() callback, and the compositor must ensure that any
 * appropriate post-effect cleanup is carried out.
@ -293,20 +436,49 @@ gboolean
 meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
                                   XEvent            *xev)
 {
-  MetaPlugin *plugin = plugin_mgr->plugin;
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+  GList *l;
+  gboolean have_plugin_xevent_func;

  if (!plugin_mgr)
    return FALSE;

+  l = plugin_mgr->plugins;
+
  /* We need to make sure that clutter gets certain events, like
   * ConfigureNotify on the stage window. If there is a plugin that
   * provides an xevent_filter function, then it's the responsibility
   * of that plugin to pass events to Clutter. Otherwise, we send the
   * event directly to Clutter ourselves.
+   *
+   * What happens if there are two plugins with xevent_filter functions
+   * is undefined; in general, multiple competing plugins are something
+   * we don't support well or care much about.
+   *
+   * FIXME: Really, we should just always handle sending the event to
+   *  clutter if a plugin doesn't report the event as handled by
+   *  returning TRUE, but it doesn't seem worth breaking compatibility
+   *  of the plugin interface right now to achieve this; the way it is
+   *  now works fine in practice.
   */
-  if (klass->xevent_filter && klass->xevent_filter (plugin, xev))
-    return TRUE;
-  else
+  have_plugin_xevent_func = FALSE;
+
+  while (l)
+    {
+      MetaPlugin      *plugin = l->data;
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      if (klass->xevent_filter)
+        {
+          have_plugin_xevent_func = TRUE;
+          if (klass->xevent_filter (plugin, xev) == TRUE)
+            return TRUE;
+        }
+
+      l = l->next;
+    }
+
+  if (!have_plugin_xevent_func)
    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
+
+  return FALSE;
 }
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@ -46,9 +46,14 @@
 */
 typedef struct MetaPluginManager MetaPluginManager;

-MetaPluginManager * meta_plugin_manager_new (MetaScreen *screen);
+MetaPluginManager * meta_plugin_manager_get         (MetaScreen *screen);
+MetaPluginManager * meta_plugin_manager_get_default (void);

-void     meta_plugin_manager_load         (const gchar       *plugin_name);
+void     meta_plugin_manager_load         (MetaPluginManager *mgr,
+                                           const gchar       *plugin_name);
+void     meta_plugin_manager_register     (MetaPluginManager *mgr,
+                                           GType              plugin_type);
+void     meta_plugin_manager_initialize   (MetaPluginManager *mgr);

 gboolean meta_plugin_manager_event_simple (MetaPluginManager *mgr,
                                           MetaWindowActor   *actor,
@ -61,6 +66,10 @@ gboolean meta_plugin_manager_event_maximize    (MetaPluginManager *mgr,
                                                gint               target_y,
                                                gint               target_width,
                                                gint               target_height);
+void     meta_plugin_manager_update_workspaces (MetaPluginManager *mgr);
+
+void meta_plugin_manager_update_workspace (MetaPluginManager *mgr,
+                                           MetaWorkspace     *w);

 gboolean meta_plugin_manager_switch_workspace (MetaPluginManager   *mgr,
                                               gint                 from,
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@ -44,17 +44,74 @@ enum
 {
  PROP_0,
  PROP_SCREEN,
+  PROP_FEATURES,
+  PROP_DISABLED,
  PROP_DEBUG_MODE,
 };

 struct _MetaPluginPrivate
 {
  MetaScreen   *screen;
+  gulong        features;

  gint          running;
+
+  gboolean      disabled : 1;
  gboolean      debug    : 1;
 };

+static void
+meta_plugin_set_features (MetaPlugin *plugin)
+{
+  MetaPluginPrivate  *priv     = plugin->priv;
+  MetaPluginClass    *klass    = META_PLUGIN_GET_CLASS (plugin);
+
+  priv->features = 0;
+
+  /*
+   * Feature flags: identify events that the plugin can handle; a plugin can
+   * handle one or more events.
+   */
+  if (klass->minimize)
+    priv->features |= META_PLUGIN_MINIMIZE;
+
+  if (klass->maximize)
+    priv->features |= META_PLUGIN_MAXIMIZE;
+
+  if (klass->unmaximize)
+    priv->features |= META_PLUGIN_UNMAXIMIZE;
+
+  if (klass->map)
+    priv->features |= META_PLUGIN_MAP;
+
+  if (klass->destroy)
+    priv->features |= META_PLUGIN_DESTROY;
+
+  if (klass->switch_workspace)
+    priv->features |= META_PLUGIN_SWITCH_WORKSPACE;
+}
+
+static void
+meta_plugin_constructed (GObject *object)
+{
+  meta_plugin_set_features (META_PLUGIN (object));
+
+  if (G_OBJECT_CLASS (meta_plugin_parent_class)->constructed)
+      G_OBJECT_CLASS (meta_plugin_parent_class)->constructed (object);
+}
+
+static void
+meta_plugin_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (meta_plugin_parent_class)->dispose (object);
+}
+
+static void
+meta_plugin_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (meta_plugin_parent_class)->finalize (object);
+}
+
 static void
 meta_plugin_set_property (GObject      *object,
                          guint         prop_id,
@ -68,6 +125,9 @@ meta_plugin_set_property (GObject      *object,
    case PROP_SCREEN:
      priv->screen = g_value_get_object (value);
      break;
+    case PROP_DISABLED:
+      priv->disabled = g_value_get_boolean (value);
+      break;
    case PROP_DEBUG_MODE:
      priv->debug = g_value_get_boolean (value);
      break;
@ -90,9 +150,15 @@ meta_plugin_get_property (GObject    *object,
    case PROP_SCREEN:
      g_value_set_object (value, priv->screen);
      break;
+    case PROP_DISABLED:
+      g_value_set_boolean (value, priv->disabled);
+      break;
    case PROP_DEBUG_MODE:
      g_value_set_boolean (value, priv->debug);
      break;
+    case PROP_FEATURES:
+      g_value_set_ulong (value, priv->features);
+      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@ -105,6 +171,9 @@ meta_plugin_class_init (MetaPluginClass *klass)
 {
  GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);

+  gobject_class->constructed     = meta_plugin_constructed;
+  gobject_class->finalize        = meta_plugin_finalize;
+  gobject_class->dispose         = meta_plugin_dispose;
  gobject_class->set_property    = meta_plugin_set_property;
  gobject_class->get_property    = meta_plugin_get_property;

@ -116,6 +185,22 @@ meta_plugin_class_init (MetaPluginClass *klass)
                                                        META_TYPE_SCREEN,
                                                        G_PARAM_READWRITE));

+  g_object_class_install_property (gobject_class,
+				   PROP_FEATURES,
+				   g_param_spec_ulong ("features",
+                                                       "Features",
+                                                       "Plugin Features",
+                                                       0 , G_MAXULONG, 0,
+                                                       G_PARAM_READABLE));
+
+  g_object_class_install_property (gobject_class,
+				   PROP_DISABLED,
+				   g_param_spec_boolean ("disabled",
+                                                      "Plugin disabled",
+                                                      "Plugin disabled",
+                                                      FALSE,
+                                                      G_PARAM_READWRITE));
+
  g_object_class_install_property (gobject_class,
 				   PROP_DEBUG_MODE,
 				   g_param_spec_boolean ("debug-mode",
@ -135,6 +220,22 @@ meta_plugin_init (MetaPlugin *self)
  self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
 }

+gulong
+meta_plugin_features (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return priv->features;
+}
+
+gboolean
+meta_plugin_disabled (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return priv->disabled;
+}
+
 gboolean
 meta_plugin_running  (MetaPlugin *plugin)
 {
@ -162,6 +263,38 @@ meta_plugin_get_info (MetaPlugin *plugin)
  return NULL;
 }

+ClutterActor *
+meta_plugin_get_overlay_group (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return meta_get_overlay_group_for_screen (priv->screen);
+}
+
+ClutterActor *
+meta_plugin_get_stage (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return meta_get_stage_for_screen (priv->screen);
+}
+
+ClutterActor *
+meta_plugin_get_window_group (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return meta_get_window_group_for_screen (priv->screen);
+}
+
+ClutterActor *
+meta_plugin_get_background_actor (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return meta_get_background_actor_for_screen (priv->screen);
+}
+
 /**
 * _meta_plugin_effect_started:
 * @plugin: the plugin
@ -182,7 +315,7 @@ meta_plugin_switch_workspace_completed (MetaPlugin *plugin)
 {
  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;

-  MetaScreen *screen = priv->screen;
+  MetaScreen *screen = meta_plugin_get_screen (plugin);

  if (priv->running-- < 0)
    {
@ -256,6 +389,80 @@ meta_plugin_destroy_completed (MetaPlugin      *plugin,
  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_DESTROY);
 }

+void
+meta_plugin_query_screen_size (MetaPlugin *plugin,
+                               int        *width,
+                               int        *height)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  meta_screen_get_size (priv->screen, width, height);
+}
+
+void
+meta_plugin_set_stage_reactive (MetaPlugin *plugin,
+                                gboolean    reactive)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+  MetaScreen  *screen  = priv->screen;
+
+  if (reactive)
+    meta_set_stage_input_region (screen, None);
+  else
+    meta_empty_stage_input_region (screen);
+}
+
+void
+meta_plugin_set_stage_input_area (MetaPlugin *plugin,
+                                  gint x, gint y, gint width, gint height)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+  MetaScreen   *screen  = priv->screen;
+  MetaDisplay  *display = meta_screen_get_display (screen);
+  Display      *xdpy    = meta_display_get_xdisplay (display);
+  XRectangle    rect;
+  XserverRegion region;
+
+  rect.x = x;
+  rect.y = y;
+  rect.width = width;
+  rect.height = height;
+
+  region = XFixesCreateRegion (xdpy, &rect, 1);
+  meta_set_stage_input_region (screen, region);
+  XFixesDestroyRegion (xdpy, region);
+}
+
+void
+meta_plugin_set_stage_input_region (MetaPlugin   *plugin,
+                                    XserverRegion region)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+  MetaScreen  *screen  = priv->screen;
+
+  meta_set_stage_input_region (screen, region);
+}
+
+/**
+ * meta_plugin_get_window_actors:
+ * @plugin: A #MetaPlugin
+ *
+ * This function returns all of the #MetaWindowActor objects referenced by Mutter, including
+ * override-redirect windows.  The returned list is a snapshot of Mutter's current
+ * stacking order, with the topmost window last.
+ *
+ * The 'restacked' signal of #MetaScreen signals when this value has changed.
+ *
+ * Returns: (transfer none) (element-type MetaWindowActor): Windows in stacking order, topmost last
+ */
+GList *
+meta_plugin_get_window_actors (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  return meta_get_window_actors (priv->screen);
+}
+
 /**
 * meta_plugin_begin_modal:
 * @plugin: a #MetaPlugin
@ -295,7 +502,7 @@ meta_plugin_begin_modal (MetaPlugin       *plugin,
 }

 /**
- * meta_plugin_end_modal:
+ * meta_plugin_end_modal
 * @plugin: a #MetaPlugin
 * @timestamp: the time used for releasing grabs
 *
@ -314,6 +521,16 @@ meta_plugin_end_modal (MetaPlugin *plugin,
  meta_end_modal_for_plugin (priv->screen, plugin, timestamp);
 }

+Display *
+meta_plugin_get_xdisplay (MetaPlugin *plugin)
+{
+  MetaPluginPrivate *priv    = META_PLUGIN (plugin)->priv;
+  MetaDisplay       *display = meta_screen_get_display (priv->screen);
+  Display           *xdpy    = meta_display_get_xdisplay (display);
+
+  return xdpy;
+}
+
 /**
 * meta_plugin_get_screen:
 * @plugin: a #MetaPlugin
@ -331,3 +548,19 @@ meta_plugin_get_screen (MetaPlugin *plugin)

  return priv->screen;
 }
+
+/**
+ * meta_plugin_type_register:
+ * @plugin_type: a #MetaPlugin type
+ *
+ * Register @plugin_type as a compositor plugin type to be used.
+ * You must call this before calling meta_init().
+ */
+void
+meta_plugin_type_register (GType plugin_type)
+{
+  MetaPluginManager *plugin_manager;
+
+  plugin_manager = meta_plugin_manager_get_default ();
+  meta_plugin_manager_register (plugin_manager, plugin_type);
+}
--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@ -130,7 +130,7 @@ MetaShadowClassInfo default_shadow_classes[] = {
  { "popup-menu",    { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } },

  { "dropdown-menu", { 1, 10, 0, 1, 128 }, { 1, 10, 0, 1, 128 } },
-  { "attached",      { 2, -1, 0, 1, 255 }, { 1, -1, 0, 1, 128 } }
+  { "attached",      { 2, 50, 0, 1, 255 }, { 1, 50, 0, 1, 128 } }
 };

 G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);
@ -360,7 +360,7 @@ meta_shadow_paint (MetaShadow     *shadow,
 * @window_height: actual height of the region to paint a shadow for
 *
 * Computes the bounds of the pixels that will be affected by
- * meta_shadow_paint()
+ * meta_shadow_paints()
 */
 void
 meta_shadow_get_bounds  (MetaShadow            *shadow,
@ -442,7 +442,8 @@ meta_shadow_factory_class_init (MetaShadowFactoryClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@ -1,13 +1,11 @@
 /*
 * shaped texture
 *
- * An actor to draw a masked texture.
+ * An actor to draw a texture clipped to a list of rectangles
 *
 * Authored By Neil Roberts  <neil@linux.intel.com>
- * and Jasper St. Pierre <jstpierre@mecheye.net>
 *
 * Copyright (C) 2008 Intel Corporation
- * Copyright (C) 2012 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
@ -27,37 +25,32 @@

 #include <config.h>

-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
-#include <meta/meta-shaped-texture.h>
+#include "meta-shaped-texture.h"
 #include "meta-texture-tower.h"
+#include "meta-texture-rectangle.h"

 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
-#include <cogl/cogl-texture-pixmap-x11.h>
-#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
+#include <string.h>

 static void meta_shaped_texture_dispose  (GObject    *object);
+static void meta_shaped_texture_notify   (GObject    *object,
+					  GParamSpec *pspec);

 static void meta_shaped_texture_paint (ClutterActor       *actor);
 static void meta_shaped_texture_pick  (ClutterActor       *actor,
 				       const ClutterColor *color);

-static void meta_shaped_texture_get_preferred_width (ClutterActor *self,
-                                                     gfloat        for_height,
-                                                     gfloat       *min_width_p,
-                                                     gfloat       *natural_width_p);
+static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
+					     int                      x,
+					     int                      y,
+					     int                      width,
+					     int                      height);

-static void meta_shaped_texture_get_preferred_height (ClutterActor *self,
-                                                      gfloat        for_width,
-                                                      gfloat       *min_height_p,
-                                                      gfloat       *natural_height_p);
-
-static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, ClutterPaintVolume *volume);
+static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);

 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
-               CLUTTER_TYPE_ACTOR);
+               CLUTTER_X11_TYPE_TEXTURE_PIXMAP);

 #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
@ -66,15 +59,19 @@ G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
 struct _MetaShapedTexturePrivate
 {
  MetaTextureTower *paint_tower;
-  Pixmap pixmap;
-  CoglHandle texture;
  CoglHandle mask_texture;
  CoglHandle material;
  CoglHandle material_unshaped;

  cairo_region_t *clip_region;
+  cairo_region_t *shape_region;

-  guint tex_width, tex_height;
+  cairo_region_t *overlay_region;
+  cairo_path_t *overlay_path;
+
+  cairo_region_t *visible_pixels_region;
+
+  guint mask_width, mask_height;

  guint create_mipmaps : 1;
 };
@ -84,14 +81,15 @@ meta_shaped_texture_class_init (MetaShapedTextureClass *klass)
 {
  GObjectClass *gobject_class = (GObjectClass *) klass;
  ClutterActorClass *actor_class = (ClutterActorClass *) klass;
+  ClutterX11TexturePixmapClass *x11_texture_class = (ClutterX11TexturePixmapClass *) klass;

  gobject_class->dispose = meta_shaped_texture_dispose;
+  gobject_class->notify = meta_shaped_texture_notify;

-  actor_class->get_preferred_width = meta_shaped_texture_get_preferred_width;
-  actor_class->get_preferred_height = meta_shaped_texture_get_preferred_height;
  actor_class->paint = meta_shaped_texture_paint;
  actor_class->pick = meta_shaped_texture_pick;
-  actor_class->get_paint_volume = meta_shaped_texture_get_paint_volume;
+
+  x11_texture_class->update_area = meta_shaped_texture_update_area;

  g_type_class_add_private (klass, sizeof (MetaShapedTexturePrivate));
 }
@ -103,8 +101,11 @@ meta_shaped_texture_init (MetaShapedTexture *self)

  priv = self->priv = META_SHAPED_TEXTURE_GET_PRIVATE (self);

+  priv->shape_region = NULL;
+  priv->overlay_path = NULL;
+  priv->overlay_region = NULL;
+  priv->visible_pixels_region = NULL;
  priv->paint_tower = meta_texture_tower_new ();
-  priv->texture = COGL_INVALID_HANDLE;
  priv->mask_texture = COGL_INVALID_HANDLE;
  priv->create_mipmaps = TRUE;
 }
@ -119,6 +120,8 @@ meta_shaped_texture_dispose (GObject *object)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;

+  meta_shaped_texture_dirty_mask (self);
+
  if (priv->material != COGL_INVALID_HANDLE)
    {
      cogl_handle_unref (priv->material);
@ -129,18 +132,287 @@ meta_shaped_texture_dispose (GObject *object)
      cogl_handle_unref (priv->material_unshaped);
      priv->material_unshaped = COGL_INVALID_HANDLE;
    }
-  if (priv->texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->texture);
-      priv->texture = COGL_INVALID_HANDLE;
-    }

-  meta_shaped_texture_set_mask_texture (self, COGL_INVALID_HANDLE);
+  meta_shaped_texture_set_shape_region (self, NULL);
  meta_shaped_texture_set_clip_region (self, NULL);
+  meta_shaped_texture_set_overlay_path (self, NULL, NULL);

  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }

+static void
+meta_shaped_texture_notify (GObject    *object,
+			    GParamSpec *pspec)
+{
+  if (G_OBJECT_CLASS (meta_shaped_texture_parent_class)->notify)
+    G_OBJECT_CLASS (meta_shaped_texture_parent_class)->notify (object, pspec);
+
+  /* It seems like we could just do this out of update_area(), but unfortunately,
+   * clutter_glx_texture_pixmap() doesn't call through the vtable on the
+   * initial update_area, so we need to look for changes to the texture
+   * explicitly.
+   */
+  if (strcmp (pspec->name, "cogl-texture") == 0)
+    {
+      MetaShapedTexture *stex = (MetaShapedTexture *) object;
+      MetaShapedTexturePrivate *priv = stex->priv;
+
+      meta_shaped_texture_clear (stex);
+
+      if (priv->create_mipmaps)
+	meta_texture_tower_set_base_texture (priv->paint_tower,
+					       clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex)));
+    }
+}
+
+static void
+meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+
+  if (priv->visible_pixels_region != NULL)
+    {
+      cairo_region_destroy (priv->visible_pixels_region);
+      priv->visible_pixels_region = NULL;
+
+      if (priv->mask_texture != COGL_INVALID_HANDLE)
+        {
+          cogl_handle_unref (priv->mask_texture);
+          priv->mask_texture = COGL_INVALID_HANDLE;
+        }
+
+      if (priv->material != COGL_INVALID_HANDLE)
+        cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
+    }
+}
+
+static void
+scan_visible_region (MetaShapedTexture *stex,
+                     guchar            *mask_data,
+                     int                stride)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  cairo_region_t *visible_pixels_region;
+  cairo_region_t *overlay_region;
+  int i, n_rects;
+
+  /* The visible pixels region contains all pixel values above 0.
+   * This is somewhat complicated when there's an overlay: we
+   * need to scan all regions potentially modified by it.
+   */
+
+  if (priv->visible_pixels_region)
+    cairo_region_destroy (priv->visible_pixels_region);
+
+  priv->visible_pixels_region = cairo_region_copy (priv->shape_region);
+
+  visible_pixels_region = priv->visible_pixels_region;
+  overlay_region = priv->overlay_region;
+
+  /* With no overlay region, the visible region is defined
+   * by the mask region, so we don't need to scan anything. */
+  if (overlay_region == NULL)
+      return;
+
+  /* Subtract all the rectangles in the overlay region so that we can
+   * scan all the pixels potentially added by the overlay path. */
+  cairo_region_subtract (visible_pixels_region, overlay_region);
+
+  n_rects = cairo_region_num_rectangles (overlay_region);
+
+  for (i = 0; i < n_rects; i++)
+    {
+      int x, y;
+      cairo_rectangle_int_t rect;
+
+      cairo_region_get_rectangle (overlay_region, i, &rect);
+
+      for (y = rect.y; y < (rect.y + rect.height); y++)
+        {
+          for (x = rect.x; x < (rect.x + rect.width); x++)
+            {
+              int w = x;
+              while (mask_data[y * stride + w] > 0 && w < (rect.x + rect.width))
+                w++;
+
+              if (w > 0)
+                {
+                  cairo_rectangle_int_t tmp;
+                  tmp.x = x;
+                  tmp.y = y;
+                  tmp.width = w - x;
+                  tmp.height = 1;
+                  cairo_region_union_rectangle (visible_pixels_region, &tmp);
+                  x = w;
+                }
+            }
+        }
+    }
+}
+
+static void
+install_overlay_path (MetaShapedTexture *stex,
+                      guchar            *mask_data,
+                      int                tex_width,
+                      int                tex_height,
+                      int                stride)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  int i, n_rects;
+  cairo_t *cr;
+  cairo_rectangle_int_t rect;
+  cairo_surface_t *surface;
+
+  if (priv->overlay_region == NULL)
+    return;
+
+  surface = cairo_image_surface_create_for_data (mask_data,
+                                                 CAIRO_FORMAT_A8,
+                                                 tex_width,
+                                                 tex_height,
+                                                 stride);
+
+  cr = cairo_create (surface);
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+
+  n_rects = cairo_region_num_rectangles (priv->overlay_region);
+  for (i = 0; i < n_rects; i++)
+    {
+      cairo_region_get_rectangle (priv->overlay_region, i, &rect);
+      cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
+    }
+
+  cairo_fill_preserve (cr);
+  if (priv->overlay_path == NULL)
+    {
+      /* If we have an overlay region but not an overlay path, then we
+       * just need to clear the rectangles in the overlay region. */
+      goto out;
+    }
+
+  cairo_clip (cr);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  cairo_set_source_rgba (cr, 1, 1, 1, 1);
+
+  cairo_append_path (cr, priv->overlay_path);
+  cairo_fill (cr);
+
+ out:
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+}
+
+static void
+meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  CoglHandle paint_tex;
+  guint tex_width, tex_height;
+
+  paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+
+  if (paint_tex == COGL_INVALID_HANDLE)
+    return;
+
+  tex_width = cogl_texture_get_width (paint_tex);
+  tex_height = cogl_texture_get_height (paint_tex);
+
+  /* If the mask texture we have was created for a different size then
+     recreate it */
+  if (priv->mask_texture != COGL_INVALID_HANDLE
+      && (priv->mask_width != tex_width || priv->mask_height != tex_height))
+    meta_shaped_texture_dirty_mask (stex);
+
+  /* If we don't have a mask texture yet then create one */
+  if (priv->visible_pixels_region == NULL)
+    {
+      guchar *mask_data;
+      int i;
+      int n_rects;
+      int stride;
+      GLenum paint_gl_target;
+
+      /* If we have no shape region and no (or an empty) overlay region, we
+       * don't need to create a full mask texture, so quit early. */
+      if (priv->shape_region == NULL &&
+          (priv->overlay_region == NULL ||
+           cairo_region_num_rectangles (priv->overlay_region) == 0))
+        {
+          /* With no mask, the visible region is just
+           * {0, 0, tex_width, tex_height}. */
+          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
+          priv->visible_pixels_region = cairo_region_create_rectangle (&rect);
+          return;
+        }
+
+      stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);
+
+      /* Create data for an empty image */
+      mask_data = g_malloc0 (stride * tex_height);
+
+      n_rects = cairo_region_num_rectangles (priv->shape_region);
+
+      /* Fill in each rectangle. */
+      for (i = 0; i < n_rects; i ++)
+        {
+          cairo_rectangle_int_t rect;
+          cairo_region_get_rectangle (priv->shape_region, i, &rect);
+
+          gint x1 = rect.x, x2 = x1 + rect.width;
+          gint y1 = rect.y, y2 = y1 + rect.height;
+          guchar *p;
+
+          /* Clip the rectangle to the size of the texture */
+          x1 = CLAMP (x1, 0, (gint) tex_width - 1);
+          x2 = CLAMP (x2, x1, (gint) tex_width);
+          y1 = CLAMP (y1, 0, (gint) tex_height - 1);
+          y2 = CLAMP (y2, y1, (gint) tex_height);
+
+          /* Fill the rectangle */
+          for (p = mask_data + y1 * stride + x1;
+               y1 < y2;
+               y1++, p += stride)
+            memset (p, 255, x2 - x1);
+        }
+
+      install_overlay_path (stex, mask_data, tex_width, tex_height, stride);
+      scan_visible_region (stex, mask_data, stride);
+
+      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
+
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+      if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+        {
+          priv->mask_texture
+            = meta_texture_rectangle_new (tex_width, tex_height,
+                                          0, /* flags */
+                                          /* data format */
+                                          COGL_PIXEL_FORMAT_A_8,
+                                          /* internal GL format */
+                                          GL_ALPHA,
+                                          /* internal cogl format */
+                                          COGL_PIXEL_FORMAT_A_8,
+                                          /* rowstride */
+                                          stride,
+                                          mask_data);
+        }
+      else
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+        priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                         COGL_TEXTURE_NONE,
+                                                         COGL_PIXEL_FORMAT_A_8,
+                                                         COGL_PIXEL_FORMAT_ANY,
+                                                         stride,
+                                                         mask_data);
+
+      g_free (mask_data);
+
+      priv->mask_width = tex_width;
+      priv->mask_height = tex_height;
+    }
+}
+
 static void
 meta_shaped_texture_paint (ClutterActor *actor)
 {
@ -179,20 +451,20 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (priv->create_mipmaps)
    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
  else
-    paint_tex = priv->texture;
+    paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));

  if (paint_tex == COGL_INVALID_HANDLE)
    return;

-  tex_width = priv->tex_width;
-  tex_height = priv->tex_height;
+  tex_width = cogl_texture_get_width (paint_tex);
+  tex_height = cogl_texture_get_height (paint_tex);

  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;

-  if (priv->mask_texture == COGL_INVALID_HANDLE)
+  if (priv->shape_region == NULL)
    {
-      /* Use a single-layer texture if we don't have a mask. */
+      /* No region means an unclipped shape. Use a single-layer texture. */

      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
        {
@ -205,6 +477,8 @@ meta_shaped_texture_paint (ClutterActor *actor)
    }
  else
    {
+      meta_shaped_texture_ensure_mask (stex);
+
      if (priv->material == COGL_INVALID_HANDLE)
 	{
 	   if (G_UNLIKELY (material_template == COGL_INVALID_HANDLE))
@ -238,7 +512,6 @@ meta_shaped_texture_paint (ClutterActor *actor)
    {
      int n_rects;
      int i;
-      cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };

      /* Limit to how many separate rectangles we'll draw; beyond this just
       * fall back and draw the whole thing */
@ -256,9 +529,6 @@ meta_shaped_texture_paint (ClutterActor *actor)

 	      cairo_region_get_rectangle (priv->clip_region, i, &rect);

-	      if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
-		continue;
-
 	      x1 = rect.x;
 	      y1 = rect.y;
 	      x2 = rect.x + rect.width;
@ -295,7 +565,7 @@ meta_shaped_texture_pick (ClutterActor       *actor,
  MetaShapedTexturePrivate *priv = stex->priv;

  /* If there is no region then use the regular pick */
-  if (priv->mask_texture == COGL_INVALID_HANDLE)
+  if (priv->shape_region == NULL)
    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
@ -304,7 +574,7 @@ meta_shaped_texture_pick (ClutterActor       *actor,
      ClutterActorBox alloc;
      guint tex_width, tex_height;

-      paint_tex = priv->texture;
+      paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));

      if (paint_tex == COGL_INVALID_HANDLE)
        return;
@ -315,6 +585,8 @@ meta_shaped_texture_pick (ClutterActor       *actor,
      if (tex_width == 0 || tex_height == 0) /* no contents yet */
        return;

+      meta_shaped_texture_ensure_mask (stex);
+
      cogl_set_source_color4ub (color->red, color->green, color->blue,
                                 color->alpha);

@ -330,48 +602,19 @@ meta_shaped_texture_pick (ClutterActor       *actor,
 }

 static void
-meta_shaped_texture_get_preferred_width (ClutterActor *self,
-                                         gfloat        for_height,
-                                         gfloat       *min_width_p,
-                                         gfloat       *natural_width_p)
+meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
+				 int                      x,
+				 int                      y,
+				 int                      width,
+				 int                      height)
 {
-  MetaShapedTexturePrivate *priv;
+  MetaShapedTexture *stex = (MetaShapedTexture *) texture;
+  MetaShapedTexturePrivate *priv = stex->priv;

-  g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
+  CLUTTER_X11_TEXTURE_PIXMAP_CLASS (meta_shaped_texture_parent_class)->update_area (texture,
+                                                                                      x, y, width, height);

-  priv = META_SHAPED_TEXTURE (self)->priv;
-
-  if (min_width_p)
-    *min_width_p = 0;
-
-  if (natural_width_p)
-    *natural_width_p = priv->tex_width;
-}
-
-static void
-meta_shaped_texture_get_preferred_height (ClutterActor *self,
-                                          gfloat        for_width,
-                                          gfloat       *min_height_p,
-                                          gfloat       *natural_height_p)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
-
-  priv = META_SHAPED_TEXTURE (self)->priv;
-
-  if (min_height_p)
-    *min_height_p = 0;
-
-  if (natural_height_p)
-    *natural_height_p = priv->tex_height;
-}
-
-static gboolean
-meta_shaped_texture_get_paint_volume (ClutterActor *self,
-                                      ClutterPaintVolume *volume)
-{
-  return clutter_paint_volume_set_from_allocation (volume, self);
+  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
 }

 ClutterActor *
@ -397,16 +640,34 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
  if (create_mipmaps != priv->create_mipmaps)
    {
      CoglHandle base_texture;
+
      priv->create_mipmaps = create_mipmaps;
+
      base_texture = create_mipmaps ?
-        priv->texture : COGL_INVALID_HANDLE;
+	clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex)) : COGL_INVALID_HANDLE;
+
      meta_texture_tower_set_base_texture (priv->paint_tower, base_texture);
    }
 }

+/* This is a workaround for deficiencies in the hack tower:
+ *
+ * When we call clutter_x11_texture_pixmap_set_pixmap(tp, None),
+ * ClutterX11TexturePixmap knows that it has to get rid of the old texture, but
+ * clutter_texture_set_cogl_texture(texture, COGL_INVALID_HANDLE) isn't allowed, so
+ * it grabs the material for the texture and manually sets the texture in it. This means
+ * that the "cogl-texture" property isn't notified, so we don't find out about it.
+ *
+ * And if we keep the CoglX11TexturePixmap around after the X pixmap is freed, then
+ * we'll trigger X errors when we actually try to free it.
+ *
+ * The only correct thing to do here is to change our code to derive
+ * from ClutterActor and get rid of the inheritance hack tower.  Once
+ * we want to depend on Clutter-1.4 (which has CoglTexturePixmapX11),
+ * that will be very easy to do.
+ */
 void
-meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
-                                      CoglHandle         mask_texture)
+meta_shaped_texture_clear (MetaShapedTexture *stex)
 {
  MetaShapedTexturePrivate *priv;

@ -414,98 +675,18 @@ meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,

  priv = stex->priv;

-  if (priv->mask_texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->mask_texture);
-      priv->mask_texture = COGL_INVALID_HANDLE;
-    }
-
-  if (mask_texture != COGL_INVALID_HANDLE)
-    {
-      priv->mask_texture = mask_texture;
-      cogl_handle_ref (priv->mask_texture);
-    }
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
-}
-
-void
-meta_shaped_texture_update_area (MetaShapedTexture *stex,
-				 int                x,
-				 int                y,
-				 int                width,
-				 int                height)
-{
-  MetaShapedTexturePrivate *priv;
-  const cairo_rectangle_int_t clip = { x, y, width, height };
-
-  priv = stex->priv;
-
-  if (priv->texture == COGL_INVALID_HANDLE)
-    return;
-
-  cogl_texture_pixmap_x11_update_area (priv->texture, x, y, width, height);
-
-  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
-
-  clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip);
-}
-
-static void
-set_cogl_texture (MetaShapedTexture *stex,
-                  CoglHandle         cogl_tex)
-{
-  MetaShapedTexturePrivate *priv;
-  guint width, height;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  if (priv->texture != COGL_INVALID_HANDLE)
-    cogl_handle_unref (priv->texture);
-
-  priv->texture = cogl_tex;
+  meta_texture_tower_set_base_texture (priv->paint_tower, COGL_INVALID_HANDLE);

  if (priv->material != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material, 0, cogl_tex);
+    cogl_material_set_layer (priv->material, 0, COGL_INVALID_HANDLE);

  if (priv->material_unshaped != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material_unshaped, 0, cogl_tex);
-
-  if (cogl_tex != COGL_INVALID_HANDLE)
-    {
-      width = cogl_texture_get_width (cogl_tex);
-      height = cogl_texture_get_height (cogl_tex);
-
-      if (width != priv->tex_width ||
-          height != priv->tex_height)
-        {
-          priv->tex_width = width;
-          priv->tex_height = height;
-
-          clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
-        }
-    }
-  else
-    {
-      /* size changed to 0 going to an invalid handle */
-      priv->tex_width = 0;
-      priv->tex_height = 0;
-      clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
-    }
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+    cogl_material_set_layer (priv->material_unshaped, 0, COGL_INVALID_HANDLE);
 }

-/**
- * meta_shaped_texture_set_pixmap:
- * @stex: The #MetaShapedTexture
- * @pixmap: The pixmap you want the stex to assume
- */
 void
-meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
-                                Pixmap             pixmap)
+meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
+                                      cairo_region_t    *region)
 {
  MetaShapedTexturePrivate *priv;

@ -513,42 +694,88 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,

  priv = stex->priv;

-  if (priv->pixmap == pixmap)
-    return;
-
-  priv->pixmap = pixmap;
-
-  if (pixmap != None)
+  if (priv->shape_region != NULL)
    {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      set_cogl_texture (stex, cogl_texture_pixmap_x11_new (ctx, pixmap, FALSE, NULL));
+      cairo_region_destroy (priv->shape_region);
+      priv->shape_region = NULL;
    }
-  else
-    set_cogl_texture (stex, COGL_INVALID_HANDLE);

-  if (priv->create_mipmaps)
-    meta_texture_tower_set_base_texture (priv->paint_tower, priv->texture);
+  if (region != NULL)
+    {
+      cairo_region_reference (region);
+      priv->shape_region = region;
+    }
+
+  meta_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

 /**
- * meta_shaped_texture_get_texture:
- * @stex: The #MetaShapedTexture
+ * meta_shaped_texture_get_visible_pixels_region:
+ * @stex: a #MetaShapedTexture
 *
- * Returns: (transfer none): the unshaped texture
+ * Return a region enclosing only visible pixels: those with
+ * alpha values above 0.
+ *
+ * Returns: a #cairo_region_t
 */
-CoglHandle
-meta_shaped_texture_get_texture (MetaShapedTexture *stex)
+cairo_region_t *
+meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex)
 {
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), COGL_INVALID_HANDLE);
-  return stex->priv->texture;
+  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
+
+  meta_shaped_texture_ensure_mask (stex);
+  return stex->priv->visible_pixels_region;
+}
+
+/**
+ * meta_shaped_texture_set_overlay_path:
+ * @stex: a #MetaShapedTexture
+ * @overlay_region: A region containing the parts of the mask to overlay.
+ *   All rectangles in this region are wiped clear to full transparency,
+ *   and the overlay path is clipped to this region.
+ * @overlay_path (transfer full): This path will be painted onto the mask
+ *   texture with a fully opaque source. Due to the lack of refcounting
+ *   in #cairo_path_t, ownership of the path is assumed.
+ */
+void
+meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
+                                      cairo_region_t    *overlay_region,
+                                      cairo_path_t      *overlay_path)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  if (priv->overlay_region != NULL)
+    {
+      cairo_region_destroy (priv->overlay_region);
+      priv->overlay_region = NULL;
+    }
+
+  if (priv->overlay_path != NULL)
+    {
+      cairo_path_destroy (priv->overlay_path);
+      priv->overlay_path = NULL;
+    }
+
+  cairo_region_reference (overlay_region);
+  priv->overlay_region = overlay_region;
+
+  /* cairo_path_t does not have refcounting. */
+  priv->overlay_path = overlay_path;
+
+  meta_shaped_texture_dirty_mask (stex);
 }

 /**
 * meta_shaped_texture_set_clip_region:
- * @stex: a #MetaShapedTexture
+ * @frame: a #MetaShapedTexture
 * @clip_region: (transfer full): the region of the texture that
- *   is visible and should be painted.
+ *   is visible and should be painted. OWNERSHIP IS ASSUMED BY
+ *   THE FUNCTION (for efficiency to avoid a copy.)
 *
 * Provides a hint to the texture about what areas of the texture
 * are not completely obscured and thus need to be painted. This
@ -574,106 +801,5 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
      priv->clip_region = NULL;
    }

-  if (clip_region)
-    priv->clip_region = cairo_region_copy (clip_region);
-  else
-    priv->clip_region = NULL;
-}
-
-/**
- * meta_shaped_texture_get_image:
- * @stex: A #MetaShapedTexture
- * @clip: A clipping rectangle, to help prevent extra processing.
- * In the case that the clipping rectangle is partially or fully
- * outside the bounds of the texture, the rectangle will be clipped.
- *
- * Flattens the two layers of the shaped texture into one ARGB32
- * image by alpha blending the two images, and returns the flattened
- * image.
- *
- * Returns: (transfer full): a new cairo surface to be freed with
- * cairo_surface_destroy().
- */
-cairo_surface_t *
-meta_shaped_texture_get_image (MetaShapedTexture     *stex,
-                               cairo_rectangle_int_t *clip)
-{
-  CoglHandle texture, mask_texture;
-  cairo_rectangle_int_t texture_rect = { 0, 0, 0, 0 };
-  cairo_surface_t *surface;
-
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
-
-  texture = stex->priv->texture;
-
-  if (texture == NULL)
-    return NULL;
-
-  texture_rect.width = cogl_texture_get_width (texture);
-  texture_rect.height = cogl_texture_get_height (texture);
-
-  if (clip != NULL)
-    {
-      /* GdkRectangle is just a typedef of cairo_rectangle_int_t,
-       * so we can use the gdk_rectangle_* APIs on these. */
-      if (!gdk_rectangle_intersect (&texture_rect, clip, clip))
-        return NULL;
-    }
-
-  if (clip != NULL)
-    texture = cogl_texture_new_from_sub_texture (texture,
-                                                 clip->x,
-                                                 clip->y,
-                                                 clip->width,
-                                                 clip->height);
-
-  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                        cogl_texture_get_width (texture),
-                                        cogl_texture_get_height (texture));
-
-  cogl_texture_get_data (texture, CLUTTER_CAIRO_FORMAT_ARGB32,
-                         cairo_image_surface_get_stride (surface),
-                         cairo_image_surface_get_data (surface));
-
-  cairo_surface_mark_dirty (surface);
-
-  if (clip != NULL)
-    cogl_object_unref (texture);
-
-  mask_texture = stex->priv->mask_texture;
-  if (mask_texture != COGL_INVALID_HANDLE)
-    {
-      cairo_t *cr;
-      cairo_surface_t *mask_surface;
-
-      if (clip != NULL)
-        mask_texture = cogl_texture_new_from_sub_texture (mask_texture,
-                                                          clip->x,
-                                                          clip->y,
-                                                          clip->width,
-                                                          clip->height);
-
-      mask_surface = cairo_image_surface_create (CAIRO_FORMAT_A8,
-                                                 cogl_texture_get_width (mask_texture),
-                                                 cogl_texture_get_height (mask_texture));
-
-      cogl_texture_get_data (mask_texture, COGL_PIXEL_FORMAT_A_8,
-                             cairo_image_surface_get_stride (mask_surface),
-                             cairo_image_surface_get_data (mask_surface));
-
-      cairo_surface_mark_dirty (mask_surface);
-
-      cr = cairo_create (surface);
-      cairo_set_source_surface (cr, mask_surface, 0, 0);
-      cairo_set_operator (cr, CAIRO_OPERATOR_DEST_IN);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-
-      cairo_surface_destroy (mask_surface);
-
-      if (clip != NULL)
-        cogl_object_unref (mask_texture);
-    }
-
-  return surface;
+  priv->clip_region = clip_region;
 }
--- a/src/compositor/meta-shaped-texture.h
+++ b/src/compositor/meta-shaped-texture.h
@ -26,8 +26,10 @@
 #ifndef __META_SHAPED_TEXTURE_H__
 #define __META_SHAPED_TEXTURE_H__

+#include <config.h>
+
 #include <clutter/clutter.h>
-#include <X11/Xlib.h>
+#include <clutter/x11/clutter-x11.h>

 G_BEGIN_DECLS

@ -44,12 +46,12 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;

 struct _MetaShapedTextureClass
 {
-  ClutterActorClass parent_class;
+  ClutterX11TexturePixmapClass parent_class;
 };

 struct _MetaShapedTexture
 {
-  ClutterActor parent;
+  ClutterX11TexturePixmap parent;

  MetaShapedTexturePrivate *priv;
 };
@ -61,27 +63,21 @@ ClutterActor *meta_shaped_texture_new (void);
 void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 					     gboolean           create_mipmaps);

-void meta_shaped_texture_update_area (MetaShapedTexture *stex,
-                                      int                x,
-                                      int                y,
-                                      int                width,
-                                      int                height);
+void meta_shaped_texture_clear (MetaShapedTexture *stex);

-void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
-                                     Pixmap             pixmap);
+void meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
+                                           cairo_region_t    *region);

-CoglHandle meta_shaped_texture_get_texture (MetaShapedTexture *stex);
+cairo_region_t *meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex);

-void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
-                                           CoglHandle         mask_texture);
+void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
+                                           cairo_region_t    *overlay_region,
+                                           cairo_path_t      *overlay_path);

 /* Assumes ownership of clip_region */
 void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
 					  cairo_region_t    *clip_region);

-cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture     *stex,
-                                                 cairo_rectangle_int_t *clip);
-
 G_END_DECLS

 #endif /* __META_SHAPED_TEXTURE_H__ */
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@ -5,7 +5,7 @@
 *
 * Authored By Neil Roberts  <neil@linux.intel.com>
 *
- * Copyright (C) 2011, 2012 Intel Corporation
+ * Copyright (C) 2011 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@ -25,77 +25,94 @@

 #include <config.h>

-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
-#include <clutter/clutter.h>
 #include "meta-texture-rectangle.h"

-CoglTexture *
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+
+static void (* pf_glGetIntegerv) (GLenum pname, GLint *params);
+static void (* pf_glTexImage2D) (GLenum target, GLint level,
+                                 GLint internalFormat,
+                                 GLsizei width, GLsizei height,
+                                 GLint border, GLenum format, GLenum type,
+                                 const GLvoid *pixels);
+static void (* pf_glGenTextures) (GLsizei n, GLuint *textures);
+static void (* pf_glDeleteTextures) (GLsizei n, const GLuint *texture);
+static void (* pf_glBindTexture) (GLenum target, GLuint texture);
+
+static void
+rectangle_texture_destroy_cb (void *user_data)
+{
+  GLuint tex = GPOINTER_TO_UINT (user_data);
+
+  pf_glDeleteTextures (1, &tex);
+}
+
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+CoglHandle
 meta_texture_rectangle_new (unsigned int width,
                            unsigned int height,
+                            CoglTextureFlags flags,
                            CoglPixelFormat format,
-                            CoglPixelFormat internal_format,
+                            GLenum internal_gl_format,
+                            GLenum internal_format,
                            unsigned int rowstride,
-                            const guint8 *data,
-                            GError **error)
+                            const guint8 *data)
 {
-  ClutterBackend *backend =
-    clutter_get_default_backend ();
-  CoglContext *context =
-    clutter_backend_get_cogl_context (backend);
-  CoglTextureRectangle *tex_rect;
+  CoglHandle cogl_tex = COGL_INVALID_HANDLE;

-  tex_rect = cogl_texture_rectangle_new_with_size (context,
-                                                   width, height,
-                                                   internal_format,
-                                                   error);
-  if (tex_rect == NULL)
-    return NULL;
+#ifdef GL_TEXTURE_RECTANGLE_ARB

+  static CoglUserDataKey user_data_key;
+  GLint old_binding;
+  GLuint tex;
+
+  if (pf_glGenTextures == NULL)
+    {
+      pf_glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv");
+      pf_glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D");
+      pf_glGenTextures = (void *) cogl_get_proc_address ("glGenTextures");
+      pf_glDeleteTextures = (void *) cogl_get_proc_address ("glDeleteTextures");
+      pf_glBindTexture = (void *) cogl_get_proc_address ("glBindTexture");
+    }
+
+  pf_glGenTextures (1, &tex);
+  pf_glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding);
+  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+  pf_glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                   internal_gl_format, width, height,
+                   0, internal_gl_format,
+                   GL_UNSIGNED_BYTE, NULL);
+  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, old_binding);
+
+  cogl_tex = cogl_texture_new_from_foreign (tex,
+                                            GL_TEXTURE_RECTANGLE_ARB,
+                                            width, height,
+                                            0, 0, /* no waste */
+                                            internal_format);
+
+  /* Cogl won't destroy the GL texture when a foreign texture is used
+     so we need to destroy it manually. We can set a destroy
+     notification callback to do this transparently */
+  cogl_object_set_user_data (cogl_tex,
+                             &user_data_key,
+                             GUINT_TO_POINTER (tex),
+                             rectangle_texture_destroy_cb);
+
+  /* Use cogl_texture_set_region instead of uploading the data
+     directly with GL calls so that we can let Cogl deal with setting
+     the pixel store parameters and handling format conversion */
  if (data)
-    cogl_texture_set_region (COGL_TEXTURE (tex_rect),
-                             0, 0, /* src_x/y */
-                             0, 0, /* dst_x/y */
-                             width, height, /* dst_width/height */
-                             width, height, /* width/height */
+    cogl_texture_set_region (cogl_tex,
+                             0, 0, /* src x/y */
+                             0, 0, /* dst x/y */
+                             width, height, /* dst width/height */
+                             width, height, /* src width/height */
                             format,
                             rowstride,
                             data);

-  return COGL_TEXTURE (tex_rect);
-}
-
-static void
-texture_rectangle_check_cb (CoglTexture *sub_texture,
-                            const float *sub_texture_coords,
-                            const float *meta_coords,
-                            void *user_data)
-{
-  gboolean *result = user_data;
-
-  if (cogl_is_texture_rectangle (sub_texture))
-    *result = TRUE;
-}
-
-/* Determines if the given texture is using a rectangle texture as its
- * primitive texture type. Eventually this function could be replaced
- * with cogl_texture_get_type if Cogl makes that public.
- *
- * http://git.gnome.org/browse/cogl/commit/?h=8012eee31
- */
-gboolean
-meta_texture_rectangle_check (CoglTexture *texture)
-{
-  gboolean result = FALSE;
-
-  cogl_meta_texture_foreach_in_region (COGL_META_TEXTURE (texture),
-                                       0.0f, 0.0f, /* tx_1 / ty_1 */
-                                       1.0f, 1.0f, /* tx_2 / ty_2 */
-                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
-                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
-                                       texture_rectangle_check_cb,
-                                       &result);
-
-  return result;
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+  return cogl_tex;
 }
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.h
@ -30,17 +30,15 @@

 G_BEGIN_DECLS

-CoglTexture *
+CoglHandle
 meta_texture_rectangle_new (unsigned int width,
                            unsigned int height,
+                            CoglTextureFlags flags,
                            CoglPixelFormat format,
-                            CoglPixelFormat internal_format,
+                            GLenum internal_gl_format,
+                            GLenum internal_format,
                            unsigned int rowstride,
-                            const guint8 *data,
-                            GError **error);
-
-gboolean
-meta_texture_rectangle_check (CoglTexture *texture);
+                            const guint8 *data);

 G_END_DECLS

--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@ -98,6 +98,18 @@ meta_texture_tower_free (MetaTextureTower *tower)
  g_slice_free (MetaTextureTower, tower);
 }

+#ifdef GL_TEXTURE_RECTANGLE_ARB
+static gboolean
+texture_is_rectangle (CoglHandle texture)
+{
+  GLuint gl_tex;
+  GLenum gl_target;
+
+  cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
+  return gl_target == GL_TEXTURE_RECTANGLE_ARB;
+}
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
 /**
 * meta_texture_tower_set_base_texture:
 * @tower: a #MetaTextureTower
@ -186,9 +198,6 @@ meta_texture_tower_update_area (MetaTextureTower *tower,

  g_return_if_fail (tower != NULL);

-  if (tower->textures[0] == COGL_INVALID_HANDLE)
-    return;
-
  texture_width = cogl_texture_get_width (tower->textures[0]);
  texture_height = cogl_texture_get_height (tower->textures[0]);

@ -342,11 +351,13 @@ get_paint_level (int width, int height)
    return (int)(0.5 + lambda);
 }

+#ifdef GL_TEXTURE_RECTANGLE_ARB
 static gboolean
 is_power_of_two (int x)
 {
  return (x & (x - 1)) == 0;
 }
+#endif /* GL_TEXTURE_RECTANGLE_ARB */

 static void
 texture_tower_create_texture (MetaTextureTower *tower,
@ -354,23 +365,25 @@ texture_tower_create_texture (MetaTextureTower *tower,
                              int               width,
                              int               height)
 {
+#ifdef GL_TEXTURE_RECTANGLE_ARB
  if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
-      meta_texture_rectangle_check (tower->textures[level - 1]))
+      texture_is_rectangle (tower->textures[level - 1]))
    {
      tower->textures[level] =
        meta_texture_rectangle_new (width, height,
+                                    0, /* flags */
                                    /* data format */
                                    TEXTURE_FORMAT,
+                                    /* internal GL format */
+                                    GL_RGBA,
                                    /* internal cogl format */
                                    TEXTURE_FORMAT,
                                    /* rowstride */
                                    width * 4,
-                                    /* data */
-                                    NULL,
-                                    /* error */
                                    NULL);
    }
  else
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
    {
      tower->textures[level] = cogl_texture_new_with_size (width, height,
                                                           COGL_TEXTURE_NO_AUTO_MIPMAP,
@ -546,7 +559,7 @@ texture_tower_revalidate_client (MetaTextureTower *tower,
                           4 * dest_width,
                           dest_data);

-  if (dest_texture_height < source_texture_height)
+  if (dest_height < source_texture_height)
    {
      g_free (source_tmp1);
      g_free (source_tmp2);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@ -13,20 +13,17 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_union() */
-#include <string.h>

 #include <meta/display.h>
 #include <meta/errors.h>
 #include "frame.h"
 #include <meta/window.h>
-#include <meta/meta-shaped-texture.h>
 #include "xprops.h"

 #include "compositor-private.h"
 #include "meta-shadow-factory-private.h"
+#include "meta-shaped-texture.h"
 #include "meta-window-actor-private.h"
-#include "meta-texture-rectangle.h"
-#include "region-utils.h"

 enum {
  POSITION_CHANGED,
@ -126,10 +123,15 @@ enum
  PROP_META_WINDOW = 1,
  PROP_META_SCREEN,
  PROP_X_WINDOW,
+  PROP_X_WINDOW_ATTRIBUTES,
  PROP_NO_SHADOW,
  PROP_SHADOW_CLASS
 };

+#define DEFAULT_SHADOW_RADIUS 12
+#define DEFAULT_SHADOW_X_OFFSET 0
+#define DEFAULT_SHADOW_Y_OFFSET 8
+
 static void meta_window_actor_dispose    (GObject *object);
 static void meta_window_actor_finalize   (GObject *object);
 static void meta_window_actor_constructed (GObject *object);
@ -230,13 +232,15 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
    g_signal_new ("position-changed",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
  signals[SIZE_CHANGED] =
    g_signal_new ("size-changed",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

@ -737,52 +741,74 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
      meta_window_is_fullscreen (priv->window))
    return FALSE;

-  /*
-   * If we have two snap-tiled windows, we don't want the shadow to obstruct
-   * the other window.
-   */
-  if (meta_window_get_tile_match (priv->window))
-    return FALSE;
-
  /*
   * Always put a shadow around windows with a frame - This should override
   * the restriction about not putting a shadow around ARGB windows.
   */
-  if (meta_window_get_frame (priv->window))
-    return TRUE;
+  if (priv->window)
+    {
+      if (meta_window_get_frame (priv->window))
+	{
+	  meta_verbose ("Window 0x%x has shadow because it has a frame\n",
+			(guint)priv->xwindow);
+	  return TRUE;
+	}
+    }

  /*
   * Do not add shadows to ARGB windows; eventually we should generate a
   * shadow from the input shape for such windows.
   */
  if (priv->argb32 || priv->opacity != 0xff)
-    return FALSE;
+    {
+      meta_verbose ("Window 0x%x has no shadow as it is ARGB\n",
+		    (guint)priv->xwindow);
+      return FALSE;
+    }

  /*
   * Add shadows to override redirect windows (e.g., Gtk menus).
   */
  if (priv->window->override_redirect)
-    return TRUE;
+    {
+      meta_verbose ("Window 0x%x has shadow because it is override redirect.\n",
+		    (guint)priv->xwindow);
+      return TRUE;
+    }

  /*
   * Don't put shadow around DND icon windows
   */
  if (window_type == META_WINDOW_DND ||
      window_type == META_WINDOW_DESKTOP)
-    return FALSE;
+    {
+      meta_verbose ("Window 0x%x has no shadow as it is DND or Desktop\n",
+		    (guint)priv->xwindow);
+      return FALSE;
+    }

  if (window_type == META_WINDOW_MENU
 #if 0
      || window_type == META_WINDOW_DROPDOWN_MENU
 #endif
      )
-    return TRUE;
+    {
+      meta_verbose ("Window 0x%x has shadow as it is a menu\n",
+		    (guint)priv->xwindow);
+      return TRUE;
+    }

 #if 0
  if (window_type == META_WINDOW_TOOLTIP)
-    return TRUE;
+    {
+      meta_verbose ("Window 0x%x has shadow as it is a tooltip\n",
+		    (guint)priv->xwindow);
+      return TRUE;
+    }
 #endif

+  meta_verbose ("Window 0x%x has no shadow as it fell through\n",
+		(guint)priv->xwindow);
  return FALSE;
 }

@ -802,9 +828,9 @@ meta_window_actor_get_x_window (MetaWindowActor *self)
 /**
 * meta_window_actor_get_meta_window:
 *
- * Gets the #MetaWindow object that the the #MetaWindowActor is displaying
+ * Gets the MetaWindow object that the the MetaWindowActor is displaying
 *
- * Return value: (transfer none): the displayed #MetaWindow
+ * Return value: (transfer none): the displayed MetaWindow
 */
 MetaWindow *
 meta_window_actor_get_meta_window (MetaWindowActor *self)
@ -817,7 +843,7 @@ meta_window_actor_get_meta_window (MetaWindowActor *self)
 *
 * Gets the ClutterActor that is used to display the contents of the window
 *
- * Return value: (transfer none): the #ClutterActor for the contents
+ * Return value: (transfer none): the ClutterActor for the contents
 */
 ClutterActor *
 meta_window_actor_get_texture (MetaWindowActor *self)
@ -920,20 +946,23 @@ static void
 meta_window_actor_damage_all (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  CoglHandle texture;
+  ClutterX11TexturePixmap *texture_x11 = CLUTTER_X11_TEXTURE_PIXMAP (priv->actor);
+  guint pixmap_width = 0;
+  guint pixmap_height = 0;

  if (!priv->needs_damage_all)
    return;

-  texture = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
+  g_object_get (texture_x11,
+                "pixmap-width", &pixmap_width,
+                "pixmap-height", &pixmap_height,
+                NULL);

-  if (!priv->mapped || priv->needs_pixmap)
-    return;
-
-  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                   0, 0,
-                                   cogl_texture_get_width (texture),
-                                   cogl_texture_get_height (texture));
+  clutter_x11_texture_pixmap_update_area (texture_x11,
+                                          0,
+                                          0,
+                                          pixmap_width,
+                                          pixmap_height);

  priv->needs_damage_all = FALSE;
 }
@ -1172,8 +1201,9 @@ meta_window_actor_detach (MetaWindowActor *self)
   * you are supposed to be able to free a GLXPixmap after freeing the underlying
   * pixmap, but it certainly doesn't work with current DRI/Mesa
   */
-  meta_shaped_texture_set_pixmap (META_SHAPED_TEXTURE (priv->actor),
-                                  None);
+  clutter_x11_texture_pixmap_set_pixmap (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor),
+                                         None);
+  meta_shaped_texture_clear (META_SHAPED_TEXTURE (priv->actor));
  cogl_flush();

  XFreePixmap (xdisplay, priv->back_pixmap);
@ -1188,36 +1218,31 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
  MetaWindow *metaWindow = meta_window_actor_get_meta_window (self);
  MetaScreen *screen = meta_window_get_screen (metaWindow);
  MetaWindowActorPrivate *priv = self->priv;
-  int screen_width, screen_height;
-  MetaRectangle window_rect, monitor_rect;
-  int num_monitors = meta_screen_get_n_monitors (screen);
-  int i;

-  if (!meta_window_is_override_redirect (metaWindow))
-    return FALSE;
-
-  if (priv->opacity != 0xff)
-    return FALSE;
-
-  if (priv->argb32)
-    return FALSE;
-
-  if (metaWindow->has_shape)
-    return FALSE;
-
-  meta_screen_get_size (screen, &screen_width, &screen_height);
-  meta_window_get_outer_rect (metaWindow, &window_rect);
-
-  if (window_rect.x == 0 && window_rect.y == 0 &&
-      window_rect.width == screen_width && window_rect.height == screen_height)
-    return TRUE;
-
-  for (i = 0; i < num_monitors; i++)
+  if (meta_window_is_override_redirect (metaWindow) && priv->opacity == 0xff && !priv->argb32)
    {
-      meta_screen_get_monitor_geometry (screen , i, &monitor_rect);
-      if (monitor_rect.x == window_rect.x && monitor_rect.y == window_rect.y &&
-          monitor_rect.width == window_rect.width && monitor_rect.height == window_rect.height)
-        return TRUE;
+      int screen_width, screen_height;
+      MetaRectangle window_rect;
+      meta_screen_get_size (screen, &screen_width, &screen_height);
+      meta_window_get_outer_rect (metaWindow, &window_rect);
+
+      if (window_rect.x == 0 && window_rect.y == 0 &&
+          window_rect.width == screen_width && window_rect.height == screen_height)
+           return TRUE;
+      else
+        {
+          int num_monitors = meta_screen_get_n_monitors (screen);
+          int i;
+          MetaRectangle monitor_rect;
+
+          for (i = 0; i < num_monitors; i++)
+            {
+              meta_screen_get_monitor_geometry (screen , i, &monitor_rect);
+              if (monitor_rect.x == window_rect.x && monitor_rect.y == window_rect.y &&
+                  monitor_rect.width == window_rect.width && monitor_rect.height == window_rect.height)
+                    return TRUE;
+            }
+        }
    }

  return FALSE;
@ -1590,16 +1615,24 @@ meta_window_actor_update_bounding_region_and_borders (MetaWindowActor *self,
                                                      int              height)
 {
  MetaWindowActorPrivate *priv = self->priv;
+  MetaFrame *frame;
  MetaFrameBorders borders;
  cairo_rectangle_int_t bounding_rectangle;

-  meta_frame_calc_borders (priv->window->frame, &borders);
+  bounding_rectangle.x = 0;
+  bounding_rectangle.y = 0;

-  bounding_rectangle.x = borders.invisible.left;
-  bounding_rectangle.y = borders.invisible.top;
+  frame = priv->window->frame;
+  if (frame != NULL)
+    {
+      meta_frame_calc_borders (frame, &borders);

-  width -= borders.invisible.left + borders.invisible.right;
-  height -= borders.invisible.top + borders.invisible.bottom;
+      bounding_rectangle.x = borders.invisible.left;
+      bounding_rectangle.y = borders.invisible.top;
+
+      width -= borders.invisible.left + borders.invisible.right;
+      height -= borders.invisible.top + borders.invisible.bottom;
+    }

  bounding_rectangle.width = width;
  bounding_rectangle.height = height;
@ -1689,7 +1722,7 @@ meta_window_actor_get_obscured_region (MetaWindowActor *self)
 #if 0
 /* Print out a region; useful for debugging */
 static void
-print_region (cairo_region_t *region)
+dump_region (cairo_region_t *region)
 {
  int n_rects;
  int i;
@ -1707,26 +1740,6 @@ print_region (cairo_region_t *region)
 }
 #endif

-#if 0
-/* Dump a region to a PNG file; useful for debugging */
-static void
-see_region (cairo_region_t *region,
-            int             width,
-            int             height,
-            char           *filename)
-{
-  cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
-  cairo_t *cr = cairo_create (surface);
-
-  gdk_cairo_region (cr, region);
-  cairo_fill (cr);
-
-  cairo_surface_write_to_png (surface, filename);
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-}
-#endif
-
 /**
 * meta_window_actor_set_visible_region:
 * @self: a #MetaWindowActor
@ -1742,9 +1755,22 @@ meta_window_actor_set_visible_region (MetaWindowActor *self,
                                      cairo_region_t  *visible_region)
 {
  MetaWindowActorPrivate *priv = self->priv;
+  cairo_region_t *texture_clip_region = NULL;

+  /* Get the area of the window texture that would be drawn if
+   * we weren't obscured at all
+   */
+  texture_clip_region = meta_shaped_texture_get_visible_pixels_region (META_SHAPED_TEXTURE (priv->actor));
+  texture_clip_region = cairo_region_copy (texture_clip_region);
+
+  /* Then intersect that with the visible region to get the region
+   * that we actually need to redraw.
+   */
+  cairo_region_intersect (texture_clip_region, visible_region);
+
+  /* Assumes ownership */
  meta_shaped_texture_set_clip_region (META_SHAPED_TEXTURE (priv->actor),
-                                       visible_region);
+                                       texture_clip_region);
 }

 /**
@ -1784,7 +1810,7 @@ meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
 * @self: a #MetaWindowActor
 *
 * Unsets the regions set by meta_window_actor_reset_visible_region() and
- * meta_window_actor_reset_visible_region_beneath()
+ *meta_window_actor_reset_visible_region_beneath()
 */
 void
 meta_window_actor_reset_visible_regions (MetaWindowActor *self)
@ -1796,6 +1822,19 @@ meta_window_actor_reset_visible_regions (MetaWindowActor *self)
  meta_window_actor_clear_shadow_clip (self);
 }

+static gboolean
+texture_pixmap_using_extension (ClutterX11TexturePixmap *texture)
+{
+  ClutterTexture *self = CLUTTER_TEXTURE (texture);
+  CoglHandle handle;
+
+  handle = clutter_texture_get_cogl_texture (self);
+
+  return handle != NULL &&
+         cogl_is_texture_pixmap_x11 (handle) &&
+         cogl_texture_pixmap_x11_is_using_tfp_extension (handle);
+}
+
 static void
 check_needs_pixmap (MetaWindowActor *self)
 {
@ -1829,7 +1868,7 @@ check_needs_pixmap (MetaWindowActor *self)

  if (priv->back_pixmap == None)
    {
-      CoglHandle texture;
+      gint pxm_width, pxm_height;

      meta_error_trap_push (display);

@ -1858,22 +1897,23 @@ check_needs_pixmap (MetaWindowActor *self)
        meta_shaped_texture_set_create_mipmaps (META_SHAPED_TEXTURE (priv->actor),
                                                FALSE);

-      meta_shaped_texture_set_pixmap (META_SHAPED_TEXTURE (priv->actor),
-                                      priv->back_pixmap);
-
-      texture = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
-
+      clutter_x11_texture_pixmap_set_pixmap
+                       (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor),
+                        priv->back_pixmap);
      /*
       * This only works *after* actually setting the pixmap, so we have to
       * do it here.
       * See: http://bugzilla.clutter-project.org/show_bug.cgi?id=2236
       */
-      if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (texture)))
+      if (G_UNLIKELY (!texture_pixmap_using_extension (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor))))
        g_warning ("NOTE: Not using GLX TFP!\n");

-      meta_window_actor_update_bounding_region_and_borders (self,
-                                                            cogl_texture_get_width (texture),
-                                                            cogl_texture_get_height (texture));
+      g_object_get (priv->actor,
+                    "pixmap-width", &pxm_width,
+                    "pixmap-height", &pxm_height,
+                    NULL);
+
+      meta_window_actor_update_bounding_region_and_borders (self, pxm_width, pxm_height);
    }

  priv->needs_pixmap = FALSE;
@ -1966,6 +2006,7 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
                                  XDamageNotifyEvent *event)
 {
  MetaWindowActorPrivate *priv = self->priv;
+  ClutterX11TexturePixmap *texture_x11 = CLUTTER_X11_TEXTURE_PIXMAP (priv->actor);

  priv->received_damage = TRUE;

@ -1993,14 +2034,12 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
      return;
    }

-  if (!priv->mapped || priv->needs_pixmap)
-    return;

-  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                   event->area.x,
-                                   event->area.y,
-                                   event->area.width,
-                                   event->area.height);
+  clutter_x11_texture_pixmap_update_area (texture_x11,
+                                          event->area.x,
+                                          event->area.y,
+                                          event->area.width,
+                                          event->area.height);
 }

 void
@ -2017,196 +2056,121 @@ meta_window_actor_sync_visibility (MetaWindowActor *self)
    }
 }

-#define TAU (2*M_PI)
+static inline void
+set_integral_bounding_rect (cairo_rectangle_int_t *rect,
+                            double x, double y,
+                            double width, double height)
+{
+  rect->x = floor(x);
+  rect->y = floor(y);
+  rect->width = ceil(x + width) - rect->x;
+  rect->height = ceil(y + height) - rect->y;
+}

 static void
-install_corners (MetaWindow       *window,
-                 MetaFrameBorders *borders,
-                 cairo_t          *cr)
+update_corners (MetaWindowActor   *self,
+                MetaFrameBorders  *borders)
 {
-  float top_left, top_right, bottom_left, bottom_right;
-  int x, y;
+  MetaWindowActorPrivate *priv = self->priv;
  MetaRectangle outer;
+  cairo_rectangle_int_t corner_rects[4];
+  cairo_region_t *corner_region;
+  cairo_path_t *corner_path;
+  float top_left, top_right, bottom_left, bottom_right;
+  float x, y;

-  meta_frame_get_corner_radiuses (window->frame,
+  /* need these to build a path */
+  cairo_t *cr;
+  cairo_surface_t *surface;
+
+  if (!priv->window->frame)
+    {
+      meta_shaped_texture_set_overlay_path (META_SHAPED_TEXTURE (priv->actor),
+                                            NULL, NULL);
+      return;
+    }
+
+  meta_window_get_outer_rect (priv->window, &outer);
+
+  meta_frame_get_corner_radiuses (priv->window->frame,
                                  &top_left,
                                  &top_right,
                                  &bottom_left,
                                  &bottom_right);

-  meta_window_get_outer_rect (window, &outer);
+  /* Unfortunately, cairo does not allow us to create a context
+   * without a surface. Create a 0x0 image surface to "paint to"
+   * so we can get the path. */
+  surface = cairo_image_surface_create (CAIRO_FORMAT_A8,
+                                        0, 0);
+
+  cr = cairo_create (surface);

  /* top left */
  x = borders->invisible.left;
  y = borders->invisible.top;

+  set_integral_bounding_rect (&corner_rects[0],
+                              x, y, top_left, top_left);
+
  cairo_arc (cr,
             x + top_left,
             y + top_left,
             top_left,
-             2 * TAU / 4,
-             3 * TAU / 4);
+             0, M_PI*2);
+

  /* top right */
  x = borders->invisible.left + outer.width - top_right;
  y = borders->invisible.top;

+  set_integral_bounding_rect (&corner_rects[1],
+                              x, y, top_right, top_right);
+
  cairo_arc (cr,
             x,
             y + top_right,
             top_right,
-             3 * TAU / 4,
-             4 * TAU / 4);
+             0, M_PI*2);

  /* bottom right */
  x = borders->invisible.left + outer.width - bottom_right;
  y = borders->invisible.top + outer.height - bottom_right;

+  set_integral_bounding_rect (&corner_rects[2],
+                              x, y, bottom_right, bottom_right);
+
  cairo_arc (cr,
             x,
             y,
             bottom_right,
-             0 * TAU / 4,
-             1 * TAU / 4);
+             0, M_PI*2);

  /* bottom left */
  x = borders->invisible.left;
  y = borders->invisible.top + outer.height - bottom_left;

+  set_integral_bounding_rect (&corner_rects[3],
+                              x, y, bottom_left, bottom_left);
+
  cairo_arc (cr,
             x + bottom_left,
             y,
             bottom_left,
-             1 * TAU / 4,
-             2 * TAU / 4);
+             0, M_PI*2);

-  cairo_set_source_rgba (cr, 1, 1, 1, 1);
-  cairo_fill (cr);
-}
+  corner_path = cairo_copy_path (cr);

-static cairo_region_t *
-scan_visible_region (guchar         *mask_data,
-                     int             stride,
-                     cairo_region_t *scan_area)
-{
-  int i, n_rects = cairo_region_num_rectangles (scan_area);
-  MetaRegionBuilder builder;
-
-  meta_region_builder_init (&builder);
-
-  for (i = 0; i < n_rects; i++)
-    {
-      int x, y;
-      cairo_rectangle_int_t rect;
-
-      cairo_region_get_rectangle (scan_area, i, &rect);
-
-      for (y = rect.y; y < (rect.y + rect.height); y++)
-        {
-          for (x = rect.x; x < (rect.x + rect.width); x++)
-            {
-              int w = x;
-              while (mask_data[y * stride + w] == 255 && w < (rect.x + rect.width))
-                w++;
-
-              if (w > 0)
-                {
-                  meta_region_builder_add_rectangle (&builder, x, y, w - x, 1);
-                  x = w;
-                }
-            }
-        }
-    }
-
-  return meta_region_builder_finish (&builder);
-}
-
-static void
-build_and_scan_frame_mask (MetaWindowActor       *self,
-                           MetaFrameBorders      *borders,
-                           cairo_rectangle_int_t *client_area,
-                           cairo_region_t        *shape_region)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  guchar *mask_data;
-  guint tex_width, tex_height;
-  CoglHandle paint_tex, mask_texture;
-  int stride;
-  cairo_t *cr;
-  cairo_surface_t *surface;
-
-  paint_tex = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
-  if (paint_tex == COGL_INVALID_HANDLE)
-    return;
-
-  tex_width = cogl_texture_get_width (paint_tex);
-  tex_height = cogl_texture_get_height (paint_tex);
-
-  stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);
-
-  /* Create data for an empty image */
-  mask_data = g_malloc0 (stride * tex_height);
-
-  surface = cairo_image_surface_create_for_data (mask_data,
-                                                 CAIRO_FORMAT_A8,
-                                                 tex_width,
-                                                 tex_height,
-                                                 stride);
-  cr = cairo_create (surface);
-
-  gdk_cairo_region (cr, shape_region);
-  cairo_fill (cr);
-
-  if (priv->window->frame != NULL)
-    {
-      cairo_region_t *frame_paint_region, *scanned_region;
-      cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-
-      /* Make sure we don't paint the frame over the client window. */
-      frame_paint_region = cairo_region_create_rectangle (&rect);
-      cairo_region_subtract_rectangle (frame_paint_region, client_area);
-
-      gdk_cairo_region (cr, frame_paint_region);
-      cairo_clip (cr);
-
-      install_corners (priv->window, borders, cr);
-
-      cairo_surface_flush (surface);
-      scanned_region = scan_visible_region (mask_data, stride, frame_paint_region);
-      cairo_region_union (shape_region, scanned_region);
-      cairo_region_destroy (scanned_region);
-    }
-
-  cairo_destroy (cr);
  cairo_surface_destroy (surface);
+  cairo_destroy (cr);

-  if (meta_texture_rectangle_check (paint_tex))
-    {
-      mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
-                                                 COGL_PIXEL_FORMAT_A_8,
-                                                 COGL_PIXEL_FORMAT_A_8,
-                                                 stride,
-                                                 mask_data,
-                                                 NULL /* error */);
-    }
-  else
-    {
-      /* Note: we don't allow slicing for this texture because we
-       * need to use it with multi-texturing which doesn't support
-       * sliced textures */
-      mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
-                                                 COGL_TEXTURE_NO_SLICING,
-                                                 COGL_PIXEL_FORMAT_A_8,
-                                                 COGL_PIXEL_FORMAT_ANY,
-                                                 stride,
-                                                 mask_data);
-    }
+  corner_region = cairo_region_create_rectangles (corner_rects, 4);

-  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor),
-                                        mask_texture);
-  cogl_handle_unref (mask_texture);
+  meta_shaped_texture_set_overlay_path (META_SHAPED_TEXTURE (priv->actor),
+                                        corner_region, corner_path);
+
+  cairo_region_destroy (corner_region);

-  g_free (mask_data);
 }

 static void
@ -2216,30 +2180,57 @@ check_needs_reshape (MetaWindowActor *self)
  MetaScreen *screen = priv->screen;
  MetaDisplay *display = meta_screen_get_display (screen);
  MetaFrameBorders borders;
-  cairo_region_t *region = NULL;
-  cairo_rectangle_int_t client_area;
+  cairo_region_t *region;

  if (!priv->needs_reshape)
    return;

-  meta_frame_calc_borders (priv->window->frame, &borders);
-
-  client_area.x = borders.total.left;
-  client_area.y = borders.total.top;
-  client_area.width = priv->window->rect.width;
-  client_area.height = priv->window->rect.height;
-
-  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), COGL_INVALID_HANDLE);
+  meta_shaped_texture_set_shape_region (META_SHAPED_TEXTURE (priv->actor), NULL);
  meta_window_actor_clear_shape_region (self);

+  if (priv->window->frame)
+    meta_frame_calc_borders (priv->window->frame, &borders);
+  else
+    meta_frame_borders_clear (&borders);
+
+  region = meta_window_get_frame_bounds (priv->window);
+  if (region != NULL)
+    {
+      /* This returns the window's internal frame bounds region,
+       * so we need to copy it because we modify it below. */
+      region = cairo_region_copy (region);
+    }
+  else
+    {
+      /* If we have no region, we have no frame. We have no frame,
+       * so just use the bounding region instead */
+      region = cairo_region_copy (priv->bounding_region);
+    }
+
 #ifdef HAVE_SHAPE
  if (priv->window->has_shape)
    {
-      /* Translate the set of XShape rectangles that we
-       * get from the X server to a cairo_region. */
      Display *xdisplay = meta_display_get_xdisplay (display);
      XRectangle *rects;
      int n_rects, ordering;
+      cairo_rectangle_int_t client_area;
+
+      client_area.width = priv->window->rect.width;
+      client_area.height = priv->window->rect.height;
+
+      if (priv->window->frame)
+        {
+          client_area.x = borders.total.left;
+          client_area.y = borders.total.top;
+        }
+      else
+        {
+          client_area.x = 0;
+          client_area.y = 0;
+        }
+
+      /* Punch out client area. */
+      cairo_region_subtract_rectangle (region, &client_area);

      meta_error_trap_push (display);
      rects = XShapeGetRectangles (xdisplay,
@ -2252,40 +2243,28 @@ check_needs_reshape (MetaWindowActor *self)
      if (rects)
        {
          int i;
-          cairo_rectangle_int_t *cairo_rects = g_new (cairo_rectangle_int_t, n_rects);
-
          for (i = 0; i < n_rects; i ++)
            {
-              cairo_rects[i].x = rects[i].x + client_area.x;
-              cairo_rects[i].y = rects[i].y + client_area.y;
-              cairo_rects[i].width = rects[i].width;
-              cairo_rects[i].height = rects[i].height;
+              cairo_rectangle_int_t rect = { rects[i].x + client_area.x,
+                                             rects[i].y + client_area.y,
+                                             rects[i].width,
+                                             rects[i].height };
+              cairo_region_union_rectangle (region, &rect);
            }
-
          XFree (rects);
-          region = cairo_region_create_rectangles (cairo_rects, n_rects);
-          g_free (cairo_rects);
        }
    }
 #endif

-  if (region == NULL)
-    {
-      /* If we don't have a shape on the server, that means that
-       * we have an implicit shape of one rectangle covering the
-       * entire window. */
-      region = cairo_region_create_rectangle (&client_area);
-    }
+  meta_shaped_texture_set_shape_region (META_SHAPED_TEXTURE (priv->actor),
+                                        region);

-  /* This takes the region, generates a mask using GTK+
-   * and scans the mask looking for all opaque pixels,
-   * adding it to region.
-   */
-  build_and_scan_frame_mask (self, &borders, &client_area, region);
  meta_window_actor_update_shape_region (self, region);

  cairo_region_destroy (region);

+  update_corners (self, &borders);
+
  priv->needs_reshape = FALSE;
  meta_window_actor_invalidate_shadow (self);
 }
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@ -108,7 +108,7 @@ meta_window_group_paint (ClutterActor *actor)
  cairo_region_t *unredirected_window_region = NULL;
  ClutterActor *stage;
  cairo_rectangle_int_t visible_rect, unredirected_rect;
-  GList *children, *l;
+  GList *children, *l, *effects;

  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
  MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
@ -161,13 +161,16 @@ meta_window_group_paint (ClutterActor *actor)
       * as well for the same reason, but omitted for simplicity in the
       * hopes that no-one will do that.
       */
-      if (clutter_actor_has_effects (l->data))
-        continue;
+      if ((effects = clutter_actor_get_effects (l->data)) != NULL)
+        {
+          g_list_free (effects);
+          continue;
+        }

      if (META_IS_WINDOW_ACTOR (l->data))
        {
          MetaWindowActor *window_actor = l->data;
-          int x, y;
+          gboolean x, y;

          if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
            continue;
@ -209,6 +212,7 @@ meta_window_group_paint (ClutterActor *actor)
      if (META_IS_WINDOW_ACTOR (l->data))
        {
          MetaWindowActor *window_actor = l->data;
+          window_actor = l->data;
          meta_window_actor_reset_visible_regions (window_actor);
        }
      else if (META_IS_BACKGROUND_ACTOR (l->data))
--- a/src/compositor/plugins/Makefile.am
+++ b/src/compositor/plugins/Makefile.am
@ -16,9 +16,3 @@ pkglib_LTLIBRARIES = default.la
 install-exec-hook:
 	-rm $(DESTDIR)$(pkglibdir)/*.a
 	-rm $(DESTDIR)$(pkglibdir)/*.la
-
-# Since we removed the .la file, 'make uninstall' doesn't work properly,
-# since it counts on libtool to remove the .la files, so just kill the
-# .so file manually.
-uninstall-local:
-	-rm -f $(DESTDIR)$(pkglibdir)/default.so
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@ -112,6 +112,8 @@ struct _MetaDefaultPluginPrivate
  ClutterActor          *desktop2;

  MetaPluginInfo         info;
+
+  gboolean               debug_mode : 1;
 };

 /*
@ -180,6 +182,34 @@ meta_default_plugin_get_property (GObject    *object,
    }
 }

+static void
+start (MetaPlugin *plugin)
+{
+  MetaDefaultPluginPrivate *priv   = META_DEFAULT_PLUGIN (plugin)->priv;
+
+  guint destroy_timeout  = DESTROY_TIMEOUT;
+  guint minimize_timeout = MINIMIZE_TIMEOUT;
+  guint maximize_timeout = MAXIMIZE_TIMEOUT;
+  guint map_timeout      = MAP_TIMEOUT;
+  guint switch_timeout   = SWITCH_TIMEOUT;
+
+  if (meta_plugin_debug_mode (plugin))
+    {
+      g_debug ("Plugin %s: Entering debug mode.", priv->info.name);
+
+      priv->debug_mode = TRUE;
+
+      /*
+       * Double the effect duration to make them easier to observe.
+       */
+      destroy_timeout  *= 2;
+      minimize_timeout *= 2;
+      maximize_timeout *= 2;
+      map_timeout      *= 2;
+      switch_timeout   *= 2;
+    }
+}
+
 static void
 meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
 {
@ -191,6 +221,7 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
  gobject_class->set_property    = meta_default_plugin_set_property;
  gobject_class->get_property    = meta_default_plugin_get_property;

+  plugin_class->start            = start;
  plugin_class->map              = map;
  plugin_class->minimize         = minimize;
  plugin_class->maximize         = maximize;
@ -253,8 +284,7 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
 {
  MetaPlugin               *plugin  = META_PLUGIN (data);
  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
-  MetaScreen *screen = meta_plugin_get_screen (plugin);
-  GList *l = meta_get_window_actors (screen);
+  GList        *l     = meta_plugin_get_window_actors (plugin);

  while (l)
    {
@ -287,7 +317,6 @@ switch_workspace (MetaPlugin *plugin,
                  gint from, gint to,
                  MetaMotionDirection direction)
 {
-  MetaScreen *screen;
  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
  GList        *l;
  ClutterActor *workspace0  = clutter_group_new ();
@ -296,13 +325,11 @@ switch_workspace (MetaPlugin *plugin,
  int           screen_width, screen_height;
  ClutterAnimation *animation;

-  screen = meta_plugin_get_screen (plugin);
-  stage = meta_get_stage_for_screen (screen);
-
-  meta_screen_get_size (screen,
-                        &screen_width,
-                        &screen_height);
+  stage = meta_plugin_get_stage (plugin);

+  meta_plugin_query_screen_size (plugin,
+					      &screen_width,
+					      &screen_height);
  clutter_actor_set_anchor_point (workspace1,
                                  screen_width,
                                  screen_height);
@ -321,7 +348,7 @@ switch_workspace (MetaPlugin *plugin,
      return;
    }

-  l = g_list_last (meta_get_window_actors (screen));
+  l = g_list_last (meta_plugin_get_window_actors (plugin));

  while (l)
    {
@ -419,19 +446,12 @@ static void
 minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
 {
  MetaWindowType type;
-  MetaRectangle icon_geometry;
  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
  ClutterActor *actor  = CLUTTER_ACTOR (window_actor);


  type = meta_window_get_window_type (meta_window);

-  if (!meta_window_get_icon_geometry(meta_window, &icon_geometry))
-    {
-      icon_geometry.x = 0;
-      icon_geometry.y = 0;
-    }
-
  if (type == META_WINDOW_NORMAL)
    {
      ClutterAnimation *animation;
@ -448,8 +468,6 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
                                         MINIMIZE_TIMEOUT,
                                         "scale-x", 0.0,
                                         "scale-y", 0.0,
-                                         "x", (double)icon_geometry.x,
-                                         "y", (double)icon_geometry.y,
                                         NULL);
      apriv->tml_minimize = clutter_animation_get_timeline (animation);
      data->plugin = plugin;
--- a/src/compositor/region-utils.c
+++ b/src/compositor/region-utils.c
@ -43,17 +43,34 @@
 /* Optimium performance seems to be with MAX_CHUNK_RECTANGLES=4; 8 is about 10% slower.
 * But using 8 may be more robust to systems with slow malloc(). */
 #define MAX_CHUNK_RECTANGLES 8
+#define MAX_LEVELS 16

-void
+typedef struct
+{
+  /* To merge regions in binary tree order, we need to keep track of
+   * the regions that we've already merged together at different
+   * levels of the tree. We fill in an array in the pattern:
+   *
+   * |a  |
+   * |b  |a  |
+   * |c  |   |ab |
+   * |d  |c  |ab |
+   * |e  |   |   |abcd|
+   */
+  cairo_region_t *levels[MAX_LEVELS];
+  int n_levels;
+} MetaRegionBuilder;
+
+static void
 meta_region_builder_init (MetaRegionBuilder *builder)
 {
  int i;
-  for (i = 0; i < META_REGION_BUILDER_MAX_LEVELS; i++)
+  for (i = 0; i < MAX_LEVELS; i++)
    builder->levels[i] = NULL;
  builder->n_levels = 1;
 }

-void
+static void
 meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
                                   int                x,
                                   int                y,
@ -78,7 +95,7 @@ meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
        {
          if (builder->levels[i] == NULL)
            {
-              if (i < META_REGION_BUILDER_MAX_LEVELS)
+              if (i < MAX_LEVELS)
                {
                  builder->levels[i] = builder->levels[i - 1];
                  builder->levels[i - 1] = NULL;
@ -98,7 +115,7 @@ meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
    }
 }

-cairo_region_t *
+static cairo_region_t *
 meta_region_builder_finish (MetaRegionBuilder *builder)
 {
  cairo_region_t *result = NULL;
--- a/src/compositor/region-utils.h
+++ b/src/compositor/region-utils.h
@ -63,32 +63,6 @@ struct _MetaRegionIterator {
  cairo_rectangle_int_t next_rectangle;
 };

-typedef struct _MetaRegionBuilder MetaRegionBuilder;
-
-#define META_REGION_BUILDER_MAX_LEVELS 16
-struct _MetaRegionBuilder {
-  /* To merge regions in binary tree order, we need to keep track of
-   * the regions that we've already merged together at different
-   * levels of the tree. We fill in an array in the pattern:
-   *
-   * |a  |
-   * |b  |a  |
-   * |c  |   |ab |
-   * |d  |c  |ab |
-   * |e  |   |   |abcd|
-   */
-  cairo_region_t *levels[META_REGION_BUILDER_MAX_LEVELS];
-  int n_levels;
-};
-
-void     meta_region_builder_init       (MetaRegionBuilder *builder);
-void     meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
-                                            int                x,
-                                            int                y,
-                                            int                width,
-                                            int                height);
-cairo_region_t * meta_region_builder_finish (MetaRegionBuilder *builder);
-
 void     meta_region_iterator_init      (MetaRegionIterator *iter,
                                         cairo_region_t     *region);
 gboolean meta_region_iterator_at_end    (MetaRegionIterator *iter);
--- a/src/core/all-keybindings.h
+++ b/src/core/all-keybindings.h
@ -0,0 +1,400 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* 
+ * 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.
+ */
+
+/**
+ * A list of screen keybinding information.
+ *
+ * Each action which can have a keystroke bound to it is listed below.
+ * To use this file, define keybind() to be a seven-argument macro (you can
+ * throw any of the arguments you please away), include this file,
+ * and then undefine the macro again.
+ *
+ * (If you aren't familiar with this technique, sometimes called "x-macros",
+ * see DDJ of May 2001: <http://www.ddj.com/cpp/184401387>.)
+ *
+ * This makes it possible to keep all information about all the keybindings
+ * in the same place.  The only exception is the code to run when an action
+ * is actually invoked; while we *could* have put that in this file, it would
+ * have made debugging ridiculously difficult.  Instead, each action should
+ * have a corresponding static function named handle_<name>() in
+ * keybindings.c.
+ *
+ * The arguments to keybind() are:
+ *   1) the name of the binding; a bareword identifier
+ *              (it's fine if it happens to clash with a C reserved word)
+ *   2) the name of the function which implements it.
+ *              Clearly we could have guessed this from the binding very often,
+ *              but we choose to write it in full for the benefit of grep.
+ *   3) an integer parameter to pass to the handler
+ *   4) a set of boolean flags, ORed together:
+ *       BINDING_PER_WINDOW  - this is a window-based binding.
+ *                             It is only valid if there is a
+ *                             current window, and will operate in
+ *                             some way on that window.
+ *       BINDING_REVERSES    - the binding can reverse if you hold down Shift
+ *       BINDING_IS_REVERSED - the same, but the senses are reversed from the
+ *                             handler's point of view (let me know if I should
+ *                             explain this better)
+ *      or 0 if no flag applies.
+ *
+ *   5) a string representing the default binding.
+ *          If this is NULL, the action is unbound by default.
+ *          Please use NULL and not "disabled".
+ *   6) a short description.
+ *          It must be marked translatable (i.e. inside "_(...)").
+ *
+ * Don't try to do XML entity escaping anywhere in the strings.
+ */
+
+#ifndef keybind
+#error "keybind () must be defined when you include screen-bindings.h"
+#endif
+
+/***********************************/
+
+#ifndef _BINDINGS_DEFINED_CONSTANTS
+#define _BINDINGS_DEFINED_CONSTANTS 1
+
+#define BINDING_PER_WINDOW    0x01
+#define BINDING_REVERSES      0x02
+#define BINDING_IS_REVERSED   0x04
+
+#endif /* _BINDINGS_DEFINED_CONSTANTS */
+
+/***********************************/
+
+/* convenience, since in this file they must always be set together */
+#define REVERSES_AND_REVERSED (BINDING_REVERSES | BINDING_IS_REVERSED)
+
+keybind (switch_to_workspace_1,  handle_switch_to_workspace, 0, 0, NULL,
+        _("Switch to workspace 1"))
+keybind (switch_to_workspace_2,  handle_switch_to_workspace, 1, 0, NULL,
+        _("Switch to workspace 2"))
+keybind (switch_to_workspace_3,  handle_switch_to_workspace, 2, 0, NULL,
+        _("Switch to workspace 3"))
+keybind (switch_to_workspace_4,  handle_switch_to_workspace, 3, 0, NULL,
+        _("Switch to workspace 4"))
+keybind (switch_to_workspace_5,  handle_switch_to_workspace, 4, 0, NULL,
+        _("Switch to workspace 5"))
+keybind (switch_to_workspace_6,  handle_switch_to_workspace, 5, 0, NULL,
+        _("Switch to workspace 6"))
+keybind (switch_to_workspace_7,  handle_switch_to_workspace, 6, 0, NULL,
+        _("Switch to workspace 7"))
+keybind (switch_to_workspace_8,  handle_switch_to_workspace, 7, 0, NULL,
+        _("Switch to workspace 8"))
+keybind (switch_to_workspace_9,  handle_switch_to_workspace, 8, 0, NULL,
+        _("Switch to workspace 9"))
+keybind (switch_to_workspace_10, handle_switch_to_workspace, 9, 0, NULL,
+        _("Switch to workspace 10"))
+keybind (switch_to_workspace_11, handle_switch_to_workspace, 10, 0, NULL,
+        _("Switch to workspace 11"))
+keybind (switch_to_workspace_12, handle_switch_to_workspace, 11, 0, NULL,
+        _("Switch to workspace 12"))
+
+/* META_MOTION_* are negative, and so distinct from workspace numbers,
+ * which are always zero or positive.
+ * If you make use of these constants, you will need to include workspace.h
+ * (which you're probably using already for other reasons anyway).
+ * If your definition of keybind() throws them away, you don't need to include
+ * workspace.h, of course.
+ */
+
+keybind (switch_to_workspace_left, handle_switch_to_workspace,
+         META_MOTION_LEFT, 0, "<Control><Alt>Left",
+        _("Switch to workspace on the left of the current workspace"))
+
+keybind (switch_to_workspace_right, handle_switch_to_workspace,
+         META_MOTION_RIGHT, 0, "<Control><Alt>Right",
+        _("Switch to workspace on the right of the current workspace"))
+
+keybind (switch_to_workspace_up, handle_switch_to_workspace,
+         META_MOTION_UP, 0, "<Control><Alt>Up",
+        _("Switch to workspace above the current workspace"))
+
+keybind (switch_to_workspace_down, handle_switch_to_workspace,
+         META_MOTION_DOWN, 0, "<Control><Alt>Down",
+        _("Switch to workspace below the current workspace"))
+
+/***********************************/
+
+/* The ones which have inverses.  These can't be bound to any keystroke
+ * containing Shift because Shift will invert their "backward" state.
+ *
+ * TODO: "NORMAL" and "DOCKS" should be renamed to the same name as their
+ * action, for obviousness.
+ *
+ * TODO: handle_switch and handle_cycle should probably really be the
+ * same function checking a bit in the parameter for difference.
+ */
+
+keybind (switch_group,              handle_switch,        META_TAB_LIST_GROUP,
+         BINDING_REVERSES,       "<Alt>Above_Tab",
+        _("Move between windows of an application, using a popup window"))
+keybind (switch_group_backward,    handle_switch,        META_TAB_LIST_GROUP,
+         REVERSES_AND_REVERSED,  NULL,
+        _("Move backward between windows of an application, "
+          "using a popup window"))
+keybind (switch_windows,            handle_switch,        META_TAB_LIST_NORMAL,
+         BINDING_REVERSES,       "<Alt>Tab",
+        _("Move between windows, using a popup window"))
+keybind (switch_windows_backward,  handle_switch,        META_TAB_LIST_NORMAL,
+         REVERSES_AND_REVERSED,  NULL,
+        _("Move backward between windows, using a popup window"))
+keybind (switch_panels,             handle_switch,        META_TAB_LIST_DOCKS,
+         BINDING_REVERSES,       "<Control><Alt>Tab",
+        _("Move between panels and the desktop, using a popup window"))
+keybind (switch_panels_backward,   handle_switch,        META_TAB_LIST_DOCKS,
+         REVERSES_AND_REVERSED,  NULL,
+         _("Move backward between panels and the desktop, "
+          "using a popup window"))
+
+keybind (cycle_group,               handle_cycle,         META_TAB_LIST_GROUP,
+        BINDING_REVERSES,        "<Alt>F6",
+        _("Move between windows of an application immediately"))
+keybind (cycle_group_backward,     handle_cycle,         META_TAB_LIST_GROUP,
+        REVERSES_AND_REVERSED,   NULL,
+        _("Move backward between windows of an application immediately"))
+keybind (cycle_windows,             handle_cycle,         META_TAB_LIST_NORMAL,
+        BINDING_REVERSES,        "<Alt>Escape",
+        _("Move between windows immediately"))
+keybind (cycle_windows_backward,   handle_cycle,         META_TAB_LIST_NORMAL,
+        REVERSES_AND_REVERSED,   NULL,
+        _("Move backward between windows immediately"))
+keybind (cycle_panels,              handle_cycle,         META_TAB_LIST_DOCKS,
+        BINDING_REVERSES,        "<Control><Alt>Escape",
+        _("Move between panels and the desktop immediately"))
+keybind (cycle_panels_backward,    handle_cycle,         META_TAB_LIST_DOCKS,
+        REVERSES_AND_REVERSED,   NULL,
+        _("Move backward between panels and the desktop immediately"))
+
+/***********************************/
+
+/* These two are special pseudo-bindings that are provided for allowing
+ * custom handlers, but will never be bound to a key. While a tab
+ * grab is in effect, they are invoked for releasing the primary modifier
+ * or pressing some unbound key, respectively.
+ */
+keybind (tab_popup_select,        handle_tab_popup_select, 0, 0, NULL,
+         "Select window from tab popup")
+keybind (tab_popup_cancel,        handle_tab_popup_cancel, 0, 0, NULL,
+         "Cancel tab popup")
+
+/***********************************/
+     
+keybind (show_desktop, handle_show_desktop, 0, 0, "<Control><Alt>d",
+      _("Hide all normal windows and set focus to the desktop"))
+keybind (panel_main_menu, handle_panel,
+       META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0, "<Alt>F1",
+      _("Show the panel's main menu"))
+keybind (panel_run_dialog, handle_panel,
+       META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0, "<Alt>F2",
+      _("Show the panel's \"Run Application\" dialog box"))
+keybind (toggle_recording, handle_toggle_recording, 0, 0, "<Control><Shift><Alt>r",
+         _("Start or stop recording the session"))
+
+/* Yes, the param is offset by one.  Historical reasons.  (Maybe worth fixing
+ * at some point.)  The description is NULL here because the stanza is
+ * irregularly shaped in mutter.schemas.in.  This will probably be fixed
+ * as well.
+ */
+keybind (run_command_1,  handle_run_command,  0, 0, NULL, NULL)
+keybind (run_command_2,  handle_run_command,  1, 0, NULL, NULL)
+keybind (run_command_3,  handle_run_command,  2, 0, NULL, NULL)
+keybind (run_command_4,  handle_run_command,  3, 0, NULL, NULL)
+keybind (run_command_5,  handle_run_command,  4, 0, NULL, NULL)
+keybind (run_command_6,  handle_run_command,  5, 0, NULL, NULL)
+keybind (run_command_7,  handle_run_command,  6, 0, NULL, NULL)
+keybind (run_command_8,  handle_run_command,  7, 0, NULL, NULL)
+keybind (run_command_9,  handle_run_command,  8, 0, NULL, NULL)
+keybind (run_command_10, handle_run_command,  9, 0, NULL, NULL)
+keybind (run_command_11, handle_run_command, 10, 0, NULL, NULL)
+keybind (run_command_12, handle_run_command, 11, 0, NULL, NULL)
+keybind (run_command_13, handle_run_command, 12, 0, NULL, NULL)
+keybind (run_command_14, handle_run_command, 13, 0, NULL, NULL)
+keybind (run_command_15, handle_run_command, 14, 0, NULL, NULL)
+keybind (run_command_16, handle_run_command, 15, 0, NULL, NULL)
+keybind (run_command_17, handle_run_command, 16, 0, NULL, NULL)
+keybind (run_command_18, handle_run_command, 17, 0, NULL, NULL)
+keybind (run_command_19, handle_run_command, 18, 0, NULL, NULL)
+keybind (run_command_20, handle_run_command, 19, 0, NULL, NULL)
+keybind (run_command_21, handle_run_command, 20, 0, NULL, NULL)
+keybind (run_command_22, handle_run_command, 21, 0, NULL, NULL)
+keybind (run_command_23, handle_run_command, 22, 0, NULL, NULL)
+keybind (run_command_24, handle_run_command, 23, 0, NULL, NULL)
+keybind (run_command_25, handle_run_command, 24, 0, NULL, NULL)
+keybind (run_command_26, handle_run_command, 25, 0, NULL, NULL)
+keybind (run_command_27, handle_run_command, 26, 0, NULL, NULL)
+keybind (run_command_28, handle_run_command, 27, 0, NULL, NULL)
+keybind (run_command_29, handle_run_command, 28, 0, NULL, NULL)
+keybind (run_command_30, handle_run_command, 29, 0, NULL, NULL)
+keybind (run_command_31, handle_run_command, 30, 0, NULL, NULL)
+keybind (run_command_32, handle_run_command, 31, 0, NULL, NULL)
+
+keybind (run_command_screenshot, handle_run_command, 32, 0, "Print",
+      _("Take a screenshot"))
+keybind (run_command_window_screenshot, handle_run_command, 33, 0,"<Alt>Print",
+      _("Take a screenshot of a window"))
+
+keybind (run_command_terminal, handle_run_terminal, 0, 0, NULL, _("Run a terminal"))
+
+/* No description because this is undocumented */
+keybind (set_spew_mark, handle_set_spew_mark, 0, 0, NULL, NULL)
+
+#undef REVERSES_AND_REVERSED
+
+/************************ PER WINDOW BINDINGS ************************/
+
+/* These take a window as an extra parameter; they have no effect
+ * if no window is active.
+ */
+ 
+keybind (activate_window_menu, handle_activate_window_menu, 0,
+        BINDING_PER_WINDOW, "<Alt>space",
+        _("Activate the window menu"))
+keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW,
+        NULL,
+        _("Toggle fullscreen mode"))
+keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, "<Alt>F10",
+        _("Toggle maximization state"))
+keybind (toggle_above, handle_toggle_above, 0, BINDING_PER_WINDOW, NULL,
+        _("Toggle whether a window will always be visible over other windows"))
+keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, NULL,
+        _("Maximize window"))
+keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW, "<Alt>F5",
+        _("Restore window"))
+keybind (toggle_shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW, NULL,
+        _("Toggle shaded state"))
+keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "<Alt>F9",
+        _("Minimize window"))
+keybind (close, handle_close, 0, BINDING_PER_WINDOW, "<Alt>F4",
+        _("Close window"))
+keybind (begin_move, handle_begin_move, 0, BINDING_PER_WINDOW, "<Alt>F7",
+        _("Move window"))
+keybind (begin_resize, handle_begin_resize, 0, BINDING_PER_WINDOW, "<Alt>F8",
+        _("Resize window"))
+keybind (toggle_on_all_workspaces, handle_toggle_on_all_workspaces, 0,
+         BINDING_PER_WINDOW, NULL,
+        _("Toggle whether window is on all workspaces or just one"))
+
+keybind (move_to_workspace_1, handle_move_to_workspace, 0, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 1"))
+keybind (move_to_workspace_2, handle_move_to_workspace, 1, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 2"))
+keybind (move_to_workspace_3, handle_move_to_workspace, 2, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 3"))
+keybind (move_to_workspace_4, handle_move_to_workspace, 3, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 4"))
+keybind (move_to_workspace_5, handle_move_to_workspace, 4, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 5"))
+keybind (move_to_workspace_6, handle_move_to_workspace, 5, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 6"))
+keybind (move_to_workspace_7, handle_move_to_workspace, 6, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 7"))
+keybind (move_to_workspace_8, handle_move_to_workspace, 7, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 8"))
+keybind (move_to_workspace_9, handle_move_to_workspace, 8, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 9"))
+keybind (move_to_workspace_10, handle_move_to_workspace, 9, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 10"))
+keybind (move_to_workspace_11, handle_move_to_workspace, 10, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 11"))
+keybind (move_to_workspace_12, handle_move_to_workspace, 11, BINDING_PER_WINDOW,
+        NULL,
+        _("Move window to workspace 12"))
+
+/* META_MOTION_* are negative, and so distinct from workspace numbers,
+ * which are always zero or positive.
+ * If you make use of these constants, you will need to include workspace.h
+ * (which you're probably using already for other reasons anyway).
+ * If your definition of keybind() throws them away, you don't need to include
+ * workspace.h, of course.
+ */
+
+keybind (move_to_workspace_left, handle_move_to_workspace,
+         META_MOTION_LEFT, BINDING_PER_WINDOW, "<Control><Shift><Alt>Left",
+        _("Move window one workspace to the left"))
+keybind (move_to_workspace_right, handle_move_to_workspace,
+         META_MOTION_RIGHT, BINDING_PER_WINDOW, "<Control><Shift><Alt>Right",
+        _("Move window one workspace to the right"))
+keybind (move_to_workspace_up, handle_move_to_workspace,
+         META_MOTION_UP, BINDING_PER_WINDOW, "<Control><Shift><Alt>Up",
+        _("Move window one workspace up"))
+keybind (move_to_workspace_down, handle_move_to_workspace,
+         META_MOTION_DOWN, BINDING_PER_WINDOW, "<Control><Shift><Alt>Down",
+        _("Move window one workspace down"))
+
+keybind (raise_or_lower, handle_raise_or_lower, 0, BINDING_PER_WINDOW, NULL,
+        _("Raise window if it's covered by another window, otherwise lower it"))
+keybind (raise, handle_raise, 0, BINDING_PER_WINDOW, NULL,
+        _("Raise window above other windows"))
+keybind (lower, handle_lower, 0, BINDING_PER_WINDOW, NULL,
+        _("Lower window below other windows"))
+
+keybind (maximize_vertically, handle_maximize_vertically, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Maximize window vertically"))
+
+keybind (maximize_horizontally, handle_maximize_horizontally, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Maximize window horizontally"))
+
+keybind (move_to_corner_nw, handle_move_to_corner_nw, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to north-west (top left) corner"))
+keybind (move_to_corner_ne, handle_move_to_corner_ne, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to north-east (top right) corner"))
+keybind (move_to_corner_sw, handle_move_to_corner_sw, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to south-west (bottom left) corner"))
+keybind (move_to_corner_se, handle_move_to_corner_se, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to south-east (bottom right) corner"))
+
+keybind (move_to_side_n, handle_move_to_side_n, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to north (top) side of screen"))
+keybind (move_to_side_s, handle_move_to_side_s, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to south (bottom) side of screen"))
+keybind (move_to_side_e, handle_move_to_side_e, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to east (right) side of screen"))
+keybind (move_to_side_w, handle_move_to_side_w, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to west (left) side of screen"))
+keybind (move_to_center, handle_move_to_center, 0,
+        BINDING_PER_WINDOW, NULL,
+        _("Move window to center of screen"))
+
+/* eof all-keybindings.h */
+
--- a/src/core/bell.c
+++ b/src/core/bell.c
@ -23,8 +23,7 @@
 */

 /**
- * SECTION:Bell
- * @short_description: Ring the bell or flash the screen
+ * \file bell.c Ring the bell or flash the screen
 *
 * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
 * the user configure the bell to be audible or visible (aka visual), and
@ -58,10 +57,6 @@
 #endif

 /**
- * bell_flash_screen:
- * @display:  The display which owns the screen (rather redundant)
- * @screen:   The screen to flash
- *
 * 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
@ -70,12 +65,14 @@
 * 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.
- */
-/*
- * Bug: The way I read it, this appears not 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.
+ * \bug This appears to destroy our current XSync status.
 */
 static void
 bell_flash_screen (MetaDisplay *display, 
@ -133,22 +130,21 @@ bell_flash_screen (MetaDisplay *display,
      XFreeGC (display->xdisplay, gc);
    }

-  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
      !display->mouse_mode)
    meta_display_increment_focus_sentinel (display);
  XFlush (display->xdisplay);
 }

 /**
- * bell_flash_fullscreen:
- * @display: The display the event came in on
- * @xkb_ev: The bell event
- *
 * 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
@ -186,21 +182,17 @@ bell_flash_fullscreen (MetaDisplay *display,
 }

 /**
- * bell_unflash_frame:
- * @data: The frame to unflash, cast to a gpointer so it can go into
- *        a callback function.
- *
 * 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.
 *
- * Returns: Always FALSE, so we don't get called again.
- */
-
-/*
- * Bug: This is the parallel to bell_flash_window_frame(), so it should
+ * \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 
@ -213,9 +205,6 @@ bell_unflash_frame (gpointer data)
 }

 /**
- * bell_flash_window_frame:
- * @window: The window to flash
- *
 * 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
@ -223,6 +212,8 @@ bell_unflash_frame (gpointer data)
 * 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
 bell_flash_window_frame (MetaWindow *window)
@ -240,12 +231,11 @@ bell_flash_window_frame (MetaWindow *window)
 }

 /**
- * bell_flash_frame:
- * @display:  The display the bell event came in on
- * @xkb_ev:   The bell event we just received
- *
 * 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
 bell_flash_frame (MetaDisplay *display, 
@ -271,18 +261,15 @@ bell_flash_frame (MetaDisplay *display,
 }

 /**
- * bell_visual_notify:
- * @display: The display the bell event came in on
- * @xkb_ev: The bell event we just received
- *
 * 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.
- */
-
-/*
- * Bug: This should be merged with meta_bell_notify().
+ *
+ * \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
 bell_visual_notify (MetaDisplay *display, 
@ -290,12 +277,15 @@ bell_visual_notify (MetaDisplay *display,
 {
  switch (meta_prefs_get_visual_bell_type ()) 
    {
-    case G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH:
+    case META_VISUAL_BELL_FULLSCREEN_FLASH:
      bell_flash_fullscreen (display, xkb_ev);
      break;
-    case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
+    case META_VISUAL_BELL_FRAME_FLASH:
      bell_flash_frame (display, xkb_ev); /* does nothing yet */
      break;
+    case META_VISUAL_BELL_INVALID:
+      /* do nothing */
+      break;
    }
 }

@ -304,7 +294,7 @@ meta_bell_notify (MetaDisplay *display,
 		  XkbAnyEvent *xkb_ev)
 {
  /* flash something */
-  if (meta_prefs_get_visual_bell ())
+  if (meta_prefs_get_visual_bell ()) 
    bell_visual_notify (display, xkb_ev);

 #ifdef HAVE_LIBCANBERRA
@ -420,13 +410,12 @@ meta_bell_shutdown (MetaDisplay *display)
 }

 /**
- * meta_bell_notify_frame_destroy:
- * @frame: The frame which is being destroyed
- *
 * 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
@ -1,5 +1,17 @@
 /* -*- 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. Mutter 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.
 * 
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@ -625,6 +625,7 @@ meta_rectangle_get_minimal_spanning_set_for_region (
  *temp_rect = *basic_rect;
  ret = g_list_prepend (NULL, temp_rect);

+  strut_iter = all_struts;
  for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next)
    {
      GList *rect_iter; 
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@ -119,7 +119,6 @@ typedef struct
  MetaRectangle        orig;
  MetaRectangle        current;
  MetaFrameBorders    *borders;
-  gboolean             must_free_borders;
  ActionType           action_type;
  gboolean             is_user_action;

@ -338,7 +337,7 @@ meta_window_constrain (MetaWindow          *window,
   * not gobject-style--gobject would be more pain than it's worth) or
   * smart pointers would be so much nicer here.  *shrug*
   */
-  if (info.must_free_borders)
+  if (!orig_borders)
    g_free (info.borders);
 }

@ -359,15 +358,9 @@ setup_constraint_info (ConstraintInfo      *info,

  /* Create a fake frame geometry if none really exists */
  if (orig_borders && !window->fullscreen)
-    {
-      info->borders = orig_borders;
-      info->must_free_borders = FALSE;
-    }
+    info->borders = orig_borders;
  else
-    {
-      info->borders = g_new0 (MetaFrameBorders, 1);
-      info->must_free_borders = TRUE;
-    }
+    info->borders = g_new0 (MetaFrameBorders, 1);

  if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
    info->action_type = ACTION_MOVE_AND_RESIZE;
@ -446,13 +439,9 @@ setup_constraint_info (ConstraintInfo      *info,
                                         monitor_info->number);

  /* Workaround braindead legacy apps that don't know how to
-   * fullscreen themselves properly - don't get fooled by
-   * windows which hide their titlebar when maximized; that's
-   * not the same as fullscreen, even if there are no struts
-   * making the workarea smaller than the monitor.
+   * fullscreen themselves properly.
   */
  if (meta_prefs_get_force_fullscreen() &&
-      !window->hide_titlebar_when_maximized &&
      meta_rectangle_equal (new, &monitor_info->rect) &&
      window->has_fullscreen_func &&
      !window->fullscreen)
@ -580,7 +569,7 @@ place_window_if_needed(MetaWindow     *window,
                 META_MAXIMIZE_VERTICAL : 0), &info->current);

          /* maximization may have changed frame geometry */
-          if (!window->fullscreen)
+          if (window->frame && !window->fullscreen)
            meta_frame_calc_borders (window->frame, info->borders);

          if (window->fullscreen_after_placement)
@ -764,12 +753,21 @@ constrain_modal_dialog (MetaWindow         *window,
    return TRUE;

  x = parent->rect.x + (parent->rect.width / 2  - info->current.width / 2);
-  y = parent->rect.y + (parent->rect.height / 2 - info->current.height / 2);
+  y = 0;
  if (parent->frame)
    {
+      MetaFrameBorders borders;
+
      x += parent->frame->rect.x;
      y += parent->frame->rect.y;
+
+      meta_frame_calc_borders (parent->frame, &borders);
+      y += borders.total.top;
+
+      y += info->borders->visible.top;
    }
+  else
+    y = parent->rect.y + info->borders->visible.top;

  constraint_already_satisfied = (x == info->current.x) && (y == info->current.y);

--- a/src/core/core.c
+++ b/src/core/core.c
@ -212,7 +212,7 @@ lower_window_and_transients (MetaWindow *window,

  meta_window_foreach_transient (window, lower_window_and_transients, NULL);

-  if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
      meta_prefs_get_raise_on_click ())
    {
      /* Move window to the back of the focusing workspace's MRU list.
@ -538,70 +538,70 @@ meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
      break;
    case META_MENU_OP_UNSTICK:
    case META_MENU_OP_STICK:
-      name = "toggle-on-all-workspaces";
+      name = "toggle_on_all_workspaces";
      break;
    case META_MENU_OP_ABOVE:
    case META_MENU_OP_UNABOVE:
-      name = "toggle-above";
+      name = "toggle_above";
      break;
    case META_MENU_OP_WORKSPACES:
      switch (workspace)
        {
        case 1:
-          name = "move-to-workspace-1";
+          name = "move_to_workspace_1";
          break;
        case 2:
-          name = "move-to-workspace-2";
+          name = "move_to_workspace_2";
          break;
        case 3:
-          name = "move-to-workspace-3";
+          name = "move_to_workspace_3";
          break; 
        case 4:
-          name = "move-to-workspace-4";
+          name = "move_to_workspace_4";
          break; 
        case 5:
-          name = "move-to-workspace-5";
+          name = "move_to_workspace_5";
          break; 
        case 6:
-          name = "move-to-workspace-6";
+          name = "move_to_workspace_6";
          break; 
        case 7:
-          name = "move-to-workspace-7";
+          name = "move_to_workspace_7";
          break; 
        case 8:
-          name = "move-to-workspace-8";
+          name = "move_to_workspace_8";
          break; 
        case 9:
-          name = "move-to-workspace-9";
+          name = "move_to_workspace_9";
          break; 
        case 10:
-          name = "move-to-workspace-10";
+          name = "move_to_workspace_10";
          break;
        case 11:
-          name = "move-to-workspace-11";
+          name = "move_to_workspace_11";
          break;
        case 12:
-          name = "move-to-workspace-12";
+          name = "move_to_workspace_12";
          break;
        }
      break;
    case META_MENU_OP_MOVE:
-      name = "begin-move";
+      name = "begin_move";
      break;
    case META_MENU_OP_RESIZE:
-      name = "begin-resize";
+      name = "begin_resize";
      break;
    case META_MENU_OP_MOVE_LEFT:
-      name = "move-to-workspace-left";
+      name = "move_to_workspace_left";
      break;
    case META_MENU_OP_MOVE_RIGHT:
-      name = "move-to-workspace-right";
+      name = "move_to_workspace_right";
      break;
    case META_MENU_OP_MOVE_UP:
-      name = "move-to-workspace-up";
+      name = "move_to_workspace_up";
      break;
    case META_MENU_OP_MOVE_DOWN:
-      name = "move-to-workspace-down";
+      name = "move_to_workspace_down";
      break;
    case META_MENU_OP_RECOVER:
      /* No keybinding for this one */
--- a/src/core/delete.c
+++ b/src/core/delete.c
@ -108,12 +108,8 @@ delete_ping_timeout_func (MetaDisplay *display,

  /* Translators: %s is a window title */
  if (window_title)
-    {
-      gchar *bold;
-      bold = g_strconcat ("<tt>", window_title, "</tt>", NULL);
-      tmp = g_markup_printf_escaped (_("%s is not responding."), bold);
-      g_free (bold);
-    }
+    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
+                                   window_title);
  else
    tmp = g_strdup (_("Application is not responding."));

--- a/src/core/display.c
+++ b/src/core/display.c
@ -25,10 +25,9 @@
 */

 /**
- * SECTION:MetaDisplay
- * @short_description: Handles operations on an X display.
+ * \file display.c Handles operations on an X display.
 *
- * The display is represented as a #MetaDisplay struct.
+ * The display is represented as a MetaDisplay struct.
 */

 #define _XOPEN_SOURCE 600 /* for gethostname() */
@ -52,8 +51,12 @@
 #include <meta/compositor.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
-#include "mutter-enum-types.h"
-
+#ifdef HAVE_SOLARIS_XINERAMA
+#include <X11/extensions/xinerama.h>
+#endif
+#ifdef HAVE_XFREE_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@ -82,7 +85,7 @@
         g == META_GRAB_OP_KEYBOARD_ESCAPING_GROUP)

 /**
- * SECTION:pings
+ * \defgroup pings Pings
 *
 * Sometimes we want to see whether a window is responding,
 * so we send it a "ping" message and see whether it sends us back a "pong"
@ -97,13 +100,13 @@
 */

 /**
- * MetaPingData:
- *
 * Describes a ping on a window. When we send a ping to a window, we build
 * one of these structs, and it eventually gets passed to the timeout function
 * or to the function which handles the response from the window. If the window
 * does or doesn't respond to the ping, we use this information to deal with
 * these facts; we have a handler function for each.
+ *
+ * \ingroup pings
 */
 typedef struct 
 {
@ -132,8 +135,6 @@ enum
  WINDOW_CREATED,
  WINDOW_DEMANDS_ATTENTION,
  WINDOW_MARKED_URGENT,
-  GRAB_OP_BEGIN,
-  GRAB_OP_END,
  LAST_SIGNAL
 };

@ -145,7 +146,7 @@ enum {

 static guint display_signals [LAST_SIGNAL] = { 0 };

-/*
+/**
 * The display we're managing.  This is a singleton object.  (Historically,
 * this was a list of displays, but there was never any way to add more
 * than one element to it.)  The goofy name is because we don't want it
@ -180,7 +181,7 @@ static void    prefs_changed_callback    (MetaPreference pref,

 static void    sanity_check_timestamps   (MetaDisplay *display,
                                          guint32      known_good_timestamp);
- 
+
 MetaGroup*     get_focussed_group (MetaDisplay *display);

 static void
@ -229,7 +230,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  display_signals[WINDOW_CREATED] =
@ -237,7 +239,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1, META_TYPE_WINDOW);

  display_signals[WINDOW_DEMANDS_ATTENTION] =
@ -245,7 +248,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1, META_TYPE_WINDOW);

  display_signals[WINDOW_MARKED_URGENT] =
@ -253,32 +257,11 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                  G_TYPE_NONE, 1,
                  META_TYPE_WINDOW);

-  display_signals[GRAB_OP_BEGIN] =
-    g_signal_new ("grab-op-begin",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 3,
-                  META_TYPE_SCREEN,
-                  META_TYPE_WINDOW,
-                  META_TYPE_GRAB_OP);
-
-  display_signals[GRAB_OP_END] =
-    g_signal_new ("grab-op-end",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 3,
-                  META_TYPE_SCREEN,
-                  META_TYPE_WINDOW,
-                  META_TYPE_GRAB_OP);
-
  g_object_class_install_property (object_class,
                                   PROP_FOCUS_WINDOW,
                                   g_param_spec_object ("focus-window",
@ -290,10 +273,10 @@ meta_display_class_init (MetaDisplayClass *klass)


 /**
- * ping_data_free:
- *
- * Destructor for #MetaPingData structs. Will destroy the
+ * Destructor for MetaPingData structs. Will destroy the
 * event source for the struct as well.
+ *
+ * \ingroup pings
 */
 static void
 ping_data_free (MetaPingData *ping_data)
@ -306,12 +289,14 @@ ping_data_free (MetaPingData *ping_data)
 }

 /**
- * remove_pending_pings_for_window:
- * @display: The display the window appears on
- * @xwindow: The X ID of the window whose pings we should remove
- *
 * Frees every pending ping structure for the given X window on the
 * given display. This means that we also destroy the timeouts.
+ *
+ * \param display The display the window appears on
+ * \param xwindow The X ID of the window whose pings we should remove
+ *
+ * \ingroup pings
+ *
 */
 static void
 remove_pending_pings_for_window (MetaDisplay *display, Window xwindow)
@ -410,14 +395,14 @@ meta_display_init (MetaDisplay *disp)
 }

 /**
- * meta_display_open:
- *
 * Opens a new display, sets it up, initialises all the X extensions
 * we will need, and adds it to the list of displays.
 *
- * Returns: %TRUE if the display was opened successfully, and %FALSE
+ * \return True if the display was opened successfully, and False
 * otherwise-- that is, if the display doesn't exist or it already
 * has a window manager.
+ *
+ * \ingroup main
 */
 gboolean
 meta_display_open (void)
@ -467,8 +452,6 @@ meta_display_open (void)
      buf[sizeof(buf)-1] = '\0';
      the_display->hostname = g_strdup (buf);
    }
-  else
-    the_display->hostname = NULL;
  the_display->error_trap_synced_at_last_pop = TRUE;
  the_display->error_traps = 0;
  the_display->error_trap_handler = NULL;
@ -1046,7 +1029,6 @@ meta_display_close (MetaDisplay *display,
  meta_display_free_window_prop_hooks (display);
  meta_display_free_group_prop_hooks (display);
  
-  g_free (display->hostname);
  g_free (display->name);

  meta_display_shutdown_keys (display);
@ -1164,16 +1146,14 @@ meta_display_ungrab (MetaDisplay *display)
 }

 /**
- * meta_display_for_x_display:
- * @xdisplay: An X display
- *
- * Returns the singleton MetaDisplay if @xdisplay matches the X display it's
- * managing; otherwise gives a warning and returns %NULL.  When we were claiming
+ * Returns the singleton MetaDisplay if "xdisplay" matches the X display it's
+ * managing; otherwise gives a warning and returns NULL.  When we were claiming
 * to be able to manage multiple displays, this was supposed to find the
 * display out of the list which matched that display.  Now it's merely an
 * extra sanity check.
 *
- * Returns: The singleton X display, or %NULL if @xdisplay isn't the one
+ * \param xdisplay  An X display
+ * \return  The singleton X display, or NULL if "xdisplay" isn't the one
 *          we're managing.
 */
 MetaDisplay*
@ -1189,11 +1169,9 @@ meta_display_for_x_display (Display *xdisplay)
 }

 /**
- * meta_get_display:
- *
 * Accessor for the singleton MetaDisplay.
 *
- * Returns: The only #MetaDisplay there is.  This can be %NULL, but only
+ * \return  The only MetaDisplay there is.  This can be NULL, but only
 *          during startup.
 */
 MetaDisplay*
@ -1406,19 +1384,6 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
  return timestamp;
 }

-/**
- * meta_display_get_ignored_modifier_mask:
- * @display: a #MetaDisplay
- *
- * Returns: a mask of modifiers that should be ignored
- *          when matching keybindings to events
- */
-unsigned int
-meta_display_get_ignored_modifier_mask (MetaDisplay *display)
-{
-  return display->ignored_modifier_mask;
-}
-
 /**
 * meta_display_add_ignored_crossing_serial:
 * @display: a #MetaDisplay
@ -1601,18 +1566,19 @@ handle_net_restack_window (MetaDisplay* display,
 #endif

 /**
- * event_callback:
- * @event: The event that just happened
- * @data: The #MetaDisplay that events are coming from, cast to a gpointer
- *        so that it can be sent to a callback
- *
 * This is the most important function in the whole program. It is the heart,
 * it is the nexus, it is the Grand Central Station of Mutter's world.
- * When we create a #MetaDisplay, we ask GDK to pass *all* events for *all*
+ * When we create a MetaDisplay, we ask GDK to pass *all* events for *all*
 * windows to this function. So every time anything happens that we might
 * want to know about, this function gets called. You see why it gets a bit
 * busy around here. Most of this function is a ginormous switch statement
 * dealing with all the kinds of events that might turn up.
+ *
+ * \param event The event that just happened
+ * \param data  The MetaDisplay that events are coming from, cast to a gpointer
+ *              so that it can be sent to a callback
+ *
+ * \ingroup main
 */
 static gboolean
 event_callback (XEvent   *event,
@ -1798,8 +1764,6 @@ event_callback (XEvent   *event,
      if (display->grab_op == META_GRAB_OP_COMPOSITOR)
        break;

-      display->overlay_key_only_pressed = FALSE;
-
      if (event->xbutton.button == 4 || event->xbutton.button == 5)
        /* Scrollwheel event, do nothing and deliver event to compositor below */
        break;
@ -1957,7 +1921,7 @@ event_callback (XEvent   *event,
               * in application-based mode, and the different
               * app is not a dock or desktop, eat the focus click.
               */
-              if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+              if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
                  meta_prefs_get_application_based () &&
                  !window->has_focus &&
                  window->type != META_WINDOW_DOCK &&
@ -1997,8 +1961,6 @@ event_callback (XEvent   *event,
      if (display->grab_op == META_GRAB_OP_COMPOSITOR)
        break;

-      display->overlay_key_only_pressed = FALSE;
-
      if (display->grab_window == window &&
          grab_op_is_mouse (display->grab_op))
        meta_window_handle_mouse_grab_op_event (window, event);
@ -2047,8 +2009,8 @@ event_callback (XEvent   *event,
        {
          switch (meta_prefs_get_focus_mode ())
            {
-            case G_DESKTOP_FOCUS_MODE_SLOPPY:
-            case G_DESKTOP_FOCUS_MODE_MOUSE:
+            case META_FOCUS_MODE_SLOPPY:
+            case META_FOCUS_MODE_MOUSE:
              display->mouse_mode = TRUE;
              if (window->type != META_WINDOW_DOCK &&
                  window->type != META_WINDOW_DESKTOP)
@ -2086,7 +2048,7 @@ event_callback (XEvent   *event,
               * alternative mechanism works great.
               */
              if (window->type == META_WINDOW_DESKTOP &&
-                  meta_prefs_get_focus_mode() == G_DESKTOP_FOCUS_MODE_MOUSE &&
+                  meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
                  display->expected_focus_window != NULL)
                {
                  meta_topic (META_DEBUG_FOCUS,
@ -2098,7 +2060,7 @@ event_callback (XEvent   *event,
                                                          event->xcrossing.time);
                }
              break;
-            case G_DESKTOP_FOCUS_MODE_CLICK:
+            case META_FOCUS_MODE_CLICK:
              break;
            }
          
@ -3744,9 +3706,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
    {
      meta_window_refresh_resize_popup (display->grab_window);
    }
-
-  g_signal_emit (display, display_signals[GRAB_OP_BEGIN], 0,
-                 screen, display->grab_window, display->grab_op);
  
  return TRUE;
 }
@ -3761,11 +3720,6 @@ meta_display_end_grab_op (MetaDisplay *display,
  if (display->grab_op == META_GRAB_OP_NONE)
    return;

-  g_signal_emit (display, display_signals[GRAB_OP_END], 0,
-                 display->grab_screen, display->grab_window, display->grab_op);
-
-  display->grab_frame_action = FALSE;
-
  if (display->grab_window != NULL)
    display->grab_window->shaken_loose = FALSE;
  
@ -4049,7 +4003,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
   * focus window may not be raised, and who wants to think about
   * mouse focus anyway.
   */
-  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK)
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK)
    {
      meta_verbose (" (well, not grabbing since not in click to focus mode)\n");
      return;
@ -4198,23 +4152,21 @@ meta_display_set_cursor_theme (const char *theme,
 #endif
 }

-/*
+/**
 * Stores whether syncing is currently enabled.
 */
 static gboolean is_syncing = FALSE;

 /**
- * meta_is_syncing:
- *
 * Returns whether X synchronisation is currently enabled.
 *
- * FIXME: This is *only* called by meta_display_open(), but by that time
+ * \return true if we must wait for events whenever we send X requests;
+ * false otherwise.
+ *
+ * \bug This is *only* called by meta_display_open, but by that time
 * we have already turned syncing on or off on startup, and we don't
 * have any way to do so while Mutter is running, so it's rather
 * pointless.
- *
- * Returns: %TRUE if we must wait for events whenever we send X requests;
- * %FALSE otherwise.
 */
 gboolean
 meta_is_syncing (void)
@ -4223,9 +4175,10 @@ meta_is_syncing (void)
 }

 /**
- * meta_set_syncing:
- *
 * A handy way to turn on synchronisation on or off for every display.
+ *
+ * \bug Of course there is only one display ever anyway, so this can
+ * be rather hugely simplified.
 */
 void
 meta_set_syncing (gboolean setting)
@ -4238,25 +4191,26 @@ meta_set_syncing (gboolean setting)
    }
 }

-/*
+/**
 * How long, in milliseconds, we should wait after pinging a window
 * before deciding it's not going to get back to us.
 */
 #define PING_TIMEOUT_DELAY 5000

 /**
- * meta_display_ping_timeout:
- * @data: All the information about this ping. It is a #MetaPingData
- *        cast to a #gpointer in order to be passable to a timeout function.
- *        This function will also free this parameter.
- *
 * Does whatever it is we decided to do when a window didn't respond
 * to a ping. We also remove the ping from the display's list of
 * pending pings. This function is called by the event loop when the timeout
 * times out which we created at the start of the ping.
 *
- * Returns: Always returns %FALSE, because this function is called as a
- *          timeout and we don't want to run the timer again.
+ * \param data All the information about this ping. It is a MetaPingData
+ *             cast to a void* in order to be passable to a timeout function.
+ *             This function will also free this parameter.
+ *
+ * \return Always returns false, because this function is called as a
+ *         timeout and we don't want to run the timer again.
+ *
+ * \ingroup pings
 */
 static gboolean
 meta_display_ping_timeout (gpointer data)
@ -4283,17 +4237,6 @@ meta_display_ping_timeout (gpointer data)
 }

 /**
- * meta_display_ping_window:
- * @display: The #MetaDisplay that the window is on
- * @window: The #MetaWindow to send the ping to
- * @timestamp: The timestamp of the ping. Used for uniqueness.
- *             Cannot be CurrentTime; use a real timestamp!
- * @ping_reply_func: The callback to call if we get a response.
- * @ping_timeout_func: The callback to call if we don't get a response.
- * @user_data: Arbitrary data that will be passed to the callback
- *             function. (In practice it's often a pointer to
- *             the window.)
- *
 * Sends a ping request to a window. The window must respond to
 * the request within a certain amount of time. If it does, we
 * will call one callback; if the time passes and we haven't had
@ -4303,9 +4246,20 @@ meta_display_ping_timeout (gpointer data)
 * This function returns straight away after setting things up;
 * the callbacks will be called from the event loop.
 *
- * FIXME: This should probably be a method on windows, rather than displays
- *        for one of their windows.
+ * \param display  The MetaDisplay that the window is on
+ * \param window   The MetaWindow to send the ping to
+ * \param timestamp The timestamp of the ping. Used for uniqueness.
+ *                  Cannot be CurrentTime; use a real timestamp!
+ * \param ping_reply_func The callback to call if we get a response.
+ * \param ping_timeout_func The callback to call if we don't get a response.
+ * \param user_data Arbitrary data that will be passed to the callback
+ *                  function. (In practice it's often a pointer to
+ *                  the window.)
 *
+ * \bug This should probably be a method on windows, rather than displays
+ *      for one of their windows.
+ *
+ * \ingroup pings
 */
 void
 meta_display_ping_window (MetaDisplay       *display,
@ -4413,15 +4367,16 @@ process_request_frame_extents (MetaDisplay    *display,
 }

 /**
- * process_pong_message:
- * @display: the display we got the pong from
- * @event: the #XEvent which is a pong; we can tell which
- *         ping it corresponds to because it bears the
- *         same timestamp.
- *
 * Process the pong (the response message) from the ping we sent
 * to the window. This involves removing the timeout, calling the
 * reply handler function, and freeing memory.
+ *
+ * \param display  the display we got the pong from
+ * \param event    the XEvent which is a pong; we can tell which
+ *                 ping it corresponds to because it bears the
+ *                 same timestamp.
+ *
+ * \ingroup pings
 */
 static void
 process_pong_message (MetaDisplay    *display,
@ -4468,17 +4423,18 @@ process_pong_message (MetaDisplay    *display,
 }

 /**
- * meta_display_window_has_pending_pings:
- * @display: The #MetaDisplay of the window.
- * @window: The #MetaWindow whose pings we want to know about.
- *
 * Finds whether a window has any pings waiting on it.
 *
- * FIXME: This should probably be a method on windows, rather than displays
- *        for one of their windows.
+ * \param display The MetaDisplay of the window.
+ * \param window  The MetaWindow whose pings we want to know about.
 *
- * Returns: %TRUE if there is at least one ping which has been sent
- *          to the window without getting a response; %FALSE otherwise.
+ * \return True if there is at least one ping which has been sent
+ *         to the window without getting a response; false otherwise.
+ *
+ * \bug This should probably be a method on windows, rather than displays
+ *      for one of their windows.
+ *
+ * \ingroup pings
 */
 gboolean
 meta_display_window_has_pending_pings (MetaDisplay *display,
@ -4508,8 +4464,7 @@ get_focussed_group (MetaDisplay *display)

 #define IN_TAB_CHAIN(w,t) (((t) == META_TAB_LIST_NORMAL && META_WINDOW_IN_NORMAL_TAB_CHAIN (w)) \
    || ((t) == META_TAB_LIST_DOCKS && META_WINDOW_IN_DOCK_TAB_CHAIN (w)) \
-    || ((t) == META_TAB_LIST_GROUP && META_WINDOW_IN_GROUP_TAB_CHAIN (w, get_focussed_group(w->display))) \
-    || ((t) == META_TAB_LIST_NORMAL_ALL && META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w)))
+    || ((t) == META_TAB_LIST_GROUP && META_WINDOW_IN_GROUP_TAB_CHAIN (w, get_focussed_group(w->display))))

 static MetaWindow*
 find_tab_forward (MetaDisplay   *display,
@ -4657,13 +4612,12 @@ meta_display_get_tab_list (MetaDisplay   *display,
  tab_list = g_list_reverse (tab_list);

  {
-    GSList *windows, *tmp;
+    GSList *tmp;
    MetaWindow *l_window;

-    windows = meta_display_list_windows (display, META_LIST_DEFAULT);
+    tmp = meta_display_list_windows (display, META_LIST_DEFAULT);

    /* Go through all windows */
-    tmp = windows;
    while (tmp != NULL)
      {
        l_window=tmp->data;
@ -4679,8 +4633,6 @@ meta_display_get_tab_list (MetaDisplay   *display,

        tmp = tmp->next;
      } /* End while tmp!=NULL */
-
-    g_slist_free (windows);
  }
  
  return tab_list;
@ -5077,21 +5029,12 @@ meta_display_unmanage_windows_for_screen (MetaDisplay *display,
  winlist = meta_display_list_windows (display,
                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
  winlist = g_slist_sort (winlist, meta_display_stack_cmp);
-  g_slist_foreach (winlist, (GFunc)g_object_ref, NULL);

  /* Unmanage all windows */
  tmp = winlist;
  while (tmp != NULL)
    {
-      MetaWindow *window = tmp->data;
-
-      /* Check if already unmanaged for safety - in particular, catch
-       * the case where unmanaging a parent window can cause attached
-       * dialogs to be (temporarily) unmanaged.
-       */
-      if (!window->unmanaging)
-        meta_window_unmanage (window, timestamp);
-      g_object_unref (window);
+      meta_window_unmanage (tmp->data, timestamp);
      
      tmp = tmp->next;
    }
@ -5334,6 +5277,7 @@ timestamp_too_old (MetaDisplay *display,
      meta_warning ("Got a request to focus %s with a timestamp of 0.  This "
                    "shouldn't happen!\n",
                    window ? window->desc : "the no_focus_window");
+      meta_print_backtrace ();
      *timestamp = meta_display_get_current_time_roundtrip (display);
      return FALSE;
    }
@ -5537,18 +5481,3 @@ meta_display_get_leader_window (MetaDisplay *display)
 {
  return display->leader_window;
 }
-
-/**
- * meta_display_clear_mouse_mode:
- * @display: a #MetaDisplay
- *
- * Sets the mouse-mode flag to %FALSE, which means that motion events are
- * no longer ignored in mouse or sloppy focus.
- * This is an internal function. It should be used only for reimplementing
- * keybindings, and only in a manner compatible with core code.
- */
-void
-meta_display_clear_mouse_mode (MetaDisplay *display)
-{
-  display->mouse_mode = FALSE;
-}
--- a/src/core/frame.c
+++ b/src/core/frame.c
@ -322,14 +322,9 @@ void
 meta_frame_calc_borders (MetaFrame        *frame,
                         MetaFrameBorders *borders)
 {
-  /* Save on if statements and potential uninitialized values
-   * in callers -- if there's no frame, then zero the borders. */
-  if (frame == NULL)
-    meta_frame_borders_clear (borders);
-  else
-    meta_ui_get_frame_borders (frame->window->screen->ui,
-                               frame->xwindow,
-                               borders);
+  meta_ui_get_frame_borders (frame->window->screen->ui,
+                             frame->xwindow,
+                             borders);
 }

 void
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@ -29,29 +29,8 @@
 #ifndef META_KEYBINDINGS_PRIVATE_H
 #define META_KEYBINDINGS_PRIVATE_H

-#include <gio/gio.h>
 #include <meta/keybindings.h>

-struct _MetaKeyHandler
-{
-  char *name;
-  MetaKeyHandlerFunc func;
-  MetaKeyHandlerFunc default_func;
-  gint data, flags;
-  gpointer user_data;
-  GDestroyNotify user_data_free_func;
-};
-
-struct _MetaKeyBinding
-{
-  const char *name;
-  KeySym keysym;
-  KeyCode keycode;
-  unsigned int mask;
-  MetaVirtualModifier modifiers;
-  MetaKeyHandler *handler;
-};
-
 void     meta_display_init_keys             (MetaDisplay *display);
 void     meta_display_shutdown_keys         (MetaDisplay *display);
 void     meta_screen_grab_keys              (MetaScreen  *screen);
@ -73,14 +52,6 @@ void     meta_set_keybindings_disabled      (gboolean     setting);
 void     meta_display_process_mapping_event (MetaDisplay *display,
                                             XEvent      *event);

-gboolean meta_prefs_add_keybinding          (const char           *name,
-                                             GSettings            *settings,
-                                             MetaKeyBindingAction  action,
-                                             MetaKeyBindingFlags   flags);
-
-gboolean meta_prefs_remove_keybinding       (const char    *name);
-
-
 #endif


--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
--- a/src/core/main.c
+++ b/src/core/main.c
@ -23,19 +23,18 @@
 */

 /**
- * SECTION:main
- * @short_description: Program startup.
- *
+ * \file 
+ * Program startup.
 * Functions which parse the command-line arguments, create the display,
 * kick everything off and then close down Mutter when it's time to go.
- *
- *
- *
+ */
+
+/**
+ * \mainpage
 * Mutter - a boring window manager for the adult in you
 *
 * Many window managers are like Marshmallow Froot Loops; Mutter
- * is like Frosted Flakes: it's still plain old corn, but dusted
- * with some sugar.
+ * is like Cheerios.
 *
 * The best way to get a handle on how the whole system fits together
 * is discussed in doc/code-overview.txt; if you're looking for functions
@ -60,7 +59,7 @@

 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#include <wait.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
@ -78,12 +77,12 @@
 #include <girepository.h>
 #endif

-/*
+/**
 * The exit code we'll return to our parent process when we eventually die.
 */
 static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;

-/*
+/**
 * Handle on the main loop, so that we have an easy way of shutting Mutter
 * down.
 */
@ -93,15 +92,14 @@ static void prefs_changed_callback (MetaPreference pref,
                                    gpointer       data);

 /**
- * log_handler:
- * @log_domain: the domain the error occurred in (we ignore this)
- * @log_level: the log level so that we can filter out less
- *             important messages
- * @message: the message to log
- * @user_data: arbitrary data (we ignore this)
- *
 * Prints log messages. If Mutter was compiled with backtrace support,
 * also prints a backtrace (see meta_print_backtrace()).
+ *
+ * \param log_domain  the domain the error occurred in (we ignore this)
+ * \param log_level   the log level so that we can filter out less
+ *                    important messages
+ * \param message     the message to log
+ * \param user_data   arbitrary data (we ignore this)
 */
 static void
 log_handler (const gchar   *log_domain,
@ -110,15 +108,14 @@ log_handler (const gchar   *log_domain,
             gpointer       user_data)
 {
  meta_warning ("Log level %d: %s\n", log_level, message);
+  meta_print_backtrace ();
 }

 /**
- * meta_print_compilation_info:
- *
 * Prints a list of which configure script options were used to
 * build this copy of Mutter. This is actually always called
 * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose()).
+ * (see meta_set_verbose).
 */
 static void
 meta_print_compilation_info (void)
@ -128,6 +125,21 @@ meta_print_compilation_info (void)
 #else
  meta_verbose ("Compiled without shape extension\n");
 #endif
+#ifdef HAVE_XINERAMA
+  meta_topic (META_DEBUG_XINERAMA, "Compiled with Xinerama extension\n");
+#else
+  meta_topic (META_DEBUG_XINERAMA, "Compiled without Xinerama extension\n");
+#endif
+#ifdef HAVE_XFREE_XINERAMA
+  meta_topic (META_DEBUG_XINERAMA, " (using XFree86 Xinerama)\n");
+#else
+  meta_topic (META_DEBUG_XINERAMA, " (not using XFree86 Xinerama)\n");
+#endif
+#ifdef HAVE_SOLARIS_XINERAMA
+  meta_topic (META_DEBUG_XINERAMA, " (using Solaris Xinerama)\n");
+#else
+  meta_topic (META_DEBUG_XINERAMA, " (not using Solaris Xinerama)\n");
+#endif
 #ifdef HAVE_XSYNC
  meta_verbose ("Compiled with sync extension\n");
 #else
@ -146,14 +158,12 @@ meta_print_compilation_info (void)
 }

 /**
- * meta_print_self_identity:
- *
 * Prints the version number, the current timestamp (not the
 * build date), the locale, the character encoding, and a list
 * of configure script options that were used to build this
 * copy of Mutter. This is actually always called
 * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose()).
+ * (see meta_set_verbose).
 */
 static void
 meta_print_self_identity (void)
@ -178,7 +188,7 @@ meta_print_self_identity (void)
  meta_print_compilation_info ();
 }

-/*
+/**
 * The set of possible options that can be set on Mutter's
 * command line.
 */
@ -197,7 +207,7 @@ static GOptionEntry meta_options[] = {
    NULL
  },
  {
-    "replace", 'r', 0, G_OPTION_ARG_NONE,
+    "replace", 0, 0, G_OPTION_ARG_NONE,
    &opt_replace_wm,
    N_("Replace the running window manager"),
    NULL
@ -317,12 +327,10 @@ meta_clutter_init (void)
 }

 /**
- * meta_select_display:
- *
 * Selects which display Mutter should use. It first tries to use
- * @display_name as the display. If @display_name is %NULL then
+ * display_name as the display. If display_name is NULL then
 * try to use the environment variable MUTTER_DISPLAY. If that
- * also is %NULL, use the default - :0.0
+ * also is NULL, use the default - :0.0
 */
 static void
 meta_select_display (gchar *display_name)
@ -373,7 +381,7 @@ on_sigterm (void)
 * meta_init: (skip)
 *
 * Initialize mutter. Call this after meta_get_option_context() and
- * meta_plugin_manager_set_plugin_type(), and before meta_run().
+ * meta_plugin_type_register(), and before meta_run().
 */
 void
 meta_init (void)
@ -381,6 +389,8 @@ meta_init (void)
  struct sigaction act;
  sigset_t empty_mask;
  GIOChannel *channel;
+
+  g_type_init ();
  
  sigemptyset (&empty_mask);
  act.sa_handler = SIG_IGN;
@ -550,14 +560,13 @@ meta_run (void)
 }

 /**
- * meta_quit:
- * @code: The success or failure code to return to the calling process.
- *
 * Stops Mutter. This tells the event loop to stop processing; it is
 * rather dangerous to use this because this will leave the user with
 * no window manager. We generally do this only if, for example, the
 * session manager asks us to; we assume the session manager knows
 * what it's talking about.
+ *
+ * \param code The success or failure code to return to the calling process.
 */
 void
 meta_quit (MetaExitCode code)
@ -570,14 +579,13 @@ meta_quit (MetaExitCode code)
 }

 /**
- * prefs_changed_callback:
- * @pref  Which preference has changed
- * @data  Arbitrary data (which we ignore)
- *
 * Called on pref changes. (One of several functions of its kind and purpose.)
 *
- * FIXME: Why are these particular prefs handled in main.c and not others?
- *        Should they be?
+ * \bug Why are these particular prefs handled in main.c and not others?
+ * Should they be?
+ *
+ * \param pref  Which preference has changed
+ * \param data  Arbitrary data (which we ignore)
 */
 static void
 prefs_changed_callback (MetaPreference pref,
--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@ -25,7 +25,9 @@

 #include <meta/main.h>
 #include <meta/util.h>
+#ifdef HAVE_INTROSPECTION
 #include "meta-plugin-manager.h"
+#endif

 #include <glib.h>

@ -45,7 +47,7 @@ print_version (const gchar    *option_name,
  exit (0);
 }

-static gchar *plugin = "default";
+static gchar *mutter_plugins;

 GOptionEntry mutter_options[] = {
  {
@ -55,10 +57,10 @@ GOptionEntry mutter_options[] = {
    NULL
  },
  {
-    "mutter-plugin", 0, 0, G_OPTION_ARG_STRING,
-    &plugin,
-    N_("Mutter plugin to use"),
-    "PLUGIN",
+    "mutter-plugins", 0, 0, G_OPTION_ARG_STRING,
+    &mutter_plugins,
+    N_("Comma-separated list of compositor plugins"),
+    "PLUGINS"
  },
  { NULL }
 };
@ -69,8 +71,6 @@ main (int argc, char **argv)
  GOptionContext *ctx;
  GError *error = NULL;

-  g_type_init ();
-
  ctx = meta_get_option_context ();
  g_option_context_add_main_entries (ctx, mutter_options, GETTEXT_PACKAGE);
  if (!g_option_context_parse (ctx, &argc, &argv, &error))
@ -79,8 +79,20 @@ main (int argc, char **argv)
      exit (1);
    }

-  if (plugin)
-    meta_plugin_manager_load (plugin);
+  if (mutter_plugins)
+    {
+      MetaPluginManager *mgr;
+      char **plugins = g_strsplit (mutter_plugins, ",", -1); 
+      char **plugin;
+
+      mgr = meta_plugin_manager_get_default ();
+      for (plugin = plugins; *plugin; plugin++)
+        {
+          g_strstrip (*plugin);
+          meta_plugin_manager_load (mgr, *plugin);
+        }
+      g_strfreev (plugins);
+    }

  meta_init ();
  return meta_run ();
--- a/src/core/place.c
+++ b/src/core/place.c
@ -105,7 +105,7 @@ find_next_cascade (MetaWindow *window,
  int window_width, window_height;
  int cascade_stage;
  MetaRectangle work_area;
-  int current;
+  const MetaMonitorInfo* current;
  
  sorted = g_list_copy (windows);
  sorted = g_list_sort (sorted, northwestcmp);
@ -137,7 +137,7 @@ find_next_cascade (MetaWindow *window,
   */

  current = meta_screen_get_current_monitor (window->screen);
-  meta_window_get_work_area_for_monitor (window, current, &work_area);
+  meta_window_get_work_area_for_monitor (window, current->number, &work_area);

  cascade_x = MAX (0, work_area.x);
  cascade_y = MAX (0, work_area.y);
@ -815,7 +815,7 @@ meta_window_place (MetaWindow        *window,
      int w, h;

      /* Warning, this function is a round trip! */
-      xi = meta_screen_get_current_monitor_info (window->screen);
+      xi = meta_screen_get_current_monitor (window->screen);

      w = xi->rect.width;
      h = xi->rect.height;
@ -860,7 +860,7 @@ meta_window_place (MetaWindow        *window,
  }

  /* Warning, this is a round trip! */
-  xi = meta_screen_get_current_monitor_info (window->screen);
+  xi = meta_screen_get_current_monitor (window->screen);
  
  /* "Origin" placement algorithm */
  x = xi->rect.x;
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@ -156,6 +156,8 @@ void          meta_screen_manage_all_windows  (MetaScreen                 *scree
 void          meta_screen_foreach_window      (MetaScreen                 *screen,
                                               MetaScreenWindowFunc        func,
                                               gpointer                    data);
+void          meta_screen_queue_frame_redraws (MetaScreen                 *screen);
+void          meta_screen_queue_window_resizes (MetaScreen                 *screen);

 void          meta_screen_set_cursor          (MetaScreen                 *screen,
                                               MetaCursor                  cursor);
@ -184,7 +186,7 @@ void          meta_screen_tile_preview_hide            (MetaScreen    *screen);
 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
                                                MetaWindow                 *not_this_one);

-const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen);
+const MetaMonitorInfo* meta_screen_get_current_monitor    (MetaScreen    *screen);
 const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen,
                                                           MetaRectangle *rect);
 const MetaMonitorInfo* meta_screen_get_monitor_for_window (MetaScreen    *screen,
--- a/src/core/screen.c
+++ b/src/core/screen.c
@ -39,10 +39,15 @@
 #include "stack.h"
 #include "xprops.h"
 #include <meta/compositor.h>
+#include "mutter-marshal.h"
 #include "mutter-enum-types.h"

+#ifdef HAVE_SOLARIS_XINERAMA
+#include <X11/extensions/xinerama.h>
+#endif
+#ifdef HAVE_XFREE_XINERAMA
 #include <X11/extensions/Xinerama.h>
-
+#endif
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@ -79,6 +84,7 @@ enum
 enum
 {
  RESTACKED,
+  TOGGLE_RECORDING,
  WORKSPACE_ADDED,
  WORKSPACE_REMOVED,
  WORKSPACE_SWITCHED,
@ -156,7 +162,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaScreenClass, restacked),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  pspec = g_param_spec_int ("n-workspaces",
@ -170,7 +177,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__INT,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_INT);
@ -180,7 +188,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__INT,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_INT);
@ -190,19 +199,21 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_INT_ENUM,
                  G_TYPE_NONE,
                  3,
                  G_TYPE_INT,
                  G_TYPE_INT,
-                  META_TYPE_MOTION_DIRECTION);
+                  MUTTER_TYPE_MOTION_DIRECTION);

  screen_signals[WINDOW_ENTERED_MONITOR] =
    g_signal_new ("window-entered-monitor",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
                  G_TYPE_NONE, 2,
                  G_TYPE_INT,
                  META_TYPE_WINDOW);
@ -212,7 +223,8 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
                  G_TYPE_NONE, 2,
                  G_TYPE_INT,
                  META_TYPE_WINDOW);
@ -222,15 +234,26 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__POINTER,
                  G_TYPE_NONE, 1, G_TYPE_POINTER);

+  screen_signals[TOGGLE_RECORDING] =
+    g_signal_new ("toggle-recording",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
  screen_signals[WORKAREAS_CHANGED] =
    g_signal_new ("workareas-changed",
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (MetaScreenClass, workareas_changed),
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

  screen_signals[MONITORS_CHANGED] =
@ -238,7 +261,8 @@ meta_screen_class_init (MetaScreenClass *klass)
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (MetaScreenClass, monitors_changed),
-          NULL, NULL, NULL,
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);

  g_object_class_install_property (object_class,
@ -474,6 +498,7 @@ reload_monitor_infos (MetaScreen *screen)
      screen->monitor_infos[1].rect.width = screen->rect.width / 2;
    }

+#ifdef HAVE_XFREE_XINERAMA
  if (screen->n_monitor_infos == 0 &&
      XineramaIsActive (display->xdisplay))
    {
@ -543,10 +568,74 @@ reload_monitor_infos (MetaScreen *screen)
  else if (screen->n_monitor_infos > 0)
    {
      meta_topic (META_DEBUG_XINERAMA,
-                  "No Xinerama extension or Xinerama inactive on display %s\n",
+                  "No XFree86 Xinerama extension or XFree86 Xinerama inactive on display %s\n",
                  display->name);
    }
+#else
+  meta_topic (META_DEBUG_XINERAMA,
+              "Mutter compiled without XFree86 Xinerama support\n");
+#endif /* HAVE_XFREE_XINERAMA */

+#ifdef HAVE_SOLARIS_XINERAMA
+  /* This code from GDK, Copyright (C) 2002 Sun Microsystems */
+  if (screen->n_monitor_infos == 0 &&
+      XineramaGetState (screen->display->xdisplay,
+                        screen->number))
+    {
+      XRectangle monitors[MAXFRAMEBUFFERS];
+      unsigned char hints[16];
+      int result;
+      int n_monitors;
+      int i;
+
+      n_monitors = 0;
+      result = XineramaGetInfo (screen->display->xdisplay,
+                                screen->number,
+				monitors, hints,
+                                &n_monitors);
+      /* Yes I know it should be Success but the current implementation 
+       * returns the num of monitor
+       */
+      if (result > 0)
+	{
+          g_assert (n_monitors > 0);
+          
+          screen->monitor_infos = g_new0 (MetaMonitorInfo, n_monitors);
+          screen->n_monitor_infos = n_monitors;
+          
+          i = 0;
+          while (i < n_monitors)
+            {
+              screen->monitor_infos[i].number = i;
+              screen->monitor_infos[i].rect.x = monitors[i].x;
+              screen->monitor_infos[i].rect.y = monitors[i].y;
+              screen->monitor_infos[i].rect.width = monitors[i].width;
+              screen->monitor_infos[i].rect.height = monitors[i].height;
+
+              meta_topic (META_DEBUG_XINERAMA,
+                          "Monitor %d is %d,%d %d x %d\n",
+                          screen->monitor_infos[i].number,
+                          screen->monitor_infos[i].rect.x,
+                          screen->monitor_infos[i].rect.y,
+                          screen->monitor_infos[i].rect.width,
+                          screen->monitor_infos[i].rect.height);              
+              
+              ++i;
+            }
+	}
+    }
+  else if (screen->n_monitor_infos == 0)
+    {
+      meta_topic (META_DEBUG_XINERAMA,
+                  "No Solaris Xinerama extension or Solaris Xinerama inactive on display %s\n",
+                  display->name);
+    }
+#else
+  meta_topic (META_DEBUG_XINERAMA,
+              "Mutter compiled without Solaris Xinerama support\n");
+#endif /* HAVE_SOLARIS_XINERAMA */
+
+  
  /* If no Xinerama, fill in the single screen info so
   * we can use the field unconditionally
   */
@ -1095,11 +1184,9 @@ prefs_changed_callback (MetaPreference pref,
 {
  MetaScreen *screen = data;
  
-  if ((pref == META_PREF_NUM_WORKSPACES ||
-       pref == META_PREF_DYNAMIC_WORKSPACES) &&
-      !meta_prefs_get_dynamic_workspaces ())
+  if (pref == META_PREF_NUM_WORKSPACES)
    {
-      /* GSettings doesn't provide timestamps, but luckily update_num_workspaces
+      /* GConf doesn't provide timestamps, but luckily update_num_workspaces
       * often doesn't need it...
       */
      guint32 timestamp = 
@ -1216,6 +1303,31 @@ meta_screen_foreach_window (MetaScreen *screen,
  g_slist_free (winlist);
 }

+static void
+queue_draw (MetaScreen *screen, MetaWindow *window, gpointer data)
+{
+  if (window->frame)
+    meta_frame_queue_draw (window->frame);
+}
+
+void
+meta_screen_queue_frame_redraws (MetaScreen *screen)
+{
+  meta_screen_foreach_window (screen, queue_draw, NULL);
+}
+
+static void
+queue_resize (MetaScreen *screen, MetaWindow *window, gpointer data)
+{
+  meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
+}
+
+void
+meta_screen_queue_window_resizes (MetaScreen *screen)
+{
+  meta_screen_foreach_window (screen, queue_resize, NULL);
+}
+
 int
 meta_screen_get_n_workspaces (MetaScreen *screen)
 {
@ -1382,14 +1494,12 @@ meta_screen_remove_workspace (MetaScreen *screen, MetaWorkspace *workspace,
  new_num = g_list_length (screen->workspaces);

  set_number_of_spaces_hint (screen, new_num);
-
-  if (!meta_prefs_get_dynamic_workspaces ())
-    meta_prefs_set_num_workspaces (new_num);
+  meta_prefs_set_num_workspaces (new_num);

  /* If deleting a workspace before the current workspace, the active
   * workspace index changes, so we need to update that hint */
  if (active_index_changed)
-      meta_screen_set_active_workspace_hint (screen);
+      meta_screen_set_active_workspace_hint (workspace->screen);

  l = next;
  while (l)
@ -1439,9 +1549,7 @@ meta_screen_append_new_workspace (MetaScreen *screen, gboolean activate,
  new_num = g_list_length (screen->workspaces);

  set_number_of_spaces_hint (screen, new_num);
-
-  if (!meta_prefs_get_dynamic_workspaces ())
-    meta_prefs_set_num_workspaces (new_num);
+  meta_prefs_set_num_workspaces (new_num);

  meta_screen_queue_workarea_recalc (screen);

@ -1457,7 +1565,7 @@ static void
 update_num_workspaces (MetaScreen *screen,
                       guint32     timestamp)
 {
-  int new_num, old_num;
+  int new_num;
  GList *tmp;
  int i;
  GList *extras;
@ -1487,7 +1595,6 @@ update_num_workspaces (MetaScreen *screen,
      ++i;
      tmp = tmp->next;
    }
-  old_num = i;

  g_assert (last_remaining);
  
@ -1522,22 +1629,22 @@ update_num_workspaces (MetaScreen *screen,

      g_assert (w->windows == NULL);
      meta_workspace_remove (w);
-
+      
      tmp = tmp->next;
    }
-
+  
  g_list_free (extras);
-
-  for (i = old_num; i < new_num; i++)
-    meta_workspace_new (screen);
+  
+  while (i < new_num)
+    {
+      meta_workspace_new (screen);
+      ++i;
+    }

  set_number_of_spaces_hint (screen, new_num);

  meta_screen_queue_workarea_recalc (screen);

-  for (i = old_num; i < new_num; i++)
-    g_signal_emit (screen, screen_signals[WORKSPACE_ADDED], 0, i);
-
  g_object_notify (G_OBJECT (screen), "n-workspaces");
 }

@ -1828,6 +1935,7 @@ meta_screen_tile_preview_update_timeout (gpointer data)
 {
  MetaScreen *screen = data;
  MetaWindow *window = screen->display->grab_window;
+  gboolean composited = screen->display->compositor != NULL;
  gboolean needs_preview = FALSE;

  screen->tile_preview_timeout_id = 0;
@ -1837,7 +1945,8 @@ meta_screen_tile_preview_update_timeout (gpointer data)
      Window xwindow;
      gulong create_serial;

-      screen->tile_preview = meta_tile_preview_new (screen->number);
+      screen->tile_preview = meta_tile_preview_new (screen->number,
+                                                    composited);
      xwindow = meta_tile_preview_get_xwindow (screen->tile_preview,
                                               &create_serial);
      meta_stack_tracker_record_add (screen->stack_tracker,
@ -2054,7 +2163,7 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
      visited[i] = FALSE;
    }

-  current = meta_screen_get_current_monitor_info (screen);
+  current = meta_screen_get_current_monitor (screen);
  monitor_queue = g_queue_new ();
  g_queue_push_tail (monitor_queue, (gpointer) current);
  visited[current->number] = TRUE;
@ -2121,26 +2230,10 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
 }

 const MetaMonitorInfo*
-meta_screen_get_current_monitor_info (MetaScreen *screen)
-{
-    int monitor_index;
-    monitor_index = meta_screen_get_current_monitor (screen);
-    return &screen->monitor_infos[monitor_index];
-}
-
-/**
- * meta_screen_get_current_monitor:
- * @screen: a #MetaScreen
- *
- * Gets the index of the monitor that currently has the mouse pointer.
- *
- * Return value: a monitor index
- */
-int
 meta_screen_get_current_monitor (MetaScreen *screen)
 {
  if (screen->n_monitor_infos == 1)
-    return 0;
+    return &screen->monitor_infos[0];
  
  /* Sadly, we have to do it this way. Yuck.
   */
@ -2182,7 +2275,7 @@ meta_screen_get_current_monitor (MetaScreen *screen)
                  screen->last_monitor_index);
    }

-  return screen->last_monitor_index;
+  return &screen->monitor_infos[screen->last_monitor_index];
 }

 /**
@ -2899,7 +2992,7 @@ meta_screen_resize (MetaScreen *screen,
  g_free (old_monitor_infos);
  g_slist_free (windows);

-  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0);
+  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0, index);
 }

 void
@ -3376,10 +3469,9 @@ meta_screen_get_screen_number (MetaScreen *screen)

 /**
 * meta_screen_get_display:
+ * Retrieve the display associated with screen.
 * @screen: A #MetaScreen
 * 
- * Retrieve the display associated with screen.
- *
 * Returns: (transfer none): Display 
 */
 MetaDisplay *
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@ -394,8 +394,6 @@ meta_stack_tracker_free (MetaStackTracker *tracker)
  g_queue_foreach (tracker->queued_requests, (GFunc)meta_stack_op_free, NULL);
  g_queue_free (tracker->queued_requests);
  tracker->queued_requests = NULL;
-
-  g_free (tracker);
 }

 static void
--- a/src/core/stack.c
+++ b/src/core/stack.c
@ -1,8 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * SECTION:stack
- * @short_description: Which windows cover which other windows
+ * \file stack.c  Which windows cover which other windows
 */

 /* 
@ -122,7 +121,6 @@ meta_stack_add (MetaStack  *stack,
              window->desc, window->stack_position);
  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 void
@ -158,7 +156,6 @@ meta_stack_remove (MetaStack  *stack,
                                     GUINT_TO_POINTER (window->frame->xwindow));
  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 void
@ -168,7 +165,6 @@ meta_stack_update_layer (MetaStack  *stack,
  stack->need_relayer = TRUE;
  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 void
@ -178,64 +174,26 @@ meta_stack_update_transient (MetaStack  *stack,
  stack->need_constrain = TRUE;
  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 /* raise/lower within a layer */
 void
 meta_stack_raise (MetaStack  *stack,
                  MetaWindow *window)
-{
-  GList *l;
-  int max_stack_position = window->stack_position;
-  MetaWorkspace *workspace;
-
-  stack_ensure_sorted (stack);
-
-  workspace = meta_window_get_workspace (window);
-  for (l = stack->sorted; l; l = l->next)
-    {
-      MetaWindow *w = (MetaWindow *) l->data;
-      if (meta_window_located_on_workspace (w, workspace) &&
-          w->stack_position > max_stack_position)
-        max_stack_position = w->stack_position;
-    }
-
-  if (max_stack_position == window->stack_position)
-    return;
-
-  meta_window_set_stack_position_no_sync (window, max_stack_position);
-
+{  
+  meta_window_set_stack_position_no_sync (window,
+                                          stack->n_positions - 1);
+  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 void
 meta_stack_lower (MetaStack  *stack,
                  MetaWindow *window)
 {
-  GList *l;
-  int min_stack_position = window->stack_position;
-  MetaWorkspace *workspace;
-
-  stack_ensure_sorted (stack);
-
-  workspace = meta_window_get_workspace (window);
-  for (l = stack->sorted; l; l = l->next)
-    {
-      MetaWindow *w = (MetaWindow *) l->data;
-      if (meta_window_located_on_workspace (w, workspace) &&
-          w->stack_position < min_stack_position)
-        min_stack_position = w->stack_position;
-    }
-
-  if (min_stack_position == window->stack_position)
-    return;
-
-  meta_window_set_stack_position_no_sync (window, min_stack_position);
+  meta_window_set_stack_position_no_sync (window, 0);
  
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, window->screen->active_workspace);
 }

 void
@ -251,27 +209,6 @@ meta_stack_thaw (MetaStack *stack)
  
  stack->freeze_count -= 1;
  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, NULL);
-}
-
-void
-meta_stack_update_window_tile_matches (MetaStack     *stack,
-                                       MetaWorkspace *workspace)
-{
-  GList *windows, *tmp;
-
-  if (stack->freeze_count > 0)
-    return;
-
-  windows = meta_stack_list_windows (stack, workspace);
-  tmp = windows;
-  while (tmp)
-    {
-      meta_window_compute_tile_match ((MetaWindow *) tmp->data);
-      tmp = tmp->next;
-    }
-
-  g_list_free (windows);
 }

 static gboolean
@ -341,7 +278,7 @@ get_standalone_layer (MetaWindow *window)
                 windows_on_different_monitor (window,
                                               window->display->expected_focus_window))))
        layer = META_LAYER_FULLSCREEN;
-      else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window))
+      else if (window->wm_state_above)
        layer = META_LAYER_TOP;
      else
        layer = META_LAYER_NORMAL;
@ -800,8 +737,6 @@ apply_constraints (Constraint **constraints,
 }

 /**
- * stack_do_window_deletions:
- *
 * Go through "deleted" and take the matching windows
 * out of "windows".
 */
@ -902,8 +837,6 @@ stack_do_window_additions (MetaStack *stack)
 }

 /**
- * stack_do_relayer:
- *
 * Update the layers that windows are in
 */
 static void
@ -949,8 +882,6 @@ stack_do_relayer (MetaStack *stack)
 }

 /**
- * stack_do_constrain:
- *
 * Update stack_position and layer to reflect transiency
 * constraints
 */
@ -983,8 +914,6 @@ stack_do_constrain (MetaStack *stack)
 }

 /**
- * stack_do_resort:
- *
 * Sort stack->sorted with layers having priority over stack_position.
 */
 static void
@ -1003,8 +932,6 @@ stack_do_resort (MetaStack *stack)
 }

 /**
- * stack_ensure_sorted:
- *
 * Puts the stack into canonical form.
 *
 * Honour the removed and added lists of the stack, and then recalculate
@ -1024,8 +951,6 @@ stack_ensure_sorted (MetaStack *stack)
 }

 /**
- * raise_window_relative_to_managed_windows:
- *
 * This function is used to avoid raising a window above popup
 * menus and other such things.
 *
@ -1126,8 +1051,6 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
 }

 /**
- * stack_sync_to_server:
- *
 * Order the windows on the X server to be the same as in our structure.
 * We do this using XRestackWindows if we don't know the previous order,
 * or XConfigureWindow on a few particular windows if we do and can figure
@ -1733,7 +1656,6 @@ meta_stack_set_positions (MetaStack *stack,
              "Reset the stack positions of (nearly) all windows\n");

  stack_sync_to_server (stack);
-  meta_stack_update_window_tile_matches (stack, NULL);
 }

 void
@ -1796,6 +1718,4 @@ meta_window_set_stack_position (MetaWindow *window,
 {
  meta_window_set_stack_position_no_sync (window, position);
  stack_sync_to_server (window->screen->stack);
-  meta_stack_update_window_tile_matches (window->screen->stack,
-                                         window->screen->active_workspace);
 }
--- a/src/core/stack.h
+++ b/src/core/stack.h
@ -1,5 +1,23 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/**
+ * \file stack.h  Which windows cover which other windows
+ *
+ * There are two factors that determine window position.
+ * 
+ * One is window->stack_position, which is a unique integer
+ * indicating how windows are ordered with respect to one
+ * another. The ordering here transcends layers; it isn't changed
+ * as the window is moved among layers. This allows us to move several
+ * windows from one layer to another, while preserving the relative
+ * order of the moved windows. Also, it allows us to restore
+ * the stacking order from a saved session.
+ * 
+ * However when actually stacking windows on the screen, the
+ * layer overrides the stack_position; windows are first sorted
+ * by layer, then by stack_position within each layer.
+ */
+
 /* 
 * Copyright (C) 2001 Havoc Pennington
 * Copyright (C) 2005 Elijah Newren
@ -23,25 +41,6 @@
 #ifndef META_STACK_H
 #define META_STACK_H

-/**
- * SECTION:stack
- * @short_description: Which windows cover which other windows
- *
- * There are two factors that determine window position.
- * 
- * One is window->stack_position, which is a unique integer
- * indicating how windows are ordered with respect to one
- * another. The ordering here transcends layers; it isn't changed
- * as the window is moved among layers. This allows us to move several
- * windows from one layer to another, while preserving the relative
- * order of the moved windows. Also, it allows us to restore
- * the stacking order from a saved session.
- * 
- * However when actually stacking windows on the screen, the
- * layer overrides the stack_position; windows are first sorted
- * by layer, then by stack_position within each layer.
- */
-
 #include "screen-private.h"

 /**
@ -124,214 +123,192 @@ struct _MetaStack
 };

 /**
- * meta_stack_new:
- * @screen: The MetaScreen which will be the parent of this stack.
- *
 * Creates and initialises a MetaStack.
 *
- * Returns: The new screen.
+ * \param screen  The MetaScreen which will be the parent of this stack.
+ * \return The new screen.
 */
 MetaStack *meta_stack_new       (MetaScreen     *screen);

 /**
- * meta_stack_free:
- * @stack: The stack to destroy.
- *
 * Destroys and frees a MetaStack.
+ *
+ * \param stack  The stack to destroy.
 */
 void       meta_stack_free      (MetaStack      *stack);

 /**
- * meta_stack_add:
- * @stack: The stack to add it to
- * @window: The window to add
- *
 * Adds a window to the local stack.  It is a fatal error to call this
 * function on a window which already exists on the stack of any screen.
+ *
+ * \param window  The window to add
+ * \param stack  The stack to add it to
 */
 void       meta_stack_add       (MetaStack      *stack,
                                 MetaWindow     *window);

 /**
- * meta_stack_remove:
- * @stack: The stack to remove it from
- * @window: The window to remove
- *
 * Removes a window from the local stack.  It is a fatal error to call this
 * function on a window which exists on the stack of any screen.
+ *
+ * \param window  The window to remove
+ * \param stack   The stack to remove it from
 */
 void       meta_stack_remove    (MetaStack      *stack,
                                 MetaWindow     *window);
 /**
- * meta_stack_update_layer:
- * @stack: The stack to recalculate
- * @window: Dummy parameter
- *
 * Recalculates the correct layer for all windows in the stack,
 * and moves them about accordingly.
 *
+ * \param window  Dummy parameter
+ * \param stack   The stack to recalculate
+ * \bug What's with the dummy parameter?
 */
 void       meta_stack_update_layer    (MetaStack      *stack,
                                       MetaWindow     *window);

 /**
- * meta_stack_update_transient:
- * @stack: The stack to recalculate
- * @window: Dummy parameter
- *
 * Recalculates the correct stacking order for all windows in the stack
 * according to their transience, and moves them about accordingly.
 *
- * FIXME: What's with the dummy parameter?
+ * \param window  Dummy parameter
+ * \param stack   The stack to recalculate
+ * \bug What's with the dummy parameter?
 */
 void       meta_stack_update_transient (MetaStack     *stack,
                                        MetaWindow    *window);

 /**
- * meta_stack_raise:
- * @stack: The stack to modify.
- * @window: The window that's making an ascension.
- *              (Amulet of Yendor not required.)
- *
 * Move a window to the top of its layer.
+ *
+ * \param stack  The stack to modify.
+ * \param window  The window that's making an ascension.
+ *                (Amulet of Yendor not required.)
 */
 void       meta_stack_raise     (MetaStack      *stack,
                                 MetaWindow     *window);
 /**
- * meta_stack_lower:
- * @stack: The stack to modify.
- * @window: The window that's on the way downwards.
- *
 * Move a window to the bottom of its layer.
+ *
+ * \param stack  The stack to modify.
+ * \param window  The window that's on the way downwards.
 */
 void       meta_stack_lower     (MetaStack      *stack,
                                 MetaWindow     *window);

 /**
- * meta_stack_freeze:
- * @stack: The stack to freeze.
- *
 * Prevent syncing to server until the next call of meta_stack_thaw(),
 * so that we can carry out multiple operations in one go without having
 * everything halfway reflected on the X server.
 *
 * (Calls to meta_stack_freeze() nest, so that multiple calls to
 * meta_stack_freeze will require multiple calls to meta_stack_thaw().)
+ *
+ * \param stack  The stack to freeze.
 */
 void       meta_stack_freeze    (MetaStack      *stack);

 /**
- * meta_stack_thaw:
- * @stack: The stack to thaw.
- *
 * Undoes a meta_stack_freeze(), and processes anything which has become
 * necessary during the freeze.  It is an error to call this function if
 * the stack has not been frozen.
+ *
+ * \param stack  The stack to thaw.
 */
 void       meta_stack_thaw      (MetaStack      *stack);

 /**
- * meta_stack_get_top:
- * @stack: The stack to examine.
- *
 * Finds the top window on the stack.
 *
- * Returns: The top window on the stack, or %NULL in the vanishingly unlikely
- *          event that you have no windows on your screen whatsoever.
+ * \param stack  The stack to examine.
+ * \return The top window on the stack, or NULL in the vanishingly unlikely
+ *         event that you have no windows on your screen whatsoever.
 */
 MetaWindow* meta_stack_get_top    (MetaStack  *stack);

 /**
- * meta_stack_get_bottom:
- * @stack: The stack to search
- *
 * Finds the window at the bottom of the stack.  Since that's pretty much
 * always the desktop, this isn't the most useful of functions, and nobody
 * actually calls it.  We should probably get rid of it.
+ *
+ * \param stack  The stack to search
 */
 MetaWindow* meta_stack_get_bottom (MetaStack  *stack);

 /**
- * meta_stack_get_above:
- * @stack: The stack to search.
- * @window: The window to look above.
- * @only_within_layer: If %TRUE, will return %NULL if @window is the
- *                     top window in its layer.
- *
 * Finds the window above a given window in the stack.
 * It is not an error to pass in a window which does not exist in
- * the stack; the function will merely return %NULL.
+ * the stack; the function will merely return NULL.
 *
- * Returns: %NULL if there is no such window;
- *          the window above @window otherwise.
+ * \param stack   The stack to search.
+ * \param window  The window to look above.
+ * \param only_within_layer  If true, will return NULL if "window" is the
+ *                           top window in its layer.
+ * \return NULL if there is no such window;
+ *         the window above "window" otherwise.
 */
 MetaWindow* meta_stack_get_above  (MetaStack  *stack,
                                   MetaWindow *window,
                                   gboolean    only_within_layer);

 /**
- * meta_stack_get_below:
- * @stack: The stack to search.
- * @window: The window to look below.
- * @only_within_layer: If %TRUE, will return %NULL if window is the
- *                     bottom window in its layer.
- *
 * Finds the window below a given window in the stack.
 * It is not an error to pass in a window which does not exist in
- * the stack; the function will merely return %NULL.
+ * the stack; the function will merely return NULL.
 *
- *
- * Returns: %NULL if there is no such window;
- *          the window below @window otherwise.
+ * \param stack   The stack to search.
+ * \param window  The window to look below.
+ * \param only_within_layer  If true, will return NULL if "window" is the
+ *                           bottom window in its layer.
+ * \return NULL if there is no such window;
+ *         the window below "window" otherwise.
 */
 MetaWindow* meta_stack_get_below  (MetaStack  *stack,
                                   MetaWindow *window,
                                   gboolean    only_within_layer);

 /**
- * meta_stack_get_default_focus_window:
- * @stack: The stack to search.
- * @workspace: %NULL to search all workspaces; otherwise only windows
- *             from that workspace will be returned.
- * @not_this_one: Window to ignore because it's being unfocussed or
- *                going away.
- *
- * Find the topmost, focusable, mapped, window in a stack. If you supply
- * a window as @not_this_one, we won't return that one (presumably
- * because it's going to be going away).  But if you do supply @not_this_one
- * and we find its parent, we'll return that; and if @not_this_one is in
+ * Find the topmost, focusable, mapped, window in a stack.  If you supply
+ * a window as "not_this_one", we won't return that one (presumably
+ * because it's going to be going away).  But if you do supply "not_this_one"
+ * and we find its parent, we'll return that; and if "not_this_one" is in
 * a group, we'll return the top window of that group.
 *
 * Also, we are prejudiced against dock windows.  Every kind of window, even
 * the desktop, will be returned in preference to a dock window.
 *
- * Returns: The window matching all these constraints or %NULL if none does.
+ * \param stack  The stack to search.
+ * \param workspace  NULL to search all workspaces; otherwise only windows
+ *                   from that workspace will be returned.
+ * \param not_this_one  Window to ignore because it's being unfocussed or
+ *                      going away.
+ * \return The window matching all these constraints or NULL if none does.
+ * 
+ * \bug Never called!
  */
 MetaWindow* meta_stack_get_default_focus_window          (MetaStack     *stack,
                                                          MetaWorkspace *workspace,
                                                          MetaWindow    *not_this_one);

 /**
- * meta_stack_get_default_focus_window_at_point:
- * @stack: The stack to search.
- * @workspace: %NULL to search all workspaces; otherwise only windows
- *             from that workspace will be returned.
- * @not_this_one: Window to ignore because it's being unfocussed or
- *                going away.
- * @root_x: The returned window must contain this point,
- *          unless it's a dock.
- * @root_y: See root_x.
- *
 * Find the topmost, focusable, mapped, window in a stack.  If you supply
- * a window as @not_this_one, we won't return that one (presumably
- * because it's going to be going away).  But if you do supply @not_this_one
- * and we find its parent, we'll return that; and if @not_this_one is in
+ * a window as "not_this_one", we won't return that one (presumably
+ * because it's going to be going away).  But if you do supply "not_this_one"
+ * and we find its parent, we'll return that; and if "not_this_one" is in
 * a group, we'll return the top window of that group.
 *
 * Also, we are prejudiced against dock windows.  Every kind of window, even
 * the desktop, will be returned in preference to a dock window.
 *
- * Returns: The window matching all these constraints or %NULL if none does.
+ * \param stack  The stack to search.
+ * \param workspace  NULL to search all workspaces; otherwise only windows
+ *                   from that workspace will be returned.
+ * \param not_this_one  Window to ignore because it's being unfocussed or
+ *                      going away.
+ * \param root_x  The returned window must contain this point,
+ *                unless it's a dock.
+ * \param root_y  See root_x.
+ * \return The window matching all these constraints or NULL if none does.
 */
 MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack     *stack,
                                                          MetaWorkspace *workspace,
@ -340,25 +317,18 @@ MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack     *stack,
                                                          int            root_y);

 /**
- * meta_stack_list_windows:
- * @stack: The stack to examine.
- * @workspace: If not %NULL, only windows on this workspace will be
- *             returned; otherwise all windows in the stack will be
- *             returned.
- *
 * Finds all the windows in the stack, in order.
 *
- * Returns: A list of windows, in stacking order, honouring layers.
+ * \param stack  The stack to examine.
+ * \param workspace  If non-NULL, only windows on this workspace will be
+ *                   returned; otherwise all windows in the stack will be
+ *                   returned.
+ * \return A list of windows, in stacking order, honouring layers.
 */
 GList*      meta_stack_list_windows (MetaStack *stack,
                                     MetaWorkspace *workspace);

 /**
- * meta_stack_windows_cmp:
- * @stack: A stack containing both window_a and window_b
- * @window_a: A window
- * @window_b  Another window
- *
 * Comparison function for windows within a stack.  This is not directly
 * suitable for use within a standard comparison routine, because it takes
 * an extra parameter; you will need to wrap it.
@ -369,6 +339,9 @@ GList*      meta_stack_list_windows (MetaStack *stack,
 *
 * (FIXME: Apparently identical to compare_window_position(). Merge them.)
 *
+ * \param stack  A stack containing both window_a and window_b
+ * \param window_a  A window
+ * \param window_b  Another window
 * \return -1 if window_a is below window_b, honouring layers; 1 if it's
 *         above it; 0 if you passed in the same window twice!
 */
@ -377,44 +350,37 @@ int         meta_stack_windows_cmp  (MetaStack  *stack,
                                     MetaWindow *window_b);

 /**
- * meta_window_set_stack_position:
- * @window: The window which is moving.
- * @position:  Where it should move to (0 is the bottom).
- *
 * Sets the position of a window within the stack.  This will only move it
 * up or down within its layer.  It is an error to attempt to move this
 * below position zero or above the last position in the stack (however, since
 * we don't provide a simple way to tell the number of windows in the stack,
 * this requirement may not be easy to fulfil).
+ *
+ * \param window  The window which is moving.
+ * \param position  Where it should move to (0 is the bottom).
 */
 void meta_window_set_stack_position (MetaWindow *window,
                                     int         position);

 /**
- * meta_stack_get_positions:
- * @stack: The stack to examine.
- *
 * Returns the current stack state, allowing rudimentary transactions.
 *
- * Returns: An opaque GList representing the current stack sort order;
- *          it is the caller's responsibility to free it.
- *          Pass this to meta_stack_set_positions() later if you want to restore
- *          the state to where it was when you called this function.
+ * \param stack  The stack to examine.
+ * \return An opaque GList representing the current stack sort order;
+ *         it is the caller's responsibility to free it.
+ *         Pass this to meta_stack_set_positions() later if you want to restore
+ *         the state to where it was when you called this function.
 */
 GList* meta_stack_get_positions (MetaStack *stack);

 /**
- * meta_stack_set_positions:
- * @stack:  The stack to roll back.
- * @windows:  The list returned from meta_stack_get_positions().
- *
 * Rolls back a transaction, given the list returned from
 * meta_stack_get_positions().
 *
+ * \param stack  The stack to roll back.
+ * \param windows  The list returned from meta_stack_get_positions().
 */
 void   meta_stack_set_positions (MetaStack *stack,
                                 GList     *windows);

-void meta_stack_update_window_tile_matches (MetaStack     *stack,
-                                            MetaWorkspace *workspace);
 #endif
--- a/src/core/util.c
+++ b/src/core/util.c
@ -47,6 +47,37 @@ meta_topic_real_valist (MetaDebugTopic topic,
                        va_list        args);
 #endif

+#ifdef HAVE_BACKTRACE
+#include <execinfo.h>
+void
+meta_print_backtrace (void)
+{
+  void *bt[500];
+  int bt_size;
+  int i;
+  char **syms;
+  
+  bt_size = backtrace (bt, 500);
+
+  syms = backtrace_symbols (bt, bt_size);
+  
+  i = 0;
+  while (i < bt_size)
+    {
+      meta_verbose ("  %s\n", syms[i]);
+      ++i;
+    }
+
+  free (syms);
+}
+#else
+void
+meta_print_backtrace (void)
+{
+  meta_verbose ("Not compiled with backtrace support\n");
+}
+#endif
+
 static gint verbose_topics = 0;
 static gboolean is_debugging = FALSE;
 static gboolean replace_current = FALSE;
@ -410,6 +441,8 @@ meta_bug (const char *format, ...)
  fflush (out);
  
  g_free (str);
+
+  meta_print_backtrace ();
  
  /* stop us in a debugger */
  abort ();
@ -888,7 +921,6 @@ meta_later_remove (guint later_id)
           * repaint func run and get removed
           */
          destroy_later (later);
-          return;
        }
    }
 }
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@ -97,18 +97,10 @@ struct _MetaWindow
  char *role;
  char *sm_client_id;
  char *wm_client_machine;
-
  char *startup_id;
  char *mutter_hints;
  char *gtk_theme_variant;
-  char *gtk_application_id;
-  char *gtk_unique_bus_name;
-  char *gtk_application_object_path;
-  char *gtk_window_object_path;
-  char *gtk_app_menu_object_path;
-  char *gtk_menubar_object_path;

-  int hide_titlebar_when_maximized;
  int net_wm_pid;
  
  Window xtransient_for;
@ -137,9 +129,6 @@ struct _MetaWindow
   * this is the current mode. If not, it is the mode which will be
   * requested after the window grab is released */
  guint tile_mode : 2;
-  /* The last "full" maximized/unmaximized state. We need to keep track of
-   * that to toggle between normal/tiled or maximized/tiled states. */
-  guint saved_maximize : 1;
  int tile_monitor_number;

  /* Whether we're shaded */
@ -410,9 +399,6 @@ struct _MetaWindow

  /* Focused window that is (directly or indirectly) attached to this one */
  MetaWindow *attached_focus_window;
-
-  /* The currently complementary tiled window, if any */
-  MetaWindow *tile_match;
 };

 struct _MetaWindowClass
@ -472,8 +458,20 @@ void        meta_window_unmaximize_with_gravity (MetaWindow        *window,
                                                 int                new_width,
                                                 int                new_height,
                                                 int                gravity);
+void        meta_window_make_above         (MetaWindow  *window);
+void        meta_window_unmake_above       (MetaWindow  *window);
+void        meta_window_shade              (MetaWindow  *window,
+                                            guint32      timestamp);
+void        meta_window_unshade            (MetaWindow  *window,
+                                            guint32      timestamp);
+void        meta_window_change_workspace   (MetaWindow  *window,
+                                            MetaWorkspace *workspace);
+void        meta_window_stick              (MetaWindow  *window);
+void        meta_window_unstick            (MetaWindow  *window);

 void        meta_window_make_fullscreen_internal (MetaWindow    *window);
+void        meta_window_make_fullscreen    (MetaWindow  *window);
+void        meta_window_unmake_fullscreen  (MetaWindow  *window);
 void        meta_window_update_fullscreen_monitors (MetaWindow    *window,
                                                    unsigned long  top,
                                                    unsigned long  bottom,
@ -500,8 +498,7 @@ void        meta_window_resize_with_gravity (MetaWindow  *window,
                                             int          w,
                                             int          h,
                                             int          gravity);
-void        meta_window_change_workspace   (MetaWindow  *window,
-                                            MetaWorkspace *workspace);
+

 /* Return whether the window should be currently mapped */
 gboolean    meta_window_should_be_showing   (MetaWindow  *window);
@ -540,6 +537,10 @@ void        meta_window_get_geometry         (MetaWindow  *window,
                                              int         *width,
                                              int         *height);

+void        meta_window_kill               (MetaWindow  *window);
+void        meta_window_focus              (MetaWindow  *window,
+                                            guint32      timestamp);
+
 void        meta_window_update_unfocused_button_grabs (MetaWindow *window);

 /* Sends a client message */
@ -617,6 +618,11 @@ void meta_window_refresh_resize_popup (MetaWindow *window);
 void meta_window_free_delete_dialog (MetaWindow *window);


+void meta_window_begin_grab_op (MetaWindow *window,
+                                MetaGrabOp  op,
+                                gboolean    frame_action,
+                                guint32     timestamp);
+
 void meta_window_update_keyboard_resize (MetaWindow *window,
                                         gboolean    update_cursor);
 void meta_window_update_keyboard_move   (MetaWindow *window);
@ -644,8 +650,5 @@ void meta_window_propagate_focus_appearance (MetaWindow *window,
                                             gboolean    focused);

 gboolean meta_window_should_attach_to_parent (MetaWindow *window);
-gboolean meta_window_can_tile_side_by_side   (MetaWindow *window);
-
-void meta_window_compute_tile_match (MetaWindow *window);

 #endif
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@ -1,8 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * SECTION:window-props
- * @short_description: #MetaWindow property handling
+ * \file window-props.c    MetaWindow property handling
 *
 * A system which can inspect sets of properties of given windows
 * and take appropriate action given their values.
@ -390,13 +389,11 @@ reload_net_wm_user_time_window (MetaWindow    *window,
 #define MAX_TITLE_LENGTH 512

 /**
- * set_title_text:
- *
- * Called by set_window_title() and set_icon_title() to set the value of
- * @target to @title. It required and @atom is set, it will update the
+ * Called by set_window_title and set_icon_title to set the value of
+ * *target to title. It required and atom is set, it will update the
 * appropriate property.
 *
- * Returns: %TRUE if a new title was set.
+ * Returns TRUE if a new title was set.
 */
 static gboolean
 set_title_text (MetaWindow  *window,
@ -1581,74 +1578,21 @@ reload_gtk_theme_variant (MetaWindow    *window,
                    requested_variant, window->desc);
    }

-  if (g_strcmp0 (requested_variant, current_variant) != 0)
+  if (g_strcmp0 (requested_variant, current_variant))
    {
      g_free (current_variant);

-      window->gtk_theme_variant = g_strdup (requested_variant);
+      if (requested_variant)
+        window->gtk_theme_variant = g_strdup (requested_variant);
+      else
+        window->gtk_theme_variant = NULL;

      if (window->frame)
        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
    }
 }

-static void
-reload_gtk_hide_titlebar_when_maximized (MetaWindow    *window,
-                                         MetaPropValue *value,
-                                         gboolean       initial)
-{
-  gboolean requested_value = FALSE;
-  gboolean current_value = window->hide_titlebar_when_maximized;
-
-  if (!meta_prefs_get_ignore_request_hide_titlebar () && value->type != META_PROP_VALUE_INVALID)
-    {
-      requested_value = ((int) value->v.cardinal == 1);
-      meta_verbose ("Request to hide titlebar for window %s.\n", window->desc);
-    }
-
-  if (requested_value == current_value)
-    return;
-
-  window->hide_titlebar_when_maximized = requested_value;
-
-  if (META_WINDOW_MAXIMIZED (window))
-    {
-      meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
-
-      if (window->frame)
-        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
-    }
-}
-
-#define RELOAD_STRING(var_name, propname) \
-  static void                                       \
-  reload_ ## var_name (MetaWindow    *window,       \
-                       MetaPropValue *value,        \
-                       gboolean       initial)      \
-  {                                                 \
-    g_free (window->var_name);                      \
-                                                    \
-    if (value->type != META_PROP_VALUE_INVALID)     \
-      window->var_name = g_strdup (value->v.str);   \
-    else                                            \
-      window->var_name = NULL;                      \
-                                                    \
-    g_object_notify (G_OBJECT (window), propname);  \
-  }
-
-RELOAD_STRING (gtk_unique_bus_name,         "gtk-unique-bus-name")
-RELOAD_STRING (gtk_application_id,          "gtk-application-id")
-RELOAD_STRING (gtk_application_object_path, "gtk-application-object-path")
-RELOAD_STRING (gtk_window_object_path,      "gtk-window-object-path")
-RELOAD_STRING (gtk_app_menu_object_path,    "gtk-app-menu-object-path")
-RELOAD_STRING (gtk_menubar_object_path,     "gtk-menubar-object-path")
-
-#undef RELOAD_STRING
-
 /**
- * meta_display_init_window_prop_hooks:
- * @display: The #MetaDisplay
- *
 * Initialises the property hooks system.  Each row in the table named "hooks"
 * represents an action to take when a property is found on a newly-created
 * window, or when a property changes its value.
@ -1701,13 +1645,6 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
    { display->atom__MOTIF_WM_HINTS,   META_PROP_VALUE_MOTIF_HINTS, reload_mwm_hints,      TRUE,  FALSE },
    { XA_WM_TRANSIENT_FOR,             META_PROP_VALUE_WINDOW,    reload_transient_for,    TRUE,  FALSE },
    { display->atom__GTK_THEME_VARIANT, META_PROP_VALUE_UTF8,     reload_gtk_theme_variant, TRUE, FALSE },
-    { display->atom__GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, META_PROP_VALUE_CARDINAL,     reload_gtk_hide_titlebar_when_maximized, TRUE, FALSE },
-    { display->atom__GTK_APPLICATION_ID,               META_PROP_VALUE_UTF8,         reload_gtk_application_id,               TRUE, FALSE },
-    { display->atom__GTK_UNIQUE_BUS_NAME,              META_PROP_VALUE_UTF8,         reload_gtk_unique_bus_name,              TRUE, FALSE },
-    { display->atom__GTK_APPLICATION_OBJECT_PATH,      META_PROP_VALUE_UTF8,         reload_gtk_application_object_path,      TRUE, FALSE },
-    { display->atom__GTK_WINDOW_OBJECT_PATH,           META_PROP_VALUE_UTF8,         reload_gtk_window_object_path,           TRUE, FALSE },
-    { display->atom__GTK_APP_MENU_OBJECT_PATH,         META_PROP_VALUE_UTF8,         reload_gtk_app_menu_object_path,         TRUE, FALSE },
-    { display->atom__GTK_MENUBAR_OBJECT_PATH,          META_PROP_VALUE_UTF8,         reload_gtk_menubar_object_path,          TRUE, FALSE },
    { display->atom__NET_WM_USER_TIME_WINDOW, META_PROP_VALUE_WINDOW, reload_net_wm_user_time_window, TRUE, FALSE },
    { display->atom_WM_STATE,          META_PROP_VALUE_INVALID,  NULL,                     FALSE, FALSE },
    { display->atom__NET_WM_ICON,      META_PROP_VALUE_INVALID,  reload_net_wm_icon,       FALSE, FALSE },
--- a/src/core/window-props.h
+++ b/src/core/window-props.h
@ -1,8 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * SECTION:window-props
- * @short_description: MetaWindow property handling
+ * \file window-props.h    MetaWindow property handling
 *
 * A system which can inspect sets of properties of given windows
 * and take appropriate action given their values.
@ -36,13 +35,12 @@
 #include "window-private.h"

 /**
- * meta_window_reload_property:
- * @window: The window.
- * @property: A single X atom.
- *
 * Requests the current values of a single property for a given
 * window from the server, and deals with it appropriately.
 * Does not return it to the caller (it's been dealt with!)
+ *
+ * \param window     The window.
+ * \param property   A single X atom.
 */
 void meta_window_reload_property   (MetaWindow *window,
                                    Atom        property,
@ -50,14 +48,13 @@ void meta_window_reload_property   (MetaWindow *window,


 /**
- * meta_window_reload_properties:
- * @window: The window.
- * @properties: A pointer to a list of X atoms, "n_properties" long.
- * @n_properties: The length of the properties list.
- *
 * Requests the current values of a set of properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
+ *
+ * \param window      The window.
+ * \param properties  A pointer to a list of X atoms, "n_properties" long.
+ * \param n_properties  The length of the properties list.
 */
 void meta_window_reload_properties (MetaWindow *window,
                                    const Atom *properties,
@ -65,15 +62,14 @@ void meta_window_reload_properties (MetaWindow *window,
                                    gboolean    initial);

 /**
- * meta_window_reload_property_from_xwindow:
- * @window:     A window on the same display as the one we're
- *                   investigating (only used to find the display)
- * @xwindow:    The X handle for the window.
- * @property:   A single X atom.
- *
 * Requests the current values of a single property for a given
 * window from the server, and deals with it appropriately.
 * Does not return it to the caller (it's been dealt with!)
+ *
+ * \param window     A window on the same display as the one we're
+ *                   investigating (only used to find the display)
+ * \param xwindow    The X handle for the window.
+ * \param property   A single X atom.
 */
 void meta_window_reload_property_from_xwindow
                                   (MetaWindow *window,
@ -82,16 +78,15 @@ void meta_window_reload_property_from_xwindow
                                    gboolean    initial);

 /**
- * meta_window_reload_properties_from_xwindow:
- * @window:     A window on the same display as the one we're
- *                   investigating (only used to find the display)
- * @xwindow:     The X handle for the window.
- * @properties:  A pointer to a list of X atoms, "n_properties" long.
- * @n_properties:  The length of the properties list.
- *
 * Requests the current values of a set of properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
+ *
+ * \param window     A window on the same display as the one we're
+ *                   investigating (only used to find the display)
+ * \param xwindow     The X handle for the window.
+ * \param properties  A pointer to a list of X atoms, "n_properties" long.
+ * \param n_properties  The length of the properties list.
 */
 void meta_window_reload_properties_from_xwindow
                                   (MetaWindow *window,
@ -101,44 +96,41 @@ void meta_window_reload_properties_from_xwindow
                                    gboolean    initial);

 /**
- * meta_window_load_initial_properties:
- * @window:      The window.
- *
 * Requests the current values for standard properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
+ *
+ * \param window      The window.
 */
 void meta_window_load_initial_properties (MetaWindow *window);

 /**
- * meta_display_init_window_prop_hooks:
- * @display:  The display.
- *
 * Initialises the hooks used for the reload_propert* functions
 * on a particular display, and stores a pointer to them in the
 * display.
+ *
+ * \param display  The display.
 */
 void meta_display_init_window_prop_hooks (MetaDisplay *display);

 /**
- * meta_display_free_window_prop_hooks:
- * @display:  The display.
 * Frees the hooks used for the reload_propert* functions
 * for a particular display.
+ *
+ * \param display  The display.
 */
 void meta_display_free_window_prop_hooks (MetaDisplay *display);

 /**
- * meta_set_normal_hints:
- * @window:   The window to set the size hints on.
- * @hints:    Either some X size hints, or NULL for default.
- *
 * Sets the size hints for a window.  This happens when a
 * WM_NORMAL_HINTS property is set on a window, but it is public
 * because the size hints are set to defaults when a window is
 * created.  See
 * http://tronche.com/gui/x/icccm/sec-4.html#WM_NORMAL_HINTS
 * for the X details.
+ *
+ * \param window   The window to set the size hints on.
+ * \param hints    Either some X size hints, or NULL for default.
 */
 void meta_set_normal_hints (MetaWindow *window,
 			    XSizeHints *hints);
--- a/src/core/window.c
+++ b/src/core/window.c
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	aac695f326	Bump version to 3.2.2 Update NEWS	2012-01-18 10:25:16 -05:00
Adel Gadllah	12a5e1c02b	meta-window-actor: Add error traps in meta_window_actor_set_redirected meta_window_actor_set_redirected makes X calls on the client window so it need to set error traps.	2012-01-17 16:24:53 -05:00
Jasper St. Pierre	974be1035e	util: Fix memory leak in meta_later_remove We never destroy the later list that's added by meta_later_add. ==4289== 16 bytes in 1 blocks are definitely lost in loss record 1,632 of 7,258 ==4289== at 0x4C2640D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==4289== by 0x5178D9F: standard_malloc (gmem.c:88) ==4289== by 0x5178E37: g_malloc (gmem.c:164) ==4289== by 0x51924B5: g_slice_alloc (gslice.c:842) ==4289== by 0x5194521: g_slist_insert_sorted_real (gslist.c:900) ==4289== by 0x519465A: g_slist_insert_sorted (gslist.c:957) ==4289== by 0x4EA609A: meta_later_add (util.c:876) ==4289== by 0x4E9C330: meta_screen_queue_workarea_recalc (screen.c:2640) ==4289== by 0x4E9A360: update_num_workspaces (screen.c:1646) ==4289== by 0x4E99026: meta_screen_new (screen.c:924) ==4289== by 0x4E7AB51: meta_display_open (display.c:803) ==4289== by 0x4E9168E: meta_run (main.c:552) https://bugzilla.gnome.org/show_bug.cgi?id=642652	2012-01-17 16:23:54 -05:00
krishnababu k	a22add8fbb	Updated Telugu translations	2011-10-25 17:36:35 +05:30