Bump version to 3.0.2.1

Update NEWS
Make session saving work a bit better
2011-05-25 15:42:10 -04:00 · 2011-05-25 15:39:23 -04:00 · 2011-05-25 14:40:58 -04:00 · 2011-05-25 14:22:57 -04:00 · 2011-05-23 23:50:14 -04:00 · 2011-05-23 23:49:58 -04:00
157 changed files with 52120 additions and 41561 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
@@ -41,7 +40,6 @@ stamp-h1
 stamp-it
 .intltool-merge-cache
 POTFILES
-po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
 inlinepixbufs.h
@@ -49,8 +47,7 @@ libmutter.pc
 mutter
 mutter-theme-viewer
 mutter.desktop
-org.gnome.mutter.gschema.valid
-org.gnome.mutter.gschema.xml
+mutter.schemas
 testasyncgetprop
 testboxes
 testgradient
@@ -59,13 +56,10 @@ mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
-test-attached
 test-gravity
 test-resizing
 test-size-hints
-# We can't say just "wm-tester" here or it will ignore the directory
-# rather than the binary
-src/wm-tester/wm-tester
+wm-tester
 INSTALL
 mkinstalldirs
 src/mutter-enum-types.[ch]
--- 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/364
+++ b/364
@@ -1,370 +1,8 @@
-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)
-
-3.2.1
-=====
-* Allow keyboard window switching (alt-Tab) during drag-and-drop
-  [Matthias, #660457]
-* Don't add invisible resize borders to fullscreen windows
-  [Jasper, Owen; #659854]
-* Fix crash when toplevel windows were set to unexpected window types
-  [Owen; #599988]
-* Correct problems with windows moving when restarting or switching
-  window managers [Jasper; #660848]
-* Fix interaction of tiled windows with multiple monitors
-  [Rui; #642580, #657519]
-* Make meta_display_unmanage_screen() public [Jasper; #660848]
-* Fix problem with turning off window decorations on the fly [Rui; #660773]
-* Fix spurious assertion failures with themes such as Nodoka [Sandro; #661286]
-* Misc bug fixes [Adel, Jasper, Rui; #660464, #660854, #662053]
-
-Contributors:
- Matthias Clasen, Sandro Mani, Rui Matos, Jasper St. Pierre, Owen Taylor
-
-Translations:
- Tommi Vainikainen [fi], Miroslav Nikolić [sr, sr@latin], Muhammet Kara [tr]
-
-3.2.0
-=====
-* Fix _NET_WM_FRAME_EXTENTS not to include invisible borders [Jasper; #659848]
-* Fix application-specified window placement (-geometry) for
-  invisible borders [Jasper; #659848]
-
-Contributors:
- Jasper St. Pierre
-
-Translations:
- Nilamdyuti Goswami [as], Carles Ferrando [ca@valencia], Petr Kovar [cz],
- Mario Blättermann [de], Inaki Larranaga [eu], Gabor Kelemen [hu],
- Takayoshi Okano [ja], Changwoo Ryu [ko], Djavan Fagundes [pt_BR]
-
-3.1.92
-======
-* Fix bug with unredirecting full-screen windows on multi-monitor -
-  notably affected gnome-screensaver [Adel; #657869]
-* Disable top resizing of attached dialogs [Jasper; #657795]
-* Code cleanup [Jasper, Rui]
-* Misc bug fixes [Adel, Florian, Jasper, Rui;
-  #658069, #659266, #659523, #659477]
-
-Contributors:
- Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre
-
-Translations:
- Joan Duran [ca], Joe Hansen [dk], Jiro Matsuzawa [ja], Daniel Korostil [uk]
-
-3.1.91.1
-========
-* Fix problem where certain application updates would get lost [#657071, Owen]
-* Fix a problem where after resuming from the screensaver, things got
-  slow [#658228, Jasper, Adel]
-* When a monitor is plugged or unplugged, keep existing windows on their
-  current monitor [#645408, Alex]
-* Remove 'Mutter' title from alerts such as
-  "The widow '%s' is not responding" [Matthias]
-* Remove pointless warning:
-   Received a _NET_WM_MOVERESIZE message for %s; these
-   messages lack timestamps and therefore suck.
-  [Rui]
-* Misc bug fixes [Jasper]
-* Build fixes [Javier]
-
-Contributors:
- Matthias Clasen, Adel Gadllah, Javier Jardón, Alex Larsson, Rui Matos,
- Jasper St. Pierre, Owen Taylor
-
-Translations:
- Ihar Hrachyshka [be], Bruce Cowan [en_FB], Daniel Mustieles [es],
- Claude Paroz [fr], Andika Triwidada [id], Luca Ferretti [it],
- Rudolfs Mazurs [lt], Piotr Drąg [pl], Duarte Loreto [pt],
- Matej Urbančič [sl], Tirumurti Vasudevan [ta], Chao-Hsiung Liao [zh_KH, TW]
-
-3.1.90.1
-========
-* Fix crash when no windows are open [Adel; #657692]
-* Fix annotations for new strictness in gobject-introspection [Jasper, Owen]
-* Fix some errors with rounded frame drawing [Jasper; #657661]
-
-Contributors:
- Adel Gadllah, Jasper St. Pierre, Owen Taylor
-
-3.1.90
-======
-* Extend the draggable portion of window borders outside the visible frame
-  for easy resizing with thin borders. (New draggable_border_width GConf key
-  controls the total width of visible and invisible borders.)
-  [Jasper; #644930]
-* Draw rounded window corners with antialising [Jasper; #628195]
-* Unredirect override-redirect fullscreen windows, such as full-screen
-  3D games to avoid any performance impact [Adel; #597014]
-* Add :resizable and :above properties to MetaWindow. [Tim; #653858]
-* Add MUTTER_DISABLE_FALLBACK_COLOR environment variable to allow visualizing
-  places where a color is missing for gtk:custom() colors [Florian; #656112]
-* Don't attach modal dialogs to special windows like the desktop;
-  add meta_window_is_attached_dialog() [Dan, #646761]
-* Make MetaBackgroundActor public, allow creating multiple instances
-  (sharing a common texture), and add a :dim-factor property
-  [Rui, Owen; #656433]
-* Fix attached dialogs to not be resizable from the top and to be
-  position correctly [Jasper; #656619]
-* Misc bug fixes [Jasper, Rui; #656335, #657583]
-
-Contributors:
- Tim Cuthbertson, Adel Gadllah, Rui Matos, Florian Müllner, Jasper St. Pierre,
- Owen Taylor, Dan Winship
-
-Translations:
- Alexander Shopov [bg], Jorge González [es], Fran Dieguez [gl],
- Yaron Shahrabani [he], Takeshi Aihana [ja], Aurimas Černius [lt],
- Kjartan Maraas [nb], A S Alam [pa], Yuri Kozlov [ru], Daniel Nylander [se],
- Theppitak Karoonboonyanan [th], Abduxukur Abdurixit [ug], Aron Xu [zh_CN]
-
-3.1.4
-=====
-* Use better, much more subtle shadow definitions [Jakub; #649374]
-* Add the ability to use named GTK+ colors in theme files as
-  gtk:custom(name,fallback) [Florian; #648709]
-* Port from GdkColor to GdkRGBA and from GtkStyle to GtkStyleContext
-  [Florian; #650586]
-* Try to fix window bindings using the Super key [Owen; #624869]
-* Update to using more modern Cogl and Clutter APIs
-  [Adel, Emmanuele, Neil; #654551 #654729 #654730 #655064]
-* Fix for srcdir != builddir builds [Thierry; #624910]
-* Make handling of focus appearance for attached dialogs more robust
-  [Dan; #647712]
-* Misc bug fixes
-  [Dan, Florian, Jasper, Owen, Rui; #642957 #649374 #650661 #654489 #654539]
-
-Contributors:
- Emmanuele Bassi, Adel Gadllah, Rui Matos, Florian Müllner, Neil Roberts,
- Jasper St. Pierre, Jakub Steiner, Owen Taylor
-
-Translations:
- Ihar Hrachyshka [be], Jorge González, Daniel Mustieles [es],
- Fran Dieguez [gl], Yaron Shahrabani [he], Takeshi Aihana [ja],
- Kjartan Maraas [nb], Rudolfs Mazurs [lv], Matej Urbančič [sl],
- Abduxukur Abdurixit [ug], Nguyễn Thái Ngọc Duy [vi]
-
-3.1.3.1
-=======
-* Back API version down to "3.0" - the change to Meta-3.1.gir
-  was unintentional [Owen]
-
-Translations:
- Yaron Shahrabani [he], Kjartan Maraas [nb], Muhammet Kara [tr]
-
-3.1.3
-=====
-* Support dark window theme variants for windows with a dark
-  widget theme; this is selected by the _GTK_THEME_VARIANT
-  property [Florian, #645355]
-* Don't draw a shadow under windows with an alpha-channel - this
-  fixes transparency for GNOME Terminal [Owen, Jasper; #635268]
-* Add a MetaWindow:wm-class property for notification [Jasper; #649315]
-* Add a MetaWindow:minimized property for notification [Florian]
-* Fix handing of unusual window shapes that Wine was setting
-  causing some applications to draw wrong [Jasper; #627880]
-* Improve replacing another compositor and being replaced:
-  release compositor selection in the right order and wait for
-  compositors that get it wrong. [Colin, Owen; #653121]
-* Remove behavior where left clicking on a window border with
-  the titlebar offscreen gave the window menu [Florian; #652369]
-* Don't set the global default textdomain, since Mutter is
-  a library as well as an application [Dan; #649202]
-* Exit with the right (success or failure) exit status [Dan]
-* Code cleanup [Florian]
-* Miscellaneous bug fixes [Owen; #649114, #652507]
-
-Contributors:
- Florian Müllner, Jasper St. Pierre, Owen Taylor, Colin Walters, Dan Winship
-
-Translations:
- Ihar Hrachyshka [be], Daniel Mustieles [es], Yaron Shahrabani [he],
- Carles Ferrando [ca@valencia], Takeshi Aihana [ja], Fran Diéguez [gl],
- Matej Urbančič [sl], Miroslav Nikolic [sr], Muhammet Kara [tr],
- Daniel Korostil [uk]
-
 3.0.2.1
 =======
 * When saving the session, use the "program name" rather than
  harcoding mutter, fixing session saving for gnome-shell [Matthias]
-  https://bugzilla.gnome.org/show_bug.cgi?id=648828
+  https://bugzilla.gnome.org/show_bug.cgi?id=648828 

 Contributors:
 Matthias Clasen
--- 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], [2])
+m4_define([mutter_minor_version], [0])
+m4_define([mutter_micro_version], [2.1])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -15,9 +15,9 @@ AC_INIT([mutter], [mutter_version],
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)

-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE

 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_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],
@@ -122,8 +120,8 @@ AM_GLIB_GNU_GETTEXT
 # 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"
@@ -173,18 +171,51 @@ 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.2.0
+CLUTTER_PACKAGE=clutter-1.0
+AC_SUBST(CLUTTER_PACKAGE)
+if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
+  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
+  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
+
+  dnl Check for the clutter-glx-texture-pixmap header
+  mutter_save_cppflags="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
+  AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
+                  [have_glx_texture_pixmap=yes],
+                  [have_glx_texture_pixmap=no])
+  CPPFLAGS="$mutter_save_cppflags"
+
+  if test x$have_glx_texture_pixmap = xyes; then
+    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
+              [Is ClutterGLXTexturePixmap available?])
+  fi
+else
+  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
+fi
+
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])

 if test x$found_introspection != xno; then
  AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
-  # Since we don't make any guarantees about stability and we don't support
-  # parallel install, there's no real reason to change directories, filenames,
-  # etc. as we change the Mutter tarball version. Note that this must match
-  # api_version in src/Makefile.am
-  META_GIR=Meta_3_0_gir
-  # META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
+  META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
  AC_SUBST(META_GIR)
 fi

@@ -204,39 +235,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,
@@ -352,6 +408,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])
@@ -429,7 +497,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
@@ -451,6 +519,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"
@@ -467,6 +542,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}
@@ -481,8 +559,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/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -22,18 +22,6 @@ This document has separate sections for each format version. You may
 want to read the document in reverse order, since the base features
 are discussed under version 1.

-New Features in Theme Format Version 3.4
-========================================
-
-An additional color type is added to pick up custom colors defined
-in the GTK+ theme's CSS:
-
-  gtk:custom(name,fallback)
-
-where <name> refers to a custom color defined with @define-color in
-the GTK+ theme, and <fallback> provides an alternative color definition
-in case the color referenced by <name> is not found.
-
 New Features in Theme Format Version 3.3
 ========================================

--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # 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 +18,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/id.po
+++ b/po/id.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/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/ug.po
+++ b/po/ug.po
@@ -10,24 +10,14 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-27 17:13+0000\n"
-"PO-Revision-Date: 2011-08-08 16:52+0600\n"
+"POT-Creation-Date: 2011-04-29 11:25+0000\n"
+"PO-Revision-Date: 2011-04-25 15:53+0600\n"
 "Last-Translator: Sahran <sahran.ug@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. This probably means that a non-WM compositor like xcompmgr is running;
-#. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:487
-#, c-format
-msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
-msgstr ""
-"كۆرسەتكۈچ \"%2$s\" نىڭدىكى ئېكران %1$d دا بۆلەك باشقۇرغۇچ ئىجرا قىلىنىۋاتىدۇ."
-
 #: ../src/core/all-keybindings.h:88
 msgid "Switch to workspace 1"
 msgstr "1-خىزمەت رايونىغا ئالماش"
@@ -127,7 +117,7 @@ msgstr "پروگراممىنىڭ كۆزنەكلىرى ئارىسىدا دەرھ
 #: ../src/core/all-keybindings.h:174
 msgid "Move backward between windows of an application immediately"
 msgstr ""
-"قوللىنىشچان پروگراممىنىڭ كۆزنىكى ئارىسىدا ئەكسىچە دەرھال تەتۈر يۆتكىلىدۇ"
+"قوللىنىشچان پروگراممىنىڭ كۆزنىكى ئارىسىدا ئەكسىچە دەرھال تەتۈر يۆتكىلىدۇ "

 #: ../src/core/all-keybindings.h:177
 msgid "Move between windows immediately"
@@ -163,7 +153,7 @@ msgstr "مەزكۇر ئەڭگىمەنى خاتىرىلەشنى توختىتىد

 #: ../src/core/all-keybindings.h:252
 msgid "Take a screenshot"
-msgstr "ئېكران كەسمىسى تۇت"
+msgstr "ئېكران كۆرۈنۈشىنى رەسىمگە ئال"

 #: ../src/core/all-keybindings.h:254
 msgid "Take a screenshot of a window"
@@ -353,26 +343,23 @@ msgstr "قوڭغۇراق ھادىسىسى"
 msgid "Unknown window information request: %d"
 msgstr "نامەلۇم كۆزنەك ئۇچۇرى ئىلتىماسى：%d"

-#: ../src/core/delete.c:111
+#. Translators: %s is a window title
+#: ../src/core/delete.c:94
 #, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> جاۋاب قايتۇرمايۋاتىدۇ."

-#: ../src/core/delete.c:114
-msgid "Application is not responding."
-msgstr "پىروگراممىدا ئىنكاس يوق."
-
-#: ../src/core/delete.c:119
+#: ../src/core/delete.c:99
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "سەل كۈتۈشنى ياكى پروگراممىنى مەجبۇرى چېكىندۈرۈشنى تاللىسىڭىز بولىدۇ."

-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:108
 msgid "_Wait"
 msgstr "كۈت(_W)"

-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:108
 msgid "_Force Quit"
 msgstr "مەجبۇرى چېكىن(_F)"

@@ -398,7 +385,7 @@ msgstr ""
 #. Displayed when a keybinding which is
 #. * supposed to launch a program fails.
 #.
-#: ../src/core/keybindings.c:2523
+#: ../src/core/keybindings.c:2468
 #, c-format
 msgid ""
 "There was an error running <tt>%s</tt>:\n"
@@ -409,12 +396,12 @@ msgstr ""
 "\n"
 "%s"

-#: ../src/core/keybindings.c:2613
+#: ../src/core/keybindings.c:2558
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "بۇيرۇق %d بېكىتىلمىگەن.\n"

-#: ../src/core/keybindings.c:3625
+#: ../src/core/keybindings.c:3570
 #, c-format
 msgid "No terminal command has been defined.\n"
 msgstr "تېرمىنال بۇيرۇققا ئېنىقلىما بېرىلمىگەن .\n"
@@ -443,12 +430,12 @@ msgstr "ساقلانغان ھۆججەتتىن ئەڭگىمەنى دەسلەپل
 msgid "Make X calls synchronous"
 msgstr "X نى قەدەمداش قىلىپ ئىشلەت"

-#: ../src/core/main.c:504
+#: ../src/core/main.c:506
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "تېما مۇندەرىجىسىنى ئىزدەش مەغلۇپ بولدى：%s\n"

-#: ../src/core/main.c:520
+#: ../src/core/main.c:522
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -489,41 +476,41 @@ msgstr "پەش بىلەن ئايرىلغان تىزىم ۋە بىرىكمە رە
 #. * (Empty comment follows so the translators don't see this.)
 #.
 #.
-#: ../src/core/prefs.c:550 ../src/core/prefs.c:711
+#: ../src/core/prefs.c:543 ../src/core/prefs.c:704
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 "GConf  نىڭ ئاچقۇچ سۆزى“%s”  ئۈنۈمسىز  \n"
 " قىلىپ تەڭشەلگەن\n"

-#: ../src/core/prefs.c:637 ../src/core/prefs.c:880
+#: ../src/core/prefs.c:630 ../src/core/prefs.c:873
 #, c-format
 msgid "%d stored in GConf key %s is out of range %d to %d\n"
 msgstr ""
 "GConf نىڭ %2$s  ئاچقۇچىنىڭ قىممىتى %1$d نىڭ دائىرىسى %3$d〜%4$d نىڭ ئىچىدە "
 "ئەمەس\n"

-#: ../src/core/prefs.c:681 ../src/core/prefs.c:758 ../src/core/prefs.c:806
-#: ../src/core/prefs.c:870 ../src/core/prefs.c:1331 ../src/core/prefs.c:1347
-#: ../src/core/prefs.c:1364 ../src/core/prefs.c:1380
+#: ../src/core/prefs.c:674 ../src/core/prefs.c:751 ../src/core/prefs.c:799
+#: ../src/core/prefs.c:863 ../src/core/prefs.c:1324 ../src/core/prefs.c:1340
+#: ../src/core/prefs.c:1357 ../src/core/prefs.c:1373
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 "GConf  نىڭ ئاچقۇچلۇق سۆزى “%s” ئۈنۈمسىز تىپتىكى \n"
 " قىلىپ تەڭشەلگەن\n"

-#: ../src/core/prefs.c:1210
+#: ../src/core/prefs.c:1203
 #, c-format
 msgid "GConf key %s is already in use and can't be used to override %s\n"
 msgstr ""
 "GConf ئاچقۇچى %s ئىشلىتىلىۋاتىدۇ، شۇڭا %s نى قاپلاشقا ئىشلەتكىلى بولمايدۇ\n"

-#: ../src/core/prefs.c:1269
+#: ../src/core/prefs.c:1262
 #, c-format
 msgid "Can't override GConf key, %s not found\n"
 msgstr "GConf ئاچقۇچىنى قاپلىغىلى بولمىدى، %s تېپىلمىدى\n"

-#: ../src/core/prefs.c:1454
+#: ../src/core/prefs.c:1447
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -531,14 +518,14 @@ msgstr ""
 "بۇزۇلغان پروگراممىلارنى تۈزىتىش-ياخشىلاش قوزغىتىلمىغان. بەزى پروگراممىلار "
 "نورمال ئىشلىمەسلىكى مۇمكىن.\n"

-#: ../src/core/prefs.c:1531
+#: ../src/core/prefs.c:1524
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "خەت نۇسخىسىنىڭ چۈشەندۈرۈلۈشىنى ئانالىز قىلغىلى بولمىدى “%s” ( GConf دىكى "
 "ئاچقۇچلۇق سۆز  %s )\n"

-#: ../src/core/prefs.c:1593
+#: ../src/core/prefs.c:1586
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -548,17 +535,17 @@ msgstr ""
 "ئۈنۈملۈك قىممەت \n"
 " ئەمەس\n"

-#: ../src/core/prefs.c:2028
+#: ../src/core/prefs.c:2016
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "خىزمەت رايونى سانىنى %d قىلىپ تەڭشەشتە كۆرۈلگەن خاتالىق ：%s\n"

-#: ../src/core/prefs.c:2212 ../src/core/prefs.c:2714
+#: ../src/core/prefs.c:2200 ../src/core/prefs.c:2702
 #, c-format
 msgid "Workspace %d"
 msgstr "خىزمەت بوشلۇقى %d"

-#: ../src/core/prefs.c:2244 ../src/core/prefs.c:2422
+#: ../src/core/prefs.c:2232 ../src/core/prefs.c:2410
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -567,28 +554,28 @@ msgstr ""
 "سەپلىمە ساندانىدىن تېپىلغان \"%s\"، \"%s\" كۇنۇپكا باغلانمىسىنىڭ ئىناۋەتلىك "
 "قىممىتى ئەمەس\n"

-#: ../src/core/prefs.c:2795
+#: ../src/core/prefs.c:2783
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "خىزمەت مۇھىتى %d  غا \"%s\"  دەپ ئائىت قويۇشتا خاتالىق كۆرۈلدى: %s\n"

-#: ../src/core/prefs.c:3009
+#: ../src/core/prefs.c:2997
 #, c-format
 msgid "Error setting live hidden windows status status: %s\n"
 msgstr ""
 "شۇئان يوشۇرۇنىدىغان كۆزنەك ھالىتىنى تەڭشەۋاتقاندا خاتالىق كۆرۈلدى: %s\n"

-#: ../src/core/prefs.c:3044
+#: ../src/core/prefs.c:3032
 #, c-format
 msgid "Error setting no tab popup status: %s\n"
 msgstr "بەتكۈچ يوق قاڭقىش ھالىتىنى تەڭشەۋەتقاندا خاتالىق كۆرۈلدى: %s\n"

-#: ../src/core/screen.c:663
+#: ../src/core/screen.c:624
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "“%2$s” دىكى %1$d ئېكراننى كۆرسىتىش ئۈنۈمسىز\n"

-#: ../src/core/screen.c:679
+#: ../src/core/screen.c:640
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -597,7 +584,7 @@ msgstr ""
 "كۆرسەتكۈچ «%2$s» دىكى ئېكران %1$d نىڭ كۆزنەك باشقۇرغۇچىسى بار؛ ھازىرقى كۆزنەك "
 "باشقۇرغۇچنى ئالماشتۇرۇش ئۈچۈن --replace تاللانمىسىنى ئىشلىتىپ كۆرۈپ بېقىڭ.\n"

-#: ../src/core/screen.c:706
+#: ../src/core/screen.c:667
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -605,14 +592,14 @@ msgstr ""
 "كۆرسەتكۈچ \"%2$s\" نىڭدىكى ئېكران %1$d دا كۆزنەك باشقۇرغۇنىڭ تاللانمىسىنى "
 "ئالغىلى بولمىدى\n"

-#: ../src/core/screen.c:761
+#: ../src/core/screen.c:722
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "“%2$s” دىكى %1$d ئېكراندا بىر كۆزنەك باشقۇرغۇچ  \n"
 " بار\n"

-#: ../src/core/screen.c:946
+#: ../src/core/screen.c:907
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -712,13 +699,13 @@ msgid "Window manager error: "
 msgstr "كۆزنەك باشقۇرغۇچ خاتالىقى： "

 #. Translators: This is the title used on dialog boxes
-#: ../src/core/util.c:632 ../src/mutter.desktop.in.h:1
+#: ../src/core/util.c:615 ../src/mutter.desktop.in.h:1
 #: ../src/mutter-wm.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"

 #. first time through
-#: ../src/core/window.c:7019
+#: ../src/core/window.c:6860
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -734,7 +721,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7682
+#: ../src/core/window.c:7523
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -756,17 +743,12 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (ھەققىدە  %s)"

-#: ../src/core/window-props.c:1481
+#: ../src/core/window-props.c:1482
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "%2$s  گە بەلگىلەنگەن ئۈنۈمسىز WM_TRANSIENT_FOR كۆزنەك 0x%1$lx بولىدۇ.\n"

-#: ../src/core/window-props.c:1492
-#, c-format
-msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
-msgstr "%2$s نىڭ WM_TRANSIENT_FOR كۆزنەك0x%1$lx دەۋرىيلىك قۇرۇشى مۇمكىن.\n"
-
 #: ../src/core/xprops.c:155
 #, c-format
 msgid ""
@@ -817,24 +799,14 @@ msgstr ""
 "ئېكرانغىلا قارىتىلغانلىقىنى جەزملەيدۇ."

 #: ../src/mutter.schemas.in.h:4
-msgid "Draggable border width"
-msgstr ""
-
-#: ../src/mutter.schemas.in.h:5
 msgid "Live Hidden Windows"
 msgstr "شۇئان يوشۇرۇنىدىغان كۆزنەكلەر"

-#: ../src/mutter.schemas.in.h:6
+#: ../src/mutter.schemas.in.h:5
 msgid "Modifier to use for extended window management operations"
 msgstr "كېڭەيتىلگەن كۆزنەك باشقۇرۇش مەشغۇلاتىغا ئىشلىتىلىدىغان ئۆزگەرتىش"

-#: ../src/mutter.schemas.in.h:7
-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 ""
-
-#: ../src/mutter.schemas.in.h:8
+#: ../src/mutter.schemas.in.h:6
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -846,7 +818,7 @@ msgstr ""
 "ئەھۋالدا يەككە كومپيۇتېردىكى \"Windows key\" كۇنۇپكىسىنى ئىشلىتىشنى تەلەپ "
 "قىلىدۇ. بەلكىم كۆڭۈلدىكى ياكى بوش تىزىقنى ئىشلىتىدۇ."

-#: ../src/mutter.schemas.in.h:9
+#: ../src/mutter.schemas.in.h:7
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -855,7 +827,7 @@ msgstr ""
 "true بولغاندا مودېل سۆزلەشكۈ ئاتا كۆزنەكنىڭ ماۋزۇ بالداققا يېپىشىپ كۆرۈنىدۇ "
 "ھەمدە ئاتا كۆزنەككە ئەگىشىپ يۆتكىلىدۇ، ئايرىم ماۋزۇ بالدىقى بولمايدۇ."

-#: ../src/mutter.schemas.in.h:10
+#: ../src/mutter.schemas.in.h:8
 msgid "Workspaces only on primary"
 msgstr "ئاساسىي كۆزەتكۈچتىكى خىزمەت رايونىغىلا"

@@ -864,47 +836,47 @@ msgstr "ئاساسىي كۆزەتكۈچتىكى خىزمەت رايونىغىل
 msgid "Usage: %s\n"
 msgstr "ئىشلىتىش ئۇسۇلى：%s\n"

-#: ../src/ui/frames.c:1157
+#: ../src/ui/frames.c:1177
 msgid "Close Window"
 msgstr "كۆزنەك ياپ"

-#: ../src/ui/frames.c:1160
+#: ../src/ui/frames.c:1180
 msgid "Window Menu"
 msgstr "كۆزنەك تىزىملىكى"

-#: ../src/ui/frames.c:1163
+#: ../src/ui/frames.c:1183
 msgid "Minimize Window"
 msgstr "كۆزنەكنى كىچىكلەت"

-#: ../src/ui/frames.c:1166
+#: ../src/ui/frames.c:1186
 msgid "Maximize Window"
 msgstr "كۆزنەكنى چوڭايت"

-#: ../src/ui/frames.c:1169
+#: ../src/ui/frames.c:1189
 msgid "Restore Window"
 msgstr "كۆزنەكنى ئەسلىگە كەلتۈر"

-#: ../src/ui/frames.c:1172
+#: ../src/ui/frames.c:1192
 msgid "Roll Up Window"
 msgstr "كۆزنەكنى تۈر"

-#: ../src/ui/frames.c:1175
+#: ../src/ui/frames.c:1195
 msgid "Unroll Window"
 msgstr "كۆزنەكنى تۈرمە"

-#: ../src/ui/frames.c:1178
+#: ../src/ui/frames.c:1198
 msgid "Keep Window On Top"
 msgstr "كۆزنەكنى چوققىلاشنى ساقلا"

-#: ../src/ui/frames.c:1181
+#: ../src/ui/frames.c:1201
 msgid "Remove Window From Top"
 msgstr "كۆزنەكنى چوققىلاشنى بىكار قىلىش"

-#: ../src/ui/frames.c:1184
+#: ../src/ui/frames.c:1204
 msgid "Always On Visible Workspace"
 msgstr "خىزمەت رايونىدا ئىزچىل كۆرۈنسۇن"

-#: ../src/ui/frames.c:1187
+#: ../src/ui/frames.c:1207
 msgid "Put Window On Only One Workspace"
 msgstr "بىر خىزمەت رايونىغا ئورۇنلاشتۇرۇش"

@@ -1107,77 +1079,50 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:253
+#: ../src/ui/theme.c:255
 msgid "top"
 msgstr "چوققا"

-#: ../src/ui/theme.c:255
+#: ../src/ui/theme.c:257
 msgid "bottom"
 msgstr "ئاستى"

-#: ../src/ui/theme.c:257
+#: ../src/ui/theme.c:259
 msgid "left"
 msgstr "سول"

-#: ../src/ui/theme.c:259
+#: ../src/ui/theme.c:261
 msgid "right"
 msgstr "ئوڭ"

-#: ../src/ui/theme.c:286
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "كاندۇك گىيومېتىرىك جايلاشتۇرۇش \"%s\" نىڭ چوڭلۇقىنى بەلگىلىمىگەن"

-#: ../src/ui/theme.c:305
+#: ../src/ui/theme.c:307
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "كاندۇك گىيومېتىرىك جايلاشتۇرۇش \"%s\" نىڭ چوڭلۇقىنى بەلگىلىمىگەن(\"%s\" "
 "گىرۋىكىگە بەلگىلەنگەن)"

-#: ../src/ui/theme.c:342
+#: ../src/ui/theme.c:344
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "كۇنۇپكا ئۇزۇنلۇق كەڭلىك نىسبىتى  %g غا ماس كەلمەيدۇ"

-#: ../src/ui/theme.c:354
+#: ../src/ui/theme.c:356
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "كاندۇك گىيومېتىرىك جايلاشتۇرۇشتا تۈگمە چوڭلۇقى بەلگىلەنمىگەن"

-#: ../src/ui/theme.c:1060
+#: ../src/ui/theme.c:1064
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "تەدرىجىي ئۆزگىرىشتە ئاز دېگەندە ئىككى خىل رەڭ بولۇش كېرەك"

-#: ../src/ui/theme.c:1212
-#, 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 رەڭ ئۆلچىمىدە ھالەتتىن كېيىن چوقۇم رەڭ ئاتى ۋە زاپاس بولۇشى لازىم، "
-"مەسىلەن، gtk:custom(foo,bar) ھالەت؛ \"%s\" نى تەھلىل قىلالمايدۇ"
-
-#: ../src/ui/theme.c:1228
-#, 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 پارامېتىرىدىكى ئىناۋەتسىز ھەرپ '%c'، پەقەت A-Za-z0-"
-"9-_  نىلا ئىشلەتكىلى بولىدۇ"
-
-#: ../src/ui/theme.c:1242
-#, c-format
-msgid ""
-"Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
-"fit the format"
-msgstr ""
-"Gtk:custom نىڭ پىچىمى \"gtk:custom(color_name,fallback)\" بولۇپ، \"%s\" "
-"پىچىمغا توغرا كەلمەيدۇ"
-
-#: ../src/ui/theme.c:1287
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1186,7 +1131,7 @@ msgstr ""
 "GTK رەڭ ئۆلچىمىدە ھالەت چوقۇم ئوتتۇرا تىرناققا ئېلىنىشى لازىم، مەسىلەن، gtk:"
 "fg[NORMAL] بۇنىڭدىكى NORMAL ھالەت؛ \"%s\" نى تەھلىل قىلالمايدۇ"

-#: ../src/ui/theme.c:1301
+#: ../src/ui/theme.c:1216
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1195,17 +1140,17 @@ msgstr ""
 "GTK رەڭ ئۆلچىمىدە ھالەتتىن كېيىن چوقۇم ئوتتۇرا تىرناق يېپىلىشى لازىم، "
 "مەسىلەن، gtk:fg[NORMAL] بۇنىڭدىكى NORMAL ھالەت؛ \"%s\" نى تەھلىل قىلالمايدۇ"

-#: ../src/ui/theme.c:1312
+#: ../src/ui/theme.c:1227
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» ھالەتنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1325
+#: ../src/ui/theme.c:1240
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» رەڭ بۆلىكىنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1355
+#: ../src/ui/theme.c:1270
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1214,44 +1159,44 @@ msgstr ""
 "بىرىكمە رەڭنىڭ فورماتى \"blend/bg_color/fg_color/alpha\"،  \"%s\" بۇ "
 "فورماتقا ماس كەلمىدى"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1281
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "بىرىكمە رەڭدىكى ئالفا قىممىتى \"%s\" نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1376
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "بىرىكمە رەڭنىڭ ئالفا قىممىتى \"%s\" نىڭ دائىرىسى  0.0 ~1.0 ئىچىدە ئەمەس"

-#: ../src/ui/theme.c:1423
+#: ../src/ui/theme.c:1338
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "سايە پىچىمى \"shade/base_color/factor\"، \"%s\" پىچىمغا توغرا كەلمەيدۇ"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1349
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "سايە رەڭگىدىكى سايە فاكتور «%s»نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1444
+#: ../src/ui/theme.c:1359
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "سايە رەڭگىدىكى سايە فاكتور “%s” مەنپىي سان"

-#: ../src/ui/theme.c:1473
+#: ../src/ui/theme.c:1388
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "رەڭنى تەھلىل قىلغىلى بولمىدى“%s”"

-#: ../src/ui/theme.c:1784
+#: ../src/ui/theme.c:1646
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە رۇخسەت قىلىنمىغان تېكىست '%s' بار"

-#: ../src/ui/theme.c:1811
+#: ../src/ui/theme.c:1673
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1260,54 +1205,54 @@ msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان كەسىر سان '%s' "
 "بار"

-#: ../src/ui/theme.c:1825
+#: ../src/ui/theme.c:1687
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان پۈتۈن سان '%s' "
 "بار"

-#: ../src/ui/theme.c:1947
+#: ../src/ui/theme.c:1809
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "كوئوردېنات ئىپادىسىنىڭ بېشىدا نامەلۇم ئەمەل بار: «%s»"

-#: ../src/ui/theme.c:2004
+#: ../src/ui/theme.c:1866
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "كوئوردېناتنىڭ ئىپادىلەش شەكلى قۇرۇق ياكى چۈشىنىكسىز"

-#: ../src/ui/theme.c:2115 ../src/ui/theme.c:2125 ../src/ui/theme.c:2159
+#: ../src/ui/theme.c:1977 ../src/ui/theme.c:1987 ../src/ui/theme.c:2021
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "كوئوردېناتنىڭ ئىپادىلەش شەكلى 0 نى بۆلگۈچ قىلغان"

-#: ../src/ui/theme.c:2167
+#: ../src/ui/theme.c:2029
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "كوئوردېنات ئىپادىسى كەسىر سانغا mod ئەمىلىنى ئىشلەتمەكچى"

-#: ../src/ui/theme.c:2223
+#: ../src/ui/theme.c:2085
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە سان كېلىدىغان يەردە ئەمەل \"%s\" بار ئىكەن"

-#: ../src/ui/theme.c:2232
+#: ../src/ui/theme.c:2094
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل كېلىدىغان يەردە سان بار ئىكەن"

-#: ../src/ui/theme.c:2240
+#: ../src/ui/theme.c:2102
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "كوئوردېنات ئىپادىسى سان بىلەن ئاياغلاشماي ئەمەل بىلەن ئاياغلاشقان"

-#: ../src/ui/theme.c:2250
+#: ../src/ui/theme.c:2112
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1316,43 +1261,43 @@ msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل \"%2$c\" نىڭ ئارقىسىدىن ئەمەل \"%1$c"
 "\" كېلىپتۇ، ئارىلىقتا سان يوق ئىكەن"

-#: ../src/ui/theme.c:2401 ../src/ui/theme.c:2446
+#: ../src/ui/theme.c:2263 ../src/ui/theme.c:2308
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە نامەلۇم ئۆزگەرگۈچى ياكى تۇراقلىق سان \"%s\" "
 "بار ئىكەن"

-#: ../src/ui/theme.c:2500
+#: ../src/ui/theme.c:2362
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "كوئوردېنات ئىپادىسىنى تەھلىل قىلىۋاتقاندا يىغلەك تېشىپ كەتتى."

-#: ../src/ui/theme.c:2529
+#: ../src/ui/theme.c:2391
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى يېپىلغان تىرناققا ماس كېلىدىغان ئېچىلغان "
 "تىرناق يوق"

-#: ../src/ui/theme.c:2593
+#: ../src/ui/theme.c:2455
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى ئېچىلغان تىرناققا ماس كېلىدىغان يېپىلغان "
 "تىرناق يوق"

-#: ../src/ui/theme.c:2604
+#: ../src/ui/theme.c:2466
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل(قوشۇش، ئېلىش...) ياكى سان يوق"

-#: ../src/ui/theme.c:2816 ../src/ui/theme.c:2836 ../src/ui/theme.c:2856
+#: ../src/ui/theme.c:2676 ../src/ui/theme.c:2696 ../src/ui/theme.c:2716
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "تېما تەركىبىدە خاتالىق چىقىرىدىغان ئىپادە بار: %s\n"

-#: ../src/ui/theme.c:4527
+#: ../src/ui/theme.c:4410
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1361,25 +1306,25 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/>بۇ كۆزنەكنىڭ "
 "ئۇسلۇبى ئۈچۈن بەلگىلىنىشى زۆرۈر"

-#: ../src/ui/theme.c:5060 ../src/ui/theme.c:5085
+#: ../src/ui/theme.c:4940 ../src/ui/theme.c:4965
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> يوق"

-#: ../src/ui/theme.c:5133
+#: ../src/ui/theme.c:5013
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "تېما “%s”  نى كىرگۈزگىلى بولمىدى：%s\n"

-#: ../src/ui/theme.c:5269 ../src/ui/theme.c:5276 ../src/ui/theme.c:5283
-#: ../src/ui/theme.c:5290 ../src/ui/theme.c:5297
+#: ../src/ui/theme.c:5149 ../src/ui/theme.c:5156 ../src/ui/theme.c:5163
+#: ../src/ui/theme.c:5170 ../src/ui/theme.c:5177
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ئۇسلۇب \"%1$s\" نىڭ <%2$s> ئى بەلگىلەنمىگەن"

-#: ../src/ui/theme.c:5305
+#: ../src/ui/theme.c:5185
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1388,7 +1333,7 @@ msgstr ""
 "كۆزنەك تىپى \"%s\" (\"%s\" تېمىدا)غا كاندۇك كۆزنەك تەڭشەلمىگەن، بىر <window "
 "type=\"%s\" style_set=\"whatever\"/> ئېلېمېنتى قوشۇڭ"

-#: ../src/ui/theme.c:5744 ../src/ui/theme.c:5806 ../src/ui/theme.c:5869
+#: ../src/ui/theme.c:5635 ../src/ui/theme.c:5697 ../src/ui/theme.c:5760
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1396,7 +1341,7 @@ msgstr ""
 "ئىشلەتكۈچى بەلگىلىگەن تۇراقلىق مىقدار چوقۇم چوڭ ھەرپ بىلەن باشلانسۇن؛ «%s» "
 "بولمايدۇ"

-#: ../src/ui/theme.c:5752 ../src/ui/theme.c:5814 ../src/ui/theme.c:5877
+#: ../src/ui/theme.c:5643 ../src/ui/theme.c:5705 ../src/ui/theme.c:5768
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "تۇراقلىق سان “%s” غا ئېنىقلىما بېرىلگەن"
@@ -1855,88 +1800,88 @@ msgstr "بۇ ئۈلگە سۆزلەشكۈسىدىكى مىسال ئۇچۇرى"
 msgid "Fake menu item %d\n"
 msgstr "مەۋھۇم تىزىملىك تۈرى %d\n"

-#: ../src/ui/theme-viewer.c:371
+#: ../src/ui/theme-viewer.c:370
 msgid "Border-only window"
 msgstr "گىرۋەكلىك كۆزنەك"

-#: ../src/ui/theme-viewer.c:373
+#: ../src/ui/theme-viewer.c:372
 msgid "Bar"
 msgstr "تۈۋرۈكسىمان دىئاگرامما"

-#: ../src/ui/theme-viewer.c:390
+#: ../src/ui/theme-viewer.c:389
 msgid "Normal Application Window"
 msgstr "ئادەتتىكى پروگرامما كۆزنىكى"

-#: ../src/ui/theme-viewer.c:394
+#: ../src/ui/theme-viewer.c:393
 msgid "Dialog Box"
 msgstr "سۆزلەشكۈ كۆزنەكچىسى"

-#: ../src/ui/theme-viewer.c:398
+#: ../src/ui/theme-viewer.c:397
 msgid "Modal Dialog Box"
 msgstr "ھالەت سۆزلەشكۈ رامكىسى"

-#: ../src/ui/theme-viewer.c:402
+#: ../src/ui/theme-viewer.c:401
 msgid "Utility Palette"
 msgstr "قورال كۇنۇپكىسى"

-#: ../src/ui/theme-viewer.c:406
+#: ../src/ui/theme-viewer.c:405
 msgid "Torn-off Menu"
 msgstr "بۆلىۋالغان تىزىملىك"

-#: ../src/ui/theme-viewer.c:410
+#: ../src/ui/theme-viewer.c:409
 msgid "Border"
 msgstr "گىرۋەك"

-#: ../src/ui/theme-viewer.c:414
+#: ../src/ui/theme-viewer.c:413
 msgid "Attached Modal Dialog"
 msgstr "قوشۇلغان Modal سۆزلەشكۈ"

-#: ../src/ui/theme-viewer.c:747
+#: ../src/ui/theme-viewer.c:744
 #, c-format
 msgid "Button layout test %d"
 msgstr "كۇنۇپكا ئورۇنلاشتۇرۇلۇشىنى سىناش %d"

-#: ../src/ui/theme-viewer.c:776
+#: ../src/ui/theme-viewer.c:773
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g مىللىسېكۇنت(بىر كۆزنەك كاندۇكىنى سىزىشقا كەتكەن ۋاقىت)"

-#: ../src/ui/theme-viewer.c:821
+#: ../src/ui/theme-viewer.c:818
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "ئىشلىتىش ئۇسۇلى: metacity-theme-viewer [ئۇسلۇب ئاتى]\n"

-#: ../src/ui/theme-viewer.c:828
+#: ../src/ui/theme-viewer.c:825
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "تېما قاچىلاشتا خاتالىق كۆرۈلدى：%s\n"

-#: ../src/ui/theme-viewer.c:834
+#: ../src/ui/theme-viewer.c:831
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "\"%s\" دېگەن ئۇسلۇبنى %g سېكۇنتتا ئوقۇدى\n"

-#: ../src/ui/theme-viewer.c:878
+#: ../src/ui/theme-viewer.c:875
 msgid "Normal Title Font"
 msgstr "ئادەتتىكى ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:884
+#: ../src/ui/theme-viewer.c:881
 msgid "Small Title Font"
 msgstr "تارماق ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:890
+#: ../src/ui/theme-viewer.c:887
 msgid "Large Title Font"
 msgstr "ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:895
+#: ../src/ui/theme-viewer.c:892
 msgid "Button Layouts"
 msgstr "كۇنۇپكا ئورۇنلاشتۇرۇلۇشى"

-#: ../src/ui/theme-viewer.c:900
+#: ../src/ui/theme-viewer.c:897
 msgid "Benchmark"
 msgstr "ئاساسىي ئۆلچەم"

-#: ../src/ui/theme-viewer.c:952
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "بۇ يەردە كۆزنەك ماۋزۇسى كۆرسىتىلىدۇ"

@@ -1989,9 +1934,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d كوئوردېنات ئىپادىسى %g سېكۇنتتا تەھلىل قىلىندى(%g ئوتتۇرىچە سېكۇنت)\n"

-#~ msgid "Failed to retrieve color %s[%s] from GTK+ theme.\n"
-#~ msgstr "GTK+ ئۆرنەكتىن رەڭ %s[%s] نى ئىزدىيەلمىدى\n"
-
 #~ msgid "Turn compositing on"
 #~ msgstr "ئارىلاشتۇرۇشنى ئىچىش"

--- 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

@@ -43,7 +45,7 @@ libmutter_la_SOURCES =				\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
 	compositor/meta-background-actor.c	\
-	compositor/meta-background-actor-private.h	\
+	compositor/meta-background-actor.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -52,8 +54,7 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
-	compositor/meta-texture-rectangle.c	\
-	compositor/meta-texture-rectangle.h	\
+	compositor/meta-shaped-texture.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
@@ -65,7 +66,6 @@ libmutter_la_SOURCES =				\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
 	meta/compositor.h			\
-	meta/meta-background-actor.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
@@ -130,6 +130,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 +149,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)
@@ -167,9 +170,7 @@ libmutterinclude_base_headers =		\
 	meta/group.h				\
 	meta/keybindings.h			\
 	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				\
@@ -203,11 +204,7 @@ mutter_LDADD = $(MUTTER_LIBS) libmutter.la
 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)

-# Since we don't make any guarantees about stability and we don't support
-# parallel install, there's no real reason to change directories, filenames,
-# etc. as we change the Mutter tarball version.
-#api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
-api_version = 3.0
+api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)

 # These files are in package-private directories, even though they may be used
 # by plugins.  If you're writing a plugin, use g-ir-compiler --add-include-path
@@ -221,8 +218,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 +254,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 +279,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,24 +296,43 @@ 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
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.h.in \
+	    --template $(srcdir)/mutter-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
 	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
 	rm -f xgen-teth && \
@@ -323,7 +341,7 @@ stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.
 mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.c.in \
+	    --template $(srcdir)/mutter-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@@ -29,10 +29,6 @@
 * @green:
 * @blue:
 * @alpha:
- * @flags: Optional flags for the texture, or %COGL_TEXTURE_NONE;
- *   %COGL_TEXTURE_NO_SLICING is useful if the texture will be
- *   repeated to create a constant color fill, since hardware
- *   repeat can't be used for a sliced texture.
 *
 * Creates a texture that is a single pixel with the specified
 * unpremultiplied color components.
@@ -40,11 +36,10 @@
 * Return value: (transfer full): a newly created Cogl texture
 */
 CoglHandle
-meta_create_color_texture_4ub (guint8           red,
-                               guint8           green,
-                               guint8           blue,
-                               guint8           alpha,
-                               CoglTextureFlags flags)
+meta_create_color_texture_4ub (guint8 red,
+                               guint8 green,
+                               guint8 blue,
+                               guint8 alpha)
 {
  CoglColor color;
  guint8 pixel[4];
@@ -58,7 +53,7 @@ meta_create_color_texture_4ub (guint8           red,
  pixel[3] = cogl_color_get_alpha_byte (&color);

  return cogl_texture_new_from_data (1, 1,
-                                     flags,
+                                     COGL_TEXTURE_NONE,
                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE,
                                     COGL_PIXEL_FORMAT_ANY,
                                     4, pixel);
@@ -93,8 +88,7 @@ meta_create_texture_material (CoglHandle src_texture)
    {
      CoglHandle dummy_texture;

-      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
-                                                     COGL_TEXTURE_NONE);
+      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff);

      texture_material_template = cogl_material_new ();
      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
--- a/src/compositor/cogl-utils.h
+++ b/src/compositor/cogl-utils.h
@@ -25,11 +25,10 @@

 #include <cogl/cogl.h>

-CoglHandle meta_create_color_texture_4ub (guint8           red,
-                                          guint8           green,
-                                          guint8           blue,
-                                          guint8           alpha,
-                                          CoglTextureFlags flags);
+CoglHandle meta_create_color_texture_4ub (guint8     red,
+                                          guint8     green,
+                                          guint8     blue,
+                                          guint8     alpha);
 CoglHandle meta_create_texture_material  (CoglHandle src_texture);

 #endif /* __META_COGL_UTILS_H__ */
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -8,7 +8,6 @@
 #include <meta/compositor.h>
 #include <meta/display.h>
 #include "meta-plugin-manager.h"
-#include "meta-window-actor-private.h"
 #include <clutter/clutter.h>

 typedef struct _MetaCompScreen MetaCompScreen;
@@ -42,10 +41,6 @@ struct _MetaCompScreen
  GHashTable            *windows_by_xid;
  Window                 output;

-  /* Used for unredirecting fullscreen windows */
-  guint                   disable_unredirect_count;
-  MetaWindowActor             *unredirected_window;
-
  /* Before we create the output window */
  XserverRegion     pending_input_region;

@@ -55,6 +50,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
@@ -11,11 +11,10 @@
 #include <meta/compositor-mutter.h>
 #include "xprops.h"
 #include <meta/prefs.h>
-#include <meta/main.h>
 #include <meta/meta-shadow-factory.h>
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
-#include "meta-background-actor-private.h"
+#include "meta-background-actor.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
 #include <X11/extensions/shape.h>
@@ -109,6 +108,28 @@ process_damage (MetaCompositor     *compositor,
  meta_window_actor_process_damage (window_actor, event);
 }

+#ifdef HAVE_SHAPE
+static void
+process_shape (MetaCompositor *compositor,
+               XShapeEvent    *event,
+               MetaWindow     *window)
+{
+  MetaWindowActor *window_actor;
+
+  if (window == NULL)
+    return;
+
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (window_actor == NULL)
+    return;
+
+  if (event->kind == ShapeBounding)
+    {
+      meta_window_actor_update_shape (window_actor, event->shaped);
+    }
+}
+#endif
+
 static void
 process_property_notify (MetaCompositor	*compositor,
                         XPropertyEvent *event,
@@ -125,7 +146,8 @@ process_property_notify (MetaCompositor	*compositor,
 	  MetaScreen  *screen = l->data;
          if (event->window == meta_screen_get_xroot (screen))
            {
-              meta_background_actor_update (screen);
+              MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+              meta_background_actor_update (META_BACKGROUND_ACTOR (info->background_actor));
              return;
            }
        }
@@ -279,12 +301,6 @@ do_set_stage_input_region (MetaScreen   *screen,
  Window        xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));

  XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
-
-  /* It's generally a good heuristic that when a crossing event is generated because
-   * we reshape the overlay, we don't want it to affect focus-follows-mouse focus -
-   * it's not the user doing something, it's the environment changing under the user.
-   */
-  meta_display_add_ignored_crossing_serial (display, XNextRequest (xdpy));
  XFixesSetWindowShapeRegion (xdpy, info->output, ShapeInput, 0, 0, region);
 }

@@ -458,43 +474,20 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  gint            width, height;
  XWindowAttributes attr;
  long            event_mask;
-  guint           n_retries;
-  guint           max_retries;

  /* Check if the screen is already managed */
  if (meta_screen_get_compositor_data (screen))
    return;

-  if (meta_get_replace_current_wm ())
-    max_retries = 5;
-  else
-    max_retries = 1;
+  meta_error_trap_push_with_return (display);
+  XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
+  XSync (xdisplay, FALSE);

-  n_retries = 0;
-
-  /* Some compositors (like old versions of Mutter) might not properly unredirect
-   * subwindows before destroying the WM selection window; so we wait a while
-   * for such a compositor to exit before giving up.
-   */
-  while (TRUE)
+  if (meta_error_trap_pop_with_return (display))
    {
-      meta_error_trap_push_with_return (display);
-      XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
-      XSync (xdisplay, FALSE);
-
-      if (!meta_error_trap_pop_with_return (display))
-        break;
-
-      if (n_retries == max_retries)
-        {
-          /* This probably means that a non-WM compositor like xcompmgr is running;
-           * we have no way to get it to exit */
-          meta_fatal (_("Another compositing manager is already running on screen %i on display \"%s\"."),
-                      screen_number, display->name);
-        }
-
-      n_retries++;
-      g_usleep (G_USEC_PER_SEC);
+      g_warning ("Another compositing manager is running on screen %i",
+                 screen_number);
+      return;
    }

  info = g_new0 (MetaCompScreen, 1);
@@ -515,15 +508,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 |
@@ -541,7 +532,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  XSelectInput (xdisplay, xwin, event_mask);

  info->window_group = meta_window_group_new (screen);
-  info->background_actor = meta_background_actor_new_for_screen (screen);
+  info->background_actor = meta_background_actor_new (screen);
  info->overlay_group = clutter_group_new ();
  info->hidden_group = clutter_group_new ();

@@ -596,55 +587,6 @@ void
 meta_compositor_unmanage_screen (MetaCompositor *compositor,
                                 MetaScreen     *screen)
 {
-  MetaDisplay    *display       = meta_screen_get_display (screen);
-  Display        *xdisplay      = meta_display_get_xdisplay (display);
-  Window          xroot         = meta_screen_get_xroot (screen);
-
-  /* This is the most important part of cleanup - we have to do this
-   * before giving up the window manager selection or the next
-   * window manager won't be able to redirect subwindows */
-  XCompositeUnredirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
-}
-
-/*
- * Shapes the cow so that the given window is exposed,
- * when metaWindow is NULL it clears the shape again
- */
-static void
-meta_shape_cow_for_window (MetaScreen *screen,
-                           MetaWindow *metaWindow)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  Display *xdisplay = meta_display_get_xdisplay (meta_screen_get_display (screen));
-
-  if (metaWindow == NULL)
-      XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None);
-  else
-    {
-      XserverRegion output_region;
-      XRectangle screen_rect, window_bounds;
-      int width, height;
-      MetaRectangle rect;
-
-      meta_window_get_outer_rect (metaWindow, &rect);
-
-      window_bounds.x = rect.x;
-      window_bounds.y = rect.y;
-      window_bounds.width = rect.width;
-      window_bounds.height = rect.height;
-
-      meta_screen_get_size (screen, &width, &height);
-      screen_rect.x = 0;
-      screen_rect.y = 0;
-      screen_rect.width = width;
-      screen_rect.height = height;
-
-      output_region = XFixesCreateRegion (xdisplay, &window_bounds, 1);
-
-      XFixesInvertRegion (xdisplay, output_region, &screen_rect, output_region);
-      XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, output_region);
-      XFixesDestroyRegion (xdisplay, output_region);
-    }
 }

 void
@@ -667,25 +609,12 @@ meta_compositor_remove_window (MetaCompositor *compositor,
                               MetaWindow     *window)
 {
  MetaWindowActor         *window_actor     = NULL;
-  MetaScreen *screen;
-  MetaCompScreen *info;

  DEBUG_TRACE ("meta_compositor_remove_window\n");
  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
  if (!window_actor)
    return;

-  screen = meta_window_get_screen (window);
-  info = meta_screen_get_compositor_data (screen);
-
-  if (window_actor == info->unredirected_window)
-    {
-      meta_window_actor_set_redirected (window_actor, TRUE);
-      meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
-                                 NULL);
-      info->unredirected_window = NULL;
-    }
-
  meta_window_actor_destroy (window_actor);
 }

@@ -713,16 +642,6 @@ is_grabbed_event (XEvent *event)

  return FALSE;
 }
-
-void
-meta_compositor_window_shape_changed (MetaCompositor *compositor,
-                                      MetaWindow     *window)
-{
-  MetaWindowActor *window_actor;
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  meta_window_actor_update_shape (window_actor);
-}
-
 /**
 * meta_compositor_process_event: (skip)
 *
@@ -802,6 +721,13 @@ meta_compositor_process_event (MetaCompositor *compositor,
 	  DEBUG_TRACE ("meta_compositor_process_event (process_damage)\n");
          process_damage (compositor, (XDamageNotifyEvent *) event, window);
        }
+#ifdef HAVE_SHAPE
+      else if (event->type == meta_display_get_shape_event_base (compositor->display) + ShapeNotify)
+	{
+	  DEBUG_TRACE ("meta_compositor_process_event (process_shape)\n");
+	  process_shape (compositor, (XShapeEvent *) event, window);
+	}
+#endif /* HAVE_SHAPE */
      break;
    }

@@ -871,6 +797,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,
@@ -1118,20 +1067,14 @@ 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));
+  clutter_actor_set_size (info->stage, width, height);

-  XResizeWindow (xdisplay, xwin, width, height);
-
-  meta_background_actor_screen_size_changed (screen);
+  meta_background_actor_screen_size_changed (META_BACKGROUND_ACTOR (info->background_actor));

  meta_verbose ("Changed size for stage on screen %d to %dx%d\n",
 		meta_screen_get_screen_number (screen),
@@ -1142,36 +1085,6 @@ static void
 pre_paint_windows (MetaCompScreen *info)
 {
  GList *l;
-  MetaWindowActor *top_window;
-  MetaWindowActor *expected_unredirected_window = NULL;
-
-  if (info->windows == NULL)
-    return;
-
-  top_window = g_list_last (info->windows)->data;
-
-  if (meta_window_actor_should_unredirect (top_window) &&
-      info->disable_unredirect_count == 0)
-    expected_unredirected_window = top_window;
-
-  if (info->unredirected_window != expected_unredirected_window)
-    {
-      if (info->unredirected_window != NULL)
-        {
-          meta_window_actor_set_redirected (info->unredirected_window, TRUE);
-          meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
-                                     NULL);
-        }
-
-      if (expected_unredirected_window != NULL)
-        {
-          meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (top_window)),
-                                     meta_window_actor_get_meta_window (top_window));
-          meta_window_actor_set_redirected (top_window, FALSE);
-        }
-
-      info->unredirected_window = expected_unredirected_window;
-    }

  for (l = info->windows; l; l = l->next)
    meta_window_actor_pre_paint (l->data);
@@ -1275,37 +1188,6 @@ meta_get_overlay_window (MetaScreen *screen)
  return info->output;
 }

-/**
- * meta_disable_unredirect_for_screen:
- * @screen: a #MetaScreen
- *
- * Disables unredirection, can be usefull in situations where having
- * unredirected windows is undesireable like when recording a video.
- *
- */
-void
-meta_disable_unredirect_for_screen (MetaScreen *screen)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL)
-    info->disable_unredirect_count = info->disable_unredirect_count + 1;
-}
-
-/**
- * meta_enable_unredirect_for_screen:
- * @screen: a #MetaScreen
- *
- * Enables unredirection which reduces the overhead for apps like games.
- *
- */
-void
-meta_enable_unredirect_for_screen (MetaScreen *screen)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL)
-   info->disable_unredirect_count = MAX(0, info->disable_unredirect_count - 1);
-}
-
 #define FLASH_TIME_MS 50

 static void
--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@@ -1,15 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef META_BACKGROUND_ACTOR_PRIVATE_H
-#define META_BACKGROUND_ACTOR_PRIVATE_H
-
-#include <meta/screen.h>
-#include <meta/meta-background-actor.h>
-
-void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
-                                                cairo_region_t      *visible_region);
-
-void meta_background_actor_update              (MetaScreen *screen);
-void meta_background_actor_screen_size_changed (MetaScreen *screen);
-
-#endif /* META_BACKGROUND_ACTOR_PRIVATE_H */
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -28,188 +28,76 @@
 #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"
 #include "compositor-private.h"
 #include <meta/errors.h>
-#include "meta-background-actor-private.h"
+#include "meta-background-actor.h"

-/* We allow creating multiple MetaBackgroundActors for the same MetaScreen to
- * allow different rendering options to be set for different copies.
- * But we want to share the same underlying CoglTexture for efficiency and
- * to avoid driver bugs that might occur if we created multiple CoglTexturePixmaps
- * for the same pixmap.
- *
- * This structure holds common information.
- */
-typedef struct _MetaScreenBackground MetaScreenBackground;
-
-struct _MetaScreenBackground
+struct _MetaBackgroundActorClass
 {
-  MetaScreen *screen;
-  GSList *actors;
+  ClutterActorClass parent_class;
+};

+struct _MetaBackgroundActor
+{
+  ClutterActor parent;
+
+  CoglHandle material;
+  MetaScreen *screen;
+  cairo_region_t *visible_region;
  float texture_width;
  float texture_height;
-  CoglHandle texture;
-  CoglMaterialWrapMode wrap_mode;
+
  guint have_pixmap : 1;
 };

-struct _MetaBackgroundActorPrivate
-{
-  MetaScreenBackground *background;
-  CoglHandle material;
-  cairo_region_t *visible_region;
-  float dim_factor;
-};
-
-enum
-{
-  PROP_0,
-
-  PROP_DIM_FACTOR,
-
-  PROP_LAST
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
 G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);

-static void set_texture                (MetaScreenBackground *background,
-                                        CoglHandle            texture);
-static void set_texture_to_stage_color (MetaScreenBackground *background);
-
 static void
-on_notify_stage_color (GObject              *stage,
-                       GParamSpec           *pspec,
-                       MetaScreenBackground *background)
+update_wrap_mode (MetaBackgroundActor *self)
 {
-  if (!background->have_pixmap)
-    set_texture_to_stage_color (background);
-}
-
-static void
-free_screen_background (MetaScreenBackground *background)
-{
-  set_texture (background, COGL_INVALID_HANDLE);
-
-  if (background->screen != NULL)
-    {
-      ClutterActor *stage = meta_get_stage_for_screen (background->screen);
-      g_signal_handlers_disconnect_by_func (stage,
-                                            (gpointer) on_notify_stage_color,
-                                            background);
-      background->screen = NULL;
-    }
-}
-
-static MetaScreenBackground *
-meta_screen_background_get (MetaScreen *screen)
-{
-  MetaScreenBackground *background;
-
-  background = g_object_get_data (G_OBJECT (screen), "meta-screen-background");
-  if (background == NULL)
-    {
-      ClutterActor *stage;
-
-      background = g_new0 (MetaScreenBackground, 1);
-
-      background->screen = screen;
-      g_object_set_data_full (G_OBJECT (screen), "meta-screen-background",
-                              background, (GDestroyNotify) free_screen_background);
-
-      stage = meta_get_stage_for_screen (screen);
-      g_signal_connect (stage, "notify::color",
-                        G_CALLBACK (on_notify_stage_color), background);
-
-      meta_background_actor_update (screen);
-    }
-
-  return background;
-}
-
-static void
-update_wrap_mode_of_actor (MetaBackgroundActor *self)
-{
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  cogl_material_set_layer_wrap_mode (priv->material, 0, priv->background->wrap_mode);
-}
-
-static void
-update_wrap_mode (MetaScreenBackground *background)
-{
-  GSList *l;
  int width, height;
+  CoglMaterialWrapMode wrap_mode;

-  meta_screen_get_size (background->screen, &width, &height);
+  meta_screen_get_size (self->screen, &width, &height);

  /* We turn off repeating when we have a full-screen pixmap to keep from
   * getting artifacts from one side of the image sneaking into the other
   * side of the image via bilinear filtering.
   */
-  if (width == background->texture_width && height == background->texture_height)
-    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
+  if (width == self->texture_width && height == self->texture_height)
+    wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
  else
-    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;
+    wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;

-  for (l = background->actors; l; l = l->next)
-    update_wrap_mode_of_actor (l->data);
+  cogl_material_set_layer_wrap_mode (self->material, 0, wrap_mode);
 }

 static void
-set_texture_on_actor (MetaBackgroundActor *self)
+set_texture (MetaBackgroundActor *self,
+             CoglHandle           texture)
 {
-  MetaBackgroundActorPrivate *priv = self->priv;
-  MetaDisplay *display = meta_screen_get_display (priv->background->screen);
+  MetaDisplay *display;
+
+  display = meta_screen_get_display (self->screen);

  /* This may trigger destruction of an old texture pixmap, which, if
   * the underlying X pixmap is already gone has the tendency to trigger
   * X errors inside DRI. For safety, trap errors */
  meta_error_trap_push (display);
-  cogl_material_set_layer (priv->material, 0, priv->background->texture);
+  cogl_material_set_layer (self->material, 0, texture);
  meta_error_trap_pop (display);

+  self->texture_width = cogl_texture_get_width (texture);
+  self->texture_height = cogl_texture_get_height (texture);
+
+  update_wrap_mode (self);
+
  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 }

-static void
-set_texture (MetaScreenBackground *background,
-             CoglHandle            texture)
-{
-  MetaDisplay *display = meta_screen_get_display (background->screen);
-  GSList *l;
-
-  /* This may trigger destruction of an old texture pixmap, which, if
-   * the underlying X pixmap is already gone has the tendency to trigger
-   * X errors inside DRI. For safety, trap errors */
-  meta_error_trap_push (display);
-  if (background->texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (background->texture);
-      background->texture = COGL_INVALID_HANDLE;
-    }
-  meta_error_trap_pop (display);
-
-  if (texture != COGL_INVALID_HANDLE)
-    background->texture = cogl_handle_ref (texture);
-
-  background->texture_width = cogl_texture_get_width (background->texture);
-  background->texture_height = cogl_texture_get_height (background->texture);
-
-  for (l = background->actors; l; l = l->next)
-    set_texture_on_actor (l->data);
-
-  update_wrap_mode (background);
-}
-
 /* Sets our material to paint with a 1x1 texture of the stage's background
 * color; doing this when we have no pixmap allows the application to turn
 * off painting the stage. There might be a performance benefit to
@@ -218,45 +106,49 @@ set_texture (MetaScreenBackground *background,
 * actually pick up the (small?) performance win. This is just a fallback.
 */
 static void
-set_texture_to_stage_color (MetaScreenBackground *background)
+set_texture_to_stage_color (MetaBackgroundActor *self)
 {
-  ClutterActor *stage = meta_get_stage_for_screen (background->screen);
+  ClutterActor *stage = meta_get_stage_for_screen (self->screen);
  ClutterColor color;
  CoglHandle texture;

  clutter_stage_get_color (CLUTTER_STAGE (stage), &color);
-
-  /* Slicing will prevent COGL from using hardware texturing for
-   * the tiled 1x1 pixmap, and will cause it to draw the window
-   * background in millions of separate 1x1 rectangles */
  texture = meta_create_color_texture_4ub (color.red, color.green,
-                                           color.blue, 0xff,
-                                           COGL_TEXTURE_NO_SLICING);
-  set_texture (background, texture);
+                                           color.blue, 0xff);
+  set_texture (self, texture);
  cogl_handle_unref (texture);
 }

+static void
+on_notify_stage_color (GObject             *stage,
+                       GParamSpec          *pspec,
+                       MetaBackgroundActor *self)
+{
+  if (!self->have_pixmap)
+    set_texture_to_stage_color (self);
+}
+
 static void
 meta_background_actor_dispose (GObject *object)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-  MetaBackgroundActorPrivate *priv = self->priv;

  meta_background_actor_set_visible_region (self, NULL);

-  if (priv->background != NULL)
+  if (self->material != COGL_INVALID_HANDLE)
    {
-      priv->background->actors = g_slist_remove (priv->background->actors, self);
-      priv->background = NULL;
+      cogl_handle_unref (self->material);
+      self->material = COGL_INVALID_HANDLE;
    }

-  if (priv->material != COGL_INVALID_HANDLE)
+  if (self->screen != NULL)
    {
-      cogl_handle_unref (priv->material);
-      priv->material = COGL_INVALID_HANDLE;
+      ClutterActor *stage = meta_get_stage_for_screen (self->screen);
+      g_signal_handlers_disconnect_by_func (stage,
+                                            (gpointer) on_notify_stage_color,
+                                            self);
+      self->screen = NULL;
    }
-
-  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }

 static void
@@ -266,15 +158,14 @@ meta_background_actor_get_preferred_width (ClutterActor *actor,
                                           gfloat       *natural_width_p)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
  int width, height;

-  meta_screen_get_size (priv->background->screen, &width, &height);
+  meta_screen_get_size (self->screen, &width, &height);

  if (min_width_p)
    *min_width_p = width;
  if (natural_width_p)
-    *natural_width_p = width;
+    *natural_width_p = height;
 }

 static void
@@ -285,10 +176,9 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,

 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
  int width, height;

-  meta_screen_get_size (priv->background->screen, &width, &height);
+  meta_screen_get_size (self->screen, &width, &height);

  if (min_height_p)
    *min_height_p = height;
@@ -300,39 +190,32 @@ static void
 meta_background_actor_paint (ClutterActor *actor)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
-  guint8 opacity = clutter_actor_get_paint_opacity (actor);
-  guint8 color_component;
+  guchar opacity = clutter_actor_get_paint_opacity (actor);
  int width, height;

-  meta_screen_get_size (priv->background->screen, &width, &height);
+  meta_screen_get_size (self->screen, &width, &height);

-  color_component = (int)(0.5 + opacity * priv->dim_factor);
+  cogl_material_set_color4ub (self->material,
+                              opacity, opacity, opacity, opacity);

-  cogl_material_set_color4ub (priv->material,
-                              color_component,
-                              color_component,
-                              color_component,
-                              opacity);
+  cogl_set_source (self->material);

-  cogl_set_source (priv->material);
-
-  if (priv->visible_region)
+  if (self->visible_region)
    {
-      int n_rectangles = cairo_region_num_rectangles (priv->visible_region);
+      int n_rectangles = cairo_region_num_rectangles (self->visible_region);
      int i;

      for (i = 0; i < n_rectangles; i++)
        {
          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (priv->visible_region, i, &rect);
+          cairo_region_get_rectangle (self->visible_region, i, &rect);

          cogl_rectangle_with_texture_coords (rect.x, rect.y,
                                              rect.x + rect.width, rect.y + rect.height,
-                                              rect.x / priv->background->texture_width,
-                                              rect.y / priv->background->texture_height,
-                                              (rect.x + rect.width) / priv->background->texture_width,
-                                              (rect.y + rect.height) / priv->background->texture_height);
+                                              rect.x / self->texture_width,
+                                              rect.y / self->texture_height,
+                                              (rect.x + rect.width) / self->texture_width,
+                                              (rect.y + rect.height) / self->texture_height);
        }
    }
  else
@@ -340,160 +223,85 @@ meta_background_actor_paint (ClutterActor *actor)
      cogl_rectangle_with_texture_coords (0.0f, 0.0f,
                                          width, height,
                                          0.0f, 0.0f,
-                                          width / priv->background->texture_width,
-                                          height / priv->background->texture_height);
+                                          width / self->texture_width,
+                                          height / self->texture_height);
    }
 }

+#if CLUTTER_CHECK_VERSION(1, 5, 2)
 static gboolean
 meta_background_actor_get_paint_volume (ClutterActor       *actor,
                                        ClutterPaintVolume *volume)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
  int width, height;

-  meta_screen_get_size (priv->background->screen, &width, &height);
+  meta_screen_get_size (self->screen, &width, &height);

  clutter_paint_volume_set_width (volume, width);
  clutter_paint_volume_set_height (volume, height);

  return TRUE;
 }
-
-static void
-meta_background_actor_set_dim_factor (MetaBackgroundActor *self,
-                                      gfloat               dim_factor)
-{
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  if (priv->dim_factor == dim_factor)
-    return;
-
-  priv->dim_factor = dim_factor;
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DIM_FACTOR]);
-}
-
-static void
-meta_background_actor_get_property(GObject         *object,
-                                   guint            prop_id,
-                                   GValue          *value,
-                                   GParamSpec      *pspec)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  switch (prop_id)
-    {
-    case PROP_DIM_FACTOR:
-      g_value_set_float (value, priv->dim_factor);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_background_actor_set_property(GObject         *object,
-                                   guint            prop_id,
-                                   const GValue    *value,
-                                   GParamSpec      *pspec)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-
-  switch (prop_id)
-    {
-    case PROP_DIM_FACTOR:
-      meta_background_actor_set_dim_factor (self, g_value_get_float (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
+#endif

 static void
 meta_background_actor_class_init (MetaBackgroundActorClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  GParamSpec *pspec;
-
-  g_type_class_add_private (klass, sizeof (MetaBackgroundActorPrivate));

  object_class->dispose = meta_background_actor_dispose;
-  object_class->get_property = meta_background_actor_get_property;
-  object_class->set_property = meta_background_actor_set_property;

  actor_class->get_preferred_width = meta_background_actor_get_preferred_width;
  actor_class->get_preferred_height = meta_background_actor_get_preferred_height;
  actor_class->paint = meta_background_actor_paint;
+#if CLUTTER_CHECK_VERSION(1, 5, 2)
  actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
-
-  /**
-   * MetaBackgroundActor:dim-factor:
-   *
-   * Factor to dim the background by, between 0.0 (black) and 1.0 (original
-   * colors)
-   */
-  pspec = g_param_spec_float ("dim-factor",
-                              "Dim factor",
-                              "Factor to dim the background by",
-                              0.0, 1.0,
-                              1.0,
-                              G_PARAM_READWRITE);
-  obj_props[PROP_DIM_FACTOR] = pspec;
-  g_object_class_install_property (object_class, PROP_DIM_FACTOR, pspec);
+#endif
 }

 static void
-meta_background_actor_init (MetaBackgroundActor *self)
+meta_background_actor_init (MetaBackgroundActor *background_actor)
 {
-  MetaBackgroundActorPrivate *priv;
-
-  priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                                   META_TYPE_BACKGROUND_ACTOR,
-                                                   MetaBackgroundActorPrivate);
-  priv->dim_factor = 1.0;
 }

 /**
- * meta_background_actor_new:
 * @screen: the #MetaScreen
+ * meta_background_actor_new:
 *
 * Creates a new actor to draw the background for the given screen.
 *
- * Return value: the newly created background actor
+ * Return value: (transfer none): the newly created background actor
 */
 ClutterActor *
-meta_background_actor_new_for_screen (MetaScreen *screen)
+meta_background_actor_new (MetaScreen *screen)
 {
  MetaBackgroundActor *self;
-  MetaBackgroundActorPrivate *priv;
+  ClutterActor *stage;

  g_return_val_if_fail (META_IS_SCREEN (screen), NULL);

  self = g_object_new (META_TYPE_BACKGROUND_ACTOR, NULL);
-  priv = self->priv;

-  priv->background = meta_screen_background_get (screen);
-  priv->background->actors = g_slist_prepend (priv->background->actors, self);
+  self->screen = screen;

-  priv->material = meta_create_texture_material (NULL);
+  self->material = meta_create_texture_material (NULL);
+  cogl_material_set_layer_wrap_mode (self->material, 0,
+                                     COGL_MATERIAL_WRAP_MODE_REPEAT);

-  set_texture_on_actor (self);
-  update_wrap_mode_of_actor (self);
+  stage = meta_get_stage_for_screen (self->screen);
+  g_signal_connect (stage, "notify::color",
+                    G_CALLBACK (on_notify_stage_color), self);
+
+  meta_background_actor_update (self);

  return CLUTTER_ACTOR (self);
 }

 /**
 * meta_background_actor_update:
- * @screen: a #MetaScreen
+ * @self: a #MetaBackgroundActor
 *
 * Refetches the _XROOTPMAP_ID property for the root window and updates
 * the contents of the background actor based on that. There's no attempt
@@ -503,9 +311,8 @@ meta_background_actor_new_for_screen (MetaScreen *screen)
 * a PropertyNotify event for the property.
 */
 void
-meta_background_actor_update (MetaScreen *screen)
+meta_background_actor_update (MetaBackgroundActor *self)
 {
-  MetaScreenBackground *background;
  MetaDisplay *display;
  MetaCompositor *compositor;
  Atom type;
@@ -515,13 +322,14 @@ meta_background_actor_update (MetaScreen *screen)
  guchar *data;
  Pixmap root_pixmap_id;

-  background = meta_screen_background_get (screen);
-  display = meta_screen_get_display (screen);
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
+
+  display = meta_screen_get_display (self->screen);
  compositor = meta_display_get_compositor (display);

  root_pixmap_id = None;
  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
-                           meta_screen_get_xroot (screen),
+                           meta_screen_get_xroot  (self->screen),
                           compositor->atom_x_root_pixmap,
                           0, LONG_MAX,
                           False,
@@ -542,31 +350,23 @@ 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)
        {
-          set_texture (background, texture);
+          set_texture (self, texture);
          cogl_handle_unref (texture);

-          background->have_pixmap = True;
+          self->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;
-  set_texture_to_stage_color (background);
+  self->have_pixmap = False;
+  set_texture_to_stage_color (self);
 }

 /**
@@ -582,46 +382,37 @@ void
 meta_background_actor_set_visible_region (MetaBackgroundActor *self,
                                          cairo_region_t      *visible_region)
 {
-  MetaBackgroundActorPrivate *priv;
-
  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));

-  priv = self->priv;
-
-  if (priv->visible_region)
+  if (self->visible_region)
    {
-      cairo_region_destroy (priv->visible_region);
-      priv->visible_region = NULL;
+      cairo_region_destroy (self->visible_region);
+      self->visible_region = NULL;
    }

  if (visible_region)
    {
      cairo_rectangle_int_t screen_rect = { 0 };
-      meta_screen_get_size (priv->background->screen, &screen_rect.width, &screen_rect.height);
+      meta_screen_get_size (self->screen, &screen_rect.width, &screen_rect.height);

      /* Doing the intersection here is probably unnecessary - MetaWindowGroup
       * should never compute a visible area that's larger than the root screen!
       * but it's not that expensive and adds some extra robustness.
       */
-      priv->visible_region = cairo_region_create_rectangle (&screen_rect);
-      cairo_region_intersect (priv->visible_region, visible_region);
+      self->visible_region = cairo_region_create_rectangle (&screen_rect);
+      cairo_region_intersect (self->visible_region, visible_region);
    }
 }

 /**
 * meta_background_actor_screen_size_changed:
- * @screen: a #MetaScreen
+ * @self: a #MetaBackgroundActor
 *
 * Called by the compositor when the size of the #MetaScreen changes
 */
 void
-meta_background_actor_screen_size_changed (MetaScreen *screen)
+meta_background_actor_screen_size_changed (MetaBackgroundActor *self)
 {
-  MetaScreenBackground *background = meta_screen_background_get (screen);
-  GSList *l;
-
-  update_wrap_mode (background);
-
-  for (l = background->actors; l; l = l->next)
-    clutter_actor_queue_relayout (l->data);
+  update_wrap_mode (self);
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
--- a/src/compositor/meta-background-actor.h
+++ b/src/compositor/meta-background-actor.h
@@ -46,20 +46,13 @@ typedef struct _MetaBackgroundActor        MetaBackgroundActor;
 typedef struct _MetaBackgroundActorClass   MetaBackgroundActorClass;
 typedef struct _MetaBackgroundActorPrivate MetaBackgroundActorPrivate;

-struct _MetaBackgroundActorClass
-{
-  ClutterActorClass parent_class;
-};
-
-struct _MetaBackgroundActor
-{
-  ClutterActor parent;
-
-  MetaBackgroundActorPrivate *priv;
-};
-
 GType meta_background_actor_get_type (void);

-ClutterActor *meta_background_actor_new_for_screen (MetaScreen *screen);
+ClutterActor *meta_background_actor_new (MetaScreen *screen);
+
+void meta_background_actor_update              (MetaBackgroundActor *actor);
+void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
+                                                cairo_region_t      *visible_region);
+void meta_background_actor_screen_size_changed (MetaBackgroundActor *self);

 #endif /* META_BACKGROUND_ACTOR_H */
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@@ -66,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
@@ -263,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
@@ -283,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)
    {
@@ -357,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
@@ -396,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
 *
@@ -415,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
--- a/src/compositor/meta-shadow-factory-private.h
+++ b/src/compositor/meta-shadow-factory-private.h
@@ -47,8 +47,7 @@ void        meta_shadow_paint       (MetaShadow            *shadow,
                                     int                    window_width,
                                     int                    window_height,
                                     guint8                 opacity,
-                                     cairo_region_t        *clip,
-                                     gboolean               clip_strictly);
+                                     cairo_region_t        *clip);
 void        meta_shadow_get_bounds  (MetaShadow            *shadow,
                                     int                    window_x,
                                     int                    window_y,
--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@@ -120,17 +120,17 @@ static guint signals[LAST_SIGNAL] = { 0 };
 /* The first element in this array also defines the default parameters
 * for newly created classes */
 MetaShadowClassInfo default_shadow_classes[] = {
-  { "normal",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "dialog",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "modal_dialog", { 6, -1, 0, 1, 255 }, { 3, -1, 0, 3, 128 } },
-  { "utility",      { 3, -1, 0, 1, 255 }, { 3, -1, 0, 1, 128 } },
-  { "border",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "menu",         { 6, -1, 0, 3, 255 }, { 3, -1, 0, 0, 128 } },
+  { "normal",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "dialog",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "modal_dialog", { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "utility",      { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "border",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "menu",         { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },

-  { "popup-menu",    { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } },
+  { "popup-menu",    { 6, -1, 0, 4, 255 }, { 6, -1, 0, 4, 255 } },

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

 G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);
@@ -189,10 +189,8 @@ meta_shadow_unref (MetaShadow *shadow)
 * @window_width: actual width of the region to paint a shadow for
 * @window_height: actual height of the region to paint a shadow for
 * @clip: (allow-none): if non-%NULL specifies the visible portion
- *   of the shadow.
- * @clip_strictly: if %TRUE, drawing will be clipped strictly
- *   to @clip, otherwise, it will be only used to optimize
- *   drawing.
+ *   of the shadow. Drawing won't be strictly clipped to this region
+ *   but it will be used to optimize what is drawn.
 *
 * Paints the shadow at the given position, for the specified actual
 * size of the region. (Since a #MetaShadow can be shared between
@@ -206,8 +204,7 @@ meta_shadow_paint (MetaShadow     *shadow,
                   int             window_width,
                   int             window_height,
                   guint8          opacity,
-                   cairo_region_t *clip,
-                   gboolean        clip_strictly)
+                   cairo_region_t *clip)
 {
  float texture_width = cogl_texture_get_width (shadow->texture);
  float texture_height = cogl_texture_get_height (shadow->texture);
@@ -279,9 +276,6 @@ meta_shadow_paint (MetaShadow     *shadow,
      dest_rect.y = dest_y[j];
      dest_rect.height = dest_y[j + 1] - dest_y[j];

-      if (dest_rect.height == 0)
-        continue;
-
      for (i = 0; i < n_x; i++)
        {
          cairo_region_overlap_t overlap;
@@ -289,64 +283,16 @@ meta_shadow_paint (MetaShadow     *shadow,
          dest_rect.x = dest_x[i];
          dest_rect.width = dest_x[i + 1] - dest_x[i];

-          if (dest_rect.width == 0)
-            continue;
-
          if (clip)
            overlap = cairo_region_contains_rectangle (clip, &dest_rect);
          else
-            overlap = CAIRO_REGION_OVERLAP_IN;
+            overlap = CAIRO_REGION_OVERLAP_PART;

-          /* There's quite a bit of overhead from allocating a new
-           * region in order to find an exact intersection and
-           * generating more geometry - we make the assumption that
-           * unless we have to clip strictly it will be cheaper to
-           * just draw the entire rectangle.
-           */
-          if (overlap == CAIRO_REGION_OVERLAP_IN ||
-              (overlap == CAIRO_REGION_OVERLAP_PART && !clip_strictly))
-            {
-              cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
-                                                  dest_x[i + 1], dest_y[j + 1],
-                                                  src_x[i], src_y[j],
-                                                  src_x[i + 1], src_y[j + 1]);
-            }
-          else if (overlap == CAIRO_REGION_OVERLAP_PART)
-            {
-              cairo_region_t *intersection;
-              int n_rectangles, k;
-
-              intersection = cairo_region_create_rectangle (&dest_rect);
-              cairo_region_intersect (intersection, clip);
-
-              n_rectangles = cairo_region_num_rectangles (intersection);
-              for (k = 0; k < n_rectangles; k++)
-                {
-                  cairo_rectangle_int_t rect;
-                  float src_x1, src_x2, src_y1, src_y2;
-
-                  cairo_region_get_rectangle (intersection, k, &rect);
-
-                  /* Separately linear interpolate X and Y coordinates in the source
-                   * based on the destination X and Y coordinates */
-
-                  src_x1 = (src_x[i] * (dest_rect.x + dest_rect.width - rect.x) +
-                            src_x[i + 1] * (rect.x - dest_rect.x)) / dest_rect.width;
-                  src_x2 = (src_x[i] * (dest_rect.x + dest_rect.width - (rect.x + rect.width)) +
-                            src_x[i + 1] * (rect.x + rect.width - dest_rect.x)) / dest_rect.width;
-
-                  src_y1 = (src_y[j] * (dest_rect.y + dest_rect.height - rect.y) +
-                            src_y[j + 1] * (rect.y - dest_rect.y)) / dest_rect.height;
-                  src_y2 = (src_y[j] * (dest_rect.y + dest_rect.height - (rect.y + rect.height)) +
-                            src_y[j + 1] * (rect.y + rect.height - dest_rect.y)) / dest_rect.height;
-
-                  cogl_rectangle_with_texture_coords (rect.x, rect.y,
-                                                      rect.x + rect.width, rect.y + rect.height,
-                                                      src_x1, src_y1, src_x2, src_y2);
-                }
-
-              cairo_region_destroy (intersection);
-            }
+          if (overlap != CAIRO_REGION_OVERLAP_OUT)
+            cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
+                                                dest_x[i + 1], dest_y[j + 1],
+                                                src_x[i], src_y[j],
+                                                src_x[i + 1], src_y[j + 1]);
        }
    }
 }
@@ -360,7 +306,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,
@@ -371,7 +317,7 @@ meta_shadow_get_bounds  (MetaShadow            *shadow,
                         cairo_rectangle_int_t *bounds)
 {
  bounds->x = window_x - shadow->outer_border_left;
-  bounds->y = window_y - shadow->outer_border_top;
+  bounds->y = window_x - shadow->outer_border_top;
  bounds->width = window_width + shadow->outer_border_left + shadow->outer_border_right;
  bounds->height = window_height + shadow->outer_border_top + shadow->outer_border_bottom;
 }
@@ -442,7 +388,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,37 @@

 #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 <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_finalize (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);

+#ifdef HAVE_GLX_TEXTURE_PIXMAP
 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
-               CLUTTER_TYPE_ACTOR);
+               CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
+#else /* HAVE_GLX_TEXTURE_PIXMAP */
+G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
+               CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */

 #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
@@ -66,15 +64,15 @@ 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;

-  guint tex_width, tex_height;
+  guint mask_width, mask_height;
+
+  GArray *rectangles;

  guint create_mipmaps : 1;
 };
@@ -84,14 +82,16 @@ 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->finalize = meta_shaped_texture_finalize;
+  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 +103,9 @@ meta_shaped_texture_init (MetaShapedTexture *self)

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

+  priv->rectangles = g_array_new (FALSE, FALSE, sizeof (XRectangle));
+
  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,167 @@ 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_clip_region (self, NULL);

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

+static void
+meta_shaped_texture_finalize (GObject *object)
+{
+  MetaShapedTexture *self = (MetaShapedTexture *) object;
+  MetaShapedTexturePrivate *priv = self->priv;
+
+  g_array_free (priv->rectangles, TRUE);
+
+  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->finalize (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->mask_texture != COGL_INVALID_HANDLE)
+    {
+      GLuint mask_gl_tex;
+      GLenum mask_gl_target;
+
+      cogl_texture_get_gl_texture (priv->mask_texture,
+                                   &mask_gl_tex, &mask_gl_target);
+
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+      if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+        glDeleteTextures (1, &mask_gl_tex);
+#endif
+
+      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
+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->mask_texture == COGL_INVALID_HANDLE)
+    {
+      guchar *mask_data;
+      const XRectangle *rect;
+      GLenum paint_gl_target;
+
+      /* Create data for an empty image */
+      mask_data = g_malloc0 (tex_width * tex_height);
+
+      /* Cut out a hole for each rectangle */
+      for (rect = (XRectangle *) priv->rectangles->data
+             + priv->rectangles->len;
+           rect-- > (XRectangle *) priv->rectangles->data;)
+        {
+          gint x1 = rect->x, x2 = x1 + rect->width;
+          gint y1 = rect->y, y2 = y1 + rect->height;
+          guchar *p;
+
+          /* Clip the rectangle to the size of the texture */
+          x1 = CLAMP (x1, 0, (gint) tex_width - 1);
+          x2 = CLAMP (x2, x1, (gint) tex_width);
+          y1 = CLAMP (y1, 0, (gint) tex_height - 1);
+          y2 = CLAMP (y2, y1, (gint) tex_height);
+
+          /* Fill the rectangle */
+          for (p = mask_data + y1 * tex_width + x1;
+               y1 < y2;
+               y1++, p += tex_width)
+            memset (p, 255, x2 - x1);
+        }
+
+      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
+
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+      if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+        {
+          GLuint tex;
+
+          glGenTextures (1, &tex);
+          glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+          glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width);
+          glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+          glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+          glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+          glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                        GL_ALPHA, tex_width, tex_height,
+                        0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data);
+
+          priv->mask_texture
+            = cogl_texture_new_from_foreign (tex,
+                                             GL_TEXTURE_RECTANGLE_ARB,
+                                             tex_width, tex_height,
+                                             0, 0,
+                                             COGL_PIXEL_FORMAT_A_8);
+        }
+      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,
+                                                         tex_width,
+                                                         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 +331,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->rectangles->len < 1)
    {
-      /* Use a single-layer texture if we don't have a mask. */
+      /* If there are no rectangles use a single-layer texture */

      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
        {
@@ -205,6 +357,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 +392,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 +409,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;
@@ -294,8 +444,8 @@ meta_shaped_texture_pick (ClutterActor       *actor,
  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
  MetaShapedTexturePrivate *priv = stex->priv;

-  /* If there is no region then use the regular pick */
-  if (priv->mask_texture == COGL_INVALID_HANDLE)
+  /* If there are no rectangles then use the regular pick */
+  if (priv->rectangles->len < 1)
    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
@@ -304,7 +454,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 +465,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 +482,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 +520,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 +555,17 @@ 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_clear_rectangles (MetaShapedTexture *stex)
 {
  MetaShapedTexturePrivate *priv;

@@ -513,42 +573,43 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,

  priv = stex->priv;

-  if (priv->pixmap == pixmap)
-    return;
-
-  priv->pixmap = pixmap;
-
-  if (pixmap != None)
-    {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      set_cogl_texture (stex, cogl_texture_pixmap_x11_new (ctx, pixmap, FALSE, NULL));
-    }
-  else
-    set_cogl_texture (stex, COGL_INVALID_HANDLE);
-
-  if (priv->create_mipmaps)
-    meta_texture_tower_set_base_texture (priv->paint_tower, priv->texture);
+  g_array_set_size (priv->rectangles, 0);
+  meta_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

-/**
- * meta_shaped_texture_get_texture:
- * @stex: The #MetaShapedTexture
- *
- * Returns: (transfer none): the unshaped texture
- */
-CoglHandle
-meta_shaped_texture_get_texture (MetaShapedTexture *stex)
+void
+meta_shaped_texture_add_rectangle (MetaShapedTexture *stex,
+				   const XRectangle  *rect)
 {
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), COGL_INVALID_HANDLE);
-  return stex->priv->texture;
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  meta_shaped_texture_add_rectangles (stex, 1, rect);
+}
+
+void
+meta_shaped_texture_add_rectangles (MetaShapedTexture *stex,
+				    size_t             num_rects,
+				    const XRectangle  *rects)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  g_array_append_vals (priv->rectangles, rects, num_rects);
+
+  meta_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

 /**
 * meta_shaped_texture_set_clip_region:
- * @stex: a #MetaShapedTexture
+ * @frame: a #TidyTextureframe
 * @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 +635,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,14 @@
 #ifndef __META_SHAPED_TEXTURE_H__
 #define __META_SHAPED_TEXTURE_H__

+#include <config.h>
+
 #include <clutter/clutter.h>
-#include <X11/Xlib.h>
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+#include <clutter/glx/clutter-glx.h>
+#else
+#include <clutter/x11/clutter-x11.h>
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */

 G_BEGIN_DECLS

@@ -44,12 +50,20 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;

 struct _MetaShapedTextureClass
 {
-  ClutterActorClass parent_class;
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmapClass parent_class;
+#else
+  ClutterX11TexturePixmapClass parent_class;
+#endif
 };

 struct _MetaShapedTexture
 {
-  ClutterActor parent;
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmap parent;
+#else
+  ClutterX11TexturePixmap parent;
+#endif

  MetaShapedTexturePrivate *priv;
 };
@@ -61,27 +75,20 @@ 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_clear_rectangles (MetaShapedTexture *stex);

-CoglHandle meta_shaped_texture_get_texture (MetaShapedTexture *stex);
-
-void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
-                                           CoglHandle         mask_texture);
+void meta_shaped_texture_add_rectangle  (MetaShapedTexture *stex,
+					 const XRectangle  *rect);
+void meta_shaped_texture_add_rectangles (MetaShapedTexture *stex,
+					 size_t             num_rects,
+					 const XRectangle  *rects);

 /* 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
@@ -1,101 +0,0 @@
-/*
- * texture rectangle
- *
- * A small utility function to help create a rectangle texture
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * Copyright (C) 2011, 2012 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include <config.h>
-
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
-#include <clutter/clutter.h>
-#include "meta-texture-rectangle.h"
-
-CoglTexture *
-meta_texture_rectangle_new (unsigned int width,
-                            unsigned int height,
-                            CoglPixelFormat format,
-                            CoglPixelFormat internal_format,
-                            unsigned int rowstride,
-                            const guint8 *data,
-                            GError **error)
-{
-  ClutterBackend *backend =
-    clutter_get_default_backend ();
-  CoglContext *context =
-    clutter_backend_get_cogl_context (backend);
-  CoglTextureRectangle *tex_rect;
-
-  tex_rect = cogl_texture_rectangle_new_with_size (context,
-                                                   width, height,
-                                                   internal_format,
-                                                   error);
-  if (tex_rect == NULL)
-    return NULL;
-
-  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 */
-                             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;
-}
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.h
@@ -1,47 +0,0 @@
-/*
- * texture rectangle
- *
- * A small utility function to help create a rectangle texture
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * 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
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __META_TEXTURE_RECTANGLE_H__
-#define __META_TEXTURE_RECTANGLE_H__
-
-#include <cogl/cogl.h>
-
-G_BEGIN_DECLS
-
-CoglTexture *
-meta_texture_rectangle_new (unsigned int width,
-                            unsigned int height,
-                            CoglPixelFormat format,
-                            CoglPixelFormat internal_format,
-                            unsigned int rowstride,
-                            const guint8 *data,
-                            GError **error);
-
-gboolean
-meta_texture_rectangle_check (CoglTexture *texture);
-
-G_END_DECLS
-
-#endif /* __META_TEXTURE_RECTANGLE_H__ */
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -26,7 +26,6 @@
 #include <string.h>

 #include "meta-texture-tower.h"
-#include "meta-texture-rectangle.h"

 #ifndef M_LOG2E
 #define M_LOG2E 1.4426950408889634074
@@ -98,9 +97,37 @@ 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 */
+
+static void
+free_texture (CoglHandle texture)
+{
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+  GLuint gl_tex;
+  GLenum gl_target;
+
+  cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
+
+  if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
+    glDeleteTextures (1, &gl_tex);
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+  cogl_handle_unref (texture);
+}
+
 /**
- * meta_texture_tower_set_base_texture:
- * @tower: a #MetaTextureTower
+ * meta_texture_tower_update_area:
+ * @tower: a MetaTextureTower
 * @texture: the new texture used as a base for scaled down versions
 *
 * Sets the base texture that is the scaled texture that the
@@ -125,7 +152,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
        {
          if (tower->textures[i] != COGL_INVALID_HANDLE)
            {
-              cogl_handle_unref (tower->textures[i]);
+              free_texture (tower->textures[i]);
              tower->textures[i] = COGL_INVALID_HANDLE;
            }

@@ -163,7 +190,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,

 /**
 * meta_texture_tower_update_area:
- * @tower: a #MetaTextureTower
+ * @tower: a MetaTextureTower
 * @x: X coordinate of upper left of rectangle that changed
 * @y: Y coordinate of upper left of rectangle that changed
 * @width: width of rectangle that changed
@@ -186,9 +213,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 +366,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 +380,30 @@ 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,
-                                    /* data format */
-                                    TEXTURE_FORMAT,
-                                    /* internal cogl format */
-                                    TEXTURE_FORMAT,
-                                    /* rowstride */
-                                    width * 4,
-                                    /* data */
-                                    NULL,
-                                    /* error */
-                                    NULL);
+      GLuint tex = 0;
+
+      glGenTextures (1, &tex);
+      glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+      glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                    GL_RGBA, width,height,
+#if TEXTURE_FORMAT == COGL_PIXEL_FORMAT_BGRA_8888_PRE
+                    0, GL_BGRA, GL_UNSIGNED_BYTE,
+#else /* assume big endian */
+                    0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
+                    NULL);
+
+      tower->textures[level] = cogl_texture_new_from_foreign (tex, GL_TEXTURE_RECTANGLE_ARB,
+                                                              width, height,
+                                                              0, 0,
+                                                              TEXTURE_FORMAT);
    }
  else
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
    {
      tower->textures[level] = cogl_texture_new_with_size (width, height,
                                                           COGL_TEXTURE_NO_AUTO_MIPMAP,
@@ -397,7 +430,12 @@ texture_tower_revalidate_fbo (MetaTextureTower *tower,
  CoglMatrix modelview;

  if (tower->fbos[level] == COGL_INVALID_HANDLE)
-    tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);
+    {
+      /* Work around http://bugzilla.openedhand.com/show_bug.cgi?id=2110 */
+      cogl_flush();
+
+      tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);
+    }

  if (tower->fbos[level] == COGL_INVALID_HANDLE)
    return FALSE;
@@ -546,7 +584,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);
@@ -566,7 +604,7 @@ texture_tower_revalidate (MetaTextureTower *tower,

 /**
 * meta_texture_tower_get_paint_texture:
- * @tower: a #MetaTextureTower
+ * @tower: a MetaTextureTower
 *
 * Gets the texture from the tower that best matches the current
 * rendering scale. (On the assumption here the texture is going to
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -26,22 +26,15 @@ void meta_window_actor_unmaximize (MetaWindowActor *self,

 void meta_window_actor_process_damage (MetaWindowActor    *self,
                                       XDamageNotifyEvent *event);
-
 void meta_window_actor_pre_paint      (MetaWindowActor    *self);

 void meta_window_actor_invalidate_shadow (MetaWindowActor *self);

-void meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state);
-
-gboolean meta_window_actor_should_unredirect (MetaWindowActor *self);
-
-void meta_window_actor_get_shape_bounds (MetaWindowActor       *self,
-                                          cairo_rectangle_int_t *bounds);
-
 gboolean meta_window_actor_effect_in_progress  (MetaWindowActor *self);
 void     meta_window_actor_sync_actor_position (MetaWindowActor *self);
 void     meta_window_actor_sync_visibility     (MetaWindowActor *self);
-void     meta_window_actor_update_shape        (MetaWindowActor *self);
+void     meta_window_actor_update_shape        (MetaWindowActor *self,
+                                                gboolean         shaped);
 void     meta_window_actor_update_opacity      (MetaWindowActor *self);
 void     meta_window_actor_mapped              (MetaWindowActor *self);
 void     meta_window_actor_unmapped            (MetaWindowActor *self);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -7,10 +7,9 @@

 #include <gdk/gdk.h> /* for gdk_rectangle_intersect() */

-#include "compositor-private.h"
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
-#include "meta-background-actor-private.h"
+#include "meta-background-actor.h"

 struct _MetaWindowGroupClass
 {
@@ -104,19 +103,12 @@ actor_is_untransformed (ClutterActor *actor,
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
-  cairo_region_t *visible_region;
-  cairo_region_t *unredirected_window_region = NULL;
-  ClutterActor *stage;
-  cairo_rectangle_int_t visible_rect, unredirected_rect;
-  GList *children, *l;
-
  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
-  MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
-  if (info->unredirected_window != NULL)
-    {
-      meta_window_actor_get_shape_bounds (META_WINDOW_ACTOR (info->unredirected_window), &unredirected_rect);
-      unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
-    }
+  cairo_region_t *visible_region;
+  GLboolean scissor_test;
+  cairo_rectangle_int_t screen_rect = { 0 };
+  cairo_rectangle_int_t scissor_rect;
+  GList *children, *l;

  /* We walk the list from top to bottom (opposite of painting order),
   * and subtract the opaque area of each window out of the visible
@@ -125,49 +117,49 @@ meta_window_group_paint (ClutterActor *actor)
  children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
  children = g_list_reverse (children);

-  /* Get the clipped redraw bounds from Clutter so that we can avoid
-   * painting shadows on windows that don't need to be painted in this
-   * frame. In the case of a multihead setup with mismatched monitor
-   * sizes, we could intersect this with an accurate union of the
-   * monitors to avoid painting shadows that are visible only in the
-   * holes. */
-  stage = clutter_actor_get_stage (actor);
-  clutter_stage_get_redraw_clip_bounds (CLUTTER_STAGE (stage),
-                                        &visible_rect);
+  /* Start off with the full screen area (for a multihead setup, we
+   * might want to use a more accurate union of the monitors to avoid
+   * painting in holes from mismatched monitor sizes. That's just an
+   * optimization, however.)
+   */
+  meta_screen_get_size (window_group->screen, &screen_rect.width, &screen_rect.height);

-  visible_region = cairo_region_create_rectangle (&visible_rect);
+  /* When doing a partial stage paint, Clutter will set the GL scissor
+   * box to the clip rectangle for the partial repaint. We combine the screen
+   * rectangle with the scissor box to get the region we need to
+   * paint. (Strangely, the scissor box sometimes seems to be bigger
+   * than the stage ... Clutter should probably be clampimg)
+   */
+  glGetBooleanv (GL_SCISSOR_TEST, &scissor_test);

-  if (unredirected_window_region)
-    cairo_region_subtract (visible_region, unredirected_window_region);
+  if (scissor_test)
+    {
+      GLint scissor_box[4];
+      glGetIntegerv (GL_SCISSOR_BOX, scissor_box);
+
+      scissor_rect.x = scissor_box[0];
+      scissor_rect.y = screen_rect.height - (scissor_box[1] + scissor_box[3]);
+      scissor_rect.width = scissor_box[2];
+      scissor_rect.height = scissor_box[3];
+
+      gdk_rectangle_intersect (&scissor_rect, &screen_rect, &scissor_rect);
+    }
+  else
+    {
+      scissor_rect = screen_rect;
+    }
+
+  visible_region = cairo_region_create_rectangle (&scissor_rect);

  for (l = children; l; l = l->next)
    {
      if (!CLUTTER_ACTOR_IS_VISIBLE (l->data))
        continue;

-      /* If an actor has effects applied, then that can change the area
-       * it paints and the opacity, so we no longer can figure out what
-       * portion of the actor is obscured and what portion of the screen
-       * it obscures, so we skip the actor.
-       *
-       * This has a secondary beneficial effect: if a ClutterOffscreenEffect
-       * is applied to an actor, then our clipped redraws interfere with the
-       * caching of the FBO - even if we only need to draw a small portion
-       * of the window right now, ClutterOffscreenEffect may use other portions
-       * of the FBO later. So, skipping actors with effects applied also
-       * prevents these bugs.
-       *
-       * Theoretically, we should check clutter_actor_get_offscreen_redirect()
-       * 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 (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;
@@ -196,9 +188,6 @@ meta_window_group_paint (ClutterActor *actor)

  cairo_region_destroy (visible_region);

-  if (unredirected_window_region)
-    cairo_region_destroy (unredirected_window_region);
-
  CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);

  /* Now that we are done painting, unset the visible regions (they will
@@ -209,6 +198,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
@@ -118,7 +118,7 @@ typedef struct
 {
  MetaRectangle        orig;
  MetaRectangle        current;
-  MetaFrameBorders    *borders;
+  MetaFrameGeometry   *fgeom;
  ActionType           action_type;
  gboolean             is_user_action;

@@ -194,7 +194,7 @@ static gboolean constrain_partially_onscreen (MetaWindow         *window,

 static void setup_constraint_info        (ConstraintInfo      *info,
                                          MetaWindow          *window,
-                                          MetaFrameBorders    *orig_borders,
+                                          MetaFrameGeometry   *orig_fgeom,
                                          MetaMoveResizeFlags  flags,
                                          int                  resize_gravity,
                                          const MetaRectangle *orig,
@@ -204,11 +204,11 @@ static void place_window_if_needed       (MetaWindow     *window,
 static void update_onscreen_requirements (MetaWindow     *window,
                                          ConstraintInfo *info);
 static void extend_by_frame              (MetaRectangle           *rect,
-                                          const MetaFrameBorders  *borders);
+                                          const MetaFrameGeometry *fgeom);
 static void unextend_by_frame            (MetaRectangle           *rect,
-                                          const MetaFrameBorders  *borders);
+                                          const MetaFrameGeometry *fgeom);
 static inline void get_size_limits       (const MetaWindow        *window,
-                                          const MetaFrameBorders  *borders,
+                                          const MetaFrameGeometry *fgeom,
                                          gboolean include_frame,
                                          MetaRectangle *min_size,
                                          MetaRectangle *max_size);
@@ -279,7 +279,7 @@ do_all_constraints (MetaWindow         *window,

 void
 meta_window_constrain (MetaWindow          *window,
-                       MetaFrameBorders    *orig_borders,
+                       MetaFrameGeometry   *orig_fgeom,
                       MetaMoveResizeFlags  flags,
                       int                  resize_gravity,
                       const MetaRectangle *orig,
@@ -302,7 +302,7 @@ meta_window_constrain (MetaWindow          *window,

  setup_constraint_info (&info,
                         window, 
-                         orig_borders,
+                         orig_fgeom, 
                         flags,
                         resize_gravity,
                         orig,
@@ -337,14 +337,14 @@ 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 (!orig_borders)
-    g_free (info.borders);
+  if (!orig_fgeom)
+    g_free (info.fgeom);
 }

 static void
 setup_constraint_info (ConstraintInfo      *info,
                       MetaWindow          *window,
-                       MetaFrameBorders    *orig_borders,
+                       MetaFrameGeometry   *orig_fgeom,
                       MetaMoveResizeFlags  flags,
                       int                  resize_gravity,
                       const MetaRectangle *orig,
@@ -357,10 +357,10 @@ setup_constraint_info (ConstraintInfo      *info,
  info->current = *new;

  /* Create a fake frame geometry if none really exists */
-  if (orig_borders && !window->fullscreen)
-    info->borders = orig_borders;
+  if (orig_fgeom && !window->fullscreen)
+    info->fgeom = orig_fgeom;
  else
-    info->borders = g_new0 (MetaFrameBorders, 1);
+    info->fgeom = g_new0 (MetaFrameGeometry, 1);

  if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
    info->action_type = ACTION_MOVE_AND_RESIZE;
@@ -439,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)
@@ -465,6 +461,7 @@ setup_constraint_info (ConstraintInfo      *info,
              "Setting up constraint info:\n"
              "  orig: %d,%d +%d,%d\n"
              "  new : %d,%d +%d,%d\n"
+              "  fgeom: %d,%d,%d,%d\n"
              "  action_type     : %s\n"
              "  is_user_action  : %s\n"
              "  resize_gravity  : %s\n"
@@ -474,6 +471,8 @@ setup_constraint_info (ConstraintInfo      *info,
              info->orig.x, info->orig.y, info->orig.width, info->orig.height,
              info->current.x, info->current.y, 
                info->current.width, info->current.height,
+              info->fgeom->left_width, info->fgeom->right_width,
+                info->fgeom->top_height, info->fgeom->bottom_height,
              (info->action_type == ACTION_MOVE) ? "Move" :
                (info->action_type == ACTION_RESIZE) ? "Resize" :
                (info->action_type == ACTION_MOVE_AND_RESIZE) ? "Move&Resize" :
@@ -514,7 +513,7 @@ place_window_if_needed(MetaWindow     *window,
      MetaWorkspace *cur_workspace;
      const MetaMonitorInfo *monitor_info;

-      meta_window_place (window, info->borders, info->orig.x, info->orig.y,
+      meta_window_place (window, info->fgeom, info->orig.x, info->orig.y,
                         &placed_rect.x, &placed_rect.y);
      did_placement = TRUE;

@@ -573,8 +572,8 @@ place_window_if_needed(MetaWindow     *window,
                 META_MAXIMIZE_VERTICAL : 0), &info->current);

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

          if (window->fullscreen_after_placement)
            {
@@ -635,7 +634,7 @@ update_onscreen_requirements (MetaWindow     *window,
  /* The require onscreen/on-single-monitor and titlebar_visible
   * stuff is relative to the outer window, not the inner
   */
-  extend_by_frame (&info->current, info->borders);
+  extend_by_frame (&info->current, info->fgeom);

  /* Update whether we want future constraint runs to require the
   * window to be on fully onscreen.
@@ -671,7 +670,7 @@ update_onscreen_requirements (MetaWindow     *window,
      MetaRectangle titlebar_rect;

      titlebar_rect = info->current;
-      titlebar_rect.height = info->borders->visible.top;
+      titlebar_rect.height = info->fgeom->top_height;
      old = window->require_titlebar_visible;
      window->require_titlebar_visible =
        meta_rectangle_overlaps_with_region (info->usable_screen_region,
@@ -684,32 +683,32 @@ update_onscreen_requirements (MetaWindow     *window,
    }

  /* Don't forget to restore the position of the window */
-  unextend_by_frame (&info->current, info->borders);
+  unextend_by_frame (&info->current, info->fgeom);
 }

 static void
 extend_by_frame (MetaRectangle           *rect,
-                 const MetaFrameBorders *borders)
+                 const MetaFrameGeometry *fgeom)
 {
-  rect->x -= borders->visible.left;
-  rect->y -= borders->visible.top;
-  rect->width  += borders->visible.left + borders->visible.right;
-  rect->height += borders->visible.top + borders->visible.bottom;
+  rect->x -= fgeom->left_width;
+  rect->y -= fgeom->top_height;
+  rect->width  += fgeom->left_width + fgeom->right_width;
+  rect->height += fgeom->top_height + fgeom->bottom_height;
 }

 static void
 unextend_by_frame (MetaRectangle           *rect,
-                   const MetaFrameBorders *borders)
+                   const MetaFrameGeometry *fgeom)
 {
-  rect->x += borders->visible.left;
-  rect->y += borders->visible.top;
-  rect->width  -= borders->visible.left + borders->visible.right;
-  rect->height -= borders->visible.top + borders->visible.bottom;
+  rect->x += fgeom->left_width;
+  rect->y += fgeom->top_height;
+  rect->width  -= fgeom->left_width + fgeom->right_width;
+  rect->height -= fgeom->top_height + fgeom->bottom_height;
 }

 static inline void
 get_size_limits (const MetaWindow        *window,
-                 const MetaFrameBorders *borders,
+                 const MetaFrameGeometry *fgeom,
                 gboolean                 include_frame,
                 MetaRectangle *min_size,
                 MetaRectangle *max_size)
@@ -724,8 +723,8 @@ get_size_limits (const MetaWindow        *window,

  if (include_frame)
    {
-      int fw = borders->visible.left + borders->visible.right;
-      int fh = borders->visible.top + borders->visible.bottom;
+      int fw = fgeom->left_width + fgeom->right_width;
+      int fh = fgeom->top_height + fgeom->bottom_height;

      min_size->width  += fw;
      min_size->height += fh;
@@ -753,25 +752,27 @@ constrain_modal_dialog (MetaWindow         *window,
  MetaWindow *parent = meta_window_get_transient_for (window);
  gboolean constraint_already_satisfied;

-  if (!meta_window_is_attached_dialog (window))
+  if (!meta_prefs_get_attach_modal_dialogs ())
+    return TRUE;
+  if (window->type != META_WINDOW_MODAL_DIALOG || !parent || parent == window)
    return TRUE;

  x = parent->rect.x + (parent->rect.width / 2  - info->current.width / 2);
  y = 0;
  if (parent->frame)
    {
-      MetaFrameBorders borders;
+      MetaFrameGeometry fgeom;

      x += parent->frame->rect.x;
      y += parent->frame->rect.y;

-      meta_frame_calc_borders (parent->frame, &borders);
-      y += borders.total.top;
+      meta_frame_calc_geometry (parent->frame, &fgeom);
+      y += fgeom.top_height;

-      y += info->borders->visible.top;
+      y += info->fgeom->top_height;
    }
  else
-    y = parent->rect.y + info->borders->visible.top;
+    y = parent->rect.y + info->fgeom->top_height;

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

@@ -809,14 +810,8 @@ constrain_maximization (MetaWindow         *window,
    return TRUE;

  /* Calculate target_size = maximized size of (window + frame) */
-  if (META_WINDOW_TILED_MAXIMIZED (window))
-    {
-      meta_window_get_current_tile_area (window, &target_size);
-    }
-  else if (META_WINDOW_MAXIMIZED (window))
-    {
-      target_size = info->work_area_monitor;
-    }
+  if (window->maximized_horizontally && window->maximized_vertically)
+    target_size = info->work_area_monitor;
  else
    {
      /* Amount of maximization possible in a single direction depends
@@ -836,19 +831,19 @@ constrain_maximization (MetaWindow         *window,
      active_workspace_struts = window->screen->active_workspace->all_struts;

      target_size = info->current;
-      extend_by_frame (&target_size, info->borders);
+      extend_by_frame (&target_size, info->fgeom);
      meta_rectangle_expand_to_avoiding_struts (&target_size,
                                                &info->entire_monitor,
                                                direction,
                                                active_workspace_struts);
   }
  /* Now make target_size = maximized size of client window */
-  unextend_by_frame (&target_size, info->borders);
+  unextend_by_frame (&target_size, info->fgeom);

  /* Check min size constraints; max size constraints are ignored for maximized
   * windows, as per bug 327543.
   */
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
  hminbad = target_size.width < min_size.width && window->maximized_horizontally;
  vminbad = target_size.height < min_size.height && window->maximized_vertically;
  if (hminbad || vminbad)
@@ -902,12 +897,12 @@ constrain_tiling (MetaWindow         *window,
   * use an external function for the actual calculation
   */
  meta_window_get_current_tile_area (window, &target_size);
-  unextend_by_frame (&target_size, info->borders);
+  unextend_by_frame (&target_size, info->fgeom);

  /* Check min size constraints; max size constraints are ignored as for
   * maximized windows.
   */
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
  hminbad = target_size.width < min_size.width;
  vminbad = target_size.height < min_size.height;
  if (hminbad || vminbad)
@@ -950,7 +945,7 @@ constrain_fullscreen (MetaWindow         *window,

  monitor = info->entire_monitor;

-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
  too_big =   !meta_rectangle_could_fit_rect (&monitor, &min_size);
  too_small = !meta_rectangle_could_fit_rect (&max_size, &monitor);
  if (too_big || too_small)
@@ -1059,7 +1054,7 @@ constrain_size_limits (MetaWindow         *window,
    return TRUE;

  /* Determine whether constraint is already satisfied; exit if it is */
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
  /* We ignore max-size limits for maximized windows; see #327543 */
  if (window->maximized_horizontally)
    max_size.width = MAX (max_size.width, info->current.width);
@@ -1251,8 +1246,8 @@ do_screen_and_monitor_relative_constraints (

  /* Determine whether constraint applies; exit if it doesn't */
  how_far_it_can_be_smushed = info->current;
-  get_size_limits (window, info->borders, TRUE, &min_size, &max_size);
-  extend_by_frame (&info->current, info->borders);
+  get_size_limits (window, info->fgeom, TRUE, &min_size, &max_size);
+  extend_by_frame (&info->current, info->fgeom);

  if (info->action_type != ACTION_MOVE)
    {
@@ -1272,7 +1267,7 @@ do_screen_and_monitor_relative_constraints (
                                        &info->current);
  if (exit_early || constraint_satisfied || check_only)
    {
-      unextend_by_frame (&info->current, info->borders);
+      unextend_by_frame (&info->current, info->fgeom);
      return constraint_satisfied;
    }

@@ -1296,7 +1291,7 @@ do_screen_and_monitor_relative_constraints (
                                      info->fixed_directions,
                                      &info->current);

-  unextend_by_frame (&info->current, info->borders);
+  unextend_by_frame (&info->current, info->fgeom);
  return TRUE;
 }

@@ -1409,8 +1404,8 @@ constrain_titlebar_visible (MetaWindow         *window,
   */
  if (window->frame)
    {
-      bottom_amount = info->current.height + info->borders->visible.bottom;
-      vert_amount_onscreen = info->borders->visible.top;
+      bottom_amount = info->current.height + info->fgeom->bottom_height;
+      vert_amount_onscreen = info->fgeom->top_height;
    }
  else
    bottom_amount = vert_amount_offscreen;
@@ -1484,8 +1479,8 @@ constrain_partially_onscreen (MetaWindow         *window,
   */
  if (window->frame)
    {
-      bottom_amount = info->current.height + info->borders->visible.bottom;
-      vert_amount_onscreen = info->borders->visible.top;
+      bottom_amount = info->current.height + info->fgeom->bottom_height;
+      vert_amount_onscreen = info->fgeom->top_height;
    }
  else
    bottom_amount = vert_amount_offscreen;
--- a/src/core/constraints.h
+++ b/src/core/constraints.h
@@ -39,7 +39,7 @@ typedef enum
 } MetaMoveResizeFlags;

 void meta_window_constrain (MetaWindow          *window,
-                            MetaFrameBorders    *orig_borders,
+                            MetaFrameGeometry   *orig_fgeom,
                            MetaMoveResizeFlags  flags,
                            int                  resize_gravity,
                            const MetaRectangle *orig,
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -107,6 +107,9 @@ meta_core_get (Display *xdisplay,
      case META_CORE_GET_CLIENT_HEIGHT:
        *((gint*)answer) = window->rect.height;
        break;
+      case META_CORE_IS_TITLEBAR_ONSCREEN:
+        *((gboolean*)answer) = meta_window_titlebar_is_onscreen (window);
+        break;
      case META_CORE_GET_CLIENT_XWINDOW:
        *((Window*)answer) = window->xwindow;
        break;
@@ -143,9 +146,6 @@ meta_core_get (Display *xdisplay,
      case META_CORE_GET_FRAME_HEIGHT:
        *((gint*)answer) = window->frame->rect.height;
        break;
-      case META_CORE_GET_THEME_VARIANT:
-        *((char**)answer) = window->gtk_theme_variant;
-        break;
      case META_CORE_GET_SCREEN_WIDTH:
        *((gint*)answer) = window->screen->rect.width;
        break;
@@ -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.
@@ -261,25 +261,25 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
 }

 void
-meta_core_lower_beneath_grab_window (Display *xdisplay,
-                                     Window   xwindow,
-                                     guint32  timestamp)
+meta_core_lower_beneath_focus_window (Display *xdisplay,
+                                      Window   xwindow,
+                                      guint32  timestamp)
 {
  XWindowChanges changes;
  MetaDisplay *display;
  MetaScreen *screen;
-  MetaWindow *grab_window;
+  MetaWindow *focus_window;

  display = meta_display_for_x_display (xdisplay);
  screen = meta_display_screen_for_xwindow (display, xwindow);
-  grab_window = display->grab_window;
+  focus_window = meta_stack_get_top (screen->stack);

-  if (grab_window == NULL)
+  if (focus_window == NULL)
    return;

  changes.stack_mode = Below;
-  changes.sibling = grab_window->frame ? grab_window->frame->xwindow
-                                       : grab_window->xwindow;
+  changes.sibling = focus_window->frame ? focus_window->frame->xwindow
+                                        : focus_window->xwindow;

  meta_stack_tracker_record_lower_below (screen->stack_tracker,
                                         xwindow,
@@ -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/core.h
+++ b/src/core/core.h
@@ -35,6 +35,7 @@ typedef enum
  META_CORE_WINDOW_HAS_FRAME,
  META_CORE_GET_CLIENT_WIDTH,
  META_CORE_GET_CLIENT_HEIGHT,
+  META_CORE_IS_TITLEBAR_ONSCREEN,
  META_CORE_GET_CLIENT_XWINDOW,
  META_CORE_GET_FRAME_FLAGS,
  META_CORE_GET_FRAME_TYPE,
@@ -47,7 +48,6 @@ typedef enum
  META_CORE_GET_FRAME_Y,
  META_CORE_GET_FRAME_WIDTH,
  META_CORE_GET_FRAME_HEIGHT,
-  META_CORE_GET_THEME_VARIANT,
  META_CORE_GET_SCREEN_WIDTH,
  META_CORE_GET_SCREEN_HEIGHT,
 } MetaCoreGetType;
@@ -116,9 +116,9 @@ void meta_core_user_focus   (Display *xdisplay,
                             Window   frame_xwindow,
                             guint32  timestamp);

-void meta_core_lower_beneath_grab_window (Display *xdisplay,
-                                          Window   xwindow,
-                                          guint32  timestamp);
+void meta_core_lower_beneath_focus_window (Display *xdisplay,
+                                           Window   xwindow,
+                                           guint32  timestamp);

 void meta_core_minimize         (Display *xdisplay,
                                 Window   frame_xwindow);
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -88,37 +88,19 @@ delete_ping_timeout_func (MetaDisplay *display,
      return;
    }

-  /* This is to get a better string if the title isn't representable
-   * in the locale encoding; actual conversion to UTF-8 is done inside
-   * meta_show_dialog */
-
-  if (window->title && window->title[0])
-    {
-      tmp = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
-      if (tmp == NULL)
-        window_title = NULL;
-      else
-        window_title = window->title;
-      g_free (tmp);
-    }
-  else
-    {
-      window_title = NULL;
-    }
+  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);

  /* Translators: %s is a window title */
-  if (window_title)
-    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
-                                   window_title);
-  else
-    tmp = g_strdup (_("Application is not responding."));
-
+  tmp = g_strdup_printf (_("<tt>%s</tt> is not responding."),
+                         window_title);
  window_content = g_strdup_printf (
      "<big><b>%s</b></big>\n\n<i>%s</i>",
      tmp,
      _("You may choose to wait a short while for it to "
        "continue or force the application to quit entirely."));

+  g_free (window_title);
+
  dialog_pid =
    meta_show_dialog ("--question",
                      window_content, NULL,
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -73,11 +73,9 @@ typedef enum {
 /* This is basically a bogus number, just has to be large enough
 * to handle the expected case of the alt+tab operation, where
 * we want to ignore serials from UnmapNotify on the tab popup,
- * and the LeaveNotify/EnterNotify from the pointer ungrab. It
- * also has to be big enough to hold ignored serials from the point
- * where we reshape the stage to the point where we get events back.
+ * and the LeaveNotify/EnterNotify from the pointer ungrab
 */
-#define N_IGNORED_CROSSING_SERIALS  10
+#define N_IGNORED_SERIALS           4

 typedef enum {
  META_TILE_NONE,
@@ -155,7 +153,7 @@ struct _MetaDisplay
   * correspond to an enter event we should
   * ignore
   */
-  unsigned long ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS];
+  unsigned long ignored_serials[N_IGNORED_SERIALS];
  Window ungrab_should_not_cause_focus_window;
  
  guint32 current_time;
@@ -189,7 +187,6 @@ struct _MetaDisplay
  int         grab_anchor_root_y;
  MetaRectangle grab_anchor_window_pos;
  MetaTileMode  grab_tile_mode;
-  int           grab_tile_monitor_number;
  int         grab_latest_motion_x;
  int         grab_latest_motion_y;
  gulong      grab_mask;
@@ -344,6 +341,10 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
 void          meta_display_grab                (MetaDisplay *display);
 void          meta_display_ungrab              (MetaDisplay *display);

+void          meta_display_unmanage_screen     (MetaDisplay *display,
+                                                MetaScreen  *screen,
+                                                guint32      timestamp);
+
 void          meta_display_unmanage_windows_for_screen (MetaDisplay *display,
                                                        MetaScreen  *screen,
                                                        guint32      timestamp);
--- 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;
@@ -549,9 +532,9 @@ meta_display_open (void)
                                          meta_unsigned_long_equal);
  
  i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
    {
-      the_display->ignored_crossing_serials[i] = 0;
+      the_display->ignored_serials[i] = 0;
      ++i;
    }
  the_display->ungrab_should_not_cause_focus_window = None;
@@ -571,7 +554,6 @@ meta_display_open (void)
  the_display->grab_screen = NULL;
  the_display->grab_resize_popup = NULL;
  the_display->grab_tile_mode = META_TILE_NONE;
-  the_display->grab_tile_monitor_number = -1;

  the_display->grab_edge_resistance_data = NULL;

@@ -1046,7 +1028,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 +1145,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 +1168,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,61 +1383,37 @@ 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
- * @serial: the serial to ignore
- *
- * Save the specified serial and ignore crossing events with that
- * serial for the purpose of focus-follows-mouse. This can be used
- * for certain changes to the window hierarchy that we don't want
- * to change the focus window, even if they cause the pointer to
- * end up in a new window.
- */
-void
-meta_display_add_ignored_crossing_serial (MetaDisplay  *display,
-                                          unsigned long serial)
+static void
+add_ignored_serial (MetaDisplay  *display,
+                    unsigned long serial)
 {
  int i;

  /* don't add the same serial more than once */
-  if (display->ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS-1] == serial)
+  if (display->ignored_serials[N_IGNORED_SERIALS-1] == serial)
    return;
  
  /* shift serials to the left */
  i = 0;
-  while (i < (N_IGNORED_CROSSING_SERIALS - 1))
+  while (i < (N_IGNORED_SERIALS - 1))
    {
-      display->ignored_crossing_serials[i] = display->ignored_crossing_serials[i+1];
+      display->ignored_serials[i] = display->ignored_serials[i+1];
      ++i;
    }
  /* put new one on the end */
-  display->ignored_crossing_serials[i] = serial;
+  display->ignored_serials[i] = serial;
 }

 static gboolean
-crossing_serial_is_ignored (MetaDisplay  *display,
-                            unsigned long serial)
+serial_is_ignored (MetaDisplay  *display,
+                   unsigned long serial)
 {
  int i;

  i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
    {
-      if (display->ignored_crossing_serials[i] == serial)
+      if (display->ignored_serials[i] == serial)
        return TRUE;
      ++i;
    }
@@ -1468,14 +1421,14 @@ crossing_serial_is_ignored (MetaDisplay  *display,
 }

 static void
-reset_ignored_crossing_serials (MetaDisplay *display)
+reset_ignores (MetaDisplay *display)
 {
  int i;

  i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
    {
-      display->ignored_crossing_serials[i] = 0;
+      display->ignored_serials[i] = 0;
      ++i;
    }

@@ -1601,18 +1554,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,
@@ -1649,7 +1603,7 @@ event_callback (XEvent   *event,
      if (meta_ui_window_should_not_cause_focus (display->xdisplay,
                                                 modified))
        {
-          meta_display_add_ignored_crossing_serial (display, event->xany.serial);
+          add_ignored_serial (display, event->xany.serial);
          meta_topic (META_DEBUG_FOCUS,
                      "Adding EnterNotify serial %lu to ignored focus serials\n",
                      event->xany.serial);
@@ -1659,7 +1613,7 @@ event_callback (XEvent   *event,
           event->xcrossing.mode == NotifyUngrab &&
           modified == display->ungrab_should_not_cause_focus_window)
    {
-      meta_display_add_ignored_crossing_serial (display, event->xany.serial);
+      add_ignored_serial (display, event->xany.serial);
      meta_topic (META_DEBUG_FOCUS,
                  "Adding LeaveNotify serial %lu to ignored focus serials\n",
                  event->xany.serial);
@@ -1743,9 +1697,12 @@ event_callback (XEvent   *event,
                              window->desc);
                }

-              if (display->compositor)
-                meta_compositor_window_shape_changed (display->compositor,
-                                                      window);
+              if (window->frame)
+                {
+                  window->frame->need_reapply_frame_shape = TRUE;
+		  meta_warning("from event callback\n");		  
+                  meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
+                }
            }
        }
      else
@@ -1798,8 +1755,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 +1912,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 +1952,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);
@@ -2039,7 +1992,7 @@ event_callback (XEvent   *event,
      /* Check if we've entered a window; do this even if window->has_focus to
       * avoid races.
       */
-      if (window && !crossing_serial_is_ignored (display, event->xany.serial) &&
+      if (window && !serial_is_ignored (display, event->xany.serial) &&
               event->xcrossing.mode != NotifyGrab && 
               event->xcrossing.mode != NotifyUngrab &&
               event->xcrossing.detail != NotifyInferior &&
@@ -2047,8 +2000,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)
@@ -2064,7 +2017,7 @@ event_callback (XEvent   *event,
                  meta_window_focus (window, event->xcrossing.time);

                  /* stop ignoring stuff */
-                  reset_ignored_crossing_serials (display);
+                  reset_ignores (display);
                  
                  if (meta_prefs_get_auto_raise ()) 
                    {
@@ -2086,7 +2039,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 +2051,7 @@ event_callback (XEvent   *event,
                                                          event->xcrossing.time);
                }
              break;
-            case G_DESKTOP_FOCUS_MODE_CLICK:
+            case META_FOCUS_MODE_CLICK:
              break;
            }
          
@@ -2333,8 +2286,11 @@ event_callback (XEvent   *event,
        screen = meta_display_screen_for_root (display,
                                               event->xconfigure.event);
        if (screen)
-          meta_stack_tracker_reparent_event (screen->stack_tracker,
-                                             &event->xreparent);
+          {
+            if (screen)
+              meta_stack_tracker_reparent_event (screen->stack_tracker,
+                                                 &event->xreparent);
+          }
      }
      break;
    case ConfigureNotify:
@@ -3571,7 +3527,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
  /* If window is a modal dialog attached to its parent,
   * grab the parent instead for moving.
   */
-  if (window && meta_window_is_attached_dialog (window) &&
+  if (meta_prefs_get_attach_modal_dialogs () &&
+      window && window->type == META_WINDOW_MODAL_DIALOG &&
      meta_grab_op_is_moving (op))
    grab_window = meta_window_get_transient_for (window);

@@ -3597,7 +3554,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
  meta_display_set_grab_op_cursor (display, screen, op, FALSE, grab_xwindow,
                                   timestamp);

-  if (!display->grab_have_pointer && !grab_op_is_keyboard (op))
+  if (!display->grab_have_pointer)
    {
      meta_topic (META_DEBUG_WINDOW_OPS,
                  "XGrabPointer() failed\n");
@@ -3632,15 +3589,9 @@ meta_display_begin_grab_op (MetaDisplay *display,
  display->grab_button = button;
  display->grab_mask = modmask;
  if (window)
-    {
-      display->grab_tile_mode = window->tile_mode;
-      display->grab_tile_monitor_number = window->tile_monitor_number;
-    }
+    display->grab_tile_mode = window->tile_mode;
  else
-    {
-      display->grab_tile_mode = META_TILE_NONE;
-      display->grab_tile_monitor_number = -1;
-    }
+    display->grab_tile_mode = META_TILE_NONE;
  display->grab_anchor_root_x = root_x;
  display->grab_anchor_root_y = root_y;
  display->grab_latest_motion_x = root_x;
@@ -3744,9 +3695,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,9 +3709,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);
-
  if (display->grab_window != NULL)
    display->grab_window->shaken_loose = FALSE;
  
@@ -3844,7 +3789,6 @@ meta_display_end_grab_op (MetaDisplay *display,
  display->grab_screen = NULL;
  display->grab_xwindow = None;
  display->grab_tile_mode = META_TILE_NONE;
-  display->grab_tile_monitor_number = -1;
  display->grab_op = META_GRAB_OP_NONE;

  if (display->grab_resize_popup)
@@ -4047,7 +3991,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;
@@ -4156,6 +4100,8 @@ meta_display_queue_retheme_all_windows (MetaDisplay *display)
      meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
      if (window->frame)
        {
+          window->frame->need_reapply_frame_shape = TRUE;
+          
          meta_frame_queue_draw (window->frame);
        }
      
@@ -4196,23 +4142,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)
@@ -4221,9 +4165,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)
@@ -4236,25 +4181,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)
@@ -4281,17 +4227,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
@@ -4301,9 +4236,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,
@@ -4370,7 +4316,11 @@ process_request_frame_extents (MetaDisplay    *display,
                                         &hints);
  if ((hints_set && hints->decorations) || !hints_set)
    {
-      MetaFrameBorders borders;
+      int top = 0;
+      int bottom = 0;
+      int left = 0;
+      int right = 0;
+
      MetaScreen *screen;

      screen = meta_display_screen_for_xwindow (display,
@@ -4388,11 +4338,15 @@ process_request_frame_extents (MetaDisplay    *display,
      meta_ui_theme_get_frame_borders (screen->ui,
                                       META_FRAME_TYPE_NORMAL,
                                       0,
-                                       &borders);
-      data[0] = borders.visible.left;
-      data[1] = borders.visible.right;
-      data[2] = borders.visible.top;
-      data[3] = borders.visible.bottom;
+                                       &top,
+                                       &bottom,
+                                       &left,
+                                       &right);
+
+      data[0] = left;
+      data[1] = right;
+      data[2] = top;
+      data[3] = bottom;
    }

  meta_topic (META_DEBUG_GEOMETRY,
@@ -4411,15 +4365,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,
@@ -4466,17 +4421,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,
@@ -4506,8 +4462,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,
@@ -4655,13 +4610,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;
@@ -4677,8 +4631,6 @@ meta_display_get_tab_list (MetaDisplay   *display,

        tmp = tmp->next;
      } /* End while tmp!=NULL */
-
-    g_slist_free (windows);
  }
  
  return tab_list;
@@ -5075,21 +5027,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;
    }
@@ -5129,7 +5072,7 @@ meta_display_stack_cmp (const void *a,
 * An example of using this would be to sort the list of transient dialogs for a
 * window into their current stacking order.
 *
- * Returns: (transfer container) (element-type MetaWindow): Input windows sorted by stacking order, from lowest to highest
+ * Returns: (transfer container): Input windows sorted by stacking order, from lowest to highest
 */
 GSList *
 meta_display_sort_windows_by_stacking (MetaDisplay *display,
@@ -5237,6 +5180,34 @@ prefs_changed_callback (MetaPreference pref,
    {
      meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
    }
+  else if (pref == META_PREF_ATTACH_MODAL_DIALOGS)
+    {
+      MetaDisplay *display = data;
+      GSList *windows;
+      GSList *tmp;
+
+      windows = meta_display_list_windows (display, META_LIST_DEFAULT);
+
+      for (tmp = windows; tmp != NULL; tmp = tmp->next)
+        {
+          MetaWindow *w = tmp->data;
+          MetaWindow *parent = meta_window_get_transient_for (w);
+          meta_window_recalc_features (w);
+
+          if (w->type == META_WINDOW_MODAL_DIALOG && parent && parent != w)
+            {
+              int x, y;
+              /* Forcing a call to move_resize() does two things: first, it handles
+               * resizing the dialog frame window to the correct size when we remove
+               * or add the decorations. Second, it will take care of positioning the
+               * dialog as "attached" to the parent when we turn the preference on
+               * via the constrain_modal_dialog() constraint.
+               **/
+              meta_window_get_position (w, &x, &y);
+              meta_window_move (w, FALSE, x, y);
+            }
+        }
+    }
 }

 void
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -67,6 +67,7 @@ meta_window_ensure_frame (MetaWindow *window)
  frame->current_cursor = 0;

  frame->mapped = FALSE;
+  frame->need_reapply_frame_shape = TRUE;
  frame->is_flashing = FALSE;
  
  meta_verbose ("Framing window %s: visual %s default, depth %d default depth %d\n",
@@ -116,6 +117,11 @@ meta_window_ensure_frame (MetaWindow *window)
  
  meta_display_register_x_window (window->display, &frame->xwindow, window);

+  /* Now that frame->xwindow is registered with window, we can set its
+   * background.
+   */
+  meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
+
  /* Reparent the client window; it may be destroyed,
   * thus the error trap. We'll get a destroy notify later
   * and free everything. Comment in FVWM source code says
@@ -151,12 +157,6 @@ meta_window_ensure_frame (MetaWindow *window)
  
  /* stick frame to the window */
  window->frame = frame;
-
-  /* Now that frame->xwindow is registered with window, we can set its
-   * style and background.
-   */
-  meta_ui_update_frame_style (window->screen->ui, frame->xwindow);
-  meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
  
  if (window->title)
    meta_ui_set_frame_title (window->screen->ui,
@@ -166,6 +166,14 @@ meta_window_ensure_frame (MetaWindow *window)
  /* Move keybindings to frame instead of window */
  meta_window_grab_keys (window);

+  /* Shape mask */
+  meta_ui_apply_frame_shape (frame->window->screen->ui,
+                             frame->xwindow,
+                             frame->rect.width,
+                             frame->rect.height,
+                             frame->window->has_shape);
+  frame->need_reapply_frame_shape = FALSE;
+  
  meta_display_ungrab (window->display);
 }

@@ -173,7 +181,6 @@ void
 meta_window_destroy_frame (MetaWindow *window)
 {
  MetaFrame *frame;
-  MetaFrameBorders borders;
  
  if (window->frame == NULL)
    return;
@@ -181,8 +188,6 @@ meta_window_destroy_frame (MetaWindow *window)
  meta_verbose ("Unframing window %s\n", window->desc);
  
  frame = window->frame;
-
-  meta_frame_calc_borders (frame, &borders);
  
  meta_bell_notify_frame_destroy (frame);
  
@@ -210,8 +215,8 @@ meta_window_destroy_frame (MetaWindow *window)
                    * coordinates here means we'll need to ensure a configure
                    * notify event is sent; see bug 399552.
                    */
-                   window->frame->rect.x + borders.invisible.left,
-                   window->frame->rect.y + borders.invisible.top);
+                   window->frame->rect.x,
+                   window->frame->rect.y);
  meta_error_trap_pop (window->display);

  meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);
@@ -220,11 +225,6 @@ meta_window_destroy_frame (MetaWindow *window)
                                    frame->xwindow);
  
  window->frame = NULL;
-  if (window->frame_bounds)
-    {
-      cairo_region_destroy (window->frame_bounds);
-      window->frame_bounds = NULL;
-    }

  /* Move keybindings to window instead of frame */
  meta_window_grab_keys (window);
@@ -310,47 +310,50 @@ meta_frame_get_flags (MetaFrame *frame)
 }

 void
-meta_frame_borders_clear (MetaFrameBorders *self)
+meta_frame_calc_geometry (MetaFrame         *frame,
+                          MetaFrameGeometry *geomp)
 {
-  self->visible.top    = self->invisible.top    = self->total.top    = 0;
-  self->visible.bottom = self->invisible.bottom = self->total.bottom = 0;
-  self->visible.left   = self->invisible.left   = self->total.left   = 0;
-  self->visible.right  = self->invisible.right  = self->total.right  = 0;
+  MetaFrameGeometry geom;
+  MetaWindow *window;
+
+  window = frame->window;
+
+  meta_ui_get_frame_geometry (window->screen->ui,
+                              frame->xwindow,
+                              &geom.top_height,
+                              &geom.bottom_height,
+                              &geom.left_width,
+                              &geom.right_width);
+  
+  *geomp = geom;
+}
+
+static void
+update_shape (MetaFrame *frame)
+{
+  if (frame->need_reapply_frame_shape)
+    {
+      meta_ui_apply_frame_shape (frame->window->screen->ui,
+                                 frame->xwindow,
+                                 frame->rect.width,
+                                 frame->rect.height,
+                                 frame->window->has_shape);
+      frame->need_reapply_frame_shape = FALSE;
+    }
 }

 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);
-}
-
-void
-meta_frame_get_corner_radiuses (MetaFrame *frame,
-                                float     *top_left,
-                                float     *top_right,
-                                float     *bottom_left,
-                                float     *bottom_right)
-{
-  meta_ui_get_corner_radiuses (frame->window->screen->ui,
-                               frame->xwindow,
-                               top_left, top_right,
-                               bottom_left, bottom_right);
-}
-
-gboolean
 meta_frame_sync_to_window (MetaFrame *frame,
                           int        resize_gravity,
                           gboolean   need_move,
                           gboolean   need_resize)
 {
+  if (!(need_move || need_resize))
+    {
+      update_shape (frame);
+      return;
+    }
+
  meta_topic (META_DEBUG_GEOMETRY,
              "Syncing frame geometry %d,%d %dx%d (SE: %d,%d)\n",
              frame->rect.x, frame->rect.y,
@@ -365,8 +368,19 @@ meta_frame_sync_to_window (MetaFrame *frame,
                                  frame->xwindow,
                                  frame->rect.width,
                                  frame->rect.height);
+
+      /* we need new shape if we're resized */
+      frame->need_reapply_frame_shape = TRUE;
    }

+  /* Done before the window resize, because doing it before means
+   * part of the window being resized becomes unshaped, which may
+   * be sort of hard to see with bg = None. If we did it after
+   * window resize, part of the window being resized would become
+   * shaped, which might be more visible.
+   */
+  update_shape (frame);
+  
  meta_ui_move_resize_frame (frame->window->screen->ui,
 			     frame->xwindow,
 			     frame->rect.x,
@@ -387,17 +401,6 @@ meta_frame_sync_to_window (MetaFrame *frame,
        meta_ui_repaint_frame (frame->window->screen->ui,
                               frame->xwindow);
    }
-
-  return need_resize;
-}
-
-cairo_region_t *
-meta_frame_get_frame_bounds (MetaFrame *frame)
-{
-  return meta_ui_get_frame_bounds (frame->window->screen->ui,
-                                   frame->xwindow,
-                                   frame->rect.width,
-                                   frame->rect.height);
 }

 void
--- a/src/core/frame.h
+++ b/src/core/frame.h
@@ -26,6 +26,17 @@

 #include "window-private.h"

+typedef struct _MetaFrameGeometry MetaFrameGeometry;
+
+struct _MetaFrameGeometry
+{  
+  /* border sizes (space between frame and child) */
+  int left_width;
+  int right_width;
+  int top_height;
+  int bottom_height;
+};
+
 struct _MetaFrame
 {
  /* window we frame */
@@ -60,22 +71,13 @@ MetaFrameFlags meta_frame_get_flags   (MetaFrame *frame);
 Window         meta_frame_get_xwindow (MetaFrame *frame);

 /* These should ONLY be called from meta_window_move_resize_internal */
-void meta_frame_calc_borders      (MetaFrame        *frame,
-                                   MetaFrameBorders *borders);
-
-void meta_frame_get_corner_radiuses (MetaFrame *frame,
-                                     float     *top_left,
-                                     float     *top_right,
-                                     float     *bottom_left,
-                                     float     *bottom_right);
-
-gboolean meta_frame_sync_to_window (MetaFrame         *frame,
+void meta_frame_calc_geometry      (MetaFrame         *frame,
+                                    MetaFrameGeometry *geomp);
+void meta_frame_sync_to_window     (MetaFrame         *frame,
                                    int                gravity,
                                    gboolean           need_move,
                                    gboolean           need_resize);

-cairo_region_t *meta_frame_get_frame_bounds (MetaFrame *frame);
-
 void meta_frame_set_screen_cursor (MetaFrame	*frame,
 				   MetaCursor	cursor);

--- 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
@@ -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,
@@ -114,12 +112,10 @@ log_handler (const gchar   *log_domain,
 }

 /**
- * 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)
@@ -129,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
@@ -147,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)
@@ -179,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.
 */
@@ -242,11 +251,6 @@ meta_get_option_context (void)
 {
  GOptionContext *ctx;

-  if (setlocale (LC_ALL, "") == NULL)
-    meta_warning ("Locale not understood by C library, internationalization will not work\n");
-  bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
  ctx = g_option_context_new (NULL);
  g_option_context_add_main_entries (ctx, meta_options, GETTEXT_PACKAGE);
  g_option_context_add_group (ctx, clutter_get_option_group_without_init ());
@@ -318,12 +322,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)
@@ -383,6 +385,9 @@ meta_init (void)
  sigset_t empty_mask;
  GIOChannel *channel;

+  if (setlocale (LC_ALL, "") == NULL)
+    meta_warning ("Locale not understood by C library, internationalization will not work\n");
+
  g_type_init ();
  
  sigemptyset (&empty_mask);
@@ -425,6 +430,10 @@ meta_init (void)

  meta_print_self_identity ();
  
+  bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
 #ifdef HAVE_INTROSPECTION
  g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
 #endif
@@ -553,34 +562,31 @@ 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)
 {
+  meta_exit_code = code;
+
  if (g_main_loop_is_running (meta_main_loop))
-    {
-      meta_exit_code = code;
-      g_main_loop_quit (meta_main_loop);
-    }
+    g_main_loop_quit (meta_main_loop);
 }

 /**
- * 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,
@@ -589,7 +595,6 @@ prefs_changed_callback (MetaPreference pref,
  switch (pref)
    {
    case META_PREF_THEME:
-    case META_PREF_DRAGGABLE_BORDER_WIDTH:
      meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
      meta_display_retheme_all ();
      break;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	75af6fc40c	Bump version to 3.0.2.1 Update NEWS	2011-05-25 15:42:10 -04:00
Matthias Clasen	bbfcde1caa	Make session saving work a bit better Previously, the restart command hardcoded "mutter" as the binary name. This commit changes it to use g_get_prgname() which has a better chance of being correct (and it does fix session saving for gnome-shell). Now that mutter is a library, it might be more correct (but also much higher overhead) to add api for setting these things from the outside. https://bugzilla.gnome.org/show_bug.cgi?id=648828	2011-05-25 15:39:23 -04:00
Owen W. Taylor	31e6cdf345	Bump version to 3.0.2 Update NEWS	2011-05-25 14:40:58 -04:00
Adam Jackson	c8aaa5e33e	Fix crash in meta_display_get_above_tab_keycode https://bugzilla.gnome.org/show_bug.cgi?id=647777	2011-05-25 14:22:57 -04:00
Dan Winship	65aa3e3927	window: don't allow side-by-side tiling of non-maximizable windows If a window is not maximizable, then that probably means it looks dumb at very large sizes. Even if its hints would allow you to manually resize it to a large size, don't allow automatically tiling it to half the screen. https://bugzilla.gnome.org/show_bug.cgi?id=647901	2011-05-23 23:50:14 -04:00
Owen W. Taylor	b192771b93	Filter mirrored monitors from the monitors list For the purposes of window placement or arranging window manager or plugin controls, screens that are just mirrors of other screens should be ignored, so filter them out of the monitors list. https://bugzilla.gnome.org/show_bug.cgi?id=649299	2011-05-23 23:49:58 -04:00
Colin Walters	c1977b6532	region-utils.c: Squash a memory leak "chunk" was an allocated but unused variable. https://bugzilla.gnome.org/show_bug.cgi?id=649504	2011-05-23 23:49:33 -04:00
Colin Walters	50d1b53267	theme.c: Squash memory leak When converting a token to a different type, we need to free its string. https://bugzilla.gnome.org/show_bug.cgi?id=649500	2011-05-23 23:49:10 -04:00
Owen W. Taylor	cbec96a62f	Make _NET_WM_WINDOW_OPACITY orthogonal to window actor opacity Using MetaWindowActor.opacity for _NET_WM_WINDOW_OPACITY makes it difficult to implement effects like fading a window in on map. Instead, set the opacity on the MetaShadedTexture child and use it when drawing the shadow. Since the check MetaWindowGroup does on meta_actor_get_paint_opacity() no longer covers this, we need to handle the opacity in meta_window_actor_get_obscured_region() explicitly. https://bugzilla.gnome.org/show_bug.cgi?id=648613	2011-05-23 23:48:48 -04:00
Abduxukur Abdurixit	a28a5749db	Added UG translation	2011-05-02 18:48:56 +02:00