Add _DBUS_UNIQUE_NAME and _OBJECT_PATH properties

https://bugzilla.gnome.org/show_bug.cgi?id=664851
Load _DBUS_APPLICATION_ID property, expose it via API
2011-12-05 12:54:29 -05:00 · 2011-12-05 12:52:29 -05:00 · 2011-12-01 20:29:38 +01:00 · 2011-11-26 11:34:03 +01:00 · 2011-11-25 21:25:10 +01:00 · 2011-11-21 19:04:44 -05:00
145 changed files with 52679 additions and 57703 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -40,15 +40,16 @@ stamp-h1
 stamp-it
 .intltool-merge-cache
 POTFILES
+po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
 inlinepixbufs.h
-libmutter-private.pc
-libmutter-wm.pc
+libmutter.pc
 mutter
 mutter-theme-viewer
 mutter.desktop
-mutter.schemas
+org.gnome.mutter.gschema.valid
+org.gnome.mutter.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
@@ -57,10 +58,13 @@ mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
+test-attached
 test-gravity
 test-resizing
 test-size-hints
-wm-tester
+# We can't say just "wm-tester" here or it will ignore the directory
+# rather than the binary
+src/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+ >= 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
+  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
  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/986
+++ b/986
@@ -1,3 +1,989 @@
+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
+
+Contributors:
+ Matthias Clasen
+
+3.0.2
+=====
+
+* Fix a crash when running without XKB support [Adam]
+  https://bugzilla.gnome.org/show_bug.cgi?id=647777
+* Fix smallish memory leaks [Colin]
+  https://bugzilla.gnome.org/show_bug.cgi?id=649500
+  https://bugzilla.gnome.org/show_bug.cgi?id=649504
+* Ignore mirrored monitors when listing monitors, fixing
+  drag-and-drop problems in GNOME Shell [Owen]
+  https://bugzilla.gnome.org/show_bug.cgi?id=649299
+* Don't allow side-by-side tiling of non-maximizable windows
+  like dialogs and utility windows [Dan]
+* Fix interaction of _NET_WM_WINDOW_OPACITY with window effects,
+  making it work again with GNOME Shell
+  https://bugzilla.gnome.org/show_bug.cgi?id=648613
+
+Contributors:
+ Adam Jackson, Colin Walters, Dan Winship
+
+Translations:
+ Abduxukur Abdurixit [ug]
+
+3.0.1
+=====
+
+* If WM_CLIENT_MACHINE isn't set, don't assume a window is remote;
+  fixes behavior of Fox toolkit applications under GNOME Shell.
+  https://bugzilla.gnome.org/show_bug.cgi?id=647662 [Colin]
+* Fix cases where windows could get stuck drawing as focused after
+  an attached modal dialog was closed. [Dan]
+  https://bugzilla.gnome.org/show_bug.cgi?id=647613
+* Fix a bug where a window that is too big to be tiled side-by-side
+  would behave strangely when using the gesture of dragging to
+  the top to maximize. [Florian]
+
+Contributors:
+ Florian Müllner, Colin Walters, Dan Winship
+
+Translations:
+ Amitakhya Phukan [as], Kristjan Schmidt [eo], Muhammet Kara [tr]
+
+3.0.0
+=====
+
+* Avoid crashing when you have a single window and try to move it between
+  workspaces. [Dan]
+  https://bugzilla.gnome.org/show_bug.cgi?id=642957
+
+Contributors:
+ Dan Winship
+
+Translations:
+ Jordi Serratosa [ca], Petr Kovar [cz], Ask H. Larsen [da], Bruce Cowan [en_GB],
+ Inaki Larranaga Murgoitio [eu], Gabor Kelemen [hu], Dirgita [id], Shankar Prasad [kn],
+ Changwoo Ryu [ko], Wouter Bolsterlee [nl], Duarte Loreto [pt],
+ Antonio Fernandes C. Neto, Rodrigo Padula de Oliveira [pt_BR], T. Vasudevan [ta],
+ Nguyễn Thái Ngọc Duy [vi], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+2.91.93
+=======
+
+* Fix bug where, when a monitor was hot-plugged, all workspaces
+  would collapse to a single workspace. (There are still issues
+  when a secondary monitor is hot-plugged to the left of the
+  primary monitor.) [Alex]
+  https://bugzilla.gnome.org/show_bug.cgi?id=645408)
+
+* Fix a crash for the cycle_group action [Jasper]
+  https://bugzilla.gnome.org/show_bug.cgi?id=645843
+
+* Fix misdrawing of window shadows on some focus changes [Dan]
+  https://bugzilla.gnome.org/show_bug.cgi?id=636904
+
+* Export meta_get_replace_current_wm() to allow fixing a
+  GNOME Shell bug with --replace [Colin]
+  https://bugzilla.gnome.org/show_bug.cgi?id=645590
+
+Contributors:
+ Alexander Larsson, Jasper St. Pierre, Colin Walters, Dan Winship
+
+Translations:
+ Alexander Shopov [bg], Christian Kirbach [de], Yaron Shahrabani [he],
+ Rudolfs Mazurs [lv], A S Alam [pa], Yuri Myasoedov [ru], Daniel Nylander [se],
+ Abduxukur Abdurixit [ug], Daniel Korostil [uj], Aron Xu [zh_CN]
+
+2.91.92
+=======
+
+ * Add a workspaces_only_on_primary preferences. When set, this makes
+   workspaces switching only apply to windows on the primary monitor,
+   while windows on other monitors are unaffected.
+ * Export API for monitor handling [Alex]
+    MetaScreen::monitors-changed signal
+    meta_screen_get_primary_monitor()
+    meta_window_is_on_primary_monitor()
+    meta_window_get_monitor()
+    MetaWindow::window-entered-monitor, <etaWindow::window-left-monitor
+    meta_window_move_to_monitor() [Florian]
+ * Behavior improvemnts for attached modal dialogs:
+   - Allow dragging dragging on the titlebar to move the  parent ["Ron"]
+   - Allow resizing [Florian]
+   - Constrain to be on the current monitor [Florian]
+ * Don't turn on XSMP autorestart [Colin]
+ * Combine libmutter-wm and libmutter-private into a single libmutter
+   [Frédéric]
+ * Export methods to move and resize windows [Jeffery]
+   meta_window_move(), meta_window_resize(), meta_window_move_frame()
+ * Add a MUTTER_WM_CLASS_FILTER environment variable to allow existing
+   windows to be ignored when performance testing. [Owen]
+ * Add a new compositor-based flash for visual bell [Dan]
+ * Fix bug where application specified values for properties like
+   "skip taskbar" were sometimes ignored [Dan]
+ * Bug fixes [Dan, Florian, Giovanni, Jasper, Owen]
+ * Build fixes [Rico]
+
+Contributors:
+ Giovanni Campagna, Florian Müllner, Alexander Larsson, Jeffery Olson,
+ Frédéric Péters, Owen Taylor, Jasper St. Pierre, Rico Tzschichholz,
+ "Ron", Colin Walters, Dan Winship
+
+Translations:
+ Khaled Hosny [ar], David Planella [ca], Mario Blättermann [de],
+ Bruce Cowan [en_GB], Jorge González, Daniel Mustieles [es], Ivar Smolin [et],
+ Bruno Brouard [fr], Fran Diéguez [gl], Yaron Shahrabani [he],
+ Gabor Kelemen [hu], Luca Ferretti [it], Kjartan Maraas [nb], Piotr Drąg [pl],
+ Duarte Loreto [pt], Lucian Adrian Grijincu, Adi Roiban [ro],
+ Yuri Myasoedov [ru], Matej Urbančič [sl], Daniel Korostil [uk]
+
+Bugs fixed:
+ 624360 window shows up in when pressing alt+tab, but skip_taskbar_hint is set to True
+ 631308 Dialogs attached to parent sometimes extend out of the screen
+ 638674 [PATCH] Allow moving attached dialogs
+ 639765 a11y: visual alert only works per-window, not screen
+ 641975 Pre-_NET_WM_ICONs look corrupted
+ 642355 patch to expose MetaWindow.move(), .resize() and add/expose .move_frame() to javascript
+ 642787 MetaWindowActor has a dangling reference to its MetaWindow
+ 643597 Attached dialogs not resizable, even by app request
+ 644188 Broken build of 2.91.91
+ 644252 Add MUTTER_WM_CLASS_FILTER environment variable
+ 644529 session: Change XSMP restart style to Never
+ 644565 Kill libmutter-private ?
+ 644961 auto-tiling makes moving already-tiled windows hard
+ 645224 Translation message doesn't make much sense
+ 645247 Methods of Meta.Rectangle are missing annotations.
+ 645455 tiling: Fix dragging windows free from edge-tiling
+
+2.91.91
+=======
+
+ * Build a libmutter-wm that contains all of the logic and that
+   can be linked to to create custom executables. The mutter executable
+   becomes a small stub linked to this library [Dan]
+ * Move installed headers files into a meta/ subdirectory instead
+   of polluting the toplevel namespace [Dan]
+ * Remove various unused complications: [Dan]
+   - Ability to set the set of plugins via GConf
+   - Plugin 'params'
+   - meta_restart() and "mutter-message restart"
+ * Don't exit when we are requested to exit via XSMP, assume we'll be
+   killed along with the X server; this avoids visual artifacts from
+   unmanaging windows when logging out [Colin]
+ * Build fixes [Dan, Jani, Jeff]
+
+Contributors:
+ Jani Monoses, Jeff Olson, Colin Walters, Dan Winship
+
+Translations:
+ Bruno Brouard [fr], Kjartan Maraas [nb], Daniel Korostil [uk]
+
+Bugs fixed:
+ 643194 patch: expose new meta_window_get_window_rect
+ 643437 Don't exit on XSMP request
+ 643959 Make mutter into a library
+
+2.91.90
+=======
+
+ * Change <Alt>Above_Tab from being a cycle_group binding to
+   a switch_group binding [Rui]
+ * Make plugin-loading failure fatal [Colin]
+ * Add 'position-changed' signal to MetaWindowActor [Owen]
+ * When 'live_hidden_previews' is enabled, position hidden windows
+   to allow the creation of workspace previews [Owen]
+ * Fix bug with opacity of MetaBackgroundActor
+
+Contributors:
+  Rui Matos, Owen Taylor, Colin Walters
+
+Translations:
+  Jorge González [es],  Mattias Põldaru [et], Sweta Kothari [gu], Luca Ferretti [it],
+  Changwoo Ryu [ko], Nguyễn Thái Ngọc Duy [vi]
+
+Bugs fixed:
+  641309 When live_hidden_previews is set, force placement for hidden windows
+  641310 MetaWindowActor: Add a 'positioned-changed' signal
+  641979 Visual glitch on workspace selector closing overview mode
+  641384 Make plugin loading failure fatal
+  642426 Don't pass handled key events to GTK+
+
+2.91.6
+======
+
+ * Add meta_screen_override_window_layout() to let a plugin set the workspace
+   layout [Owen]
+ * Add a 'size-changed' signal to MetaWindowActor [Florian]
+ * Add meta_window_actor_is_destroyed() [Adel]
+ * Fix problems with window tile previews when cancelling a move [Florian]
+ * Port theme elements that use GTK+ drawing to use GtkStyleContext instead
+   of the deprecated GtkStyle. [Florian]
+ * Fix compiler warnings that were causing compilation failures [Jasper, Owen]
+ * Misc bug fixes [Gabor, Jasper, Owen, Rui]
+
+Contributors:
+ Adel Gadllah, Gabor Kelemen, Rui Matos, Florian Müllner, Jasper St. Pierre,
+ Owen Taylor
+
+Translations:
+ Khaled Hosny [ar], Alexander Shopov [bg], Petr Kovar [cz], Fran Diéguez [gl],
+ Marios Zindilis [gr], Gabor Kelemen [hu], Kjartan Maraas [nb], A S Alam [pa],
+ Daniel Nylander [se], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+2.91.5
+======
+
+* Add a Above_Tab key symbol that can be used in key bindings to mean
+  the key above the Tab key. This is now the default binding for
+  cycle_group in both Mutter and Metacity. [Owen]
+* Add new frame states for tiled-on-the-left and tiled-on-the-right [Florian]
+* Add new background drawing functions that can be defined in a theme
+  for single buttons. [Florian]
+* Draw the right button backgrounds for all custom button layouts [Florian]
+* Remove vestigal --composite/--no-composite command line options [Nickolas]
+* Fix building on GLES [Andreas]
+* Code cleanups [Adel, Owen]
+
+Contributors:
+ Adel Gadllah, Nickolas Lloyd, Andreas Mueller, Florian Müllner, Owen Taylor
+
+Translations:
+ Mattias Põldaru, Ivar Smolin [et], Gheyret T. Kenji [ug]
+
+Bugs fixed:
+ 613124 Invalid visibility-related asserts in MutterWindow
+ 626875 Fix handling of --composite and --no-composite command line options
+ 629282 [PATCH] Fix errors building for gles-systems (clutter-eglx)
+ 635569 Add an "Above_Tab" pseudo-keysym
+ 635683 add specific button background for single button (per side) case
+ 635686 button backgrounds broken with rtl locales
+ 637330 [PATCH] theme: Add tiled_left/tiled_right frame states
+
+2.91.4
+======
+
+* Update for GTK+ 3 changes [Benjamin, Colin, Emmanuele, Florian]
+* Support maximizing a window by dragging to the top of the screen
+  in the same way you can tile by dragging to the edge of the screen.
+  [Ray, Florian]
+* Misc bug fixes [Milan, Owen]
+
+Contributors:
+ Emmanuele Bassi, Milan Bouchet-Valat, Florian Müllner, Benjamin Otte,
+ Ray Strode, Owen Taylor, Colin Walters
+
+Translations:
+ Matej Urbančič [sl], Nguyễn Thái Ngọc Duy [vi]
+
+Bugs fixed:
+ 630548 gnome-shell could auto-maximize windows when dragged to top edge of screen
+ 636083 workspace: Consider text direction when switching
+ 636301 Port testgradient example to GTK3
+ 636302 Replace some GDK X11 calls with future-proof ones
+ 636491 valgrind: meta_window_shape_new (meta-window-shape.c:79)
+ 637802 ui: Adapt to GDK API changes
+
+2.91.3
+======
+
+* Better shadows: [Owen]
+   - Shadows can be different for different window types and focus states
+   - Shadows are larger by default, especially for the currently active
+     window
+   - Shadows for attached modal dialogs and menus are drawn not to
+     overlap the attachment point.
+   - Shadows follow the shape of shaped windows
+ * Optimization: [Owen]
+   - Avoid repainting in situations when windows are potentially restacked
+     but aren't actually restacked.
+   - Pay attention to partial stage repaints in obscured window calculations
+   - Better optimization of painting obscured shadows; turn off shadows
+     for maximized windows.
+   - Move background repainting into Mutter; doing it here rather than
+     in plugins allows not painting obscured parts of the background.
+ * A new frame type 'attached' is added for attached modal dialogs
+   and can be referenced in theme files with a theme version of 3.2.
+ * Fix updating key bindings when the keyboard layout changes
+   [Derek, Owen, Thomas]
+ * Bug fixes [Adel, Florian]
+ * Build fixes [Dan Williams, Diego, Javier, Owen]
+
+Contributors:
+ Adel Gadllah, Javier Jardón, Florian Müllner, Derek Poon, Owen Taylor,
+ Thomas Thurman, Diego Escalante Urrelo, Dan Williams
+
+Translations:
+ Khaled Hosny [ar], Jorge González [es], Fran Diéguez [gl],
+ Yaron Shahrabani [he], Kjartan Maraas [nb], Gheyret T. Kenji [ug]
+
+Bugs fixed:
+ 634779 MetaWindowGroup: further optimize paints by using current scissor
+ 634833 Draw the root window background
+ 592382 improve shadow effect
+ 628199 Add antialising to arc and line drawing operations
+ 633002 meta-actor-window: Use G_UNLIKELY for TFP check
+ 634771 MetaStackTracker: Avoid queueing resync for obvious no-ops
+ 635421 Fix crash in check_needs_shadow
+ 635493 configure.in: it's git, not Subversion
+ 635528 configure.ac: move call to AM_GNU_GLIB_GETTEXT above cflags modification
+ 635575 meta-window-actor: remove unused meta_window_actor_get_shadow_bounds
+ 636083 workspace: Consider text direction when switching
+
+2.91.2
+======
+
+* Remove support for GTK+ 2 [Florian]
+* Adapt to deprecation of size_request deprecation in GTK+ [Matthias]
+* Include change from Metacity to fix confusion of mouse
+  tracking when double-clicking on title bar [Owen]
+* Fix bug with the the window menu getting stuck when you alt-Tab [Owen]
+
+Contributors:
+ Matthias Clasen, Florian Müllner, Owen Taylor
+
+Translations:
+ Petr Kovar [cz]
+
+Bugs fixed:
+ 633133 Remove compatibility for GTK+-2.0
+ 633352 prepare for the demise of size_request
+ 633398 Fix check for events on UI widgets
+ 633401 Fix warning from synthesized events with GdkDevice
+
+2.91.1
+======
+
+* Default build is now GTK+ 3 build
+* Mutter namespace prefix is removed, in favor of consistent
+  meta_ namespace prefixing [Owen]. Naming changes:
+    MutterWindow              => MetaWindowActor
+    mutter_get_windows        => meta_get_window_actors
+    mutter_plugin_get_windows => meta_plugin_get_window_actors
+* Add missing values in MetaKeyBindingAction - this fixes a problem where
+  key binding lookup wasn't working properly for some key bindings. [Dan]
+* Remove keysym parameter to meta_display_get_keybinding_action() - the
+  function expected the default keysym for the keycode to always be passed [Dan]
+* Clean up installed header files - in particular, theme-parser.h is merged
+  into a new public-only theme.h and private internals are moved to
+  theme-private.h.
+* Fix problems with antialiased rendering of themes [Brandon, Owen, Nickolas]
+* Fix problem with parsing color constants in themes [Jon, Owen]
+* Build fixes [Colin]
+* Miscellaneous bug fixes [Giovanni, Rico]
+
+Contributors:
+  Giovanni Campagna, Nickolas Lloyd, William Jon McCann, Owen Taylor,
+  Rico Tzschichholz, Colin Walters, Dan Winship, Brandon Wright
+
+Translations:
+  Fran Diéguez [gl], Yinghua Wang [zh_CN]
+
+Fixed bugs:
+ 628401 tint and line draw ops rendering issues
+ 628520 unfortunate namespacing
+ 631487 Fix drawing of <arc> theme elements
+ 632116 don't clobber gerrors
+ 632149 Fill in missing MetaKeyBindingAction values
+ 632155 meta_display_get_keybinding_action: remove keysym parameter
+ 632474 Remove MetaRegion
+ 632494 introspection: remove --allow-unprefixed
+
+2.91.0
+======
+
+ * Enable side-by-side tiling via a gesture of dragging to the left or right
+   edge of the screen. (enabled with an off-by-default GConf key) [Florian]
+ * Allow breaking out of maximization/tiling using a alt-middle-button window
+   resize [Owen, Florian]
+ * Add the ability to have modal dialogs attached to their parent window
+   (enabled with an off-by-default GConf key) [Maxim]
+ * Draw with Cairo rather than GDK [Florian, Benjamin]
+ * Add compatibility for changes in GTK+ 3
+   [Benjamin, Alban, Florian, Jasper, Matthias, Owen, Thierry]
+   - libmutter-private is now only installed for GTK+ 3 builds
+   - Theme parts of libmutter-private API are changed to take cairo_t
+     rather than GdkDrawable
+ * Update introspection build and annotations for new behavior of
+   g-ir-scanner [Colin]
+ * Fix bug that caused window menu options not to work [Owen]
+ * Fix misbehavior of Wine windows [Owen, Alban]
+ * Fix crashes from missing error traps [Adel]
+ * Build fixes [Colin, Florian, Owen, Rob, Tomas]
+ * Misc bug fixes [Adel, Jon, Owen, Nickolas, Tomas]
+ * Cleanups [Adel, Benjamin, Florian]
+
+Contributors:
+ Alban Browaeys, Matthias Clasen, Maxim Ermilov, Tomas Frydrych, Adel Gadllah,
+ Nickolas Lloyd, William Jon McCann, Florian Muellner, Benjamin Otte,
+ Thierry Reding, Rob Staudinger, Jasper St. Pierre, Owen Taylor, Colin Walters
+
+Translations:
+ Alexander Shopov [bg], Mario Blättermann [de], Ask H. Larsen [dk],
+ Michael Kotsarinis [el], Philip Withnall [en_UK], Jorge González [es],
+ Fran Diéguez [gl], Bruno Brouard, Claude Paroz [fr], Yaron Shahrabani [he],
+ Gabor Kelemen [hu], Luca Ferretti [it], Nils-Christoph Fiedler [nds],
+ Kjartan Maraas [nb], A S Alam [pa], Piotr Drąg [pl], Duarte Loreto [pt],
+ Antonio Fernandes C. Neto [pt_BR], Matej Urbančič [sl],
+ Miloš Popović [sr, sr@latin], Tirumurti Vasudevan [ta], Aron Xu [zh_CN],
+ Chao-Hsiung Liao [zh_HK, zh_TW]
+
+Fixed Bugs:
+ 597763 With >2 workspaces, Window menu "Move to Another Workspace" menu doesn't work
+ 598603 displays window size when moving terminal window
+ 606158 "Always on top" triggers Window manager warning:
+        Log level 8: meta_window_set_user_time: assertion `!window->override_redirect' failed
+ 610575 make meta_screen_set_cursor public
+ 613126 Do not cancel Alt+Tab grab due to Shift key events
+ 623235 BadDamage error from XSubtractDamage
+ 624757 Check for TFP usage after actually setting the pixmap
+ 625712 [mutter-shaped-texture] Remove material_workaround
+ 626583 Replace Gdk drawing API with cairo
+ 627087 Mipmap emulation not working
+ 627210 Crash with X error
+ 628544 introspection: Build with --warn-fatal, drop fix-meta-rectangle.py hack
+ 629127 build problem with recent gtk3
+ 629232 Multiple syntax errors in file mutter-message.c when building Mutter for
+        GNOME Shell dependencies
+ 629350 [mutter-shaped-texture] Use a base material for all instances
+ 629931 Allow breaking out from maximization/tiling during a mouse resize
+ 630195 Use GDK error trapping straight-up
+ 630203 Prepare mutter code for GTK3 rendering-cleanup
+ 630671 prepare mutter for the demise of GtkObject
+ 630843 gtk_window_set_visual was replaced by gtk_widget_set_visua
+ 631147 Adapt to GTK API changes
+ 631175 Mutter error compiling Gnome Shell
+
+2.31.5
+======
+
+* Support building with GTK+ 3.0 [Florian]
+* Remove deprecated usages for compatibility with GTK+ 3.0
+  [Claudio, Florian, Nickolas]
+* Export a boxed type for MetaRectangle [Owen]
+* Allow disabling -Werror with --enable-compile-warnings=yes [Nickolas]
+* Build fixes [Andreas, Florian, Owen]
+
+Contributors:
+ Nickolas Lloyd, Andreas Mueller, Florian Müllner, Claudio Saavedra,
+ Owen Taylor
+
+Translations:
+ Petr Kovar [cz], Jorge González [es], Fran Diéguez [gl],
+ Yaron Shahrabani [he], Matej Urbančič [sl]
+
+Fixed Bugs:
+ 587991 - Remove deprecated GTK+ symbols
+ 616275 - -Werror should not be enabled by default (or should be possible to disable)
+ 622303 - Allow building with Gtk+-3.0
+ 622800 - Make mutter more gtk+ 3.0 friendly
+ 623335 - Make MetaRectangle a boxed type
+ 623639 - Work around g-ir-scanner problem with Gdk.Rectangle
+ 624166 - src/core/util.c: Fix warning in case WITH_VERBOSE_MODE is not set
+
+2.31.4
+======
+
+* Clean up MutterPlugin effect interface [Maxim]
+* Track damage as the bounding box, a significant optimizations
+  for rapidly drawing clients [Robert]
+* Add meta_window_is_remote() [Colin]
+* Add meta_add_debug_topic() for turning on logging of
+  specific topics [Colin]
+* Fix bug with window unmaximization [Owen]
+
+Contributors:
+ Robert Bragg, Maxim Ermilov, Owen Taylor, Colin Walters
+
+Translations:
+ Yaron Shahrabani (he), Fran Diéguez (gl), Kjartan Maraas (nb), A S Alam (pa)
+
+Fixed Bugs:
+ 611838 - expose sub-stage redraws by streaming raw updates to ClutterX11TexturePixmap
+ 620585 - Add meta_window_is_remote
+ 620860 - function ‘meta_display_open’
+ 621082 - MutterPluginManager should call plugin->switch_workspace,
+          when screen doesn't have any window. Or function should be renamed.
+ 621413 - Maximize/Unmaximize not behaving properly for some non-gnome based programs
+
+2.31.2
+======
+
+* Theme enhancements [Owen]
+  - Add a flexible version mechanism for themes -
+    metacity-theme-3.xml is now supported, and can include
+    version="> 3.2" type attributes on the root element or
+    any subelement.
+  - Add frame_x_center/frame_y_center variables
+  - Allow a theme to turn on title ellipsization
+* Performance enhancements:
+  - Stream raw damage updates to ClutterX11TexturePixmap
+    to enable partial stage updates when windos change [Robert]
+  - Don't trap XErrors in meta_compositor_process_event [Adel]
+* Add meta_prefs_override_preference_location(); this allows
+  a plugin like GNOME Shell to redirect preferences to a
+  plugin-specific location. [Owen]
+* Support a _MUTTER_HINTS window property; this is a string
+  property holding key-value pairs with plugin-specific
+  interpretation [Tomas]
+* Build with GSEAL_ENABLE [Florian, Javier]
+* Add meta_display_get_leader_window() [Tomas]
+* Add meta_display_sort_windows_by_stacking [Colin]
+* Export
+   meta_display_get_last_user_time()
+   meta_display_xserver_time_is_before()
+   meta_window_foreach_ancestor(),
+   meta_window_foreach_transient()
+   meta_window_lower()
+   meta_window_raise()
+   meta_window_set_demands_attention()
+   meta_window_unset_demands_attention() [Colin]
+* Bug fixes [Dan, Edward, Owen, Tomas]
+* Build fixes [Owen, Dominique, Vincent]
+
+Contributors:
+ Robert Bragg, Adel Gadllah, Tomas Frydrych, Javier Jardón,
+ Dominique Leuenberger, Florian Müllner, Edward Sheldrake,
+ Owen Taylor, Vincent Untz, Colin Walters, Dan Winship
+
+Translations:
+ Xandru Armesto Fernandez (ast), Khaled Hosny (ar), Petr Kovar (cz),
+ Mario Blättermann, (de), Jorge González (es),
+ Inaki Larranaga Murgoitio [eu), Claude Paroz (fr), Luca Ferretti (it),
+ Gintautas Miliauskas (lt), Pavol Šimo (sk), Matej Urbančič (sl)
+
+Fixed Bugs:
+ 591842 - ellipsize titles when oversize
+ 592503 - Add a flexible version mechanism
+ 595496 - Use accessor functions instead direct access (use GSEAL GnomeGoal)
+ 596659 - Fix handling of grabbed key events
+ 613123 - Framework for plugin-specific per-window hint
+ 613125 - Add meta_display_get_leader_window()
+ 613127 - Keep num_workspaces key in sync with the actual workspace number
+ 613136 - remove over-restrictive assert from meta_prefs_get_workspace_name()
+ 613398 - Don't trap XErrors in meta_compositor_process_event
+ 615586 - Allow redirecting preferences to a different GConf key
+ 615672 - cant' compile mutter error: dereferencing pointer ‘p’ does break
+          strict-aliasing rules
+ 616050 - alt-tab infrastructure patches
+ 616274 - mutter from git fails with gcc 4.5 (on new warning)
+ 616546 - On dual screen maximized windows dragged to the second screen no
+          longer update their contents
+ 618138 - Work around COGL bug causing flash for new windows
+ 618613 - Fix crash with --sync option
+
+2.29.1
+======
+
+* Support and require Clutter 1.2 (Owen)
+* Add meta_display_get_keybinding_action() (Colin, Dan)
+* Add meta_window_get_wm_class_instance() (Tomas)
+* Remove workaround for bug fixed in intel driver Q2/2009 release (Robert)
+* Build fixes (Owen, Brian, Nguyễn Thái Ngọc Duy)
+
+Contributors:
+ Robert Bragg, Brian Cameron, Tomas Frydrych, Nguyễn Thái Ngọc Duy,
+ Owen Taylor, Colin Walters, Dan Winship
+
+Translations:
+ Alexander Shopov (bg), Mario Blättermann (de), Bruno Brouard (fr),
+ Nils-Christoph Fiedler (nds), Piotr Drąg (pl), Aron Xu (zh_CN)
+
+Fixed Bugs:
+
+ 610862 Support and require Clutter 1.1
+ 612506 mutter 2.29.0 fails to compile on Solaris
+ 613100 [MetaDisplay] Expose meta_display_get_keybinding_action
+ 613121 Remove workaround for multitexturing with old intel drivers
+ 613128 [MetaWindow] Accessor for the instance part of WM_CLASS property
+ 613278 meta_display_get_keybinding_action: strip out uninteresting modifiers
+
+2.29.0
+======
+
+* Improve appearance of scaled down windows using mipmap emulation (Owen)
+* Added signals: MetaDisplay::window-created, MetaDisplay::window-marked-urgent,
+  MetaDisplay::window-demands-attention, MetaWindow::unmanaged (Colin, Tomas)
+* Added properties: MetaWindow:demands-attention, MetaWindow:urgent,
+  MetaWindow:maximized-horizontally, MetaWindow:maximized-vertically (Florian, Tomas)
+* Fix nasty crash when workspace "struts" changed during a window move (Jon, Owen)
+* Bug fixes (Dan, Maxim, Neil, Owen, Tomas)
+* Build fixes (Colin, Emmanuele, Nickolas, Owen, Richard)
+* Merge Metacity changes since 2.26. Includes themable sound support
+  via libcanberra (Owen)
+
+Contributors
+ Emmanuele Bassi, Maxim Ermilov, Tomas Frydrych, Richard Hughes, Nickolas Lloyd,
+ Florian Müllner, Jon Nettleton, Neil Roberts, Owen Taylor, Colin Walters,
+ Dan Winship
+
+Additional Metacity contributors:
+ Thomas Hindoe Paaboel Andersen, Peter Bloomfield, Matthias Clasen,
+ Matt Kraai, Claude Paroz, Lennart Poettering, Ray Strode, Thomas Thurman,
+ Vincent Untz, Tomislav Vujec, Tomeu Vizoso, Travis Watkins, 'alexisdm59'
+
+Translations:
+ Khaled Hosny (ar), Petr Kovar (cz), Kjartan Maraas (nb), Djavan Fagundes (pt_BR),
+ Nils-Christoph Fiedler (nds), Matej Urbančič (sl), Vincent Untz
+
+Fixed Bugs:
+
+ 588065 Adds demands-attention signal to the window class
+ 591913 Fails to skip current window on alt+tab when another window is asking for attention
+ 592567 Dereferencing NULL in mutter_window_get_workspace()
+ 597052 Add signal to MetaDisplay so we know when a window has demanded-attention
+ 598289 Add "window-created" signal to MetaDisplay, "unmanaged" signal for MetaWindow
+ 598473 "XXX specified twice for this theme" messages not in sync with metacity.
+ 598600 "Visual Bell" option in Metacity causes Mutter to crash
+ 600068 notifications for window urgency hint
+ 601228 rdesktop does not get keypress signals
+ 602349 [PATCH] trivial - fix compilation warning in mutter
+ 602740 Remove XOR gc only used in removed reduced-resources mode
+ 602870 Fix compilation with older libGL
+ 604200 Compile issue: Use of deprecated clutter functions
+ 606388 mutter fails to build when using ld with --no-add-needed
+ 607125 Fails to build with latest introspection data
+ 607398 Do not use CGL_* symbols
+ 607746 reduce gconf roundtrips at startup
+ 608800 alt-dragging gimp windows crashes gnome-shell
+ 609350 Mutter does not support the COGL_DEBUG environment variable
+ 609546 meta_workspace_set_builtin_struts(): optimize out non-changes
+ 609585 Merge libcanberra usage from Metacity
+ 609657 Use cogl multitexture API when drawing MutterShapedTexture
+ 609665 Bug fixes from Fedora RPM
+ 609710 screencast recording broke
+ 610391 Fix crash on startup with list bindings
+
+2.28.0
+======
+
+* New exported API:
+    meta_window_get_stable_sequence() [Colin]
+    meta_window_get_transient_for_as_xid() [Tomas]
+    MutterScreen::workareas-changed signal [Tomas]
+* Fix a problem where changes processed from a Clutter event
+  callback wouldn't get handled before the screen was next
+  repainted, causing flashing [Owen]
+* Remove MetaAltTabHandler as no longer needed [Dan]
+* Bug fixes [Colin, Owen]
+
+Contributors:
+  Tomas Frydrych, Owen Taylor, Colin Walters, Dan Winship
+
+Translations:
+  Christian Kirbach (de), Claude Paroz (fr)
+
+2.27.5
+======
+
+ * Fix bug in GConf schemas where the overview activation key was specified as
+   '<Super_L>' not 'Super_L'.
+
+Contributors:
+
+ Colin Walters
+
+Translation:
+
+ Denis Arnaud (br)
+
+2.27.4
+======
+
+* Big code cleanup: when talking about multiple monitors, call them
+  "monitors", not "xineramas". [Dan]
+
+* Accessors added or made public:
+
+  meta_screen_get_n_monitors(), meta_screen_get_monitor_geometry()
+  meta_window_get_user_time() and MetaWindow:user-time property.
+
+  [Colin, Dan]
+
+* Set _GNOME_WM_KEYBINDINGS=Metacity,Mutter on the _NET_SUPPORTING_WM_CHECK
+  window so that gnome-keybinding-properties can figure out to show the
+  Metacity keybindings when Mutter is running. [Owen]
+
+* Bug and build fixes [Colin, Owen]
+
+Contributors:
+
+  Owen Taylor, Colin Walters, Dan Winship
+
+Translation:
+
+  Jorge González (es), Inaki Larranaga Murgoitio (eu), Gabor Kelemen (hu)
+
+Bugs fixed:
+
+  592393 - Clicking on a minimized window in the overview doesn't focus the window
+  593399 - Add meta_display_get_grab_op()
+  593404 - Make MUTTER_DEBUG_XINERAMA override active Xinerama
+  593407 - Add 'skip-taskbar' accessor to MetaWindow.
+  593686 - Add meta_screen_get_monitors()
+  594067 - Export a _GNOME_WM_KEYBINDINGS property
+
+2.27.3
+======
+
+* Key handling improvements:
+
+  - enforce that every key is handled no more than once.
+  - mutter_plugin_begin_modal() and mutter_plugin_begin_modal() allow
+    putting a plugin into a "modal" state where it has exclusive access
+    to key and pointer events.
+  - Add "tab_popup_select", "tab_pop_cancel" pseudo-keypress-handlers
+    that plugins can use to get notification when Alt-Tab ends
+
+  [Owen]
+
+* Accessors added or made public:
+
+   meta_window_is_override_redirect(), meta_window_is_mapped(),
+   meta_display_xwindow_is_a_no_focus_window(),
+   meta_display_get_grab_op(), meta_window_is_skip_taskbar(),
+   meta_window_is_modal(), all of errors.h
+
+ [Colin, Owen, Michael, Steve, Tomas]
+
+* Fix for various GTK+ deprecations [Javier]
+* Bug fixes [Colin, Frédéric, Owen, Thomas, Tomas, Volker]
+
+Contributors:
+
+  Javier Jardón, Steve Frécinaux, Tomas Frydrych, Michael Meeks,
+  Frédéric Péters, Volker Sobek, Owen Taylor, Thomas Thurman,
+  Colin Walters
+
+Translation:
+
+  Fran Dieguez (gl), Gabor Kelemen (hu), Daniel Nylander (se)
+
+Bugs fixed:
+
+  589457 - Fix up window property notification for "title"
+  590911 - Do not run plugin effects on WM startup
+  590978 - API to query whether window is in modal state
+  591367 - Be silent by default
+  591566 - install errors.h header ...
+  591788 - Add meta_window_is_override_redirect
+  591836 - mutter mishandles opacity
+  591913 - Fails to skip current window on alt+tab when another window is asking for attention
+  592393 - Clicking on a minimized window in the overview doesn't focus the window
+  592699 - Remove deprecated Encoding key from desktop files
+  592742 - Avoid accessing freed memory when being replaced
+  593399 - Add meta_display_get_grab_op()
+  593404 - Make MUTTER_DEBUG_XINERAMA override active Xinerama
+  593407 - Add 'skip-taskbar' accessor to MetaWindow.
+
+----------------------------- Older Metacity News -----------------------------
+
 2.26.0
 ======

--- a/29
+++ b/29
@@ -18,8 +18,7 @@ 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. You also need GConf 1.2 (unless building a funky
-extra-small embedded metacity with --disable-gconf, see below).
+GNOME ftp site.
 You need Clutter 1.0. You need gobject-introspection 0.6.3.

 REPORTING BUGS AND SUBMITTING PATCHES
@@ -59,25 +58,24 @@ 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 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
+   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

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

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

   Can also change workspaces from GNOME 2 pager.

 - Change focus mode:
-     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
+     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

 - Global keybinding defaults include:   

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

   Change keybindings for example:

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

 - Window keybindings:

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

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

 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([dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])

 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
@@ -61,21 +61,14 @@ AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN

-GTK_MIN_VERSION=2.91.7
+GTK_MIN_VERSION=3.3.3
+GIO_MIN_VERSION=2.25.10
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26

-MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"
+MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0 gsettings-desktop-schemas >= 3.3.0"

-AC_ARG_ENABLE(gconf,
-  AC_HELP_STRING([--disable-gconf],
-                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
-  enable_gconf=yes)
-
-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
+GLIB_GSETTINGS

 AC_ARG_ENABLE(verbose-mode,
  AC_HELP_STRING([--disable-verbose-mode],
@@ -185,26 +178,13 @@ else
  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
 fi

-CLUTTER_VERSION=1.2.0
+CLUTTER_VERSION=1.7.5
 CLUTTER_PACKAGE=clutter-1.0
 AC_SUBST(CLUTTER_PACKAGE)
 if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
-
-  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
@@ -215,7 +195,12 @@ 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"
-  META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
+  # 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]
  AC_SUBST(META_GIR)
 fi

@@ -408,18 +393,6 @@ 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])
@@ -510,8 +483,7 @@ doc/Makefile
 doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
-src/libmutter-private.pc
-src/libmutter-wm.pc
+src/libmutter.pc
 src/mutter-plugins.pc
 src/tools/Makefile
 src/compositor/plugins/Makefile
@@ -520,13 +492,6 @@ 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"
@@ -543,7 +508,6 @@ 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}
--- 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 gconf database.
+Reload a theme which is specified on gsettings database.
 .TP
 .B enable-keybindings
-Enable all of keybindings which is specified on gconf database.
+Enable all of keybindings which is specified on gsettings database.
 .TP
 .B disable-keybindings
-Disable all of keybindings which is specified on gconf database.
+Disable all of keybindings which is specified on gsettings 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 gconf editing (gconf-editor or gconftool-2).
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gsettings.
 .SH SEE ALSO
 .BR mutter-message (1)
 .SH AUTHOR
--- a/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -22,6 +22,18 @@ 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/mutter.doap
+++ b/mutter.doap
@@ -6,6 +6,16 @@

  <name xml:lang="en">mutter</name>
  <shortdesc xml:lang="en">Window and compositing manager based on Clutter</shortdesc>
+  <description>Mutter is a window and compositing manager that displays and
+manages your desktop via OpenGL. Mutter combines a sophisticated display engine
+using the Clutter toolkit with solid window-management logic inherited from the
+Metacity window manager.
+
+While Mutter can be used stand-alone, it is primarily intended to be used as
+the display core of a larger system such as GNOME Shell. For this reason,
+Mutter is very extensible via plugins, which are used both to add fancy visual
+effects and to rework the window management behaviors to meet the needs of the
+environment.</description>
  <!--
  <homepage rdf:resource="http://www.gnome.org/" />
  -->
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -22,6 +22,7 @@ dz
 el
 en_CA
 en_GB
+eo
 es
 et
 eu
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/core/all-keybindings.h
+src/compositor/compositor.c
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -18,7 +18,7 @@ src/core/window-props.c
 src/core/xprops.c
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
-src/mutter.schemas.in
+src/org.gnome.mutter.gschema.xml.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
@@ -14,384 +14,16 @@ msgstr ""
 "Project-Id-Version: mutter MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&component=general\n"
-"POT-Creation-Date: 2011-02-01 17:26+0000\n"
-"PO-Revision-Date: 2011-02-03 00:52+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\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"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-msgid "Bell event"
-msgstr "Helina sündmus"
-
-#, c-format
-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 ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr "Sa võid natukene selle järel oodata või sundida rakenduse lõpetama."
-
-msgid "_Wait"
-msgstr "_Oota"
-
-msgid "_Force Quit"
-msgstr "_Sulge jõuga"
-
-#, c-format
-msgid "Missing %s extension required for compositing"
-msgstr "Puuduv laiendus %s on vajalik komposiitmontaaži jaoks"
-
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Tõrge X Window System'i kuva '%s' avamisel\n"
-
-#, c-format
-msgid ""
-"Some other program is already using the key %s with modifiers %x as a "
-"binding\n"
-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"
-
-#, c-format
-msgid ""
-"mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-"PARTICULAR PURPOSE.\n"
-msgstr ""
-"mutter %s\n"
-"Autoriõigused (C) 2001-%d Havoc Pennington, Red Hat, Inc., ja teised\n"
-"See programm on vaba tarkvara; kopeerimistingimuste kohta vaata\n"
-"programmi lähteteksti. Sellel programmil pole MINGISUGUST GARANTIID;\n"
-"isegi MITTE KOMMERTSGARANTIID EGA GARANTIID SOBIVUSELE\n"
-"TEATUD KINDLAKS EESMÄRGIKS.\n"
-
-msgid "Disable connection to session manager"
-msgstr "Seansihalduriga ühendumise keelamine"
-
-msgid "Replace the running window manager with Mutter"
-msgstr "Käivitatud aknahalduri asendamine Mutteriga"
-
-msgid "Specify session management ID"
-msgstr "Seansihalduse ID kirjeldamine"
-
-msgid "X Display to use"
-msgstr "X-kuva, mida kasutada"
-
-msgid "Initialize session from savefile"
-msgstr "Seansi lähtestamine salvestatud failist"
-
-msgid "Print version"
-msgstr "Versiooni printimine"
-
-msgid "Make X calls synchronous"
-msgstr "Tee X-väljakutsed sünkroonseks"
-
-msgid ""
-"Don't make fullscreen windows that are maximized and have no decorations"
-msgstr "Ei tehta maksimeeritud ilma raamita täisekraanaknaid."
-
-msgid "Comma-separated list of compositor plugins"
-msgstr "Komaga eraldatud nimekiri komposiitmontaaži pluginatest"
-
-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"
-
-#, c-format
-msgid "Failed to scan themes directory: %s\n"
-msgstr "Tõrge teemadekataloogi skannimisel: %s\n"
-
-#, c-format
-msgid ""
-"Could not find a theme! Be sure %s exists and contains the usual themes.\n"
-msgstr ""
-"Teemat ei leitud! Veendu, et %s on olemas ja sisaldab harilikke teemasid.\n"
-
-#, c-format
-msgid "Failed to restart: %s\n"
-msgstr "Tõrge taaskäivitamisel: %s\n"
-
-#.
-#. * 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"
-msgstr ""
-"Ümbernurga parandused vigastele rakendustele on keelatud. Mõned rakendused "
-"ei pruugi õigesti käituda.\n"
-
-#, c-format
-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 ""
-"\"%s\" found in configuration database is not a valid value for mouse button "
-"modifier\n"
-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 "
-"\"%s\"\n"
-msgstr ""
-"Seadistuste andmebaasist leitud \"%s\" ei ole sobiv väärtus kiirklahvile \"%s"
-"\"\n"
-
-#, c-format
-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 clutter plugin list: %s\n"
-msgstr "Viga clutteri pluginate nimekirja 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"
-msgstr "Ekraan %d kuval '%s' on vigane\n"
-
-#, c-format
-msgid ""
-"Screen %d on display \"%s\" already has a window manager; try using the --"
-"replace option to replace the current window manager.\n"
-msgstr ""
-"Ekraan %d kuval '%s' on juba aknahalduri poolt hallatav. Olemasoleva "
-"aknahalduri asendamiseks proovi --replace võtit \n"
-
-#, c-format
-msgid ""
-"Could not acquire window manager selection on screen %d display \"%s\"\n"
-msgstr "Aknahalduri valikut ei saa hankida ekraani %d kuval \"%s\"\n"
-
-#, c-format
-msgid "Screen %d on display \"%s\" already has a window manager\n"
-msgstr "Ekraan %d kuval '%s' on juba aknahalduri poolt hallatav\n"
-
-#, c-format
-msgid "Could not release screen %d on display \"%s\"\n"
-msgstr "Ekraani %d kuval \"%s\" ei saa vabastada\n"
-
-#, c-format
-msgid "Could not create directory '%s': %s\n"
-msgstr "Kataloogi '%s' pole võimalik luua: %s\n"
-
-#, c-format
-msgid "Could not open session file '%s' for writing: %s\n"
-msgstr "Seansifaili '%s' pole võimalik kirjutamiseks avada: %s\n"
-
-#, c-format
-msgid "Error writing session file '%s': %s\n"
-msgstr "Viga seansifaili '%s' kirjutamisel: %s\n"
-
-#, c-format
-msgid "Error closing session file '%s': %s\n"
-msgstr "Viga seansifaili '%s' sulgemisel: %s\n"
-
-#, c-format
-msgid "Failed to parse saved session file: %s\n"
-msgstr "Viga salvestatud seansifaili analüüsimisel: %s\n"
-
-#, c-format
-msgid "<mutter_session> attribute seen but we already have the session ID"
-msgstr "Nähti <mutter_session> atribuuti, aga sessiooni ID on juba määratud"
-
-#, c-format
-msgid "Unknown attribute %s on <%s> element"
-msgstr "Tundmatu atribuut %s <%s> elemendil"
-
-#, c-format
-msgid "nested <window> tag"
-msgstr "pesastatud <window>"
-
-#, c-format
-msgid "Unknown element %s"
-msgstr "Tundmatu element %s"
-
-msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
-msgstr ""
-"Need aknad ei toeta &quot;praeguse paigutuse salvestamist&quot; ja tuleb "
-"järgmisel sisselogimisel käsitsi taaskäivitada."
-
-#, c-format
-msgid "Failed to open debug log: %s\n"
-msgstr "Tõrge silumislogi avamisel: %s\n"
-
-#, c-format
-msgid "Failed to fdopen() log file %s: %s\n"
-msgstr "Tõrge logifaili %s avamisel funktsiooniga fdopen(): %s\n"
-
-#, c-format
-msgid "Opened log file %s\n"
-msgstr "Avati logifail %s\n"
-
-#, c-format
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter kompileeriti ilma jutuka režiimi toeta\n"
-
-msgid "Window manager: "
-msgstr "Aknahaldur: "
-
-msgid "Bug in window manager: "
-msgstr "Viga aknahalduris: "
-
-msgid "Window manager warning: "
-msgstr "Aknahalduri hoiatus: "
-
-msgid "Window manager error: "
-msgstr "Aknahalduri viga: "
-
-#. Translators: This is the title used on dialog boxes
-#. eof all-keybindings.h
-msgid "Mutter"
-msgstr "Mutter"
-
-#. first time through
-#, c-format
-msgid ""
-"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
-"window as specified in the ICCCM.\n"
-msgstr ""
-"Aken %s määrab SM_CLIENT_ID endale, selle asemel et  määrata see "
-"WM_CLIENT_LEADER aknale, nagu seda kirjeldab ICCCM.\n"
-
-#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
-#. * authoritative source for that info. Some apps such as mplayer or
-#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
-#. * leads to e.g. us not fullscreening their windows.  Apps that set
-#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
-#. * about these apps but make them work.
-#.
-#, c-format
-msgid ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
-"%d x %d and max size %d x %d; this doesn't make much sense.\n"
-msgstr ""
-"Aken %s määrab MWM vihje, näidates, et see pole muudetava suurusega, aga "
-"määrab vähimaks suuruseks %d x %d ja suurimaks suuruseks %d x %d; sel pole "
-"tähendust.\n"
-
-#, c-format
-msgid "Application set a bogus _NET_WM_PID %lu\n"
-msgstr "Rakendus määras võltsitud _NET_WM_PID %lu\n"
-
-#, c-format
-msgid "%s (on %s)"
-msgstr "%s (masinas %s)"
-
-#, c-format
-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 ""
-"Window 0x%lx has property %s\n"
-"that was expected to have type %s format %d\n"
-"and actually has type %s format %d n_items %d.\n"
-"This is most likely an application bug, not a window manager bug.\n"
-"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
-msgstr ""
-"Aknal 0x%lx on omadus %s,\n"
-"mis oleks pidanud olema %s tüüpi %d vormingus,\n"
-"aga tegelikult oli %s tüüpi %d vormingus n_items %d.\n"
-"See on kõige tõenäolisemalt rakenduse, mitte aknahalduri viga.\n"
-"Aknal on title=\"%s\" class=\"%s\" name=\"%s\"\n"
-
-#, c-format
-msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
-msgstr "Omadus %s aknal 0x%lx sisaldab vigast UTF-8\n"
-
-#, c-format
-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 "Switch to workspace 1"
 msgstr "Lülitumine 1. tööalale"

@@ -623,12 +255,358 @@ 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"
+
+#, c-format
+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 ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr "Sa võid natukene selle järel oodata või sundida rakenduse lõpetama."
+
+msgid "_Wait"
+msgstr "_Oota"
+
+msgid "_Force Quit"
+msgstr "_Sulge jõuga"
+
+#, c-format
+msgid "Missing %s extension required for compositing"
+msgstr "Puuduv laiendus %s on vajalik komposiitmontaaži jaoks"
+
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Tõrge X Window System'i kuva '%s' avamisel\n"
+
+#, c-format
+msgid ""
+"Some other program is already using the key %s with modifiers %x as a "
+"binding\n"
+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"
+
+msgid "Replace the running window manager"
+msgstr "Töötava aknahalduri asendamine"
+
+msgid "Specify session management ID"
+msgstr "Seansihalduse ID kirjeldamine"
+
+msgid "X Display to use"
+msgstr "X-kuva, mida kasutada"
+
+msgid "Initialize session from savefile"
+msgstr "Seansi lähtestamine salvestatud failist"
+
+msgid "Make X calls synchronous"
+msgstr "Tee X-väljakutsed sünkroonseks"
+
+#, c-format
+msgid "Failed to scan themes directory: %s\n"
+msgstr "Tõrge teemadekataloogi skannimisel: %s\n"
+
+#, c-format
+msgid ""
+"Could not find a theme! Be sure %s exists and contains the usual themes.\n"
+msgstr ""
+"Teemat ei leitud! Veendu, et %s on olemas ja sisaldab harilikke teemasid.\n"
+
+#, c-format
+msgid ""
+"mutter %s\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"This is free software; see the source for copying conditions.\n"
+"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.\n"
+msgstr ""
+"mutter %s\n"
+"Autoriõigused (C) 2001-%d Havoc Pennington, Red Hat, Inc., ja teised\n"
+"See programm on vaba tarkvara; kopeerimistingimuste kohta vaata\n"
+"programmi lähteteksti. Sellel programmil pole MINGISUGUST GARANTIID;\n"
+"isegi MITTE KOMMERTSGARANTIID EGA GARANTIID SOBIVUSELE\n"
+"TEATUD KINDLAKS EESMÄRGIKS.\n"
+
+msgid "Print version"
+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"
+msgstr ""
+"Ümbernurga parandused vigastele rakendustele on keelatud. Mõned rakendused "
+"ei pruugi õigesti käituda.\n"
+
+#, c-format
+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 ""
+"\"%s\" found in configuration database is not a valid value for mouse button "
+"modifier\n"
+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 "
+"\"%s\"\n"
+msgstr ""
+"Seadistuste andmebaasist leitud \"%s\" ei ole sobiv väärtus kiirklahvile \"%s"
+"\"\n"
+
+#, c-format
+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"
+msgstr "Ekraan %d kuval '%s' on vigane\n"
+
+#, c-format
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to replace the current window manager.\n"
+msgstr ""
+"Ekraan %d kuval '%s' on juba aknahalduri poolt hallatav. Olemasoleva "
+"aknahalduri asendamiseks proovi --replace võtit \n"
+
+#, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "Aknahalduri valikut ei saa hankida ekraani %d kuval \"%s\"\n"
+
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Ekraan %d kuval '%s' on juba aknahalduri poolt hallatav\n"
+
+#, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Ekraani %d kuval \"%s\" ei saa vabastada\n"
+
+#, c-format
+msgid "Could not create directory '%s': %s\n"
+msgstr "Kataloogi '%s' pole võimalik luua: %s\n"
+
+#, c-format
+msgid "Could not open session file '%s' for writing: %s\n"
+msgstr "Seansifaili '%s' pole võimalik kirjutamiseks avada: %s\n"
+
+#, c-format
+msgid "Error writing session file '%s': %s\n"
+msgstr "Viga seansifaili '%s' kirjutamisel: %s\n"
+
+#, c-format
+msgid "Error closing session file '%s': %s\n"
+msgstr "Viga seansifaili '%s' sulgemisel: %s\n"
+
+#, c-format
+msgid "Failed to parse saved session file: %s\n"
+msgstr "Viga salvestatud seansifaili analüüsimisel: %s\n"
+
+#, c-format
+msgid "<mutter_session> attribute seen but we already have the session ID"
+msgstr "Nähti <mutter_session> atribuuti, aga sessiooni ID on juba määratud"
+
+#, c-format
+msgid "Unknown attribute %s on <%s> element"
+msgstr "Tundmatu atribuut %s <%s> elemendil"
+
+#, c-format
+msgid "nested <window> tag"
+msgstr "pesastatud <window>"
+
+#, c-format
+msgid "Unknown element %s"
+msgstr "Tundmatu element %s"
+
+msgid ""
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
+msgstr ""
+"Need aknad ei toeta &quot;praeguse paigutuse salvestamist&quot; ja tuleb "
+"järgmisel sisselogimisel käsitsi taaskäivitada."
+
+#, c-format
+msgid "Failed to open debug log: %s\n"
+msgstr "Tõrge silumislogi avamisel: %s\n"
+
+#, c-format
+msgid "Failed to fdopen() log file %s: %s\n"
+msgstr "Tõrge logifaili %s avamisel funktsiooniga fdopen(): %s\n"
+
+#, c-format
+msgid "Opened log file %s\n"
+msgstr "Avati logifail %s\n"
+
+#, c-format
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter kompileeriti ilma jutuka režiimi toeta\n"
+
+msgid "Window manager: "
+msgstr "Aknahaldur: "
+
+msgid "Bug in window manager: "
+msgstr "Viga aknahalduris: "
+
+msgid "Window manager warning: "
+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 ""
+"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
+"window as specified in the ICCCM.\n"
+msgstr ""
+"Aken %s määrab SM_CLIENT_ID endale, selle asemel et  määrata see "
+"WM_CLIENT_LEADER aknale, nagu seda kirjeldab ICCCM.\n"
+
+#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
+#. * authoritative source for that info. Some apps such as mplayer or
+#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
+#. * leads to e.g. us not fullscreening their windows.  Apps that set
+#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
+#. * about these apps but make them work.
+#.
+#, c-format
+msgid ""
+"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
+"%d x %d and max size %d x %d; this doesn't make much sense.\n"
+msgstr ""
+"Aken %s määrab MWM vihje, näidates, et see pole muudetava suurusega, aga "
+"määrab vähimaks suuruseks %d x %d ja suurimaks suuruseks %d x %d; sel pole "
+"tähendust.\n"
+
+#, c-format
+msgid "Application set a bogus _NET_WM_PID %lu\n"
+msgstr "Rakendus määras võltsitud _NET_WM_PID %lu\n"
+
+#, c-format
+msgid "%s (on %s)"
+msgstr "%s (masinas %s)"
+
+#, c-format
+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 ""
+"Window 0x%lx has property %s\n"
+"that was expected to have type %s format %d\n"
+"and actually has type %s format %d n_items %d.\n"
+"This is most likely an application bug, not a window manager bug.\n"
+"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
+msgstr ""
+"Aknal 0x%lx on omadus %s,\n"
+"mis oleks pidanud olema %s tüüpi %d vormingus,\n"
+"aga tegelikult oli %s tüüpi %d vormingus n_items %d.\n"
+"See on kõige tõenäolisemalt rakenduse, mitte aknahalduri viga.\n"
+"Aknal on title=\"%s\" class=\"%s\" name=\"%s\"\n"
+
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr "Omadus %s aknal 0x%lx sisaldab vigast UTF-8\n"
+
+#, c-format
+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 "Attach modal dialogs"
 msgstr "Modaaldialoogide kinnistamine"

-msgid "Clutter Plugins"
-msgstr "Clutteri pluginad"
-
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -642,9 +620,6 @@ msgstr "Varjatud akende aktiivsus"
 msgid "Modifier to use for extended window management operations"
 msgstr "Laiendatud aknaoperatsioonide korral kasutatav muuteklahv"

-msgid "Plugins to load for the Clutter-based compositing manager."
-msgstr "Clutteril põhineva komposiitmontaažihalduri laadimise pluginad."
-
 # millalgi võiks selle kohta vearaporti kirjutada
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
@@ -1536,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/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.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/ro.po
+++ b/po/ro.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
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:

-lib_LTLIBRARIES = libmutter-private.la libmutter-wm.la
+lib_LTLIBRARIES = libmutter.la

 SUBDIRS=wm-tester tools compositor/plugins

@@ -32,7 +32,7 @@ mutter_built_sources = \
 	mutter-enum-types.h \
 	mutter-enum-types.c

-libmutter_wm_la_SOURCES =			\
+libmutter_la_SOURCES =				\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
 	core/bell.c				\
@@ -45,7 +45,7 @@ libmutter_wm_la_SOURCES =			\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
 	compositor/meta-background-actor.c	\
-	compositor/meta-background-actor.h	\
+	compositor/meta-background-actor-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -55,6 +55,8 @@ libmutter_wm_la_SOURCES =			\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
 	compositor/meta-shaped-texture.h	\
+	compositor/meta-texture-rectangle.c	\
+	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
@@ -66,6 +68,7 @@ libmutter_wm_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		\
@@ -149,31 +152,12 @@ libmutter_wm_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)

-libmutter_wm_la_LDFLAGS = -no-undefined
-libmutter_wm_la_LIBADD  = $(MUTTER_LIBS)
-
-# by setting libmutter_private_la_CFLAGS, the files shared with
-# mutter proper will be compiled with different names.
-libmutter_private_la_CFLAGS =
-libmutter_private_la_SOURCES=			\
-	core/boxes.c				\
-	meta/boxes.h				\
-	ui/gradient.c				\
-	meta/gradient.h				\
-	core/util.c				\
-	meta/util.h				\
-	meta/common.h				\
-	ui/preview-widget.c			\
-	meta/preview-widget.h			\
-	ui/theme-parser.c			\
-	ui/theme.c				\
-	meta/theme.h
-
-libmutter_private_la_LDFLAGS = -no-undefined
-libmutter_private_la_LIBADD  = $(MUTTER_LIBS)
+libmutter_la_LDFLAGS = -no-undefined
+libmutter_la_LIBADD  = $(MUTTER_LIBS)

 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
@@ -188,6 +172,7 @@ libmutterinclude_base_headers =		\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
+	meta/meta-background-actor.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
@@ -200,7 +185,6 @@ libmutterinclude_base_headers =		\
 	meta/workspace.h

 # Excluded from scanning for introspection but installed
-# preview-widget.h: only part of libmutter-private
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
 	meta/preview-widget.h			\
@@ -218,12 +202,16 @@ mutter_theme_viewer_SOURCES=  \
 bin_PROGRAMS=mutter mutter-theme-viewer

 mutter_SOURCES = core/mutter.c
-mutter_LDADD = libmutter-wm.la
+mutter_LDADD = $(MUTTER_LIBS) libmutter.la

 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)

-api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
+# 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

 # 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
@@ -236,20 +224,20 @@ typelib_DATA = Meta-$(api_version).typelib

 INTROSPECTION_GIRS = Meta-$(api_version).gir

-Meta-$(api_version).gir: libmutter-wm.la
-@META_GIR@_INCLUDES = GObject-2.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
+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@_PACKAGES = clutter-1.0 gtk+-3.0
@META_GIR@_CFLAGS = $(INCLUDES)
-@META_GIR@_LIBS = libmutter-wm.la
+@META_GIR@_LIBS = libmutter.la
@META_GIR@_FILES =				\
 	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_wm_la_SOURCES))
+	$(filter %.c,$(libmutter_la_SOURCES))
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error

 endif

-mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter-private.la
+mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la

 testboxes_SOURCES = core/testboxes.c
 testgradient_SOURCES = ui/testgradient.c
@@ -257,9 +245,9 @@ testasyncgetprop_SOURCES = core/testasyncgetprop.c

 noinst_PROGRAMS=testboxes testgradient testasyncgetprop

-testboxes_LDADD = libmutter-wm.la
-testgradient_LDADD = libmutter-wm.la
-testasyncgetprop_LDADD = libmutter-wm.la
+testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
+testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la

@INTLTOOL_DESKTOP_RULE@

@@ -273,20 +261,12 @@ wmproperties_in_files=mutter-wm.desktop.in
 wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
 wmproperties_DATA = $(wmproperties_files)

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

-@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
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = mutter-schemas.convert

 IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
@@ -298,7 +278,7 @@ CLEANFILES =					\
 	inlinepixbufs.h				\
 	mutter.desktop				\
 	mutter-wm.desktop			\
-	mutter.schemas				\
+	org.gnome.mutter.gschema.xml		\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
@@ -308,16 +288,16 @@ inlinepixbufs.h: $(IMAGES)

 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = libmutter-private.pc libmutter-wm.pc mutter-plugins.pc
+pkgconfig_DATA = libmutter.pc mutter-plugins.pc

 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_files)		\
 	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
-	$(schema_in_files)		\
-	libmutter-private.pc.in	\
-	libmutter-wm.pc.in \
+	org.gnome.mutter.gschema.xml.in \
+	mutter-schemas.convert \
+	libmutter.pc.in \
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
 	mutter-enum-types.c.in \
@@ -352,7 +332,7 @@ mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template $(srcdir)/mutter-enum-types.h.in \
+	    --template 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 && \
@@ -361,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 $(srcdir)/mutter-enum-types.c.in \
+	    --template 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,6 +29,10 @@
 * @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.
@@ -36,10 +40,11 @@
 * Return value: (transfer full): a newly created Cogl texture
 */
 CoglHandle
-meta_create_color_texture_4ub (guint8 red,
-                               guint8 green,
-                               guint8 blue,
-                               guint8 alpha)
+meta_create_color_texture_4ub (guint8           red,
+                               guint8           green,
+                               guint8           blue,
+                               guint8           alpha,
+                               CoglTextureFlags flags)
 {
  CoglColor color;
  guint8 pixel[4];
@@ -53,7 +58,7 @@ meta_create_color_texture_4ub (guint8 red,
  pixel[3] = cogl_color_get_alpha_byte (&color);

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

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

      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,10 +25,11 @@

 #include <cogl/cogl.h>

-CoglHandle meta_create_color_texture_4ub (guint8     red,
-                                          guint8     green,
-                                          guint8     blue,
-                                          guint8     alpha);
+CoglHandle meta_create_color_texture_4ub (guint8           red,
+                                          guint8           green,
+                                          guint8           blue,
+                                          guint8           alpha,
+                                          CoglTextureFlags flags);
 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,6 +8,7 @@
 #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;
@@ -41,6 +42,10 @@ 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;

--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -11,10 +11,11 @@
 #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.h"
+#include "meta-background-actor-private.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
 #include <X11/extensions/shape.h>
@@ -108,28 +109,6 @@ 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,
@@ -146,8 +125,7 @@ process_property_notify (MetaCompositor	*compositor,
 	  MetaScreen  *screen = l->data;
          if (event->window == meta_screen_get_xroot (screen))
            {
-              MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-              meta_background_actor_update (META_BACKGROUND_ACTOR (info->background_actor));
+              meta_background_actor_update (screen);
              return;
            }
        }
@@ -301,6 +279,12 @@ 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);
 }

@@ -474,20 +458,43 @@ 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;

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

-  if (meta_error_trap_pop_with_return (display))
+  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)
    {
-      g_warning ("Another compositing manager is running on screen %i",
-                 screen_number);
-      return;
+      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);
    }

  info = g_new0 (MetaCompScreen, 1);
@@ -532,7 +539,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 (screen);
+  info->background_actor = meta_background_actor_new_for_screen (screen);
  info->overlay_group = clutter_group_new ();
  info->hidden_group = clutter_group_new ();

@@ -587,6 +594,55 @@ 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
@@ -609,12 +665,25 @@ 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);
 }

@@ -642,6 +711,16 @@ 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)
 *
@@ -721,13 +800,6 @@ 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;
    }

@@ -1074,7 +1146,7 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,

  clutter_actor_set_size (info->stage, width, height);

-  meta_background_actor_screen_size_changed (META_BACKGROUND_ACTOR (info->background_actor));
+  meta_background_actor_screen_size_changed (screen);

  meta_verbose ("Changed size for stage on screen %d to %dx%d\n",
 		meta_screen_get_screen_number (screen),
@@ -1085,6 +1157,36 @@ 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);
@@ -1187,3 +1289,78 @@ 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
+flash_out_completed (ClutterAnimation *animation,
+                     ClutterActor     *flash)
+{
+  clutter_actor_destroy (flash);
+}
+
+static void
+flash_in_completed (ClutterAnimation *animation,
+                    ClutterActor     *flash)
+{
+  clutter_actor_animate (flash, CLUTTER_EASE_IN_QUAD,
+                         FLASH_TIME_MS,
+                         "opacity", 0,
+                         "signal-after::completed", flash_out_completed, flash,
+                         NULL);
+}
+
+void
+meta_compositor_flash_screen (MetaCompositor *compositor,
+                              MetaScreen     *screen)
+{
+  ClutterActor *stage;
+  ClutterActor *flash;
+  ClutterColor black = { 0, 0, 0, 255 };
+  gfloat width, height;
+
+  stage = meta_get_stage_for_screen (screen);
+  clutter_actor_get_size (stage, &width, &height);
+
+  flash = clutter_rectangle_new_with_color (&black);
+  clutter_actor_set_size (flash, width, height);
+  clutter_actor_set_opacity (flash, 0);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), flash);
+
+  clutter_actor_animate (flash, CLUTTER_EASE_OUT_QUAD,
+                         FLASH_TIME_MS,
+                         "opacity", 192,
+                         "signal-after::completed", flash_in_completed, flash,
+                         NULL);
+}
--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@@ -0,0 +1,15 @@
+/* -*- 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
@@ -33,71 +33,180 @@
 #include "cogl-utils.h"
 #include "compositor-private.h"
 #include <meta/errors.h>
-#include "meta-background-actor.h"
+#include "meta-background-actor-private.h"

-struct _MetaBackgroundActorClass
+/* 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
 {
-  ClutterActorClass parent_class;
-};
-
-struct _MetaBackgroundActor
-{
-  ClutterActor parent;
-
-  CoglHandle material;
  MetaScreen *screen;
-  cairo_region_t *visible_region;
+  GSList *actors;
+
  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
-update_wrap_mode (MetaBackgroundActor *self)
-{
-  int width, height;
-  CoglMaterialWrapMode wrap_mode;
+static void set_texture                (MetaScreenBackground *background,
+                                        CoglHandle            texture);
+static void set_texture_to_stage_color (MetaScreenBackground *background);

-  meta_screen_get_size (self->screen, &width, &height);
+static void
+on_notify_stage_color (GObject              *stage,
+                       GParamSpec           *pspec,
+                       MetaScreenBackground *background)
+{
+  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;
+
+  meta_screen_get_size (background->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 == self->texture_width && height == self->texture_height)
-    wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
+  if (width == background->texture_width && height == background->texture_height)
+    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
  else
-    wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;
+    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;

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

 static void
-set_texture (MetaBackgroundActor *self,
-             CoglHandle           texture)
+set_texture_on_actor (MetaBackgroundActor *self)
 {
-  MetaDisplay *display;
-
-  display = meta_screen_get_display (self->screen);
+  MetaBackgroundActorPrivate *priv = self->priv;
+  MetaDisplay *display = meta_screen_get_display (priv->background->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 (self->material, 0, texture);
+  cogl_material_set_layer (priv->material, 0, priv->background->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
@@ -106,48 +215,42 @@ set_texture (MetaBackgroundActor *self,
 * actually pick up the (small?) performance win. This is just a fallback.
 */
 static void
-set_texture_to_stage_color (MetaBackgroundActor *self)
+set_texture_to_stage_color (MetaScreenBackground *background)
 {
-  ClutterActor *stage = meta_get_stage_for_screen (self->screen);
+  ClutterActor *stage = meta_get_stage_for_screen (background->screen);
  ClutterColor color;
  CoglHandle texture;

  clutter_stage_get_color (CLUTTER_STAGE (stage), &color);
-  texture = meta_create_color_texture_4ub (color.red, color.green,
-                                           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);
+  /* 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);
+  cogl_handle_unref (texture);
 }

 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 (self->material != COGL_INVALID_HANDLE)
+  if (priv->background != NULL)
    {
-      cogl_handle_unref (self->material);
-      self->material = COGL_INVALID_HANDLE;
+      priv->background->actors = g_slist_remove (priv->background->actors, self);
+      priv->background = NULL;
    }

-  if (self->screen != NULL)
+  if (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;
+      cogl_handle_unref (priv->material);
+      priv->material = COGL_INVALID_HANDLE;
    }
 }

@@ -158,14 +261,15 @@ 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 (self->screen, &width, &height);
+  meta_screen_get_size (priv->background->screen, &width, &height);

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

 static void
@@ -176,9 +280,10 @@ 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 (self->screen, &width, &height);
+  meta_screen_get_size (priv->background->screen, &width, &height);

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

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

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

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

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

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

          cogl_rectangle_with_texture_coords (rect.x, rect.y,
                                              rect.x + rect.width, rect.y + rect.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);
+                                              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);
        }
    }
  else
@@ -223,85 +335,160 @@ meta_background_actor_paint (ClutterActor *actor)
      cogl_rectangle_with_texture_coords (0.0f, 0.0f,
                                          width, height,
                                          0.0f, 0.0f,
-                                          width / self->texture_width,
-                                          height / self->texture_height);
+                                          width / priv->background->texture_width,
+                                          height / priv->background->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 (self->screen, &width, &height);
+  meta_screen_get_size (priv->background->screen, &width, &height);

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

  return TRUE;
 }
-#endif
+
+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;
+    }
+}

 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;
-#endif
+
+  /**
+   * 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);
 }

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

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

  g_return_val_if_fail (META_IS_SCREEN (screen), NULL);

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

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

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

-  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);
+  set_texture_on_actor (self);
+  update_wrap_mode_of_actor (self);

  return CLUTTER_ACTOR (self);
 }

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

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

  root_pixmap_id = None;
  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
-                           meta_screen_get_xroot  (self->screen),
+                           meta_screen_get_xroot (screen),
                           compositor->atom_x_root_pixmap,
                           0, LONG_MAX,
                           False,
@@ -357,16 +544,16 @@ meta_background_actor_update (MetaBackgroundActor *self)

      if (texture != COGL_INVALID_HANDLE)
        {
-          set_texture (self, texture);
+          set_texture (background, texture);
          cogl_handle_unref (texture);

-          self->have_pixmap = True;
+          background->have_pixmap = True;
          return;
        }
    }

-  self->have_pixmap = False;
-  set_texture_to_stage_color (self);
+  background->have_pixmap = False;
+  set_texture_to_stage_color (background);
 }

 /**
@@ -382,37 +569,46 @@ 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));

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

  if (visible_region)
    {
      cairo_rectangle_int_t screen_rect = { 0 };
-      meta_screen_get_size (self->screen, &screen_rect.width, &screen_rect.height);
+      meta_screen_get_size (priv->background->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.
       */
-      self->visible_region = cairo_region_create_rectangle (&screen_rect);
-      cairo_region_intersect (self->visible_region, visible_region);
+      priv->visible_region = cairo_region_create_rectangle (&screen_rect);
+      cairo_region_intersect (priv->visible_region, visible_region);
    }
 }

 /**
 * meta_background_actor_screen_size_changed:
- * @self: a #MetaBackgroundActor
+ * @screen: a #MetaScreen
 *
 * Called by the compositor when the size of the #MetaScreen changes
 */
 void
-meta_background_actor_screen_size_changed (MetaBackgroundActor *self)
+meta_background_actor_screen_size_changed (MetaScreen *screen)
 {
-  update_wrap_mode (self);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (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);
 }
--- a/src/compositor/meta-shadow-factory-private.h
+++ b/src/compositor/meta-shadow-factory-private.h
@@ -47,7 +47,8 @@ void        meta_shadow_paint       (MetaShadow            *shadow,
                                     int                    window_width,
                                     int                    window_height,
                                     guint8                 opacity,
-                                     cairo_region_t        *clip);
+                                     cairo_region_t        *clip,
+                                     gboolean               clip_strictly);
 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",       { 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 } },
+  { "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 } },

-  { "popup-menu",    { 6, -1, 0, 4, 255 }, { 6, -1, 0, 4, 255 } },
+  { "popup-menu",    { 1, -1, 0, 1, 128 }, { 1, -1, 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 } }
+  { "dropdown-menu", { 1, 10, 0, 1, 128 }, { 1, 10, 0, 1, 128 } },
+  { "attached",      { 2, 50, 0, 1, 255 }, { 1, 50, 0, 1, 128 } }
 };

 G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);
@@ -189,8 +189,10 @@ 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. Drawing won't be strictly clipped to this region
- *   but it will be used to optimize what is drawn.
+ *   of the shadow.
+ * @clip_strictly: if %TRUE, drawing will be clipped strictly
+ *   to @clip, otherwise, it will be only used to optimize
+ *   drawing.
 *
 * Paints the shadow at the given position, for the specified actual
 * size of the region. (Since a #MetaShadow can be shared between
@@ -204,7 +206,8 @@ meta_shadow_paint (MetaShadow     *shadow,
                   int             window_width,
                   int             window_height,
                   guint8          opacity,
-                   cairo_region_t *clip)
+                   cairo_region_t *clip,
+                   gboolean        clip_strictly)
 {
  float texture_width = cogl_texture_get_width (shadow->texture);
  float texture_height = cogl_texture_get_height (shadow->texture);
@@ -276,6 +279,9 @@ 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;
@@ -283,16 +289,64 @@ 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_PART;
+            overlap = CAIRO_REGION_OVERLAP_IN;

-          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]);
+          /* 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);
+            }
        }
    }
 }
@@ -306,7 +360,7 @@ meta_shadow_paint (MetaShadow     *shadow,
 * @window_height: actual height of the region to paint a shadow for
 *
 * Computes the bounds of the pixels that will be affected by
- * meta_shadow_paints()
+ * meta_shadow_paint()
 */
 void
 meta_shadow_get_bounds  (MetaShadow            *shadow,
@@ -317,7 +371,7 @@ meta_shadow_get_bounds  (MetaShadow            *shadow,
                         cairo_rectangle_int_t *bounds)
 {
  bounds->x = window_x - shadow->outer_border_left;
-  bounds->y = window_x - shadow->outer_border_top;
+  bounds->y = window_y - 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;
 }
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -27,13 +27,13 @@

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

 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 #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);

@@ -49,13 +49,8 @@ static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,

 static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);

-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
-               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, \
@@ -69,11 +64,15 @@ struct _MetaShapedTexturePrivate
  CoglHandle material_unshaped;

  cairo_region_t *clip_region;
+  cairo_region_t *shape_region;
+
+  cairo_region_t *overlay_region;
+  cairo_path_t *overlay_path;
+
+  cairo_region_t *visible_pixels_region;

  guint mask_width, mask_height;

-  GArray *rectangles;
-
  guint create_mipmaps : 1;
 };

@@ -85,7 +84,6 @@ meta_shaped_texture_class_init (MetaShapedTextureClass *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->paint = meta_shaped_texture_paint;
@@ -103,8 +101,10 @@ 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->shape_region = NULL;
+  priv->overlay_path = NULL;
+  priv->overlay_region = NULL;
+  priv->visible_pixels_region = NULL;
  priv->paint_tower = meta_texture_tower_new ();
  priv->mask_texture = COGL_INVALID_HANDLE;
  priv->create_mipmaps = TRUE;
@@ -133,22 +133,13 @@ meta_shaped_texture_dispose (GObject *object)
      priv->material_unshaped = COGL_INVALID_HANDLE;
    }

+  meta_shaped_texture_set_shape_region (self, NULL);
  meta_shaped_texture_set_clip_region (self, NULL);
+  meta_shaped_texture_set_overlay_path (self, NULL, NULL);

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

-static void
-meta_shaped_texture_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)
@@ -179,27 +170,139 @@ meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
 {
  MetaShapedTexturePrivate *priv = stex->priv;

-  if (priv->mask_texture != COGL_INVALID_HANDLE)
+  if (priv->visible_pixels_region != NULL)
    {
-      GLuint mask_gl_tex;
-      GLenum mask_gl_target;
+      cairo_region_destroy (priv->visible_pixels_region);
+      priv->visible_pixels_region = NULL;

-      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->mask_texture != COGL_INVALID_HANDLE)
+        {
+          cogl_handle_unref (priv->mask_texture);
+          priv->mask_texture = COGL_INVALID_HANDLE;
+        }

      if (priv->material != COGL_INVALID_HANDLE)
        cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
    }
 }

+static void
+scan_visible_region (MetaShapedTexture *stex,
+                     guchar            *mask_data,
+                     int                stride)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  cairo_region_t *visible_pixels_region;
+  cairo_region_t *overlay_region;
+  int i, n_rects;
+
+  /* The visible pixels region contains all pixel values above 0.
+   * This is somewhat complicated when there's an overlay: we
+   * need to scan all regions potentially modified by it.
+   */
+
+  if (priv->visible_pixels_region)
+    cairo_region_destroy (priv->visible_pixels_region);
+
+  priv->visible_pixels_region = cairo_region_copy (priv->shape_region);
+
+  visible_pixels_region = priv->visible_pixels_region;
+  overlay_region = priv->overlay_region;
+
+  /* With no overlay region, the visible region is defined
+   * by the mask region, so we don't need to scan anything. */
+  if (overlay_region == NULL)
+      return;
+
+  /* Subtract all the rectangles in the overlay region so that we can
+   * scan all the pixels potentially added by the overlay path. */
+  cairo_region_subtract (visible_pixels_region, overlay_region);
+
+  n_rects = cairo_region_num_rectangles (overlay_region);
+
+  for (i = 0; i < n_rects; i++)
+    {
+      int x, y;
+      cairo_rectangle_int_t rect;
+
+      cairo_region_get_rectangle (overlay_region, i, &rect);
+
+      for (y = rect.y; y < (rect.y + rect.height); y++)
+        {
+          for (x = rect.x; x < (rect.x + rect.width); x++)
+            {
+              int w = x;
+              while (mask_data[y * stride + w] > 0 && w < (rect.x + rect.width))
+                w++;
+
+              if (w > 0)
+                {
+                  cairo_rectangle_int_t tmp;
+                  tmp.x = x;
+                  tmp.y = y;
+                  tmp.width = w - x;
+                  tmp.height = 1;
+                  cairo_region_union_rectangle (visible_pixels_region, &tmp);
+                  x = w;
+                }
+            }
+        }
+    }
+}
+
+static void
+install_overlay_path (MetaShapedTexture *stex,
+                      guchar            *mask_data,
+                      int                tex_width,
+                      int                tex_height,
+                      int                stride)
+{
+  MetaShapedTexturePrivate *priv = stex->priv;
+  int i, n_rects;
+  cairo_t *cr;
+  cairo_rectangle_int_t rect;
+  cairo_surface_t *surface;
+
+  if (priv->overlay_region == NULL)
+    return;
+
+  surface = cairo_image_surface_create_for_data (mask_data,
+                                                 CAIRO_FORMAT_A8,
+                                                 tex_width,
+                                                 tex_height,
+                                                 stride);
+
+  cr = cairo_create (surface);
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+
+  n_rects = cairo_region_num_rectangles (priv->overlay_region);
+  for (i = 0; i < n_rects; i++)
+    {
+      cairo_region_get_rectangle (priv->overlay_region, i, &rect);
+      cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
+    }
+
+  cairo_fill_preserve (cr);
+  if (priv->overlay_path == NULL)
+    {
+      /* If we have an overlay region but not an overlay path, then we
+       * just need to clear the rectangles in the overlay region. */
+      goto out;
+    }
+
+  cairo_clip (cr);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  cairo_set_source_rgba (cr, 1, 1, 1, 1);
+
+  cairo_append_path (cr, priv->overlay_path);
+  cairo_fill (cr);
+
+ out:
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+}
+
 static void
 meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
 {
@@ -222,22 +325,42 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
    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)
+  if (priv->visible_pixels_region == NULL)
    {
      guchar *mask_data;
-      const XRectangle *rect;
+      int i;
+      int n_rects;
+      int stride;
      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;)
+      /* If we have no shape region and no (or an empty) overlay region, we
+       * don't need to create a full mask texture, so quit early. */
+      if (priv->shape_region == NULL &&
+          (priv->overlay_region == NULL ||
+           cairo_region_num_rectangles (priv->overlay_region) == 0))
        {
-          gint x1 = rect->x, x2 = x1 + rect->width;
-          gint y1 = rect->y, y2 = y1 + rect->height;
+          /* With no mask, the visible region is just
+           * {0, 0, tex_width, tex_height}. */
+          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
+          priv->visible_pixels_region = cairo_region_create_rectangle (&rect);
+          return;
+        }
+
+      stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);
+
+      /* Create data for an empty image */
+      mask_data = g_malloc0 (stride * tex_height);
+
+      n_rects = cairo_region_num_rectangles (priv->shape_region);
+
+      /* Fill in each rectangle. */
+      for (i = 0; i < n_rects; i ++)
+        {
+          cairo_rectangle_int_t rect;
+          cairo_region_get_rectangle (priv->shape_region, i, &rect);
+
+          gint x1 = rect.x, x2 = x1 + rect.width;
+          gint y1 = rect.y, y2 = y1 + rect.height;
          guchar *p;

          /* Clip the rectangle to the size of the texture */
@@ -247,35 +370,32 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
          y2 = CLAMP (y2, y1, (gint) tex_height);

          /* Fill the rectangle */
-          for (p = mask_data + y1 * tex_width + x1;
+          for (p = mask_data + y1 * stride + x1;
               y1 < y2;
-               y1++, p += tex_width)
+               y1++, p += stride)
            memset (p, 255, x2 - x1);
        }

+      install_overlay_path (stex, mask_data, tex_width, tex_height, stride);
+      scan_visible_region (stex, mask_data, stride);
+
      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);

 #ifdef GL_TEXTURE_RECTANGLE_ARB
      if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
        {
-          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);
+            = meta_texture_rectangle_new (tex_width, tex_height,
+                                          0, /* flags */
+                                          /* data format */
+                                          COGL_PIXEL_FORMAT_A_8,
+                                          /* internal GL format */
+                                          GL_ALPHA,
+                                          /* internal cogl format */
+                                          COGL_PIXEL_FORMAT_A_8,
+                                          /* rowstride */
+                                          stride,
+                                          mask_data);
        }
      else
 #endif /* GL_TEXTURE_RECTANGLE_ARB */
@@ -283,7 +403,7 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
                                                         COGL_TEXTURE_NONE,
                                                         COGL_PIXEL_FORMAT_A_8,
                                                         COGL_PIXEL_FORMAT_ANY,
-                                                         tex_width,
+                                                         stride,
                                                         mask_data);

      g_free (mask_data);
@@ -342,9 +462,9 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;

-  if (priv->rectangles->len < 1)
+  if (priv->shape_region == NULL)
    {
-      /* If there are no rectangles use a single-layer texture */
+      /* No region means an unclipped shape. Use a single-layer texture. */

      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
        {
@@ -444,8 +564,8 @@ meta_shaped_texture_pick (ClutterActor       *actor,
  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
  MetaShapedTexturePrivate *priv = stex->priv;

-  /* If there are no rectangles then use the regular pick */
-  if (priv->rectangles->len < 1)
+  /* If there is no region then use the regular pick */
+  if (priv->shape_region == NULL)
    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
@@ -565,7 +685,8 @@ meta_shaped_texture_clear (MetaShapedTexture *stex)
 }

 void
-meta_shaped_texture_clear_rectangles (MetaShapedTexture *stex)
+meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
+                                      cairo_region_t    *region)
 {
  MetaShapedTexturePrivate *priv;

@@ -573,40 +694,85 @@ meta_shaped_texture_clear_rectangles (MetaShapedTexture *stex)

  priv = stex->priv;

-  g_array_set_size (priv->rectangles, 0);
-  meta_shaped_texture_dirty_mask (stex);
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
-}
+  if (priv->shape_region != NULL)
+    {
+      cairo_region_destroy (priv->shape_region);
+      priv->shape_region = NULL;
+    }

-void
-meta_shaped_texture_add_rectangle (MetaShapedTexture *stex,
-				   const XRectangle  *rect)
-{
-  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);
+  if (region != NULL)
+    {
+      cairo_region_reference (region);
+      priv->shape_region = region;
+    }

  meta_shaped_texture_dirty_mask (stex);
  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

+/**
+ * meta_shaped_texture_get_visible_pixels_region:
+ * @stex: a #MetaShapedTexture
+ *
+ * Return a region enclosing only visible pixels: those with
+ * alpha values above 0.
+ *
+ * Returns: a #cairo_region_t
+ */
+cairo_region_t *
+meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex)
+{
+  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
+
+  meta_shaped_texture_ensure_mask (stex);
+  return stex->priv->visible_pixels_region;
+}
+
+/**
+ * meta_shaped_texture_set_overlay_path:
+ * @stex: a #MetaShapedTexture
+ * @overlay_region: A region containing the parts of the mask to overlay.
+ *   All rectangles in this region are wiped clear to full transparency,
+ *   and the overlay path is clipped to this region.
+ * @overlay_path (transfer full): This path will be painted onto the mask
+ *   texture with a fully opaque source. Due to the lack of refcounting
+ *   in #cairo_path_t, ownership of the path is assumed.
+ */
+void
+meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
+                                      cairo_region_t    *overlay_region,
+                                      cairo_path_t      *overlay_path)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  if (priv->overlay_region != NULL)
+    {
+      cairo_region_destroy (priv->overlay_region);
+      priv->overlay_region = NULL;
+    }
+
+  if (priv->overlay_path != NULL)
+    {
+      cairo_path_destroy (priv->overlay_path);
+      priv->overlay_path = NULL;
+    }
+
+  cairo_region_reference (overlay_region);
+  priv->overlay_region = overlay_region;
+
+  /* cairo_path_t does not have refcounting. */
+  priv->overlay_path = overlay_path;
+
+  meta_shaped_texture_dirty_mask (stex);
+}
+
 /**
 * meta_shaped_texture_set_clip_region:
- * @frame: a #TidyTextureframe
+ * @frame: a #MetaShapedTexture
 * @clip_region: (transfer full): the region of the texture that
 *   is visible and should be painted. OWNERSHIP IS ASSUMED BY
 *   THE FUNCTION (for efficiency to avoid a copy.)
--- a/src/compositor/meta-shaped-texture.h
+++ b/src/compositor/meta-shaped-texture.h
@@ -29,11 +29,7 @@
 #include <config.h>

 #include <clutter/clutter.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

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

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

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

  MetaShapedTexturePrivate *priv;
 };
@@ -77,13 +65,14 @@ void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,

 void meta_shaped_texture_clear (MetaShapedTexture *stex);

-void meta_shaped_texture_clear_rectangles (MetaShapedTexture *stex);
+void meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
+                                           cairo_region_t    *region);

-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);
+cairo_region_t *meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex);
+
+void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
+                                           cairo_region_t    *overlay_region,
+                                           cairo_path_t      *overlay_path);

 /* Assumes ownership of clip_region */
 void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+
+#include <config.h>
+
+#include "meta-texture-rectangle.h"
+
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+
+static void (* pf_glGetIntegerv) (GLenum pname, GLint *params);
+static void (* pf_glTexImage2D) (GLenum target, GLint level,
+                                 GLint internalFormat,
+                                 GLsizei width, GLsizei height,
+                                 GLint border, GLenum format, GLenum type,
+                                 const GLvoid *pixels);
+static void (* pf_glGenTextures) (GLsizei n, GLuint *textures);
+static void (* pf_glDeleteTextures) (GLsizei n, const GLuint *texture);
+static void (* pf_glBindTexture) (GLenum target, GLuint texture);
+
+static void
+rectangle_texture_destroy_cb (void *user_data)
+{
+  GLuint tex = GPOINTER_TO_UINT (user_data);
+
+  pf_glDeleteTextures (1, &tex);
+}
+
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+CoglHandle
+meta_texture_rectangle_new (unsigned int width,
+                            unsigned int height,
+                            CoglTextureFlags flags,
+                            CoglPixelFormat format,
+                            GLenum internal_gl_format,
+                            GLenum internal_format,
+                            unsigned int rowstride,
+                            const guint8 *data)
+{
+  CoglHandle cogl_tex = COGL_INVALID_HANDLE;
+
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+
+  static CoglUserDataKey user_data_key;
+  GLint old_binding;
+  GLuint tex;
+
+  if (pf_glGenTextures == NULL)
+    {
+      pf_glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv");
+      pf_glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D");
+      pf_glGenTextures = (void *) cogl_get_proc_address ("glGenTextures");
+      pf_glDeleteTextures = (void *) cogl_get_proc_address ("glDeleteTextures");
+      pf_glBindTexture = (void *) cogl_get_proc_address ("glBindTexture");
+    }
+
+  pf_glGenTextures (1, &tex);
+  pf_glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding);
+  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+  pf_glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                   internal_gl_format, width, height,
+                   0, internal_gl_format,
+                   GL_UNSIGNED_BYTE, NULL);
+  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, old_binding);
+
+  cogl_tex = cogl_texture_new_from_foreign (tex,
+                                            GL_TEXTURE_RECTANGLE_ARB,
+                                            width, height,
+                                            0, 0, /* no waste */
+                                            internal_format);
+
+  /* Cogl won't destroy the GL texture when a foreign texture is used
+     so we need to destroy it manually. We can set a destroy
+     notification callback to do this transparently */
+  cogl_object_set_user_data (cogl_tex,
+                             &user_data_key,
+                             GUINT_TO_POINTER (tex),
+                             rectangle_texture_destroy_cb);
+
+  /* Use cogl_texture_set_region instead of uploading the data
+     directly with GL calls so that we can let Cogl deal with setting
+     the pixel store parameters and handling format conversion */
+  if (data)
+    cogl_texture_set_region (cogl_tex,
+                             0, 0, /* src x/y */
+                             0, 0, /* dst x/y */
+                             width, height, /* dst width/height */
+                             width, height, /* src width/height */
+                             format,
+                             rowstride,
+                             data);
+
+#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+  return cogl_tex;
+}
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.h
@@ -0,0 +1,45 @@
+/*
+ * 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
+
+CoglHandle
+meta_texture_rectangle_new (unsigned int width,
+                            unsigned int height,
+                            CoglTextureFlags flags,
+                            CoglPixelFormat format,
+                            GLenum internal_gl_format,
+                            GLenum internal_format,
+                            unsigned int rowstride,
+                            const guint8 *data);
+
+G_END_DECLS
+
+#endif /* __META_TEXTURE_RECTANGLE_H__ */
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -26,6 +26,7 @@
 #include <string.h>

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

 #ifndef M_LOG2E
 #define M_LOG2E 1.4426950408889634074
@@ -109,25 +110,9 @@ texture_is_rectangle (CoglHandle texture)
 }
 #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_update_area:
- * @tower: a MetaTextureTower
+ * meta_texture_tower_set_base_texture:
+ * @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
@@ -152,7 +137,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
        {
          if (tower->textures[i] != COGL_INVALID_HANDLE)
            {
-              free_texture (tower->textures[i]);
+              cogl_handle_unref (tower->textures[i]);
              tower->textures[i] = COGL_INVALID_HANDLE;
            }

@@ -190,7 +175,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
@@ -213,6 +198,9 @@ 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]);

@@ -384,23 +372,18 @@ texture_tower_create_texture (MetaTextureTower *tower,
  if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
      texture_is_rectangle (tower->textures[level - 1]))
    {
-      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);
+      tower->textures[level] =
+        meta_texture_rectangle_new (width, height,
+                                    0, /* flags */
+                                    /* data format */
+                                    TEXTURE_FORMAT,
+                                    /* internal GL format */
+                                    GL_RGBA,
+                                    /* internal cogl format */
+                                    TEXTURE_FORMAT,
+                                    /* rowstride */
+                                    width * 4,
+                                    NULL);
    }
  else
 #endif /* GL_TEXTURE_RECTANGLE_ARB */
@@ -430,12 +413,7 @@ texture_tower_revalidate_fbo (MetaTextureTower *tower,
  CoglMatrix modelview;

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

  if (tower->fbos[level] == COGL_INVALID_HANDLE)
    return FALSE;
@@ -604,7 +582,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,15 +26,22 @@ 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,
-                                                gboolean         shaped);
+void     meta_window_actor_update_shape        (MetaWindowActor *self);
 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,9 +7,10 @@

 #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.h"
+#include "meta-background-actor-private.h"

 struct _MetaWindowGroupClass
 {
@@ -100,16 +101,42 @@ actor_is_untransformed (ClutterActor *actor,
  return TRUE;
 }

+#if CLUTTER_CHECK_VERSION(1, 9, 0)
+#define has_effects clutter_actor_has_effects
+#else
+
+static gboolean
+has_effects(ClutterActor *actor)
+{
+  GList *list;
+  gboolean ret;
+
+  list = clutter_actor_get_effects (actor);
+  ret = list != NULL;
+  g_list_free (list);
+
+  return ret;
+}
+
+#endif
+
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
-  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
  cairo_region_t *visible_region;
-  GLboolean scissor_test;
-  cairo_rectangle_int_t screen_rect = { 0 };
-  cairo_rectangle_int_t scissor_rect;
+  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);
+    }
+
  /* We walk the list from top to bottom (opposite of painting order),
   * and subtract the opaque area of each window out of the visible
   * region that we pass to the windows below.
@@ -117,49 +144,49 @@ meta_window_group_paint (ClutterActor *actor)
  children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
  children = g_list_reverse (children);

-  /* 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);
+  /* 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);

-  /* 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);
+  visible_region = cairo_region_create_rectangle (&visible_rect);

-  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);
+  if (unredirected_window_region)
+    cairo_region_subtract (visible_region, unredirected_window_region);

  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 (has_effects (l->data))
+        continue;
+
      if (META_IS_WINDOW_ACTOR (l->data))
        {
          MetaWindowActor *window_actor = l->data;
-          gboolean x, y;
+          int x, y;

          if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
            continue;
@@ -188,6 +215,9 @@ 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
--- a/src/compositor/region-utils.c
+++ b/src/compositor/region-utils.c
@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region,
  MetaRegionBuilder builder;
  MetaRegionIterator iter;
  cairo_rectangle_int_t extents;
-  cairo_region_t *chunk;

  int last_x;

@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region,
                     extents.x, extents.y + extents.height, extents.width, 1,
                     x_amount, y_amount, flip);

-  chunk = NULL;
-
  last_x = extents.x;
  for (meta_region_iterator_init (&iter, region);
       !meta_region_iterator_at_end (&iter);
       meta_region_iterator_next (&iter))
    {
-      if (chunk == NULL)
-        chunk = cairo_region_create ();
-
      if (iter.rectangle.x > last_x)
        add_expanded_rect (&builder,
                           last_x, iter.rectangle.y,
--- a/src/core/above-tab-keycode.c
+++ b/src/core/above-tab-keycode.c
@@ -76,6 +76,8 @@ compute_above_tab_keycode (Display *xdisplay)
  keyboard = XkbGetKeyboard (xdisplay,
                             XkbGBN_ClientSymbolsMask | XkbGBN_KeyNamesMask | XkbGBN_GeometryMask,
                             XkbUseCoreKbd);
+  if (!keyboard)
+    return best_keycode;

  geometry = keyboard->geom;

--- a/src/core/all-keybindings.h
+++ b/src/core/all-keybindings.h
@@ -1,400 +0,0 @@
-/* -*- 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
@@ -130,7 +130,7 @@ bell_flash_screen (MetaDisplay *display,
      XFreeGC (display->xdisplay, gc);
    }

-  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK &&
      !display->mouse_mode)
    meta_display_increment_focus_sentinel (display);
  XFlush (display->xdisplay);
@@ -149,7 +149,7 @@ bell_flash_screen (MetaDisplay *display,
 #ifdef HAVE_XKB
 static void
 bell_flash_fullscreen (MetaDisplay *display, 
-			    XkbAnyEvent *xkb_ev)
+                       XkbAnyEvent *xkb_ev)
 {
  XkbBellNotifyEvent *xkb_bell_ev = (XkbBellNotifyEvent *) xkb_ev;
  MetaScreen *screen;
@@ -159,7 +159,12 @@ bell_flash_fullscreen (MetaDisplay *display,
    {
      screen = meta_display_screen_for_xwindow (display, xkb_bell_ev->window);
      if (screen)
-	bell_flash_screen (display, screen);
+        {
+          if (display->compositor)
+            meta_compositor_flash_screen (display->compositor, screen);
+          else
+            bell_flash_screen (display, screen);
+        }
    }
  else 
    {
@@ -167,7 +172,10 @@ bell_flash_fullscreen (MetaDisplay *display,
      while (screen_list) 
 	{
 	  screen = (MetaScreen *) screen_list->data;
-	  bell_flash_screen (display, screen);
+          if (display->compositor)
+            meta_compositor_flash_screen (display->compositor, screen);
+          else
+            bell_flash_screen (display, screen);
 	  screen_list = screen_list->next;
 	}
    }
@@ -269,15 +277,12 @@ bell_visual_notify (MetaDisplay *display,
 {
  switch (meta_prefs_get_visual_bell_type ()) 
    {
-    case META_VISUAL_BELL_FULLSCREEN_FLASH:
+    case G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH:
      bell_flash_fullscreen (display, xkb_ev);
      break;
-    case META_VISUAL_BELL_FRAME_FLASH:
+    case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
      bell_flash_frame (display, xkb_ev); /* does nothing yet */
      break;
-    case META_VISUAL_BELL_INVALID:
-      /* do nothing */
-      break;
    }
 }

@@ -286,7 +291,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
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -179,6 +179,16 @@ meta_rectangle_area (const MetaRectangle *rect)
  return rect->width * rect->height;
 }

+/**
+ * meta_rectangle_intersect:
+ * @src1: a #MetaRectangle
+ * @src2: another #MetaRectangle
+ * @dest: (out caller-allocates): an empty #MetaRectangle, to be filled
+ *   with the coordinates of the intersection.
+ *
+ * Returns: TRUE is some intersection exists and is not degenerate, FALSE
+ *   otherwise.
+ */
 gboolean
 meta_rectangle_intersect (const MetaRectangle *src1,
 			  const MetaRectangle *src2,
@@ -226,6 +236,13 @@ meta_rectangle_equal (const MetaRectangle *src1,
          (src1->height == src2->height));
 }

+/**
+ * meta_rectangle_union:
+ * @rect1: a #MetaRectangle
+ * @rect2: another #MetaRectangle
+ * @dest: (out caller-allocates): an empty #MetaRectangle, to be filled
+ *   with the coordinates of the bounding box.
+ */
 void
 meta_rectangle_union (const MetaRectangle *rect1,
                      const MetaRectangle *rect2,
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -118,7 +118,7 @@ typedef struct
 {
  MetaRectangle        orig;
  MetaRectangle        current;
-  MetaFrameGeometry   *fgeom;
+  MetaFrameBorders    *borders;
  ActionType           action_type;
  gboolean             is_user_action;

@@ -142,6 +142,11 @@ typedef struct
  GList  *usable_screen_region;
  GList  *usable_monitor_region;
 } ConstraintInfo;
+
+static gboolean do_screen_and_monitor_relative_constraints (MetaWindow     *window,
+                                                            GList          *region_spanning_rectangles,
+                                                            ConstraintInfo *info,
+                                                            gboolean        check_only);
 static gboolean constrain_modal_dialog       (MetaWindow         *window,
                                              ConstraintInfo     *info,
                                              ConstraintPriority  priority,
@@ -189,7 +194,7 @@ static gboolean constrain_partially_onscreen (MetaWindow         *window,

 static void setup_constraint_info        (ConstraintInfo      *info,
                                          MetaWindow          *window,
-                                          MetaFrameGeometry   *orig_fgeom,
+                                          MetaFrameBorders    *orig_borders,
                                          MetaMoveResizeFlags  flags,
                                          int                  resize_gravity,
                                          const MetaRectangle *orig,
@@ -199,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 MetaFrameGeometry *fgeom);
+                                          const MetaFrameBorders  *borders);
 static void unextend_by_frame            (MetaRectangle           *rect,
-                                          const MetaFrameGeometry *fgeom);
+                                          const MetaFrameBorders  *borders);
 static inline void get_size_limits       (const MetaWindow        *window,
-                                          const MetaFrameGeometry *fgeom,
+                                          const MetaFrameBorders  *borders,
                                          gboolean include_frame,
                                          MetaRectangle *min_size,
                                          MetaRectangle *max_size);
@@ -274,7 +279,7 @@ do_all_constraints (MetaWindow         *window,

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

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

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

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

  if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
    info->action_type = ACTION_MOVE_AND_RESIZE;
@@ -456,7 +461,6 @@ 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"
@@ -466,8 +470,6 @@ 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" :
@@ -508,7 +510,7 @@ place_window_if_needed(MetaWindow     *window,
      MetaWorkspace *cur_workspace;
      const MetaMonitorInfo *monitor_info;

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

@@ -568,7 +570,7 @@ place_window_if_needed(MetaWindow     *window,

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

          if (window->fullscreen_after_placement)
            {
@@ -629,7 +631,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->fgeom);
+  extend_by_frame (&info->current, info->borders);

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

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

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

 static void
 extend_by_frame (MetaRectangle           *rect,
-                 const MetaFrameGeometry *fgeom)
+                 const MetaFrameBorders *borders)
 {
-  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;
+  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;
 }

 static void
 unextend_by_frame (MetaRectangle           *rect,
-                   const MetaFrameGeometry *fgeom)
+                   const MetaFrameBorders *borders)
 {
-  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;
+  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;
 }

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

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

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

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

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

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

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

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

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

@@ -776,7 +776,12 @@ constrain_modal_dialog (MetaWindow         *window,

  info->current.y = y;
  info->current.x = x;
-  return TRUE;
+  /* The calculated position above may need adjustment to make sure the
+   * dialog does not end up partially off-screen */
+  return do_screen_and_monitor_relative_constraints (window,
+                                                     info->usable_screen_region,
+                                                     info,
+                                                     check_only);
 }

 static gboolean
@@ -800,8 +805,14 @@ constrain_maximization (MetaWindow         *window,
    return TRUE;

  /* Calculate target_size = maximized size of (window + frame) */
-  if (window->maximized_horizontally && window->maximized_vertically)
-    target_size = info->work_area_monitor;
+  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;
+    }
  else
    {
      /* Amount of maximization possible in a single direction depends
@@ -821,19 +832,19 @@ constrain_maximization (MetaWindow         *window,
      active_workspace_struts = window->screen->active_workspace->all_struts;

      target_size = info->current;
-      extend_by_frame (&target_size, info->fgeom);
+      extend_by_frame (&target_size, info->borders);
      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->fgeom);
+  unextend_by_frame (&target_size, info->borders);

  /* Check min size constraints; max size constraints are ignored for maximized
   * windows, as per bug 327543.
   */
-  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->borders, 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)
@@ -887,12 +898,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->fgeom);
+  unextend_by_frame (&target_size, info->borders);

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

  monitor = info->entire_monitor;

-  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->borders, 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)
@@ -1044,7 +1055,7 @@ constrain_size_limits (MetaWindow         *window,
    return TRUE;

  /* Determine whether constraint is already satisfied; exit if it is */
-  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->borders, 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);
@@ -1236,8 +1247,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->fgeom, TRUE, &min_size, &max_size);
-  extend_by_frame (&info->current, info->fgeom);
+  get_size_limits (window, info->borders, TRUE, &min_size, &max_size);
+  extend_by_frame (&info->current, info->borders);

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

@@ -1281,7 +1292,7 @@ do_screen_and_monitor_relative_constraints (
                                      info->fixed_directions,
                                      &info->current);

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

@@ -1394,8 +1405,8 @@ constrain_titlebar_visible (MetaWindow         *window,
   */
  if (window->frame)
    {
-      bottom_amount = info->current.height + info->fgeom->bottom_height;
-      vert_amount_onscreen = info->fgeom->top_height;
+      bottom_amount = info->current.height + info->borders->visible.bottom;
+      vert_amount_onscreen = info->borders->visible.top;
    }
  else
    bottom_amount = vert_amount_offscreen;
@@ -1469,8 +1480,8 @@ constrain_partially_onscreen (MetaWindow         *window,
   */
  if (window->frame)
    {
-      bottom_amount = info->current.height + info->fgeom->bottom_height;
-      vert_amount_onscreen = info->fgeom->top_height;
+      bottom_amount = info->current.height + info->borders->visible.bottom;
+      vert_amount_onscreen = info->borders->visible.top;
    }
  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,
-                            MetaFrameGeometry   *orig_fgeom,
+                            MetaFrameBorders    *orig_borders,
                            MetaMoveResizeFlags  flags,
                            int                  resize_gravity,
                            const MetaRectangle *orig,
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -107,9 +107,6 @@ 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;
@@ -146,6 +143,9 @@ 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 () == META_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () == G_DESKTOP_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_focus_window (Display *xdisplay,
-                                      Window   xwindow,
-                                      guint32  timestamp)
+meta_core_lower_beneath_grab_window (Display *xdisplay,
+                                     Window   xwindow,
+                                     guint32  timestamp)
 {
  XWindowChanges changes;
  MetaDisplay *display;
  MetaScreen *screen;
-  MetaWindow *focus_window;
+  MetaWindow *grab_window;

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

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

  changes.stack_mode = Below;
-  changes.sibling = focus_window->frame ? focus_window->frame->xwindow
-                                        : focus_window->xwindow;
+  changes.sibling = grab_window->frame ? grab_window->frame->xwindow
+                                       : grab_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,7 +35,6 @@ 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,
@@ -48,6 +47,7 @@ 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_focus_window (Display *xdisplay,
-                                           Window   xwindow,
-                                           guint32  timestamp);
+void meta_core_lower_beneath_grab_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,23 +88,41 @@ delete_ping_timeout_func (MetaDisplay *display,
      return;
    }

-  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
+  /* 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;
+    }

  /* Translators: %s is a window title */
-  tmp = g_strdup_printf (_("<tt>%s</tt> is not responding."),
-                         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."));
+
  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, 0,
-                      window->screen->number,
+                      window_content, NULL,
+                      window->screen->screen_name,
                      _("_Wait"), _("_Force Quit"), window->xwindow,
                      NULL, NULL);

--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -73,9 +73,11 @@ 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
+ * 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.
 */
-#define N_IGNORED_SERIALS           4
+#define N_IGNORED_CROSSING_SERIALS  10

 typedef enum {
  META_TILE_NONE,
@@ -153,7 +155,7 @@ struct _MetaDisplay
   * correspond to an enter event we should
   * ignore
   */
-  unsigned long ignored_serials[N_IGNORED_SERIALS];
+  unsigned long ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS];
  Window ungrab_should_not_cause_focus_window;
  
  guint32 current_time;
@@ -187,6 +189,7 @@ 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;
@@ -341,10 +344,6 @@ 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
@@ -532,9 +532,9 @@ meta_display_open (void)
                                          meta_unsigned_long_equal);
  
  i = 0;
-  while (i < N_IGNORED_SERIALS)
+  while (i < N_IGNORED_CROSSING_SERIALS)
    {
-      the_display->ignored_serials[i] = 0;
+      the_display->ignored_crossing_serials[i] = 0;
      ++i;
    }
  the_display->ungrab_should_not_cause_focus_window = None;
@@ -554,6 +554,7 @@ 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;

@@ -1383,37 +1384,48 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
  return timestamp;
 }

-static void
-add_ignored_serial (MetaDisplay  *display,
-                    unsigned long serial)
+/**
+ * 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)
 {
  int i;

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

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

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

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

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

@@ -1603,7 +1615,7 @@ event_callback (XEvent   *event,
      if (meta_ui_window_should_not_cause_focus (display->xdisplay,
                                                 modified))
        {
-          add_ignored_serial (display, event->xany.serial);
+          meta_display_add_ignored_crossing_serial (display, event->xany.serial);
          meta_topic (META_DEBUG_FOCUS,
                      "Adding EnterNotify serial %lu to ignored focus serials\n",
                      event->xany.serial);
@@ -1613,7 +1625,7 @@ event_callback (XEvent   *event,
           event->xcrossing.mode == NotifyUngrab &&
           modified == display->ungrab_should_not_cause_focus_window)
    {
-      add_ignored_serial (display, event->xany.serial);
+      meta_display_add_ignored_crossing_serial (display, event->xany.serial);
      meta_topic (META_DEBUG_FOCUS,
                  "Adding LeaveNotify serial %lu to ignored focus serials\n",
                  event->xany.serial);
@@ -1697,12 +1709,9 @@ event_callback (XEvent   *event,
                              window->desc);
                }

-              if (window->frame)
-                {
-                  window->frame->need_reapply_frame_shape = TRUE;
-		  meta_warning("from event callback\n");		  
-                  meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
-                }
+              if (display->compositor)
+                meta_compositor_window_shape_changed (display->compositor,
+                                                      window);
            }
        }
      else
@@ -1912,7 +1921,7 @@ event_callback (XEvent   *event,
               * in application-based mode, and the different
               * app is not a dock or desktop, eat the focus click.
               */
-              if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
+              if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
                  meta_prefs_get_application_based () &&
                  !window->has_focus &&
                  window->type != META_WINDOW_DOCK &&
@@ -1992,7 +2001,7 @@ event_callback (XEvent   *event,
      /* Check if we've entered a window; do this even if window->has_focus to
       * avoid races.
       */
-      if (window && !serial_is_ignored (display, event->xany.serial) &&
+      if (window && !crossing_serial_is_ignored (display, event->xany.serial) &&
               event->xcrossing.mode != NotifyGrab && 
               event->xcrossing.mode != NotifyUngrab &&
               event->xcrossing.detail != NotifyInferior &&
@@ -2000,8 +2009,8 @@ event_callback (XEvent   *event,
        {
          switch (meta_prefs_get_focus_mode ())
            {
-            case META_FOCUS_MODE_SLOPPY:
-            case META_FOCUS_MODE_MOUSE:
+            case G_DESKTOP_FOCUS_MODE_SLOPPY:
+            case G_DESKTOP_FOCUS_MODE_MOUSE:
              display->mouse_mode = TRUE;
              if (window->type != META_WINDOW_DOCK &&
                  window->type != META_WINDOW_DESKTOP)
@@ -2017,7 +2026,7 @@ event_callback (XEvent   *event,
                  meta_window_focus (window, event->xcrossing.time);

                  /* stop ignoring stuff */
-                  reset_ignores (display);
+                  reset_ignored_crossing_serials (display);
                  
                  if (meta_prefs_get_auto_raise ()) 
                    {
@@ -2039,7 +2048,7 @@ event_callback (XEvent   *event,
               * alternative mechanism works great.
               */
              if (window->type == META_WINDOW_DESKTOP &&
-                  meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
+                  meta_prefs_get_focus_mode() == G_DESKTOP_FOCUS_MODE_MOUSE &&
                  display->expected_focus_window != NULL)
                {
                  meta_topic (META_DEBUG_FOCUS,
@@ -2051,7 +2060,7 @@ event_callback (XEvent   *event,
                                                          event->xcrossing.time);
                }
              break;
-            case META_FOCUS_MODE_CLICK:
+            case G_DESKTOP_FOCUS_MODE_CLICK:
              break;
            }
          
@@ -2286,11 +2295,8 @@ event_callback (XEvent   *event,
        screen = meta_display_screen_for_root (display,
                                               event->xconfigure.event);
        if (screen)
-          {
-            if (screen)
-              meta_stack_tracker_reparent_event (screen->stack_tracker,
-                                                 &event->xreparent);
-          }
+          meta_stack_tracker_reparent_event (screen->stack_tracker,
+                                             &event->xreparent);
      }
      break;
    case ConfigureNotify:
@@ -3494,6 +3500,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
                            int          root_x,
                            int          root_y)
 {
+  MetaWindow *grab_window = NULL;
  Window grab_xwindow;
  
  meta_topic (META_DEBUG_WINDOW_OPS,
@@ -3523,14 +3530,24 @@ 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) &&
+      meta_grab_op_is_moving (op))
+    grab_window = meta_window_get_transient_for (window);
+
+  if (grab_window == NULL)
+    grab_window = window;
+
  /* FIXME:
   *   If we have no MetaWindow we do our best
   *   and try to do the grab on the RootWindow.
   *   This will fail if anyone else has any
   *   key grab on the RootWindow.
   */
-  if (window)
-    grab_xwindow = window->frame ? window->frame->xwindow : window->xwindow;
+  if (grab_window)
+    grab_xwindow = grab_window->frame ? grab_window->frame->xwindow : grab_window->xwindow;
  else
    grab_xwindow = screen->xroot;

@@ -3542,7 +3559,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)
+  if (!display->grab_have_pointer && !grab_op_is_keyboard (op))
    {
      meta_topic (META_DEBUG_WINDOW_OPS,
                  "XGrabPointer() failed\n");
@@ -3552,9 +3569,9 @@ meta_display_begin_grab_op (MetaDisplay *display,
  /* Grab keys for keyboard ops and mouse move/resizes; see #126497 */
  if (grab_op_is_keyboard (op) || grab_op_is_mouse_only (op))
    {
-      if (window)
+      if (grab_window)
        display->grab_have_keyboard =
-                     meta_window_grab_all_keys (window, timestamp);
+                     meta_window_grab_all_keys (grab_window, timestamp);

      else
        display->grab_have_keyboard =
@@ -3571,15 +3588,21 @@ meta_display_begin_grab_op (MetaDisplay *display,
    }
  
  display->grab_op = op;
-  display->grab_window = window;
+  display->grab_window = grab_window;
  display->grab_screen = screen;
  display->grab_xwindow = grab_xwindow;
  display->grab_button = button;
  display->grab_mask = modmask;
  if (window)
-    display->grab_tile_mode = window->tile_mode;
+    {
+      display->grab_tile_mode = window->tile_mode;
+      display->grab_tile_monitor_number = window->tile_monitor_number;
+    }
  else
-    display->grab_tile_mode = META_TILE_NONE;
+    {
+      display->grab_tile_mode = META_TILE_NONE;
+      display->grab_tile_monitor_number = -1;
+    }
  display->grab_anchor_root_x = root_x;
  display->grab_anchor_root_y = root_y;
  display->grab_latest_motion_x = root_x;
@@ -3777,6 +3800,7 @@ 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)
@@ -3979,7 +4003,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
   * focus window may not be raised, and who wants to think about
   * mouse focus anyway.
   */
-  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK)
+  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK)
    {
      meta_verbose (" (well, not grabbing since not in click to focus mode)\n");
      return;
@@ -4088,8 +4112,6 @@ 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);
        }
      
@@ -4304,11 +4326,7 @@ process_request_frame_extents (MetaDisplay    *display,
                                         &hints);
  if ((hints_set && hints->decorations) || !hints_set)
    {
-      int top = 0;
-      int bottom = 0;
-      int left = 0;
-      int right = 0;
-
+      MetaFrameBorders borders;
      MetaScreen *screen;

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

  meta_topic (META_DEBUG_GEOMETRY,
@@ -5060,7 +5074,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): Input windows sorted by stacking order, from lowest to highest
+ * Returns: (transfer container) (element-type MetaWindow): Input windows sorted by stacking order, from lowest to highest
 */
 GSList *
 meta_display_sort_windows_by_stacking (MetaDisplay *display,
@@ -5168,34 +5182,6 @@ 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,7 +67,6 @@ 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",
@@ -117,11 +116,6 @@ 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
@@ -157,6 +151,12 @@ 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,14 +166,6 @@ 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);
 }

@@ -181,6 +173,7 @@ void
 meta_window_destroy_frame (MetaWindow *window)
 {
  MetaFrame *frame;
+  MetaFrameBorders borders;
  
  if (window->frame == NULL)
    return;
@@ -188,6 +181,8 @@ 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);
  
@@ -215,8 +210,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,
-                   window->frame->rect.y);
+                   window->frame->rect.x + borders.invisible.left,
+                   window->frame->rect.y + borders.invisible.top);
  meta_error_trap_pop (window->display);

  meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);
@@ -225,6 +220,11 @@ 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);
@@ -282,7 +282,7 @@ meta_frame_get_flags (MetaFrame *frame)
  if (frame->window->shaded)
    flags |= META_FRAME_SHADED;

-  if (frame->window->on_all_workspaces)
+  if (frame->window->on_all_workspaces_requested)
    flags |= META_FRAME_STUCK;

  /* FIXME: Should we have some kind of UI for windows that are just vertically
@@ -310,50 +310,42 @@ meta_frame_get_flags (MetaFrame *frame)
 }

 void
-meta_frame_calc_geometry (MetaFrame         *frame,
-                          MetaFrameGeometry *geomp)
+meta_frame_borders_clear (MetaFrameBorders *self)
 {
-  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;
-    }
+  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;
 }

 void
+meta_frame_calc_borders (MetaFrame        *frame,
+                         MetaFrameBorders *borders)
+{
+  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,
@@ -368,19 +360,8 @@ 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,
@@ -401,6 +382,17 @@ 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,17 +26,6 @@

 #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 */
@@ -71,13 +60,22 @@ 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_geometry      (MetaFrame         *frame,
-                                    MetaFrameGeometry *geomp);
-void meta_frame_sync_to_window     (MetaFrame         *frame,
+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,
                                    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/iconcache.c
+++ b/src/core/iconcache.c
@@ -323,6 +323,40 @@ get_pixmap_geometry (MetaDisplay *display,
    *d = depth;
 }

+static void
+apply_foreground_background (GdkPixbuf *pixbuf)
+{
+  int w, h;
+  int i, j;
+  guchar *pixels;
+  int stride;
+
+  w = gdk_pixbuf_get_width (pixbuf);
+  h = gdk_pixbuf_get_height (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+  stride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  i = 0;
+  while (i < h)
+    {
+      j = 0;
+      while (j < w)
+        {
+          guchar *p = pixels + i * stride + j * 4;
+          if (p[3] == 0)
+            p[0] = p[1] = p[2] =  0xff; /* white background */
+          else
+            p[0] = p[1] = p[2] = 0x00; /* black foreground */
+
+          p[3] = 0xff;
+
+          ++j;
+        }
+
+      ++i;
+    }
+}
+
 static GdkPixbuf*
 apply_mask (GdkPixbuf *pixbuf,
            GdkPixbuf *mask)
@@ -352,16 +386,10 @@ apply_mask (GdkPixbuf *pixbuf,
      j = 0;
      while (j < w)
        {
-          guchar *s = src + i * src_stride + j * 3;
+          guchar *s = src + i * src_stride + j * 4;
          guchar *d = dest + i * dest_stride + j * 4;

-          /* s[0] == s[1] == s[2], they are 255 if the bit was set, 0
-           * otherwise
-           */
-          if (s[0] == 0)
-            d[3] = 0;   /* transparent */
-          else
-            d[3] = 255; /* opaque */
+          d[3] = s[3];

          ++j;
        }
@@ -385,25 +413,32 @@ try_pixmap_and_mask (MetaDisplay *display,
 {
  GdkPixbuf *unscaled = NULL;
  GdkPixbuf *mask = NULL;
-  int w, h;
+  int w, h, d;

  if (src_pixmap == None)
    return FALSE;

  meta_error_trap_push (display);

-  get_pixmap_geometry (display, src_pixmap, &w, &h, NULL);
+  get_pixmap_geometry (display, src_pixmap, &w, &h, &d);

  unscaled = meta_gdk_pixbuf_get_from_pixmap (src_pixmap,
                                              0, 0,
                                              w, h);

+  /* A depth 1 pixmap has 0 background, and 1 foreground, but
+   * cairo and meta_gdk_pixbuf_get_from_pixmap consider it
+   * to be 0 transparent, 1 opaque */
+  if (d == 1)
+    apply_foreground_background (unscaled);
+
  if (unscaled && src_mask != None)
    {
-      get_pixmap_geometry (display, src_mask, &w, &h, NULL);
-      mask = meta_gdk_pixbuf_get_from_pixmap (src_mask,
-                                              0, 0,
-                                              w, h);
+      get_pixmap_geometry (display, src_mask, &w, &h, &d);
+      if (d == 1)
+        mask = meta_gdk_pixbuf_get_from_pixmap (src_mask,
+                                                0, 0,
+                                                w, h);
    }

  meta_error_trap_pop (display);
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -31,6 +31,26 @@

 #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);
@@ -52,6 +72,14 @@ 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,
+                                             const char           *schema,
+                                             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
@@ -251,6 +251,11 @@ 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 ());
@@ -348,8 +353,6 @@ meta_finalize (void)
  if (display)
    meta_display_close (display,
                        CurrentTime); /* I doubt correct timestamps matter here */
-
-  meta_session_shutdown ();
 }

 static int sigterm_pipe_fds[2] = { -1, -1 };
@@ -387,9 +390,6 @@ 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);
@@ -432,10 +432,6 @@ 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
@@ -575,10 +571,11 @@ meta_run (void)
 void
 meta_quit (MetaExitCode code)
 {
-  meta_exit_code = code;
-
  if (g_main_loop_is_running (meta_main_loop))
-    g_main_loop_quit (meta_main_loop);
+    {
+      meta_exit_code = code;
+      g_main_loop_quit (meta_main_loop);
+    }
 }

 /**
@@ -597,6 +594,7 @@ 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/src/core/place.c
+++ b/src/core/place.c
@@ -90,7 +90,7 @@ northwestcmp (gconstpointer a, gconstpointer b)

 static void
 find_next_cascade (MetaWindow *window,
-                   MetaFrameGeometry *fgeom,
+                   MetaFrameBorders *borders,
                   /* visible windows on relevant workspaces */
                   GList      *windows,
                   int         x,
@@ -120,10 +120,10 @@ find_next_cascade (MetaWindow *window,
   * manually cascade.
   */
 #define CASCADE_FUZZ 15
-  if (fgeom)
+  if (borders)
    {
-      x_threshold = MAX (fgeom->left_width, CASCADE_FUZZ);
-      y_threshold = MAX (fgeom->top_height, CASCADE_FUZZ);
+      x_threshold = MAX (borders->visible.left, CASCADE_FUZZ);
+      y_threshold = MAX (borders->visible.top, CASCADE_FUZZ);
    }
  else
    {
@@ -224,21 +224,21 @@ find_next_cascade (MetaWindow *window,
  g_list_free (sorted);

  /* Convert coords to position of window, not position of frame. */
-  if (fgeom == NULL)
+  if (borders == NULL)
    {
      *new_x = cascade_x;
      *new_y = cascade_y;
    }
  else
    {
-      *new_x = cascade_x + fgeom->left_width;
-      *new_y = cascade_y + fgeom->top_height;
+      *new_x = cascade_x + borders->visible.left;
+      *new_y = cascade_y + borders->visible.top;
    }
 }

 static void
 find_most_freespace (MetaWindow *window,
-                     MetaFrameGeometry *fgeom,
+                     MetaFrameBorders *borders,
                     /* visible windows on relevant workspaces */
                     MetaWindow *focus_window,
                     int         x,
@@ -255,8 +255,8 @@ find_most_freespace (MetaWindow *window,
  MetaRectangle avoid;
  MetaRectangle outer;

-  frame_size_left = fgeom ? fgeom->left_width : 0;
-  frame_size_top  = fgeom ? fgeom->top_height : 0;
+  frame_size_left = borders ? borders->visible.left : 0;
+  frame_size_top  = borders ? borders->visible.top : 0;

  meta_window_get_work_area_current_monitor (focus_window, &work_area);
  meta_window_get_outer_rect (focus_window, &avoid);
@@ -336,7 +336,7 @@ find_most_freespace (MetaWindow *window,

 static void
 avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
-                                             MetaFrameGeometry *fgeom,
+                                             MetaFrameBorders *borders,
                                             int        *x,
                                             int        *y)
 {
@@ -366,7 +366,7 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
                                &focus_window->rect,
                                &overlap))
    {
-      find_most_freespace (window, fgeom, focus_window, *x, *y, x, y);
+      find_most_freespace (window, borders, focus_window, *x, *y, x, y);
      meta_topic (META_DEBUG_PLACEMENT,
                  "Dialog window %s was denied focus but may be modal "
                  "to the focus window; had to move it to avoid the "
@@ -506,7 +506,7 @@ center_tile_rect_in_area (MetaRectangle *rect,
 */
 static gboolean
 find_first_fit (MetaWindow *window,
-                MetaFrameGeometry *fgeom,
+                MetaFrameBorders *borders,
                /* visible windows on relevant workspaces */
                GList      *windows,
 		int         monitor,
@@ -544,10 +544,10 @@ find_first_fit (MetaWindow *window,
  rect.width = window->rect.width;
  rect.height = window->rect.height;
  
-  if (fgeom)
+  if (borders)
    {
-      rect.width += fgeom->left_width + fgeom->right_width;
-      rect.height += fgeom->top_height + fgeom->bottom_height;
+      rect.width += borders->visible.left + borders->visible.right;
+      rect.height += borders->visible.top + borders->visible.bottom;
    }

 #ifdef WITH_VERBOSE_MODE
@@ -570,10 +570,10 @@ find_first_fit (MetaWindow *window,
      {
        *new_x = rect.x;
        *new_y = rect.y;
-        if (fgeom)
+        if (borders)
          {
-            *new_x += fgeom->left_width;
-            *new_y += fgeom->top_height;
+            *new_x += borders->visible.left;
+            *new_y += borders->visible.top;
          }
    
        retval = TRUE;
@@ -598,10 +598,10 @@ find_first_fit (MetaWindow *window,
          {
            *new_x = rect.x;
            *new_y = rect.y;
-            if (fgeom)
+            if (borders)
              {
-                *new_x += fgeom->left_width;
-                *new_y += fgeom->top_height;
+                *new_x += borders->visible.left;
+                *new_y += borders->visible.top;
              }
          
            retval = TRUE;
@@ -629,10 +629,10 @@ find_first_fit (MetaWindow *window,
          {
            *new_x = rect.x;
            *new_y = rect.y;
-            if (fgeom)
+            if (borders)
              {
-                *new_x += fgeom->left_width;
-                *new_y += fgeom->top_height;
+                *new_x += borders->visible.left;
+                *new_y += borders->visible.top;
              }
        
            retval = TRUE;
@@ -652,7 +652,7 @@ find_first_fit (MetaWindow *window,

 void
 meta_window_place (MetaWindow        *window,
-                   MetaFrameGeometry *fgeom,
+                   MetaFrameBorders  *borders,
                   int                x,
                   int                y,
                   int               *new_x,
@@ -662,12 +662,12 @@ meta_window_place (MetaWindow        *window,
  const MetaMonitorInfo *xi;

  /* frame member variables should NEVER be used in here, only
-   * MetaFrameGeometry. But remember fgeom == NULL
+   * MetaFrameBorders. But remember borders == NULL
   * for undecorated windows. Also, this function should
   * NEVER have side effects other than computing the
   * placement coordinates.
   */
-  
+
  meta_topic (META_DEBUG_PLACEMENT, "Placing window %s\n", window->desc);

  windows = NULL;
@@ -756,7 +756,7 @@ meta_window_place (MetaWindow        *window,
        {
          meta_topic (META_DEBUG_PLACEMENT,
                      "Not placing window with PPosition or USPosition set\n");
-          avoid_being_obscured_as_second_modal_dialog (window, fgeom, &x, &y);
+          avoid_being_obscured_as_second_modal_dialog (window, borders, &x, &y);
          goto done_no_constraints;
        }
    }
@@ -791,13 +791,13 @@ meta_window_place (MetaWindow        *window,
          y += (parent->rect.height - window->rect.height)/3;

          /* put top of child's frame, not top of child's client */
-          if (fgeom)
-            y += fgeom->top_height;
+          if (borders)
+            y += borders->visible.top;

          meta_topic (META_DEBUG_PLACEMENT, "Centered window %s over transient parent\n",
                      window->desc);
          
-          avoid_being_obscured_as_second_modal_dialog (window, fgeom, &x, &y);
+          avoid_being_obscured_as_second_modal_dialog (window, borders, &x, &y);

          goto done;
        }
@@ -866,7 +866,7 @@ meta_window_place (MetaWindow        *window,
  x = xi->rect.x;
  y = xi->rect.y;

-  if (find_first_fit (window, fgeom, windows,
+  if (find_first_fit (window, borders, windows,
                      xi->number,
                      x, y, &x, &y))
    goto done_check_denied_focus;
@@ -900,7 +900,7 @@ meta_window_place (MetaWindow        *window,
   * fully overlapping window (e.g. starting multiple terminals)
   * */
  if (x == xi->rect.x && y == xi->rect.y)  
-    find_next_cascade (window, fgeom, windows, x, y, &x, &y);
+    find_next_cascade (window, borders, windows, x, y, &x, &y);

 done_check_denied_focus:
  /* If the window is being denied focus and isn't a transient of the
@@ -934,7 +934,7 @@ meta_window_place (MetaWindow        *window,
          x = xi->rect.x;
          y = xi->rect.y;

-          found_fit = find_first_fit (window, fgeom, focus_window_list,
+          found_fit = find_first_fit (window, borders, focus_window_list,
                                      xi->number,
                                      x, y, &x, &y);
          g_list_free (focus_window_list);
@@ -944,7 +944,7 @@ meta_window_place (MetaWindow        *window,
       * as possible.
       */
      if (!found_fit)
-        find_most_freespace (window, fgeom, focus_window, x, y, &x, &y);
+        find_most_freespace (window, borders, focus_window, x, y, &x, &y);
    }
  
 done:
--- a/src/core/place.h
+++ b/src/core/place.h
@@ -28,7 +28,7 @@
 #include "frame.h"

 void meta_window_place (MetaWindow *window,
-                        MetaFrameGeometry *fgeom,
+                        MetaFrameBorders *borders,
                        int         x,
                        int         y,
                        int        *new_x,
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -45,6 +45,8 @@ struct _MetaMonitorInfo
 {
  int number;
  MetaRectangle rect;
+  gboolean is_primary;
+  XID output; /* The primary or first output for this crtc, None if no xrandr */
 };

 typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
@@ -99,6 +101,7 @@ struct _MetaScreen
  guint32 wm_sn_timestamp;
  
  MetaMonitorInfo *monitor_infos;
+  int primary_monitor_index;
  int n_monitor_infos;

  /* Cache the current monitor */
@@ -141,6 +144,7 @@ struct _MetaScreenClass

  void (*restacked)         (MetaScreen *);
  void (*workareas_changed) (MetaScreen *);
+  void (*monitors_changed)  (MetaScreen *);
 };

 MetaScreen*   meta_screen_new                 (MetaDisplay                *display,
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -28,6 +28,7 @@

 #include <config.h>
 #include "screen-private.h"
+#include <meta/main.h>
 #include <meta/util.h>
 #include <meta/errors.h>
 #include "window-private.h"
@@ -47,6 +48,9 @@
 #ifdef HAVE_XFREE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
+#ifdef HAVE_RANDR
+#include <X11/extensions/Xrandr.h>
+#endif

 #include <X11/Xatom.h>
 #include <locale.h>
@@ -84,8 +88,11 @@ enum
  WORKSPACE_ADDED,
  WORKSPACE_REMOVED,
  WORKSPACE_SWITCHED,
+  WINDOW_ENTERED_MONITOR,
+  WINDOW_LEFT_MONITOR,
  STARTUP_SEQUENCE_CHANGED,
  WORKAREAS_CHANGED,
+  MONITORS_CHANGED,

  LAST_SIGNAL
 };
@@ -200,6 +207,28 @@ meta_screen_class_init (MetaScreenClass *klass)
                  G_TYPE_INT,
                  MUTTER_TYPE_MOTION_DIRECTION);

+  screen_signals[WINDOW_ENTERED_MONITOR] =
+    g_signal_new ("window-entered-monitor",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  META_TYPE_WINDOW);
+
+  screen_signals[WINDOW_LEFT_MONITOR] =
+    g_signal_new ("window-left-monitor",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  _mutter_marshal_VOID__INT_OBJECT,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_INT,
+                  META_TYPE_WINDOW);
+
  screen_signals[STARTUP_SEQUENCE_CHANGED] =
    g_signal_new ("startup-sequence-changed",
                  G_TYPE_FROM_CLASS (klass),
@@ -227,6 +256,15 @@ meta_screen_class_init (MetaScreenClass *klass)
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

+  screen_signals[MONITORS_CHANGED] =
+    g_signal_new ("monitors-changed",
+		  G_TYPE_FROM_CLASS (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (MetaScreenClass, monitors_changed),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
+
  g_object_class_install_property (object_class,
                                   PROP_N_WORKSPACES,
                                   pspec);
@@ -314,6 +352,93 @@ set_wm_icon_size_hint (MetaScreen *screen)
 #undef N_VALS
 }

+/* The list of monitors reported by the windowing system might include
+ * mirrored monitors with identical bounds. Since mirrored monitors
+ * shouldn't be treated as separate monitors for most purposes, we
+ * filter them out here. (We ignore the possibility of partially
+ * overlapping monitors because they are rare and it's hard to come
+ * up with any sensible interpretation.)
+ */
+static void
+filter_mirrored_monitors (MetaScreen *screen)
+{
+  int i, j;
+
+  /* Currently always true and simplifies things */
+  g_assert (screen->primary_monitor_index == 0);
+
+  for (i = 1; i < screen->n_monitor_infos; i++)
+    {
+      /* In case we've filtered previous monitors */
+      screen->monitor_infos[i].number = i;
+
+      for (j = 0; j < i; j++)
+        {
+          if (meta_rectangle_equal (&screen->monitor_infos[i].rect,
+                                    &screen->monitor_infos[j].rect))
+            {
+              memmove (&screen->monitor_infos[i],
+                       &screen->monitor_infos[i + 1],
+                       (screen->n_monitor_infos - i - 1) * sizeof (MetaMonitorInfo));
+              screen->n_monitor_infos--;
+              i--;
+
+              continue;
+            }
+        }
+    }
+}
+
+#ifdef HAVE_RANDR
+static MetaMonitorInfo *
+find_monitor_with_rect (MetaScreen *screen, int x, int y, int w, int h)
+{
+  MetaMonitorInfo *info;
+  int i;
+
+  for (i = 0; i < screen->n_monitor_infos; i++)
+    {
+      info = &screen->monitor_infos[i];
+      if (x == info->rect.x &&
+          y == info->rect.y &&
+          w == info->rect.width &&
+          h == info->rect.height)
+        return info;
+    }
+  return NULL;
+}
+
+/* In the case of multiple outputs of a single crtc (mirroring), we consider one of the
+ * outputs the "main". This is the one we consider "owning" the windows, so if
+ * the mirroring is changed to a dual monitor setup then the windows are moved to the
+ * crtc that now has that main output. If one of the outputs is the primary that is
+ * always the main, otherwise we just use the first.
+ */
+static XID
+find_main_output_for_crtc (MetaScreen *screen, XRRScreenResources *resources, XRRCrtcInfo *crtc)
+{
+  XRROutputInfo *output;
+  RROutput primary_output;
+  int i;
+  XID res;
+
+  primary_output = XRRGetOutputPrimary (screen->display->xdisplay, screen->xroot);
+
+  res = None;
+  for (i = 0; i < crtc->noutput; i++)
+    {
+      output = XRRGetOutputInfo (screen->display->xdisplay, resources, crtc->outputs[i]);
+      if (output->connection != RR_Disconnected &&
+          (res == None || crtc->outputs[i] == primary_output))
+        res = crtc->outputs[i];
+      XRRFreeOutputInfo (output);
+    }
+
+  return res;
+}
+
+#endif
+
 static void
 reload_monitor_infos (MetaScreen *screen)
 {
@@ -334,14 +459,25 @@ reload_monitor_infos (MetaScreen *screen)
  }

  display = screen->display;
-  
-  if (screen->monitor_infos)
-    g_free (screen->monitor_infos);
-  
+
+  /* Any previous screen->monitor_infos is freed by the caller */
+
  screen->monitor_infos = NULL;
  screen->n_monitor_infos = 0;
  screen->last_monitor_index = 0;

+  /* Xinerama doesn't have a concept of primary monitor, however XRandR
+   * does. However, the XRandR xinerama compat code always sorts the
+   * primary output first, so we rely on that here. We could use the
+   * native XRandR calls instead of xinerama, but that would be
+   * slightly problematic for _NET_WM_FULLSCREEN_MONITORS support, as
+   * that is defined in terms of xinerama monitor indexes.
+   * So, since we don't need anything in xrandr except the primary
+   * we can keep using xinerama and use the first monitor as the
+   * primary.
+   */
+  screen->primary_monitor_index = 0;
+
  screen->display->monitor_cache_invalidated = TRUE;

  if (g_getenv ("MUTTER_DEBUG_XINERAMA"))
@@ -349,7 +485,7 @@ reload_monitor_infos (MetaScreen *screen)
      meta_topic (META_DEBUG_XINERAMA,
                  "Pretending a single monitor has two Xinerama screens\n");

-      screen->monitor_infos = g_new (MetaMonitorInfo, 2);
+      screen->monitor_infos = g_new0 (MetaMonitorInfo, 2);
      screen->n_monitor_infos = 2;

      screen->monitor_infos[0].number = 0;
@@ -361,7 +497,7 @@ reload_monitor_infos (MetaScreen *screen)
      screen->monitor_infos[1].rect.x = screen->rect.width / 2;
      screen->monitor_infos[1].rect.width = screen->rect.width / 2;
    }
-  
+
 #ifdef HAVE_XFREE_XINERAMA
  if (screen->n_monitor_infos == 0 &&
      XineramaIsActive (display->xdisplay))
@@ -379,7 +515,7 @@ reload_monitor_infos (MetaScreen *screen)

      if (n_infos > 0)
        {
-          screen->monitor_infos = g_new (MetaMonitorInfo, n_infos);
+          screen->monitor_infos = g_new0 (MetaMonitorInfo, n_infos);
          screen->n_monitor_infos = n_infos;
          
          i = 0;
@@ -404,6 +540,30 @@ reload_monitor_infos (MetaScreen *screen)
        }
      
      meta_XFree (infos);
+
+#ifdef HAVE_RANDR
+      {
+        XRRScreenResources *resources;
+
+        resources = XRRGetScreenResourcesCurrent (display->xdisplay, screen->xroot);
+        if (resources)
+          {
+            for (i = 0; i < resources->ncrtc; i++)
+              {
+                XRRCrtcInfo *crtc;
+                MetaMonitorInfo *info;
+
+                crtc = XRRGetCrtcInfo (display->xdisplay, resources, resources->crtcs[i]);
+                info = find_monitor_with_rect (screen, crtc->x, crtc->y, (int)crtc->width, (int)crtc->height);
+                if (info)
+                  info->output = find_main_output_for_crtc (screen, resources, crtc);
+
+                XRRFreeCrtcInfo (crtc);
+              }
+            XRRFreeScreenResources (resources);
+          }
+      }
+#endif
    }
  else if (screen->n_monitor_infos > 0)
    {
@@ -440,7 +600,7 @@ reload_monitor_infos (MetaScreen *screen)
 	{
          g_assert (n_monitors > 0);
          
-          screen->monitor_infos = g_new (MetaMonitorInfo, n_monitors);
+          screen->monitor_infos = g_new0 (MetaMonitorInfo, n_monitors);
          screen->n_monitor_infos = n_monitors;
          
          i = 0;
@@ -484,13 +644,17 @@ reload_monitor_infos (MetaScreen *screen)
      meta_topic (META_DEBUG_XINERAMA,
                  "No Xinerama screens, using default screen info\n");
          
-      screen->monitor_infos = g_new (MetaMonitorInfo, 1);
+      screen->monitor_infos = g_new0 (MetaMonitorInfo, 1);
      screen->n_monitor_infos = 1;
          
      screen->monitor_infos[0].number = 0;
      screen->monitor_infos[0].rect = screen->rect;
    }

+  filter_mirrored_monitors (screen);
+
+  screen->monitor_infos[screen->primary_monitor_index].is_primary = TRUE;
+
  g_assert (screen->n_monitor_infos > 0);
  g_assert (screen->monitor_infos != NULL);
 }
@@ -1022,7 +1186,7 @@ prefs_changed_callback (MetaPreference pref,
  
  if (pref == META_PREF_NUM_WORKSPACES)
    {
-      /* GConf doesn't provide timestamps, but luckily update_num_workspaces
+      /* GSettings doesn't provide timestamps, but luckily update_num_workspaces
       * often doesn't need it...
       */
      guint32 timestamp = 
@@ -2130,6 +2294,22 @@ meta_screen_get_n_monitors (MetaScreen *screen)
  return screen->n_monitor_infos;
 }

+/**
+ * meta_screen_get_primary_monitor:
+ * @screen: a #MetaScreen
+ *
+ * Gets the index of the primary monitor on this @screen.
+ *
+ * Return value: a monitor index
+ */
+int
+meta_screen_get_primary_monitor (MetaScreen *screen)
+{
+  g_return_val_if_fail (META_IS_SCREEN (screen), 0);
+
+  return screen->primary_monitor_index;
+}
+
 /**
 * meta_screen_get_monitor_geometry:
 * @screen: a #MetaScreen
@@ -2778,19 +2958,41 @@ void
 meta_screen_resize (MetaScreen *screen,
                    int         width,
                    int         height)
-{  
+{
+  GSList *windows, *tmp;
+  MetaMonitorInfo *old_monitor_infos;
+
  screen->rect.width = width;
  screen->rect.height = height;

+  /* Save the old monitor infos, so they stay valid during the update */
+  old_monitor_infos = screen->monitor_infos;
+
  reload_monitor_infos (screen);
  set_desktop_geometry_hint (screen);
-  
+
  if (screen->display->compositor)
    meta_compositor_sync_screen_size (screen->display->compositor,
 				      screen, width, height);

  /* Queue a resize on all the windows */
  meta_screen_foreach_window (screen, meta_screen_resize_func, 0);
+
+  /* Fix up monitor for all windows on this screen */
+  windows = meta_display_list_windows (screen->display,
+                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
+  for (tmp = windows; tmp != NULL; tmp = tmp->next)
+    {
+      MetaWindow *window = tmp->data;
+
+      if (window->screen == screen)
+        meta_window_update_for_monitors_changed (window);
+    }
+
+  g_free (old_monitor_infos);
+  g_slist_free (windows);
+
+  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0, index);
 }

 void
@@ -3107,7 +3309,7 @@ meta_screen_sn_event (SnMonitorEvent *event,
 }

 /**
- * meta_screen_get_startup_sequences:
+ * meta_screen_get_startup_sequences: (skip)
 * @screen:
 *
 * Return value: (transfer none): Currently active #SnStartupSequence items
@@ -3288,6 +3490,14 @@ meta_screen_get_xroot (MetaScreen *screen)
  return screen->xroot;
 }

+/**
+ * meta_screen_get_size:
+ * @screen: A #MetaScreen
+ * @width: (out): The width of the screen
+ * @height: (out): The height of the screen
+ *
+ * Retrieve the size of the screen.
+ */
 void 
 meta_screen_get_size (MetaScreen *screen,
                      int        *width,
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -39,12 +39,6 @@ meta_session_init (const char *client_id,
  meta_topic (META_DEBUG_SM, "Compiled without session management support\n");
 }

-void
-meta_session_shutdown (void)
-{
-  /* nothing */
-}
-
 const MetaWindowSessionInfo*
 meta_window_lookup_saved_state (MetaWindow *window)
 {
@@ -307,15 +301,23 @@ meta_session_init (const char *previous_client_id,
    SmProp prop1, prop2, prop3, prop4, prop5, prop6, *props[6];
    SmPropValue prop1val, prop2val, prop3val, prop4val, prop5val, prop6val;
    char pid[32];
-    char hint = SmRestartImmediately;
+    /* Historically, this was SmRestartImmediately, which made sense
+     * for a stateless window manager, but we don't really control
+     * what embedders do, and it's all around better if gnome-session
+     * handles this.
+     */
+    char hint = SmRestartIfRunning;
    char priority = 20; /* low to run before other apps */
-    
+    const char *prgname;
+
+    prgname = g_get_prgname ();
+
    prop1.name = SmProgram;
    prop1.type = SmARRAY8;
    prop1.num_vals = 1;
    prop1.vals = &prop1val;
-    prop1val.value = "mutter";
-    prop1val.length = strlen ("mutter");
+    prop1val.value = (char *)prgname;
+    prop1val.length = strlen (prgname);

    /* twm sets getuid() for this, but the SM spec plainly
     * says pw_name, twm is on crack
@@ -371,31 +373,6 @@ meta_session_init (const char *previous_client_id,
  g_free (saved_client_id);
 }

-void
-meta_session_shutdown (void)
-{
-  /* Change our restart mode to IfRunning */
-  
-  SmProp prop1;
-  SmPropValue prop1val;
-  SmProp *props[1];
-  char hint = SmRestartIfRunning;
-
-  if (session_connection == NULL)
-    return;
-  
-  prop1.name = SmRestartStyleHint;
-  prop1.type = SmCARD8;
-  prop1.num_vals = 1;
-  prop1.vals = &prop1val;
-  prop1val.value = &hint;
-  prop1val.length = 1;
-    
-  props[0] = &prop1;
-  
-  SmcSetProperties (session_connection, 1, props);
-}
-
 static void
 disconnect (void)
 {
@@ -599,6 +576,9 @@ set_clone_restart_commands (void)
  char *discardv[10];
  int i;
  SmProp prop1, prop2, prop3, *props[3];
+  const char *prgname;
+
+  prgname = g_get_prgname ();
  
  /* Restart (use same client ID) */
  
@@ -608,7 +588,7 @@ set_clone_restart_commands (void)
  g_return_if_fail (client_id);
  
  i = 0;
-  restartv[i] = "mutter";
+  restartv[i] = (char *)prgname;
  ++i;
  restartv[i] = "--sm-client-id";
  ++i;
@@ -629,7 +609,7 @@ set_clone_restart_commands (void)
  /* Clone (no client ID) */
  
  i = 0;
-  clonev[i] = "mutter";
+  clonev[i] = (char *)prgname;
  ++i;
  clonev[i] = NULL;

@@ -959,7 +939,7 @@ save_state (void)
          g_free (title);
              
          /* Sticky */
-          if (window->on_all_workspaces)
+          if (window->on_all_workspaces_requested)
            fputs ("    <sticky/>\n", outfile);

          /* Minimized */
@@ -1830,7 +1810,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
                           "and will have to be restarted manually next time "
                           "you log in."),
                         "240",
-                         meta_screen_get_screen_number (meta_get_display()->active_screen),
+                         meta_get_display()->active_screen->screen_name,
                         NULL, NULL,
                         None,
                         columns,
--- a/Show More
+++ b/Show More