keybindings: Fix ungrabbing of keys

XUngrabKey() doesn't work for XI2 grabs and XI2 doesn't provide API with similar functionality. As such, we have to refactor the code a bit to be able to call XIUngrabKeycode() for each key binding, then reload keybindings and finally grab the new ones. https://bugzilla.gnome.org/show_bug.cgi?id=697003
Grab and emit a signal when XK_ISO_Next_Group is pressed
2013-04-04 12:00:08 +02:00 · 2013-04-04 12:00:07 +02:00 · 2013-04-01 14:21:03 +02:00 · 2013-04-01 14:21:03 +02:00
121 changed files with 16069 additions and 13951 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ POTFILES
 po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
+inlinepixbufs.h
 libmutter.pc
 mutter
 mutter-theme-viewer
@@ -61,7 +62,6 @@ mutter-message
 mutter-window-demo
 focus-window
 test-attached
-test-focus
 test-gravity
 test-resizing
 test-size-hints
@@ -74,8 +74,6 @@ src/mutter-enum-types.[ch]
 src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
-src/meta-dbus-xrandr.[ch]
-src/meta-dbus-idle-monitor.[ch]
 src/mutter-plugins.pc
 doc/reference/*.args
 doc/reference/*.bak
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@

 SUBDIRS=src po doc

-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt

 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
--- a/119
+++ b/119
@@ -1,122 +1,3 @@
-3.9.91
-======
-* Drop man pages for removed utilities [Kalev; #706579]
-* Add support for idle tracking [Giovanni; #706005]
-* Skip CRTC reconfigurations that have no effect [Giovanni; #706672]
-* Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399]
-* Don't save pixbuf data in user data [Tim; #706777]
-* Don't queue redraws for obscured regions [Adel; #703332]
-* Turn blending off when drawing entirely opaque regions [Jasper; #706930]
-* Check event timestamps before reconfiguring [Giovanni; #706735]
-* Misc bug fixes [Giovanni, Colin, Seán, Jasper, Cosimo; #706582, #706598,
-  #706787, #706729, #706825, #707081, #707090, #707250, #707267]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Colin Guthrie, Kalev Lember,
-  Tim Lunn, Jasper St. Pierre, Rico Tzschichholz, Seán de Búrca
-
-Translations:
-  Piotr Drąg [pl], Alexandre Franke [fr], Kjartan Maraas [nb],
-  Milo Casagrande [it], Balázs Úr [hu], Seán de Búrca [ga], Fran Diéguez [gl],
-  Daniel Mustieles [es], Aurimas Černius [lt], Gil Forcada [ca]
-
-3.9.90
-======
-* Add support for _GTK_FRAME_EXTENTS [Jasper; #705766]
-* Fix quick consecutive <super> presses breaking keyboard input [Alban; #666101]
-* Work towards running as wayland compositor [Giovanni]
- - Add DBus API for display configuration
-   [#705670, #706231, #706233, #706322, #706382]
- - Add abstraction layer for cursor tracking [#705911]
- - Add support for plugin modality under wayland [#705917]
-* Disable GTK+ scaling [Alexander; #706388]
-* Disable blending while updating tower [Robert]
-* Misc bug fixes and cleanups [Adel, Jasper, Giovanni, Colin, Rico, Florian;
-  #703332, #704437, #706207]
-
-Contributors:
-  Robert Bragg, Giovanni Campagna, Alban Crequy, Adel Gadllah,
-  Alexander Larsson, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz,
-  Colin Walters
-
-Translations:
-  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Matej Urbančič [sl],
-  Marek Černocký [cs], Daniel Mustieles [es], Rafael Ferreira [pt_BR],
-  Yaron Shahrabani [he], Ján Kyselica [sk]
-
-3.9.5
-=====
-* Don't select for touch events on the stage [Jasper; #697192]
-* Don't queue redraws for obscured regions [Adel; #703332]
-* Export timestamp of global keybinding events [Bastien; #704858]
-* Misc bug fixes and cleanups [Jasper, Rico; #703970]
-
-Contributors:
-  Adel Gadllah, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz
-
-3.9.4
-=====
-* Tweak window shadows [Allan; #702141]
-* Ignore our own focus events for focus prediction [Jasper; #701017]
-* Add API to query if the stage is focused [Jasper; #700735]
-* Add API to query the monitor for a given position [Adel]
-* Don't force attached dialogs to be border-only [Florian; #702764]
-* Allow slicing of backgrounds to avoid texture size limits [Ray; #702283]
-* Miscellaneous bug fixes and cleanups [Adel; #701224, #702564]
-
-Contributors:
-  Allan Day, Adel Gadllah, Florian Müllner, Jasper St. Pierre, Ray Strode
-
-3.9.3
-=====
-* Ensure events are always reported to the grab window [Rui; #701219]
-* Use new clutter_stage_set_paint_callback() function to prevent dropping
-  frames with frame synced toolkits [Owen; #698794]
-
-Contributors:
-  Rui Matos, Owen W. Taylor
-
-3.9.2
-=====
-* Add meta_window_can_close() function [Jasper; #699269]
-* Add support for string-array preferences [Florian; #700223]
-* Fix a potential race condition with _NET_WM_MOVERESIZE [Jasper; #699777]
-* Fix shade window action [Stef; #693714]
-* Remove overlay_group [Giovanni; #700735]
-* Improve tracking of the focus window [Dan, Jasper; #647706]
-* Add API to freeze/unfreeze the keyboard [Rui; #697001]
-* Grab and emit a signal when XK_ISO_Next_Group is pressed [Rui; #697002]
-* Misc bug fixes and cleanups [Dieter, Jasper, Rui; #699636, #700735, #697000]
-
-Contributors:
-  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
-  Dieter Verfaillie, Stef Walter, Dan Winship
-
-Translations:
-  Kjartan Maraas [nb], Ján Kyselica [sk]
-
-3.9.1
-=====
-* Fix miscellaneous memory leaks [Pavel; #698710]
-* Misc fixes and cleanups [Stef, Simon; #698179, #697758]
-
-Contributors:
-  Simon McVittie, Pavel Vasin, Stef Walter
-
-3.8.1
-=====
-* Fix crash when getting default font [Bastien; #696814]
-* Fix ungrabbing of keybindings [Rui; #697003]
-* Misc fixes and cleanups [Jasper, Simon; #697758]
-
-Contributors:
-  Jasper Lievisse Adriaanse, Rui Matos, Simon McVittie, Bastien Nocera
-
-Translations:
-  Guillaume Desmottes [fr], Shankar Prasad [kn], Bruce Cowan [en_GB],
-  Andika Triwidada [id], Yaron Shahrabani [he], Kjartan Maraas [nb],
-  Gheyret Kenji [ug]
-
 3.8.0
 =====
 * Address major memory leak when changing backgrounds [Ray; #696157]
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [9])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_minor_version], [8])
+m4_define([mutter_micro_version], [0])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -12,7 +12,6 @@ m4_define([mutter_plugin_api_version], [3])
 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])

-AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)

@@ -68,16 +67,14 @@ CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0

 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.9.11
+   gtk+-3.0 >= 3.3.7
   gio-2.0 >= 2.25.10
   pango >= 1.2.0
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.7.3
   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
-   $CLUTTER_PACKAGE >= 1.15.90
-   cogl-1.0 >= 1.15.6
-   upower-glib > 0.9.11
-   gnome-desktop-3.0
+   $CLUTTER_PACKAGE >= 1.13.5
+   cogl-1.0 >= 1.13.3
 "

 GLIB_GSETTINGS
@@ -121,6 +118,9 @@ AM_GLIB_GNU_GETTEXT
 ## here we get the flags we'll actually use
 # GRegex requires Glib-2.14.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
+# gtk_window_set_icon_name requires gtk2+-2.6.0
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0)

 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -307,6 +307,9 @@ if test "x$found_xsync" = "xyes"; then
 fi

 MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"

 found_sm=no
 case "$MUTTER_LIBS" in
@@ -436,8 +439,10 @@ doc/man/Makefile
 doc/reference/Makefile
 doc/reference/meta-docs.sgml
 src/Makefile
+src/wm-tester/Makefile
 src/libmutter.pc
 src/mutter-plugins.pc
+src/tools/Makefile
 src/compositor/plugins/Makefile
 po/Makefile.in
 ])
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,3 +1,4 @@
-man_MANS = mutter.1
+man_MANS = mutter.1 mutter-theme-viewer.1 \
+	   mutter-window-demo.1 mutter-message.1

 EXTRA_DIST = $(man_MANS)
--- a/doc/man/mutter-message.1
+++ b/doc/man/mutter-message.1
@@ -0,0 +1,60 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" -----
+.\" This file was confirmed to be licenced under the GPL
+.\" by its author and copyright holder, Akira TAGOH, on June 1st 2008:
+.\"
+.\" > I'm comfortable with DFSG-free. that sounds great if you think it's
+.\" > useful and worth containing it in upstream.
+.\" ...
+.\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
+.\" > since I have contributed that for Debian. so GPL is no problem for me.
+.\" -----
+.TH MUTTER\-MESSAGE 1 "28 August 2002"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+MUTTER\-MESSAGE \- a command to send a message to Mutter
+.SH SYNOPSIS
+.B MUTTER\-MESSAGE
+[restart|reload\-theme|enable\-keybindings|disable\-keybindings]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B mutter\-message\fP.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
+.SH OPTIONS
+.TP
+.B restart
+Restart \fBmutter\fP(1) which is running.
+.TP
+.B reload-theme
+Reload a theme which is specified on gsettings database.
+.TP
+.B enable-keybindings
+Enable all of keybindings which is specified on gsettings database.
+.TP
+.B disable-keybindings
+Disable all of keybindings which is specified on gsettings database.
+.SH SEE ALSO
+.BR mutter (1)
+.SH AUTHOR
+This manual page was written by Akira TAGOH <tagoh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- a/doc/man/mutter-theme-viewer.1
+++ b/doc/man/mutter-theme-viewer.1
@@ -0,0 +1,43 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH MUTTER-THEME-VIEWER 1 "1 June 2004" 
+.SH NAME
+mutter-theme-viewer \- view mutter themes
+.SH SYNOPSIS
+.B mutter-theme-viewer
+[
+.I THEMENAME
+]
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+.B mutter-theme-viewer
+allows you to preview any installed Mutter theme.
+.PP
+When designing a new Mutter theme, you can use
+.B mutter-theme-viewer
+to measure the performance of a window frame option, and to preview
+the option.
+.SH OPTIONS
+.TP
+.I THEMENAME
+Name of the theme to be shown (\fIAtlanta\fR by default).
+It is case-sensitive.
+.SH FILES
+.br
+.nf
+.TP
+.I /usr/share/themes
+system themes directory
+.TP
+.I /usr/share/themes/*/mutter-1/mutter-theme-1.xml
+theme specification file
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR mutter (1),
+.BR mutter-window-demo (1).
--- a/doc/man/mutter-window-demo.1
+++ b/doc/man/mutter-window-demo.1
@@ -0,0 +1,25 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH MUTTER-WINDOW-DEMO 1 "1 June 2004" 
+.SH NAME
+mutter-window-demo \- demo of window features
+.SH SYNOPSIS
+.B mutter-window-demo
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+This program demonstrates various kinds of windows that window
+managers and window manager themes should handle.
+.PP
+Be sure to tear off the menu and toolbar, those are also a special
+kind of window.
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR x-window-manager (1),
+.BR mutter (1),
+.BR mutter-theme-viewer (1).
--- a/doc/reference/meta-sections.txt
+++ b/doc/reference/meta-sections.txt
@@ -409,6 +409,7 @@ meta_prefs_get_theme
 meta_prefs_get_titlebar_font
 meta_prefs_get_num_workspaces
 meta_prefs_get_dynamic_workspaces
+meta_prefs_get_application_based
 meta_prefs_get_disable_workarounds
 meta_prefs_get_auto_raise
 meta_prefs_get_auto_raise_delay
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
-src/core/monitor.c
 src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
@@ -24,9 +23,12 @@ src/core/xprops.c
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
 src/org.gnome.mutter.gschema.xml.in
+src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
+src/ui/theme-viewer.c
+
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,23 +6,22 @@
 # Petr Tomeš <ptomes@gmail.com>, 2006.
 # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
 # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# Marek Černocký <marek@manet.cz>, 2012, 2013.
-#
+# Marek Černocký <marek@manet.cz>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-18 20:03+0000\n"
-"PO-Revision-Date: 2013-08-20 08:50+0200\n"
-"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-03-22 10:02+0000\n"
+"PO-Revision-Date: 2013-03-24 20:55+0200\n"
+"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

 #: ../src/50-mutter-navigation.xml.in.h:1
@@ -187,8 +186,7 @@ msgstr "Přepnout výskyt okna na všech plochách nebo jen na jedné"

 #: ../src/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-"Přenést okno do popředí, pokud je zakryté, jinak jej odsunout do pozadí"
+msgstr "Přenést okno do popředí, pokud je zakryté, jinak jej odsunout do pozadí"

 #: ../src/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
@@ -216,14 +214,14 @@ msgstr "Zobrazit rozdělení napravo"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:589
+#: ../src/compositor/compositor.c:568
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "Jiný kompozitní správce již běží na obrazovce %i displeje „%s“."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1191
 msgid "background texture could not be created from file"
 msgstr "textura pozadí nemohla být ze souboru vytvořena"

@@ -261,17 +259,17 @@ msgstr "_Počkat"
 msgid "_Force Quit"
 msgstr "_Vynutit ukončení"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Schází rozšíření %s vyžadované funkcemi kompozitoru"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nelze otevřít displej X Window System „%s“\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:935
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -279,8 +277,9 @@ msgid ""
 msgstr ""
 "Klávesu %s s modifikátory %x již jako zkratku používá nějaký jiný program\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1135
 #, c-format
+#| msgid "\"%s\" is not a valid value for focus attribute"
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "„%s“ není platný akcelerátor\n"

@@ -321,19 +320,6 @@ msgstr ""
 "Nelze najít motiv! Ujistěte se prosím, že existuje %s a obsahuje obvyklé "
 "motivy.\n"

-#: ../src/core/monitor.c:711
-msgid "Built-in display"
-msgstr "Vestavěný displej"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:739
-#, c-format
-msgid "Unknown %s"
-msgstr "Neznámý %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -358,7 +344,7 @@ msgstr "Vypíše verzi"
 msgid "Mutter plugin to use"
 msgstr "Zásuvný modul Mutter, který se má použít"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1095
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -366,12 +352,12 @@ msgstr ""
 "Bylo zakázáno obcházení chyb aplikací. Některé aplikace se možná nebudou "
 "chovat správně.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1170
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Nelze zpracovat popis písma „%s“ v klíči GSettings %s\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1236
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -380,7 +366,7 @@ msgstr ""
 "„%s“ nalezené v databázi nastavení není platnou hodnotou modifikátoru "
 "tlačítka myši\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1788
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -389,17 +375,17 @@ msgstr ""
 "„%s“ nalezené v databázi nastavení není platnou hodnotou klávesové zkratky "
 "„%s“\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1887
 #, c-format
 msgid "Workspace %d"
 msgstr "Plocha %d"

-#: ../src/core/screen.c:534
+#: ../src/core/screen.c:691
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"

-#: ../src/core/screen.c:550
+#: ../src/core/screen.c:707
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -408,18 +394,18 @@ msgstr ""
 "Obrazovka %d na displeji „%s“ již správce oken má; zkuste prosím nahradit "
 "aktuálního správce oken pomocí přepínače --replace.\n"

-#: ../src/core/screen.c:577
+#: ../src/core/screen.c:734
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Nelze získat výběr správce oken na obrazovce %d displeje „%s“\n"

-#: ../src/core/screen.c:655
+#: ../src/core/screen.c:812
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Obrazovka %d na displeji „%s“ již má správce oken\n"

-#: ../src/core/screen.c:846
+#: ../src/core/screen.c:998
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nelze uvolnit obrazovku %d na displeji „%s“\n"
@@ -494,7 +480,8 @@ msgstr "Nelze provést fdopen() soubor záznamu %s: %s\n"
 msgid "Opened log file %s\n"
 msgstr "Otevřen soubor záznamu %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"

@@ -502,20 +489,20 @@ msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"
 msgid "Window manager: "
 msgstr "Správce oken: "

-#: ../src/core/util.c:414
+#: ../src/core/util.c:412
 msgid "Bug in window manager: "
 msgstr "Chyba ve správci oken: "

-#: ../src/core/util.c:445
+#: ../src/core/util.c:443
 msgid "Window manager warning: "
 msgstr "Varování správce oken: "

-#: ../src/core/util.c:473
+#: ../src/core/util.c:471
 msgid "Window manager error: "
 msgstr "Chyba správce oken: "

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7596
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -531,7 +518,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8320
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -541,22 +528,22 @@ msgstr ""
 "velikost, ale nastavuje min. velikost %d × %d a max. velikost %d × %d; to "
 "nedává smysl.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Aplikace nastavila neplatný _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Neplatné okno WM_TRANSIENT_FOR 0x%lx specifikováno pro %s.\n"

-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "Okno WM_TRANSIENT_FOR 0x%lx by vytvořilo smyčku pro %s.\n"
@@ -720,104 +707,109 @@ msgstr "Vybrat okno z překryvné nabídky tabulátoru"
 msgid "Cancel tab popup"
 msgstr "Zrušit překryvné okno tabulátoru"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Použití: %s\n"
+
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "Mi_nimalizovat"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovat"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "Zrušit ma_ximalizaci"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "Sv_inout"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "Rozv_inout"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "_Přesunout"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "Z_měnit velikost"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "Přesunout záhlaví okna na _obrazovku"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "_Vždy navrchu"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "Vžd_y na viditelné ploše"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "_Jen na této ploše"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Přesunout na plochu v_levo"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Přesunout na plochu vp_ravo"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "Přesunout na plochu na_hoře"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Přesunout na plochu _dole"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "_Zavřít"

-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Plocha %d%n"

-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Plocha 1_0"

-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Plocha %s%d"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Přes_unout na jinou plochu"

@@ -993,8 +985,8 @@ msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"Specifikace GTK barvy musí mít stav v hranatých závorkách, např. gtk:"
-"fg[NORMAL], kde NORMAL je stav; nelze analyzovat „%s“"
+"Specifikace GTK barvy musí mít stav v hranatých závorkách, např. gtk:fg"
+"[NORMAL], kde NORMAL je stav; nelze analyzovat „%s“"

 #: ../src/ui/theme.c:1292
 #, c-format
@@ -1002,8 +994,8 @@ msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"Specifikace GTK barvy musí mít za stavem hranatou závorku, např. gtk:"
-"fg[NORMAL], kde NORMAL je stav; nelze analyzovat „%s“"
+"Specifikace GTK barvy musí mít za stavem hranatou závorku, např. gtk:fg"
+"[NORMAL], kde NORMAL je stav; nelze analyzovat „%s“"

 #: ../src/ui/theme.c:1303
 #, c-format
@@ -1173,18 +1165,18 @@ msgid ""
 msgstr ""
 "Chybí <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"cokoliv\"/>"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5084
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nelze načíst motiv „%s“: %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
+#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Není nastaveno <%s> motivu „%s“"

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5256
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1193,7 +1185,7 @@ msgstr ""
 "U typu okna „%s“ motivu „%s“ není nastaven typ rámu, přidejte prosím prvek "
 "<window type=\"%s\" style_set=\"cokoliv\"/>"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1201,7 +1193,7 @@ msgstr ""
 "Uživatelem definované konstanty musí začínat velkým písmenem; „%s“ toto "
 "nesplňuje"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstanta „%s“ již byla definována"
@@ -1580,4 +1572,205 @@ msgstr "<%s> u tohoto motivu definováno dvakrát"
 #: ../src/ui/theme-parser.c:4336
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
-msgstr "Nelze nalézt platný soubor motivu %s\n"
+msgstr "Nelze nalézt platný soubor motivu %s\n"
+
+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Okna"
+
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "_Dialogové okno"
+
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "_Modální dialogové okno"
+
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Nástroje"
+
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "_Spouštěcí obrazovka"
+
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "_Horní dok"
+
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "Dolní do_k"
+
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "_Levý dok"
+
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "P_ravý dok"
+
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "_Všechny doky"
+
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "Pra_covní prostředí"
+
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Otevřít další takové okno"
+
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "Toto je demonstrační tlačítko s ikonou „otevřít“"
+
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "Toto je demonstrační tlačítko s ikonou „ukončit“"
+
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "Toto je ukázková zpráva v ukázkovém dialogu"
+
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "Falešná položka nabídky %d\n"
+
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Okno jen s okrajem"
+
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Lišta"
+
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Normální okno aplikace"
+
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Dialogové okno"
+
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Modální dialogové okno"
+
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Paleta nástrojů"
+
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Odtržení nabídky"
+
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Okraj"
+
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Připojené modální dialogové okno"
+
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Test rozložení tlačítek %d"
+
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "%g milisekund na nakreslení jednoho rámu okna"
+
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Použití: metacity-theme-viewer [NÁZEVMOTIVU]\n"
+
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Chyba při načítání motivu: %s\n"
+
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "Načten motiv „%s“ za %g sekund\n"
+
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Normální písmo nadpisu"
+
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Malé písmo nadpisu"
+
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Velké písmo nadpisu"
+
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Rozložení tlačítek"
+
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Test výkonnosti"
+
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Sem patří nadpis okna"
+
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"Nakresleno %d rámů za %g sekund na straně klienta (%g milisekund na rám) a "
+"%g sekund reálného času včetně zdrojů serveru X (%g milisekund na rám)\n"
+
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr "test výrazu umístění vrátil TRUE, ale nastavil chybu"
+
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr "test výrazu umístění vrátil FALSE, ale nenastavil chybu"
+
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Byla očekávána chyba, ale nebyla přijata"
+
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "Byla očekávána chyba %d, ale bylo přijato %d"
+
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Chyba nebyla očekávána, ale byla vrácena: %s"
+
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "Hodnota x byla %d, bylo očekáváno %d"
+
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "Hodnota y byla %d, bylo očekáváno %d"
+
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr "Zpracováno %d výrazů souřadnic za %g sekund (průměr %g sekund)\n"
+
+#, fuzzy
+#~ msgid "Minimize window"
+#~ msgstr "Minimalizovat okno"
--- a/po/es.po
+++ b/po/es.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,21 +6,19 @@
 # Gabor Sari <saga at externet dot hu>, 2003.
 # Laszlo Dvornik <dvornik at gnome dot hu>, 2004.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# Balázs Úr <urbalazs at gmail dot com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-18 20:03+0000\n"
-"PO-Revision-Date: 2013-08-25 10:26+0200\n"
-"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-21 00:15+0100\n"
+"PO-Revision-Date: 2013-03-21 00:14+0100\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"

 #: ../src/50-mutter-navigation.xml.in.h:1
@@ -213,7 +211,7 @@ msgstr "Jobb oldali felosztás megjelenítése"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:589
+#: ../src/compositor/compositor.c:568
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -222,7 +220,7 @@ msgstr ""
 "Már fut egy másik kompozitáláskezelő a(z) %i képernyőn a(z) „%s” "
 "megjelenítőn."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1191
 msgid "background texture could not be created from file"
 msgstr "nem hozható létre a háttér textúrája fájlból"

@@ -260,17 +258,17 @@ msgstr "Vá_rakozás"
 msgid "_Force Quit"
 msgstr "_Erőltetett kilépés"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Hiányzik a kompozit ablakkezeléshez szükséges %s kiterjesztés"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:935
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -279,7 +277,7 @@ msgstr ""
 "Valamely másik program már használja a(z) %s billentyűt %x módosítókkal "
 "összekötve\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1135
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "„%s” érvénytelen hívóbetű\n"
@@ -321,20 +319,6 @@ msgstr ""
 "Nem található téma! Bizonyosodjon meg róla hogy a(z) %s létezik és "
 "tartalmazza a szokásos témákat.\n"

-#: ../src/core/monitor.c:711
-msgid "Built-in display"
-msgstr "Beépített kijelző"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:739
-#, c-format
-#| msgid "Unknown element %s"
-msgid "Unknown %s"
-msgstr "Ismeretlen %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -358,7 +342,7 @@ msgstr "Verzió kinyomtatása"
 msgid "Mutter plugin to use"
 msgstr "Használandó Mutter bővítmény"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1095
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -366,14 +350,14 @@ msgstr ""
 "A hibás alkalmazások hibáinak megkerülése nincs engedélyezve. Néhány "
 "alkalmazás lehet, hogy nem fog helyesen működni.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1170
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Nem sikerült feldolgozni a(z) „%s” betűkészlet leírását a(z) „%s” GSettings "
 "kulcsból\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1236
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -382,7 +366,7 @@ msgstr ""
 "A konfigurációs adatbázisban talált „%s” érvénytelen érték az egérgomb "
 "módosítóhoz\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1788
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -391,17 +375,17 @@ msgstr ""
 "A konfigurációs adatbázisban talált „%s” nem érvényes érték a következő "
 "billentyűkombinációhoz: „%s”\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1887
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. munkaterület"

-#: ../src/core/screen.c:534
+#: ../src/core/screen.c:691
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A(z) %d képernyő a(z) „%s” megjelenítőn érvénytelen\n"

-#: ../src/core/screen.c:550
+#: ../src/core/screen.c:707
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -410,7 +394,7 @@ msgstr ""
 "A(z) %d képernyő a(z) „%s” megjelenítőn már rendelkezik egy ablakkezelővel; "
 "próbálja a --replace opcióval helyettesíteni a jelenlegi ablakkezelőt.\n"

-#: ../src/core/screen.c:577
+#: ../src/core/screen.c:734
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -418,12 +402,12 @@ msgstr ""
 "Nem sikerült beolvasni az ablakkezelő kiválasztását a(z) %d képernyőn a(z) "
 "„%s” megjelenítőn\n"

-#: ../src/core/screen.c:655
+#: ../src/core/screen.c:812
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "A(z) %d képernyőnek a(z) „%s” megjelenítőn már van ablakkezelője\n"

-#: ../src/core/screen.c:846
+#: ../src/core/screen.c:998
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nem sikerült elengedni a(z) %d képernyőt a(z) „%s” kijelzőn\n"
@@ -500,7 +484,8 @@ msgstr "Nem sikerült megnyitni az fdopen()-nel a(z) „%s” naplófájlt: %s\n
 msgid "Opened log file %s\n"
 msgstr "%s naplófájl megnyitva\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordították\n"

@@ -508,20 +493,20 @@ msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordítot
 msgid "Window manager: "
 msgstr "Ablakkezelő: "

-#: ../src/core/util.c:414
+#: ../src/core/util.c:412
 msgid "Bug in window manager: "
 msgstr "Hiba az ablakkezelőben: "

-#: ../src/core/util.c:445
+#: ../src/core/util.c:443
 msgid "Window manager warning: "
 msgstr "Figyelmeztetés az ablakkezelőtől: "

-#: ../src/core/util.c:473
+#: ../src/core/util.c:471
 msgid "Window manager error: "
 msgstr "Hibaüzenet az ablakkezelőtől: "

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7596
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -537,7 +522,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8320
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -547,24 +532,24 @@ msgstr ""
 "de mégis %d x %d minimális és %d x %d maximális értéket ad meg, amelynek így "
 "nincs értelme.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Az alkalmazás hibás _NET_WM_PID-értéket állított be: %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ezen: %s)"

-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "Érvénytelen WM_TRANSIENT_FOR ablak (0x%lx) került megadásra a következőhöz: "
 "%s.\n"

-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr ""
@@ -731,104 +716,109 @@ msgstr "Ablakok kiválasztása tab billentyűre felugró ablakból"
 msgid "Cancel tab popup"
 msgstr "Tab felugró kikapcsolása"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Használat: %s\n"
+
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "Mi_nimalizálás"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Ma_ximalizálás"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "_Eredeti méret"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "_Felgördítés"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "_Legördítés"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "Át_helyezés"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "Át_méretezés"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "_Címsor mozgatása a képernyőn"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "Mindig _felül"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "Mindig a látható m_unkaterületen"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "_Csak ezen a munkaterületen"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Áthelyezés a bal ol_dali munkaterületre"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Áthelyezés a j_obb oldali munkaterületre"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "Áthelyezés a fel_ső munkaterületre"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Áthelyezés az _alsó munkaterületre"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "_Bezárás"

-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "%d%n. munkaterület"

-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "1_0. munkaterület"

-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "%s%d. munkaterület"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Áthelyezés mási_k munkaterületre"

@@ -1189,18 +1179,18 @@ msgid ""
 msgstr ""
 "Hiányzó <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"bármi\"/> elem"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5084
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Hiba a(z) „%s” téma betöltése közben: %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
+#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Nincs <%s> beállítva a(z) „%s” témához"

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5256
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1209,7 +1199,7 @@ msgstr ""
 "Nincs keretstílus beállítva a(z) „%s” ablaktípushoz a(z) „%s” témában, adjon "
 "hozzá egy <window type=\"%s\" style_set=\"bármi\"/> elemet"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1217,7 +1207,7 @@ msgstr ""
 "A felhasználó által meghatározott konstansoknak nagybetűvel kell kezdődniük, "
 "a(z) „%s” nem ilyen"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "A(z) „%s” konstans már definiálva van"
@@ -1610,154 +1600,206 @@ msgstr "<%s> kétszer lett megadva ehhez a témához"
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Nem található érvényes fájl a következő témához: %s\n"

-#~ msgid "Usage: %s\n"
-#~ msgstr "Használat: %s\n"
+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Ablakok"

-#~ msgid "_Windows"
-#~ msgstr "_Ablakok"
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "_Párbeszédablak"

-#~ msgid "_Dialog"
-#~ msgstr "_Párbeszédablak"
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "_Kizárólagos párbeszédablak"

-#~ msgid "_Modal dialog"
-#~ msgstr "_Kizárólagos párbeszédablak"
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Segédprogram"

-#~ msgid "_Utility"
-#~ msgstr "_Segédprogram"
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "_Indítóképernyő"

-#~ msgid "_Splashscreen"
-#~ msgstr "_Indítóképernyő"
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "_Felső dokk"

-#~ msgid "_Top dock"
-#~ msgstr "_Felső dokk"
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "_Alsó dokk"

-#~ msgid "_Bottom dock"
-#~ msgstr "_Alsó dokk"
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "_Bal dokk"

-#~ msgid "_Left dock"
-#~ msgstr "_Bal dokk"
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "_Jobb dokk"

-#~ msgid "_Right dock"
-#~ msgstr "_Jobb dokk"
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "Össz_es dokk"

-#~ msgid "_All docks"
-#~ msgstr "Össz_es dokk"
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "_Asztal"

-#~ msgid "Des_ktop"
-#~ msgstr "_Asztal"
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Egy újabb példány megnyitása ezekből az ablakokból"

-#~ msgid "Open another one of these windows"
-#~ msgstr "Egy újabb példány megnyitása ezekből az ablakokból"
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "Ez egy mintagomb a „Megnyitás” ikonnal"

-#~ msgid "This is a demo button with an 'open' icon"
-#~ msgstr "Ez egy mintagomb a „Megnyitás” ikonnal"
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "Ez egy mintagomb a „Kilépés” ikonnal"

-#~ msgid "This is a demo button with a 'quit' icon"
-#~ msgstr "Ez egy mintagomb a „Kilépés” ikonnal"
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "Ez egy mintaüzenet egy minta párbeszédben"

-#~ msgid "This is a sample message in a sample dialog"
-#~ msgstr "Ez egy mintaüzenet egy minta párbeszédben"
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "%d. hamis menüelem\n"

-#~ msgid "Fake menu item %d\n"
-#~ msgstr "%d. hamis menüelem\n"
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Csak keretes ablak"

-#~ msgid "Border-only window"
-#~ msgstr "Csak keretes ablak"
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Sáv"

-#~ msgid "Bar"
-#~ msgstr "Sáv"
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Normál alkalmazásablak"

-#~ msgid "Normal Application Window"
-#~ msgstr "Normál alkalmazásablak"
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Párbeszédablak"

-#~ msgid "Dialog Box"
-#~ msgstr "Párbeszédablak"
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Kizárólagos párbeszéd doboz"

-#~ msgid "Modal Dialog Box"
-#~ msgstr "Kizárólagos párbeszéd doboz"
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Eszközpaletta"

-#~ msgid "Utility Palette"
-#~ msgstr "Eszközpaletta"
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Leválasztott menü"

-#~ msgid "Torn-off Menu"
-#~ msgstr "Leválasztott menü"
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Szegély"

-#~ msgid "Border"
-#~ msgstr "Szegély"
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Csatolt kizárólagos párbeszédablak"

-#~ msgid "Attached Modal Dialog"
-#~ msgstr "Csatolt kizárólagos párbeszédablak"
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Gombelrendezés teszt %d"

-#~ msgid "Button layout test %d"
-#~ msgstr "Gombelrendezés teszt %d"
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "%g ezredmásodpercig tartott egy ablakkeret kirajzolása"

-#~ msgid "%g milliseconds to draw one window frame"
-#~ msgstr "%g ezredmásodpercig tartott egy ablakkeret kirajzolása"
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Használat: metacity-theme-viewer [TÉMANÉV]\n"

-#~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
-#~ msgstr "Használat: metacity-theme-viewer [TÉMANÉV]\n"
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Hiba történt a téma betöltése közben: %s\n"

-#~ msgid "Error loading theme: %s\n"
-#~ msgstr "Hiba történt a téma betöltése közben: %s\n"
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "A(z) „%s” téma %g másodperc alatt betöltve\n"

-#~ msgid "Loaded theme \"%s\" in %g seconds\n"
-#~ msgstr "A(z) „%s” téma %g másodperc alatt betöltve\n"
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Normál cím betűtípus"

-#~ msgid "Normal Title Font"
-#~ msgstr "Normál cím betűtípus"
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Kicsi cím betűtípus"

-#~ msgid "Small Title Font"
-#~ msgstr "Kicsi cím betűtípus"
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Nagy cím betűtípus"

-#~ msgid "Large Title Font"
-#~ msgstr "Nagy cím betűtípus"
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Gombelrendezések"

-#~ msgid "Button Layouts"
-#~ msgstr "Gombelrendezések"
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Teljesítményteszt"

-#~ msgid "Benchmark"
-#~ msgstr "Teljesítményteszt"
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Ide kerül az ablak címe"

-#~ msgid "Window Title Goes Here"
-#~ msgstr "Ide kerül az ablak címe"
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"%d keret kirajzolása %g kliens-oldali másodperc alatt (%g ezredmásodperc "
+"képkeretenként) és %g összes idő beleértve az X szerver erőforrásokat (%g "
+"ezredmásodperc képkeretenként)\n"

-#~ msgid ""
-#~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and "
-#~ "%g seconds wall clock time including X server resources (%g milliseconds "
-#~ "per frame)\n"
-#~ msgstr ""
-#~ "%d keret kirajzolása %g kliens-oldali másodperc alatt (%g ezredmásodperc "
-#~ "képkeretenként) és %g összes idő beleértve az X szerver erőforrásokat (%g "
-#~ "ezredmásodperc képkeretenként)\n"
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr "a pozíció kifejezés teszt IGAZ értéket adott vissza, de hiba történt"

-#~ msgid "position expression test returned TRUE but set error"
-#~ msgstr ""
-#~ "a pozíció kifejezés teszt IGAZ értéket adott vissza, de hiba történt"
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr ""
+"a pozíció kifejezés teszt HAMIS értéket adott vissza, de nem történt hiba"

-#~ msgid "position expression test returned FALSE but didn't set error"
-#~ msgstr ""
-#~ "a pozíció kifejezés teszt HAMIS értéket adott vissza, de nem történt hiba"
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Hibát vártunk, de nem történt egy sem"

-#~ msgid "Error was expected but none given"
-#~ msgstr "Hibát vártunk, de nem történt egy sem"
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "A(z) %d hibát vártuk, de a(z) %d hiba következett be"

-#~ msgid "Error %d was expected but %d given"
-#~ msgstr "A(z) %d hibát vártuk, de a(z) %d hiba következett be"
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Nem várt hiba következett be: %s"

-#~ msgid "Error not expected but one was returned: %s"
-#~ msgstr "Nem várt hiba következett be: %s"
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "x értéke %d volt, de a várt érték %d volt"

-#~ msgid "x value was %d, %d was expected"
-#~ msgstr "x értéke %d volt, de a várt érték %d volt"
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "y értéke %d volt, de a várt érték %d volt"

-#~ msgid "y value was %d, %d was expected"
-#~ msgstr "y értéke %d volt, de a várt érték %d volt"
-
-#~ msgid ""
-#~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-#~ msgstr ""
-#~ "A %d koordináta kifejezések %g másodperc alatt lettek feldolgozva "
-#~ "(átlagosan %g másodperc)\n"
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr ""
+"A %d koordináta kifejezések %g másodperc alatt lettek feldolgozva (átlagosan "
+"%g másodperc)\n"

 #, fuzzy
 #~ msgid "Minimize window"
--- a/po/it.po
+++ b/po/it.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-24 19:11+0200\n"
-"PO-Revision-Date: 2013-08-24 19:11+0200\n"
+"POT-Creation-Date: 2013-03-12 18:34+0100\n"
+"PO-Revision-Date: 2013-03-12 18:35+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.6\n"

 #: ../src/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
@@ -217,7 +216,7 @@ msgstr "Massimizza a destra"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:596
+#: ../src/compositor/compositor.c:502
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -226,11 +225,11 @@ msgstr ""
 "Un altro compositing manager è già in esecuzione sullo schermo %i sul "
 "display «%s»."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1180
 msgid "background texture could not be created from file"
 msgstr "La texture dello sfondo non può essere creata dal file"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Evento campanella"

@@ -266,17 +265,17 @@ msgstr "_Attendi"
 msgid "_Force Quit"
 msgstr "_Forza uscita"

-#: ../src/core/display.c:422
+#: ../src/core/display.c:402
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Estensione %s richiesta per il compositing mancante"

-#: ../src/core/display.c:514
+#: ../src/core/display.c:494
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display «%s» di X Window System non riuscita\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:929
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -285,41 +284,41 @@ msgstr ""
 "Qualche altro programma sta già usando il tasto %s con i modificatori %x "
 "come una associazione di tasti\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1129
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "«%s» non è una scorciatoia valida\n"

-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Disabilita la connessione al gestore di sessione"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Sostituisce il window manager in esecuzione"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Specifica l'ID di gestione sessione"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "Display X da usare"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Inizializza la sessione da file salvato"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate X sincrone"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:533
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Scansione della directory dei temi non riuscita: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:549
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -327,19 +326,6 @@ msgstr ""
 "Non è stato trovato alcun tema. Assicurarsi che %s esista e contenga i temi "
 "standard.\n"

-#: ../src/core/monitor.c:702
-msgid "Built-in display"
-msgstr "Display integrato"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:730
-#, c-format
-msgid "Unknown %s"
-msgstr "Sconosciuto %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -363,7 +349,7 @@ msgstr "Stampa la versione"
 msgid "Mutter plugin to use"
 msgstr "Plugin Mutter da usare"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -371,14 +357,14 @@ msgstr ""
 "Disabilitate le funzionalità palliative per la applicazioni difettose. "
 "Alcune applicazioni potrebbero avere comportamenti errati.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Impossibile analizzare la descrizione del tipo di carattere «%s» dalla "
 "chiave GSettings %s\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -387,7 +373,7 @@ msgstr ""
 "Il valore «%s» trovato nel database di configurazione non è valido per il "
 "modificatore del tasto del mouse\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -396,17 +382,17 @@ msgstr ""
 "Il valore «%s» nel database di configurazione non è valido per "
 "l'associazione di tasti «%s»\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "Spazio di lavoro %d"

-#: ../src/core/screen.c:537
+#: ../src/core/screen.c:674
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Lo schermo %d nel display «%s» non è valido\n"

-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:690
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -415,7 +401,7 @@ msgstr ""
 "Lo schermo %d sul display «%s» ha già un window manager; provare a "
 "utilizzare l'opzione --replace per sostituirlo.\n"

-#: ../src/core/screen.c:580
+#: ../src/core/screen.c:717
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -423,12 +409,12 @@ msgstr ""
 "Impossibile acquisire la selezione del window manager per lo schermo %d nel "
 "display «%s»\n"

-#: ../src/core/screen.c:658
+#: ../src/core/screen.c:795
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Lo schermo %d sul display «%s» ha già un window manager\n"

-#: ../src/core/screen.c:850
+#: ../src/core/screen.c:980
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Impossibile rilasciare lo schermo %d sul display «%s»\n"
@@ -490,44 +476,45 @@ msgstr ""
 "Queste finestre non supportano la funzione &quot;salva impostazioni "
 "attuali&quot; e dovranno essere riavviate manualmente al prossimo accesso."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Apertura nel file di registro di debug non riuscita: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Esecuzione di fdopen() sul file di registro %s non riuscita: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "File di registro %s aperto\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Mutter è stato compilato escludendo il supporto per la modalità prolissa\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Window manager: "

-#: ../src/core/util.c:414
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Bug nel window manager: "

-#: ../src/core/util.c:445
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Avviso del window manager: "

-#: ../src/core/util.c:473
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Errore del window manager: "

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7538
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -543,7 +530,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8262
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -553,26 +540,26 @@ msgstr ""
 "ridimensionabile, ma ha impostato la dimensione minima %d x %d e la "
 "dimensione massima %d x %d; ciò non ha senso.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "L'applicazione ha impostato un _NET_WM_PID errato %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (su %s)"

 # Sì, direi che è oscuro  -Luca
 #
-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Specificato un WM_TRANSIENT_FOR finestra 0x%lx non valido per %s.\n"

 # Sì, direi che è oscuro  -Luca
 #
-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR finestra 0x%lx per %s potrebbe creare un loop.\n"
@@ -744,120 +731,125 @@ msgstr "Seleziona finestra dal tab popup"
 msgid "Cancel tab popup"
 msgstr "Annulla tab popup"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Uso: %s\n"
+
 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "_Minimizza"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Ma_ssimizza"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "Dema_ssimizza"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "Arr_otola"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "Sr_otola"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "M_uovi"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "_Ridimensiona"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "Muovi barra del titolo su _schermo"

 # mantenere in sync con libwnck
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "Sempre in _primo piano"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "Sempre su spazio di lavoro _visibile"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "Solo su _questo spazio di lavoro"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Sposta su spazio di lavoro a s_inistra"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Sposta su spazio di lavoro a d_estra"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "Sposta su spazio di lavoro in alt_o"

 # mantenere in sync con libwnck
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Sposta su spazio di lavoro in _basso"

 # mantenere in sync con libwnck
 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "_Chiudi"

 # mantenere in sync con libwnck
-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Spazio di lavoro %d%n"

 # mantenere in sync con libwnck
-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Spazio di lavoro 1_0"

 # mantenere in sync con libwnck
-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Spazio di lavoro %s%d"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Sposta su _altro spazio di lavoro"

@@ -959,49 +951,49 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d × %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "alto"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "basso"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "sinistra"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "destra"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "la geometria della cornice non specifica la dimensione «%s»"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "la geometria della cornice non specifica la dimensione «%s» per il bordo «%s»"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Le proporzioni %g del pulsante non sono ragionevoli"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "La geometria della cornice non specifica la dimensione dei pulsanti"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "I gradienti dovrebbero avere almeno due colori"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -1011,7 +1003,7 @@ msgstr ""
 "colore e un ripiego tra parentesi, per es. gtk:custom(foo,bar); impossibile "
 "analizzare \"%s\""

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -1020,7 +1012,7 @@ msgstr ""
 "Carattere \"%c\" non valido nel parametro color_name di gtk:custom, sono "
 "validi solo A-Za-z0-9-_"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -1029,7 +1021,7 @@ msgstr ""
 "Il formato per Gtk:custom è \"gtk:custom(color_name,fallback)\", «%s» non è "
 "adatto a tale formato"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1038,7 +1030,7 @@ msgstr ""
 "La specificazione del colore GTK deve avere lo stato fra parentesi, per es. "
 "gtk:fg[NORMAL] dove NORMAL è lo stato; impossibile analizzare \"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1048,18 +1040,18 @@ msgstr ""
 "lo stato, per es. gtk:fg[NORMAL] dove NORMAL è lo stato; impossibile "
 "analizzare \"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Stato «%s» incomprensibile nella specificazione del colore"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 "Componente di colore «%s» incomprensibile nella specificazione del colore"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1068,17 +1060,17 @@ msgstr ""
 "Il formato della sfumature è «blend/bg_color/fg_color/alpha», «%s» non è "
 "adatto a tale formato"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Impossibile analizzare il valore alpha «%s» nel colore sfumato"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Il valore alpha «%s» nel colore sfumato non è compreso tra 0.0 e 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -1086,31 +1078,31 @@ msgstr ""
 "Il formato dell'ombreggiatura è «shade/base_color/factor», «%s» non è adatto "
 "a tale formato"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr ""
 "Impossibile analizzare il fattore di ombreggiatura «%s» nel colore "
 "ombreggiato"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Il fattore di ombreggiatura «%s» nel colore ombreggiato è negativo"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Impossibile analizzare il colore «%s»"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 "L'espressione delle coordinate contiene il carattere «%s» che non è "
 "consentito"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1119,14 +1111,14 @@ msgstr ""
 "L'espressione delle coordinate contiene il numero in virgola mobile «%s» che "
 "non può essere analizzato"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "L'espressione delle coordinate contiene l'intero «%s» che non può essere "
 "analizzato"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1135,18 +1127,18 @@ msgstr ""
 "L'espressione delle coordinate contiene un operatore sconosciuto all'inizio "
 "di questo testo: \"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "L'espressione delle coordinate è vuota o incomprensibile"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 "L'espressione delle coordinate ha come risultato una divisione per zero"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -1154,27 +1146,27 @@ msgstr ""
 "L'espressione delle coordinate tenta di usare un operatore mod su un numero "
 "in virgola mobile"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "L'espressione delle coordinate ha un operatore «%s» dove è atteso un operando"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "L'espressione delle coordinate ha un operando dove è atteso un operatore"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "L'espressione delle coordinate finisce con un operatore invece che un "
 "operando"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1183,45 +1175,45 @@ msgstr ""
 "L'espressione delle coordinate ha l'operatore «%c» seguito dall'operatore "
 "«%c» senza un operando fra i due"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "L'espressione delle coordinate ha la variabile o la costante «%s» sconosciuta"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr ""
 "L'analizzatore dell'espressione delle coordinate ha superato il proprio "
 "buffer."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "L'espressione delle coordinate ha una parentesi di chiusura senza la "
 "relativa di apertura"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "L'espressione delle coordinate ha una parentesi di apertura senza la "
 "relativa di chiusura"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "L'espressione delle coordinate non sembra avere né operatori né operandi"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Il tema contiene un'espressione che ha come risultato un errore: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1230,7 +1222,7 @@ msgstr ""
 "È necessario specificare <button function=\"%s\" state=\"%s\" draw_ops="
 "\"whatever\"/> per questo stile di cornice"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
@@ -1238,18 +1230,18 @@ msgstr ""
 "Risulta mancante <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style="
 "\"whatever\"/>"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Caricamento del tema «%s» non riuscito: %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Nessun <%s> impostato per il tema «%s»"

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1258,7 +1250,7 @@ msgstr ""
 "Nessuno stile di cornice impostato per il tipo di finestra «%s» nel tema "
 "«%s», aggiungere un elemento <window type=\"%s\" style_set=\"whatever\"/>"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1266,7 +1258,7 @@ msgstr ""
 "Le costanti definite dall'utente devono iniziare con una lettera maiuscola, "
 "«%s» non lo fa"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "La costante «%s» è già definita"
@@ -1669,7 +1661,207 @@ msgstr "Il testo non è consentito all'interno dell'elemento <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> specificato due volte per questo tema"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Ricerca di un file valido per il tema «%s» non riuscita\n"
+
+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Finestre"
+
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "_Dialogo"
+
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "Dialogo _modale"
+
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Utilità"
+
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "_Schermata d'avvio"
+
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "Dock superi_ore"
+
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "Dock in_feriore"
+
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "Dock _sinistro"
+
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "Dock _destro"
+
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "Tutti i doc_k"
+
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "Scri_vania"
+
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Apre un'altra di queste finestre"
+
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "Questo è un pulsante di prova con un'icona «Apri»"
+
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "Questo è un pulsante di prova con un'icona «Esci»"
+
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "Questo è un messaggio d'esempio in una finestra di dialogo d'esempio"
+
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "Voce di menu finta n.%d\n"
+
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Finestra solo-bordo"
+
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Barra"
+
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Finestra applicazione normale"
+
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Casella di dialogo"
+
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Casella di dialogo modale"
+
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Tavolozza di utilità"
+
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Menù staccato"
+
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Bordo"
+
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Dialogo modale attaccato"
+
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Test n.%d disposizione pulsanti"
+
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "%g millisecondi per disegnare una cornice di finestra"
+
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Uso: metacity-theme-viewer [NOME_TEMA]\n"
+
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Errore nel caricare il tema: %s\n"
+
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "Tema «%s» caricato in %g secondi\n"
+
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Carattere titolo normale"
+
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Carattere titolo piccolo"
+
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Carattere titolo grande"
+
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Disposizione pulsanti"
+
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Prestazioni"
+
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Qui va il titolo della finestra"
+
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"Disegnate %d cornici in %g secondi lato client (%g millisecondi per cornice) "
+"e %g secondi di wall clock time, incluse le risorse del server X (%g "
+"millisecondi per cornice)\n"
+
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr "test espressione posizione ha restituito TRUE, ma impostato errore"
+
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr ""
+"test espressione posizione ha restituito FALSE, ma non ha impostato errore"
+
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Errore atteso, ma non fornito"
+
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "Atteso errore %d, ma fornito %d"
+
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Errore non atteso, ma è stato restituito: %s"
+
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "valore x era %d, era atteso %d"
+
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "valore y era %d, era atteso %d"
+
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr ""
+"%d espressioni di coordinate analizzate in %g secondi (%g secondi in media)\n"
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-07-30 12:29+0000\n"
-"PO-Revision-Date: 2013-07-30 23:01+0900\n"
+"POT-Creation-Date: 2013-03-22 10:02+0000\n"
+"PO-Revision-Date: 2013-03-25 17:02+0000\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -133,7 +133,7 @@ msgstr "コマンド実行プロンプトを表示する"

 #: ../src/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
-msgstr "アクティビティ画面を表示する"
+msgstr "アクティビティを表示する"

 #: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
@@ -213,12 +213,12 @@ msgstr "画面右半分に表示する"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:589
+#: ../src/compositor/compositor.c:568
 #, c-format
 msgid "Another compositing manager is already running on screen %i on display \"%s\"."
 msgstr "既に別の合成マネージャーがディスプレイ \"%2$s\" 上のスクリーン %1$i で起動中です"

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1191
 msgid "background texture could not be created from file"
 msgstr ""

@@ -252,22 +252,22 @@ msgstr "待機する(_W)"
 msgid "_Force Quit"
 msgstr "強制終了する(_F)"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "ウィンドウの合成に必要な %s という拡張モジュールが存在しません"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Window System のディスプレイ '%s' のオープンに失敗しました\n"

-#: ../src/core/keybindings.c:1138
+#: ../src/core/keybindings.c:935
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "既にバインディングとして別のプログラムでキー %s (修飾キー %x) を使っています\n"

-#: ../src/core/keybindings.c:1335
+#: ../src/core/keybindings.c:1135
 #, fuzzy, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "\"%s\" はフォーカス属性のためには有効な値ではありません"
@@ -328,26 +328,26 @@ msgstr "バージョンを表示する"
 msgid "Mutter plugin to use"
 msgstr "使用する Mutter のプラグイン"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1095
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "仕様に準拠していないアプリケーションに対する次善策は無効になっています。一部のアプリケーションは正常に動作しない可能性があります\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1170
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings の %2$s キーからフォント名 \"%1$s\" を解析できませんでした\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1236
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "設定データベース中の \"%s\" はマウスボタンの修飾キーとして妥当な値ではありません\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1788
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "設定データベース中の \"%s\" はキーバインド \"%s\" に有効な値ではありません\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1887
 #, c-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d"
@@ -465,7 +465,7 @@ msgid "Window manager error: "
 msgstr "ウィンドウマネージャーのエラー: "

 #. first time through
-#: ../src/core/window.c:7513
+#: ../src/core/window.c:7596
 #, 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 "ウィンドウ %s は ICCCM で指定されていたような WM_CLIENT_LEADER ウィンドウの代わりに自分自身で SM_CLIENT_ID を設定しています\n"
@@ -477,7 +477,7 @@ msgstr "ウィンドウ %s は ICCCM で指定されていたような WM_CLIENT
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8237
+#: ../src/core/window.c:8320
 #, 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 "ウィンドウ %s はリサイズ可能ではない MWM ヒント指示を設定していますが、最小サイズ %d x %d と最大サイズ %d x %dも設定しています。これはあまり意味がありません\n"
--- a/po/lt.po
+++ b/po/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-18 20:03+0000\n"
-"PO-Revision-Date: 2013-08-28 23:06+0300\n"
+"POT-Creation-Date: 2013-03-01 15:50+0000\n"
+"PO-Revision-Date: 2013-03-02 22:57+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -216,18 +216,18 @@ msgstr "Rodyti skyrimą dešinėje"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:589
+#: ../src/compositor/compositor.c:507
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "Kita kompozicijos valdyklė jau veikia ekrane %i vaizduoklyje „%s“."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1111
 msgid "background texture could not be created from file"
 msgstr "nepavyko sukurti fono tekstūros iš failo"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Skambučio įvykis"

@@ -259,17 +259,17 @@ msgstr "_Laukti"
 msgid "_Force Quit"
 msgstr "_Priverstinai išeiti"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Trūksta %s priedo, reikalingo komponavimui"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepavyko atverti X Window sistemos ekrano „%s“\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:929
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -278,41 +278,42 @@ msgstr ""
 "Kažkokia kita programa jau naudoja %s klavišą su modifikatoriais %x kaip "
 "susiejimą\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1129
 #, c-format
+#| msgid "\"%s\" is not a valid value for focus attribute"
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "„%s“ yra nepriimtinas spartusis klavišas\n"

-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Išjungti susijungimą su sesijos valdykle"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Pakeisti veikiančią langų valdyklę"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Nurodyti sesijos valdymo ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "Naudotinas X ekranas"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Inicializuoti sesiją iš išsaugojimo failo"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Sinchronizuoti X iškvietimus"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Nepavyko nuskanuoti temų aplanko: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -320,20 +321,6 @@ msgstr ""
 "Nepavyko rasti temos! Įsitikinkite, kad %s egzistuoja ir kad ten yra "
 "įprastos temos.\n"

-#: ../src/core/monitor.c:711
-msgid "Built-in display"
-msgstr "Integruotas vaizduoklis"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:739
-#, c-format
-#| msgid "Unknown element %s"
-msgid "Unknown %s"
-msgstr "Nežinomas %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -359,7 +346,7 @@ msgstr "Parodyti versiją"
 msgid "Mutter plugin to use"
 msgstr "Naudojamas Mutter įskiepis"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -367,12 +354,12 @@ msgstr ""
 "Apsauga nuo sugadintų programų atjungta. Kai kurios programos gali pradėti "
 "keistai elgtis.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Nepavyko perskaityti šrifto aprašymo „%s“ saugomo GSettings rakte %s\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -381,7 +368,7 @@ msgstr ""
 "„%s“ reikšmė rasta nustatymų duomenų bazėje yra netinkama pelės mygtuko "
 "keitiklio aprašymui\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -390,17 +377,17 @@ msgstr ""
 "„%s“ reikšmė rasta konfiguracijos duomenų bazė yra netinkama klavišų "
 "kombinacijai „%s“\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbalaukis %d"

-#: ../src/core/screen.c:534
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ netinkamas\n"

-#: ../src/core/screen.c:550
+#: ../src/core/screen.c:689
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -409,19 +396,19 @@ msgstr ""
 "Ekranas %d vaizduoklyje „%s“ jau turi langų valdyklę; pabandykite "
 "pasinaudoti parinktimi --replace, jei norite pakeisti esamą langų valdyklę.\n"

-#: ../src/core/screen.c:577
+#: ../src/core/screen.c:716
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Nepavyko aptikti langų valdyklės pasirinkimo ekrano %d vaizduoklyje „%s“\n"

-#: ../src/core/screen.c:655
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ jau turi langų valdyklę\n"

-#: ../src/core/screen.c:846
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nepavyko pasitraukti iš ekrano %d vaizduoklyje „%s“\n"
@@ -481,43 +468,44 @@ msgstr ""
 "Šie langai nepalaiko &quot;išsaugoti esamus nustatymus&quot; komandos ir "
 "turi būti paleisti rankiniu būdu, kai prisijungsite kitą kartą."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Nepavyko atverti derinimo žurnalo: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Funkcija fdopen() su žurnalo failu %s nesėkminga: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Atvertas žurnalo failas %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Langų valdyklė:"

-#: ../src/core/util.c:414
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Klaida langų valdyklėje:"

-#: ../src/core/util.c:445
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Langų valdyklės perspėjimas:"

-#: ../src/core/util.c:473
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Langų valdyklės klaida:"

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7539
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -533,7 +521,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8263
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -543,22 +531,22 @@ msgstr ""
 "tuo pat metu nustatė ir leistinas mažiausio dydžio %d x %d bei didžiausio "
 "dydžio %d x %d reikšmes; tai yra beprasmiška.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Programa nustatė netinkamą _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (kompiuteryje %s)"

-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Nekorektiškas WM_TRANSIENT_FOR langas 0x%lx nurodytas %s.\n"

-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR langas 0x%lx nurodytas %s sukurtų ciklą.\n"
@@ -722,104 +710,109 @@ msgstr "Pasirinkti langą iš tab iššokimo"
 msgid "Cancel tab popup"
 msgstr "Atšaukti tab iššokimą"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Naudojimas: %s\n"
+
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "Sumaži_nti"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Iš_didinti"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "_Grąžinti iš išdidinimo"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "Su_vynioti"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "_Išvynioti"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "Pe_rkelti"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "_Keisti dydį"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "Perkelti lango juostą ant _ekrano"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "Visada _viršuje"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "_Visada matomame darbalaukyje"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "_Tik šiame darbalaukyje"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Perkelti _langą į kairįjį darbalaukį"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Pe_rkelti langą į dešinįjį darbalaukį"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "Perkelti langą į a_ukštesnįjį darbalaukį"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Perkelti langą į ž_emesnįjį darbalaukį"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "_Užverti"

-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Darbalaukis %d%n"

-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "1_0-tas darbalaukis"

-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Darbalaukis %s%d"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Perkelti langą į kitą _darbalaukį"

@@ -921,48 +914,48 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "viršus"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "apačia"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "kairė"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "dešinė"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rėmelio aprašyme nenurodytas „%s“ matmuo"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rėmelio aprašyme nenurodytas paraštės „%2$s“ „%1$s“ matmuo"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Mygtuko dydžio santykis %g yra nenuosaikus"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rėmelio aprašyme nenurodytas mygtukų dydis"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Aprašant persiliejančias spalvas reikia nurodyti bent dvi spalvas"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -972,7 +965,7 @@ msgstr ""
 "uždarančius laužtinius skliaustus, pvz.: gtk:custom(foo,bar); nepavyko "
 "perskaityti „%s“"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -981,7 +974,7 @@ msgstr ""
 "Netinkamas simbolis „%c“ gtk:custom parametre color_name, leidžiama tik A-Za-"
 "z0-9_"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -990,7 +983,7 @@ msgstr ""
 "Gtk:custom formatas yra „gtk:custom(color_name,fallback)“, „%s“ neatitinka "
 "šio formato"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1000,7 +993,7 @@ msgstr ""
 "skliaustų, pvz.: gtk:fg[NORMAL], kur NORMAL yra būsena; nepavyko apdoroti "
 "\"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1010,17 +1003,17 @@ msgstr ""
 "skliaustus, pvz.: gtk:fg[NORMAL], kur NORMAL yra būsena; nepavyko apdoroti "
 "\"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Nesuprantama spalvų aprašymo būsena \"%s\""

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Spalvų aprašyme nurodytas nesuprantamas spalvos komponentas \"%s\""

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1029,19 +1022,19 @@ msgstr ""
 "Išplaukimo formatas yra \"blend/bg_color/fg_color/alpha\", \"%s\" neatitinka "
 "šio formato"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 "Nepavyko aprodoti skaidrumo reikšmės \"%s\" priskirtos išplaukiančiai spalva"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "Skaidrumo reikšmė \"%s\" tarp išplaukiančios spalvos yra ne tarp 0.0 ir 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -1049,27 +1042,27 @@ msgstr ""
 "Šešėlio formatas yra \"shade/base_color/factor\", \"%s\" neatitinka šio "
 "formato"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Nepavyko apdoroti šešėlinės spalvos šešėlių rodiklio \"%s\""

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Šešėlio rodiklis \"%s\" tarp šešėlinės spalvos yra neigiamas"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nepavyko apdoroti spalvos \"%s\""

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinačių išraiška turi neleistiną simbolį '%s'"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1078,13 +1071,13 @@ msgstr ""
 "Koordinačių išraiška turi skaičių su slankiu kableliu '%s', kuris negali "
 "būti apdorotas"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Koordinačių išraiška turi sveiką skaičių '%s', kuris negali būti apdorotas"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1093,17 +1086,17 @@ msgstr ""
 "Koordinačių išraiškoje nurodytas nežinomas operatorius šio teksto pradžioje: "
 "\"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinačių išraiška tuščia arba nesuprantama"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinačių išraiška sukelia dalybą iš nulio"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -1111,7 +1104,7 @@ msgstr ""
 "Koordinačių išraiška bando panaudoti liekanos operatorių (mod) slankaus "
 "kablelio skaičiui"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
@@ -1119,17 +1112,17 @@ msgstr ""
 "Koordinačių išraiškoje įvestas operatorius \"%s\" ten, kur turi būti vedamas "
 "operandas"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinačių išraiškoje operandas įrašytas operatoriaus vietoje"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinačių išraiška pasibaigė operatoriumi, o ne operandu"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1138,41 +1131,41 @@ msgstr ""
 "Koordinačių išraiškoje operatorius \"%c\" eina po operatoriaus \"%c\" be "
 "tarpinio operando"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinačių išraiška saugo nežinomą kintamąjį arba konstantą \"%s\""

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Koordinačių išraiškų skaitytuvas perpildė buferį."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Koordinačių išraiškoje įvesti uždarantys skliaustai, nors atidarančių "
 "skliaustų nerasta"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Koordinačių išraiškoje po atidarančių skliaustų neįvesti uždarantys "
 "skliaustai"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Koordinačių išraiška neturi jokių operatorių ar operandų"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Temoje esanti išraiška sukėlė klaidą: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1181,25 +1174,25 @@ msgstr ""
 "Šiam rėmelio stiliui turi būti nurodytas <button function=\"%s\" state=\"%s"
 "\" draw_ops=\"kažkokswhatever\"/> požymis"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Trūksta <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"kažkoks\"/>"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nepavyko paleisti temos \"%s\": %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Temoje \"%2$s\" trūksta <%1$s> nustatymų"

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1208,7 +1201,7 @@ msgstr ""
 "Rėmelio stilius nenurodytas lango tipui \"%s\" temoje \"%s\", pridėkite "
 "<window type=\"%s\" style_set=\"kažkoks\"/> elementą"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1216,7 +1209,7 @@ msgstr ""
 "Naudotojo nustatytos konstantos turi prasidėti didžiąja raide; „%s“ nėra "
 "didžioji"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstanta „%s“ jau aprašyta"
@@ -1600,8 +1593,210 @@ msgstr "Elemente <%s> tekstas negalimas"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> elementas temos aprašyme nurodytas du kartus"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Nepavyko rasti tinkamo temos %s failo\n"

+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Langai"
+
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "_Dialogas"
+
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "_Modalinis dialogas"
+
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Įrankis"
+
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "_Pristatymo langas"
+
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "_Viršutinis dokas"
+
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "_Apatinis dokas"
+
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "_Kairysis dokas"
+
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "_Kairysis dokas"
+
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "Visi dok_ai"
+
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "Dar_bastalis"
+
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Atverti dar vieną tokį langą"
+
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "Tai yra bandomasis mygtukas su „atverti“ piktograma"
+
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "Tai yra bandomasis mygtukas su „uždaryti“ piktograma"
+
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "Tai yra pavydžio pranešimas pavyzdžio dialoge"
+
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "Netikras meniu punktas %d\n"
+
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Tik rėmelį turintis langas"
+
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Juosta"
+
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Normalus programos langas"
+
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Dialogo langas"
+
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Modalinis dialogo langas"
+
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Įrankių paletė"
+
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Atkabinamas meniu"
+
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Paraštė"
+
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Prikabintas modalinis dialogas"
+
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Mygtukų išdėstymo testas %d"
+
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "vienam lango kadrui išvesti yra skirta %g milisekundžių"
+
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Panaudojimas: metacity-theme-viewer [TEMOS PAVADINIMAS]\n"
+
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Klaida įkeliant temą: %s\n"
+
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "Tema „%s“ įkelta per %g sekundžių\n"
+
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Normalus antraštės šriftas"
+
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Smulkus antraštės šriftas"
+
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Didelis antraštės šriftas"
+
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Mygtukų išdėstymai"
+
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Greičio testas"
+
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Čia rodomo lango antraštė"
+
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"%d kadrai buvo išvesti per %g klientines sekundes (%g milisekunčių kadrui) "
+"ir per %g bendrinio laiko sekundes įskaitant X serverio resursus (%g "
+"milisekundžių kadrui)\n"
+
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr ""
+"padėties išraiškos testas grąžino teigiamą reikšmę, bet kartu nustatė "
+"klaidos pranešimą"
+
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr ""
+"padėties išraiškos testas grąžino neigiamą reikšmę, bet nenustatė klaidos "
+"pranešimo"
+
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Tikėtasi sulaukti klaidos pranešimo, tačiau nieko nesulaukta"
+
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "Tikėtasi klaidos %d, tačiau gauta %d"
+
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Klaidos nesitikėta, tačiau grąžinta klaida: %s"
+
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "x reikšmė buvo %d, tikėtasi %d"
+
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "y reikšmė buvo %d, tikėtasi %d"
+
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr ""
+"Koordinačių %d išraiška apdorota per %g sekundžių (%g sekundžių vidurkis)\n"
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter 3.9.x\n"
+"Project-Id-Version: mutter 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 16:11+0200\n"
-"PO-Revision-Date: 2013-08-22 16:12+0200\n"
+"POT-Creation-Date: 2013-03-04 14:57+0100\n"
+"PO-Revision-Date: 2013-03-04 14:57+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -205,18 +205,18 @@ msgstr "Visning delt til høyre"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:596
+#: ../src/compositor/compositor.c:509
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "En annen compositing manager kjører skjerm %i på display «%s»."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1180
 msgid "background texture could not be created from file"
 msgstr "bakgrunnstekstur kunne ikke lages fra fil"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Klokkehendelse"

@@ -250,17 +250,17 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Mangler utvidelsen %s som kreves for komposittfunksjon"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:929
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -269,41 +269,41 @@ msgstr ""
 "Et annet program bruker allerede nøkkelen %s med modifikatorer %x som "
 "binding\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1129
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "«%s» er ikke en gyldig aksellerator\n"

-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Deaktiver tilkobling til sesjonshåndtereren"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Erstatt kjørende vindushåndterer"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Oppgi sesjonshåndterings-ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "X-skjerm som skal brukes"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Initier sesjonen fra en lagret fil"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Gjør X-kall synkrone"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:533
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Feil under søk i temakatalog: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:549
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -311,19 +311,6 @@ msgstr ""
 "Kunne ikke finne et tema! Sjekk at %s eksisterer og inneholder de vanlige "
 "temaene.\n"

-#: ../src/core/monitor.c:702
-msgid "Built-in display"
-msgstr "Innebygget skjerm"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:730
-#, c-format
-msgid "Unknown %s"
-msgstr "Ukjent %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -346,7 +333,7 @@ msgstr "Skriv versjonsnummer"
 msgid "Mutter plugin to use"
 msgstr "Mutter-tillegg som skal brukes"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -354,12 +341,12 @@ msgstr ""
 "Funksjonalitet for å gå rundt ødelagte programmer er deaktivert. Noen "
 "programmer vil kanskje ikke oppføre seg korrekt.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Kunne ikke tolke skriftbeskrivelsen «%s» fra GSettings-nøkkel %s\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -368,7 +355,7 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for endring av "
 "musknapp\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -377,17 +364,17 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for "
 "tastaturbinding «%s»\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: ../src/core/screen.c:537
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"

-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:689
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -396,19 +383,19 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"

-#: ../src/core/screen.c:580
+#: ../src/core/screen.c:716
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Kunne ikke hente utvalg fra vinduhåndterer på skjerm %d, display «%s»\n"

-#: ../src/core/screen.c:658
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"

-#: ../src/core/screen.c:850
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
@@ -468,43 +455,44 @@ msgstr ""
 "Disse vinduene støtter ikke &quot;lagre aktiv konfigurasjon&quot;og vil "
 "måtte startes på nytt manuelt neste gang du logger inn."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Feil under åpning av feilsøkingslogg: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Feil under fdopen() av loggfil %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Åpnet loggfil %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter er kompilert uten støtte for «verbose» modus\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Vindushåndterer: "

-#: ../src/core/util.c:414
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Feil i vindushåndterer: "

-#: ../src/core/util.c:445
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Advarsel fra vindushåndterer: "

-#: ../src/core/util.c:473
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Feil i vindushåndterer: "

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7539
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -520,7 +508,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8263
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -530,22 +518,22 @@ msgstr ""
 "men setter minste størrelse %d x %d og maks størrelse %d x %d; dette virker "
 "ikke fornuftig.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Programmet satte en feil _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (på %s)"

-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Ugyldig WM_TRANSIENT_FOR vindu 0x%lx oppgitt for %s.\n"

-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR vindu 0x%lx for %s ville skapt en løkke.\n"
@@ -697,8 +685,6 @@ msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
-"Nye vinduer som i utgangspunktet er samme størrelse som skjermen vil "
-"automatisk bli maksimert hvis denne slås på."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@@ -708,104 +694,109 @@ msgstr "Fjern vindu fra tabulatordialog"
 msgid "Cancel tab popup"
 msgstr "Avbryt tabulatordialog"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr " Bruk: %s\n"
+
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "Mi_nimer"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Ma_ksimer"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "G_jenopprett"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "Rull _opp"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "R_ull ned"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "_Flytt"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "End_re størrelse"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "Flytt tittellinje på _skjermen"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "All_tid øverst"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "_Alltid på synlig arbeidsområde"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "K_un på dette arbeidsområdet"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Flytt til arbeidsområdet ti_l venstre"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Flytt til a_rbeidsområdet til høyre"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "Flytt til arbeidsområdet _over"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Flytt til arbeidsområdet ne_denfor"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "_Lukk"

-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Arbeidsområde %d%n"

-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Arbeidsområde 1_0"

-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Arbeidsområde %s%d"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Flytt til et annet ar_beidsområde"

@@ -907,48 +898,48 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "topp"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "bunn"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "venstre"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "høyre"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri spesifiserer ikke dimensjon «%s» for kant «%s»"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Aspektrate %g for knapp er ikke fornuftig"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rammegeometrien spesifiserer ikke størrelse på knapper"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienter må ha minst to farger"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -957,7 +948,7 @@ msgstr ""
 "Egendefinert GTK-fargespesifikasjon må ha fargenavn og reserve i parantes, f."
 "eks gtk:custom(foo,bar); kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -966,7 +957,7 @@ msgstr ""
 "Ugyldig tegn «%c» i parameter color_name for gtk:custom, kun A-Za-z0-9-_ er "
 "gyldig"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -975,7 +966,7 @@ msgstr ""
 "Gtk:custom-format er «gtk:custom(color_name,fallback)», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -984,7 +975,7 @@ msgstr ""
 "GTK-fargespesifikasjon må ha tilstand i klammer, f.eks. gtk:fg[NORMAL], hvor "
 "NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -993,17 +984,17 @@ msgstr ""
 "GTK-fargespesifikasjon må ha en avsluttende klamme etter tilstanden, f.eks. "
 "gtk:fg[NORMAL], hvor NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forsto ikke tilstand «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forsto ikke fargekomponent «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1012,56 +1003,56 @@ msgstr ""
 "Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha-verdi «%s» i blandet farge er ikke mellom 0.0 og 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Skyggeformatet er «shade/base_color/factor», «%s» passer ikke i formatet"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Kunne ikke lese skyggefaktor «%s» i skyggelagt farge"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Skyggefaktor «%s» i skyggelagt farge er negativ"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke lese farge «%s»"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn «%s» som ikke er tillatt"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrykk inneholder flyttall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrykk inneholder heltall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1070,39 +1061,39 @@ msgstr ""
 "Koordinatuttrykket inneholdt en ukjent operator ved begynnelsen av denne "
 "teksten: «%s»"

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forstått"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrykket prøver å bruke mod-operator på et flyttall"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator «%s» hvor en operand var ventet"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrykket sluttet med en operator i stedet for en operand"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1111,38 +1102,38 @@ msgstr ""
 "Koordinatuttrykket har en operator «%c» etter en operator «%c» og ingen "
 "operand mellom dem."

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel eller konstant «%s»"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Tolkeren for koordinatuttrykk oversteg buffergrensen."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en åpen parantes uten en avsluttende parantes"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatuttrykket ser ikke ut til å ha noen operatorer eller operander"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema inneholdt et uttrykk som resulterte i en feil: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1151,25 +1142,25 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må "
 "spesifiseres for denne rammestilen"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Mangler <frame state=«%s» resize=«%s» focus=«%s» stil=«ett-eller-annet»/>"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Klarte ikke å laste tema «%s»: %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "<%s> er ikke satt for tema «%s»"

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1178,14 +1169,14 @@ msgstr ""
 "Ingen rammestil satt for vindutype «%s» i tema «%s», legg til et <window "
 "type=«%s» style_set=«ett-eller-annet»/>-element"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Brukerdefinerte konstanter må begynne med stor bokstav; «%s» gjør ikke det"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstant «%s» er allerede definert"
@@ -1566,7 +1557,205 @@ msgstr "Ingen tekst er tillatt inne i element <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> spesifisert to ganger for dette temaet"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Fant ikke en gyldig fil for tema %s\n"
+
+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Vinduer"
+
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "_Dialog"
+
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "_Modal dialog"
+
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Verktøy"
+
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "Opp_startskjerm"
+
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "_Toppdokk"
+
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "_Bunndokk"
+
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "_Venstre dokk"
+
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "Høy_re dokk"
+
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "_Alle dokker"
+
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "S_krivebord"
+
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Åpne et til av disse vinduene"
+
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "Dette er en demoknapp med et «åpne»-ikon"
+
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "Dette er en demoknapp med et «avslutt»-ikon"
+
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "Dette er en eksempelbeskjed i en eksempeldialog"
+
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "Falsk menyoppføring %d\n"
+
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Vindu uten innhold"
+
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Linje"
+
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Normalt programvindu"
+
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Dialogboks"
+
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Modal dialogboks"
+
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Verktøypalett"
+
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Avrevet meny"
+
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Kant"
+
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Festet modal dialog"
+
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Test av knappeplassering %d"
+
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "%g millisekunder for å tegne en vindusramme"
+
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Bruk: metacity-theme-viewer [TEMANAVN]\n"
+
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Feil under lasting av tema: %s\n"
+
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "Lastet tema «%s» på %g sekunder\n"
+
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Normal tittelskrift"
+
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Liten tittelskrift"
+
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Stor tittelskrift"
+
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Knappeplasseringer"
+
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Ytelsestest"
+
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Vindutittel skal her"
+
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"Tegnet %d rammer på %g sekunder hos klienten (%g millisekunder per ramme) og "
+"%g sekunder på klokken inklusive ressurser på X-tjener (%g millisekunder per "
+"ramme)\n"
+
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr "test av posisjonsuttrykk returnerte TRUE, men satte en feilkode"
+
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr "test av posisjonsuttrykk returnerte FALSE, men satte ikke en feilkode"
+
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Feil var ventet men ingen ble gitt"
+
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "Feil %d var ventet men %d ble gitt"
+
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Feil ikke ventet men en ble returnert: %s"
+
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "x-verdi var %d, %d var ventet"
+
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "y-verdi var %d, %d var ventet"
+
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr "%d koordinatuttrykk lest på %g sekunder (%g sekunder i snitt)\n"
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 01:49+0200\n"
-"PO-Revision-Date: 2013-08-22 01:50+0200\n"
+"POT-Creation-Date: 2013-03-02 01:52+0100\n"
+"PO-Revision-Date: 2013-03-02 01:53+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -220,7 +220,7 @@ msgstr "Podział widoku po prawej"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:596
+#: ../src/compositor/compositor.c:507
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -228,11 +228,11 @@ msgid ""
 msgstr ""
 "Inny menedżer składania jest już uruchomiony na podekranie %i ekranu \"%s\"."

-#: ../src/compositor/meta-background.c:1076
+#: ../src/compositor/meta-background.c:1111
 msgid "background texture could not be created from file"
 msgstr "nie można utworzyć tekstury tła z pliku"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"

@@ -264,18 +264,18 @@ msgstr "_Czekaj"
 msgid "_Force Quit"
 msgstr "_Zakończ"

-#: ../src/core/display.c:421
+#: ../src/core/display.c:401
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Brak rozszerzenia %s, wymaganego przez składanie"

-#: ../src/core/display.c:513
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 "Otwarcie połączenia z ekranem \"%s\" systemu X Window się nie powiodło\n"

-#: ../src/core/keybindings.c:1136
+#: ../src/core/keybindings.c:929
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -284,41 +284,41 @@ msgstr ""
 "Skrótu klawiszowego z klawiszem %s i modyfikatorami %x używa już inny "
 "program\n"

-#: ../src/core/keybindings.c:1333
+#: ../src/core/keybindings.c:1129
 #, c-format
 msgid "\"%s\" is not a valid accelerator\n"
 msgstr "\"%s\" nie jest prawidłowym skrótem\n"

-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Rozłącza połączenie z menedżerem sesji"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "Używany ekran X"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Inicjuje sesję z zapisanego pliku"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:533
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Przejrzenie katalogu z motywami się nie powiodło: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:549
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -326,19 +326,6 @@ msgstr ""
 "Nie można odnaleźć żadnego motywu. Proszę sprawdzić, czy katalog %s istnieje "
 "i zawiera standardowe motywy.\n"

-#: ../src/core/monitor.c:702
-msgid "Built-in display"
-msgstr "Wbudowany ekran"
-
-#. TRANSLATORS: this is a monitor name (in case we don't know
-#. the vendor), it's Unknown followed by a size in inches,
-#. like 'Unknown 15"'
-#.
-#: ../src/core/monitor.c:730
-#, c-format
-msgid "Unknown %s"
-msgstr "Nieznany %s"
-
 #: ../src/core/mutter.c:40
 #, c-format
 msgid ""
@@ -363,7 +350,7 @@ msgstr "Wyświetla wersję"
 msgid "Mutter plugin to use"
 msgstr "Używana wtyczka programu Mutter"

-#: ../src/core/prefs.c:1202
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -371,14 +358,14 @@ msgstr ""
 "Obejścia dla błędnie działających programów są wyłączone. Niektóre z nich "
 "mogą się zachowywać w sposób nieprzewidywalny.\n"

-#: ../src/core/prefs.c:1277
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Nie można przetworzyć opisu czcionki \"%s\", powiązanego z kluczem GSettings "
 "%s\n"

-#: ../src/core/prefs.c:1343
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -387,7 +374,7 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo modyfikatora przycisku myszy\n"

-#: ../src/core/prefs.c:1909
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -396,17 +383,17 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo skrótu klawiszowego \"%s\"\n"

-#: ../src/core/prefs.c:1999
+#: ../src/core/prefs.c:1879
 #, c-format
 msgid "Workspace %d"
 msgstr "Obszar roboczy %d"

-#: ../src/core/screen.c:537
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu \"%s\" jest nieprawidłowy\n"

-#: ../src/core/screen.c:553
+#: ../src/core/screen.c:689
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -415,7 +402,7 @@ msgstr ""
 "Na podekranie %d ekranu \"%s\" działa już menedżer okien. Aby zastąpić "
 "działającego menedżera okien, proszę spróbować użyć opcji --replace.\n"

-#: ../src/core/screen.c:580
+#: ../src/core/screen.c:716
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -423,12 +410,12 @@ msgstr ""
 "Nie można uzyskać zaznaczenia menedżera okien na podekranie %d ekranu \"%s"
 "\"\n"

-#: ../src/core/screen.c:658
+#: ../src/core/screen.c:794
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Na podekranie %d ekranu \"%s\" działa już menedżer okien\n"

-#: ../src/core/screen.c:850
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nie można zwolnić podekranu %d ekranu \"%s\"\n"
@@ -490,44 +477,45 @@ msgstr ""
 "Te okna nie obsługują opcji zapisu aktualnego stanu (\"save current setup"
 "\"), więc przy następnym zalogowaniu będą musiały zostać uruchomione ręcznie."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Otwarcie dziennika z zapisem wykonania się nie powiodło: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Wykonać fdopen() na pliku dziennika %s się nie powiodło: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Otwarty plik dziennika %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
 "Program Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Menedżer okien: "

-#: ../src/core/util.c:414
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Błąd w programie menedżera okien: "

-#: ../src/core/util.c:445
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Ostrzeżenie menedżera okien: "

-#: ../src/core/util.c:473
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Błąd menedżera okien: "

 #. first time through
-#: ../src/core/window.c:7533
+#: ../src/core/window.c:7539
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -543,7 +531,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8257
+#: ../src/core/window.c:8263
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -553,23 +541,23 @@ msgstr ""
 "niezmienny, lecz jednocześnie ustawia minimalny rozmiar na %d x %d, a "
 "maksymalny rozmiar na %d x %d. To nie ma żadnego sensu.\n"

-#: ../src/core/window-props.c:347
+#: ../src/core/window-props.c:318
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Program ustawił błędną wartość _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:463
+#: ../src/core/window-props.c:434
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#: ../src/core/window-props.c:1546
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "Nieprawidłowa wartość WM_TRANSIENT_FOR dla okna 0x%lx określona w %s.\n"

-#: ../src/core/window-props.c:1557
+#: ../src/core/window-props.c:1528
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR okna 0x%lx dla %s utworzyłoby pętlę.\n"
@@ -742,104 +730,109 @@ msgstr "Wybór okna z wyskakującego okna dla tabulacji"
 msgid "Cancel tab popup"
 msgstr "Anulowanie wyskakującego okna dla tabulacji"

+#: ../src/tools/mutter-message.c:123
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Użycie: %s\n"
+
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:67
+#: ../src/ui/menu.c:69
 msgid "Mi_nimize"
 msgstr "Zm_inimalizuj"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:69
+#: ../src/ui/menu.c:71
 msgid "Ma_ximize"
 msgstr "Zm_aksymalizuj"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:71
+#: ../src/ui/menu.c:73
 msgid "Unma_ximize"
 msgstr "Cofnij m_aksymalizację"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:73
+#: ../src/ui/menu.c:75
 msgid "Roll _Up"
 msgstr "_Zwiń"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:75
+#: ../src/ui/menu.c:77
 msgid "_Unroll"
 msgstr "Ro_zwiń"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:77
+#: ../src/ui/menu.c:79
 msgid "_Move"
 msgstr "Prz_esuń"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:79
+#: ../src/ui/menu.c:81
 msgid "_Resize"
 msgstr "Zmień _rozmiar"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:81
+#: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
 msgstr "Przeno_szenie paska tytułowego na ekranie"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84 ../src/ui/menu.c:86
+#: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
 msgstr "Zawsze na _wierzchu"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:88
+#: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
 msgstr "_Zawsze na widocznym obszarze roboczym"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:90
+#: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
 msgstr "_Tylko na tym obszarze roboczym"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:92
+#: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
 msgstr "Przenieś na _lewy obszar roboczy"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:94
+#: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
 msgstr "Przen_ieś na prawy obszar roboczy"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:96
+#: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
 msgstr "_Przenieś na górny obszar roboczy"

 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:98
+#: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
 msgstr "Przenieś na _dolny obszar roboczy"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:102
+#: ../src/ui/menu.c:104
 msgid "_Close"
 msgstr "Za_mknij"

-#: ../src/ui/menu.c:202
+#: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
 msgstr "Obszar roboczy %d%n"

-#: ../src/ui/menu.c:212
+#: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Obszar roboczy 1_0"

-#: ../src/ui/menu.c:214
+#: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Obszar roboczy %s%d"

-#: ../src/ui/menu.c:384
+#: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
 msgstr "Przeniesienie na inny _obszar roboczy"

@@ -941,49 +934,49 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "góra"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "dół"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "lewa"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "prawa"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\""

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\" dla krawędzi \"%s\""

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr ""
 "Współczynnik proporcji przycisku %g nie mieści się w rozsądnych granicach"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rozmiar ramki nie określa liczby przycisków"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienty powinny się składać co najmniej z dwóch kolorów"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -993,7 +986,7 @@ msgstr ""
 "kolor zastępczy w nawiasach, np. gtk:custom(foo,bar); nie można przetworzyć "
 "\"%s\""

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -1002,7 +995,7 @@ msgstr ""
 "Nieprawidłowy znak \"%c\" w parametrze nazwa_koloru opcji gtk:custom, tylko "
 "znaki A-Za-z0-9-_ są prawidłowe"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -1011,7 +1004,7 @@ msgstr ""
 "Formatem Gtk:custom jest \"gtk:custom(nazwa_koloru,kolor_zastępczy)\", \"%s"
 "\" nie pasuje do formatu"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1021,7 +1014,7 @@ msgstr ""
 "kwadratowych, np. gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie można "
 "przetworzyć \"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1031,17 +1024,17 @@ msgstr ""
 "nawias kwadratowy, np. gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie "
 "można przetworzyć \"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Niezrozumiały stan \"%s\" w specyfikacji koloru"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Niezrozumiała definicja koloru \"%s\" w specyfikacji koloru"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1050,19 +1043,19 @@ msgstr ""
 "Formatem przenikania jest \"blend/bg_color/fg_color/alpha\", \"%s\" nie "
 "pasuje do formatu"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Nie można przetworzyć wartości alfa \"%s\" w przenikającym kolorze"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "Wartość alfa \"%s\" w przenikającym kolorze nie zawiera się pomiędzy 0,0 i "
 "1,0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -1070,29 +1063,29 @@ msgstr ""
 "Formatem przenikania jest \"shade/base_color/factor\", \"%s\" nie pasuje do "
 "formatu"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr ""
 "Nie można przetworzyć współczynnika przenikania \"%s\" w przenikającym "
 "kolorze"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Współczynnik przenikania \"%s\" w przenikającym kolorze jest ujemny"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nie można przetworzyć koloru \"%s\""

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Wyrażenie określające współrzędne zawiera niedozwolony znak \"%s\""

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1101,14 +1094,14 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę zmiennoprzecinkową \"%s\", "
 "której nie można przetworzyć"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę całkowitą \"%s\", której "
 "nie można przetworzyć"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1117,18 +1110,18 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera nieznany operator na początku "
 "tekstu: \"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 "Wyrażenie określające współrzędne jest puste lub nie można go rozpoznać"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Wyrażenie opisujące położenie zawiera dzielenie przez zero"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -1136,7 +1129,7 @@ msgstr ""
 "Wyrażenie opisujące położenie używa operatora dzielenia modulo z liczbą "
 "zmiennoprzecinkową"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
@@ -1144,19 +1137,19 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera operator \"%s\" w miejscu, w którym "
 "oczekiwano operandu"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera operand w miejscu, w którym oczekiwano "
 "operatora"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Wyrażenie opisujące położenie kończy się operatorem zamiast operandem"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1165,43 +1158,43 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera operator \"%c\" bezpośrednio po "
 "operatorze \"%c\" bez rozdzielającego ich operandu"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nieznaną zmienną lub stałą \"%s\""

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Parser wyrażeń określających współrzędne przepełnił swój bufor."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias zamykający bez odpowiadającego "
 "mu nawiasu otwierającego"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias otwierający bez odpowiadającego "
 "mu nawiasu zamykającego"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Wyrażenie opisujące położenie nie zawiera żadnych operatorów ani operandów"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Motyw zawiera wyrażenie, przy którego obliczaniu wystąpił błąd: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1210,25 +1203,25 @@ msgstr ""
 "Przy tym stylu ramki należy podać <button function=\"%s\" state=\"%s\" "
 "draw_ops=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Brak <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Wczytanie motywu \"%s\" się nie powiodło: %s\n"

-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Nie określono elementu <%s> dla motywu \"%s\""

-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1237,7 +1230,7 @@ msgstr ""
 "Przy typie okna \"%s\" w motywie \"%s\" nie ustawiono stylu ramki. Należy "
 "dodać element <window type=\"%s\" style_set=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5661 ../src/ui/theme.c:5723 ../src/ui/theme.c:5786
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1245,7 +1238,7 @@ msgstr ""
 "Stałe definiowane przez użytkownika powinny rozpoczynać się wielką literą, "
 "natomiast \"%s\" nie spełnia tego warunku"

-#: ../src/ui/theme.c:5669 ../src/ui/theme.c:5731 ../src/ui/theme.c:5794
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Stała \"%s\" została już określona"
@@ -1633,7 +1626,208 @@ msgstr "Wewnątrz elementu <%s> nie jest dopuszczalny tekst"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> określono dwukrotnie dla tego motywu"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Odnalezienie prawidłowego pliku dla motywu %s się nie powiodło\n"
+
+#: ../src/ui/theme-viewer.c:99
+msgid "_Windows"
+msgstr "_Okna"
+
+#: ../src/ui/theme-viewer.c:100
+msgid "_Dialog"
+msgstr "Okno _dialogowe"
+
+#: ../src/ui/theme-viewer.c:101
+msgid "_Modal dialog"
+msgstr "_Modalne okno dialogowe"
+
+#: ../src/ui/theme-viewer.c:102
+msgid "_Utility"
+msgstr "_Narzędzie"
+
+#: ../src/ui/theme-viewer.c:103
+msgid "_Splashscreen"
+msgstr "_Ekran powitalny"
+
+#: ../src/ui/theme-viewer.c:104
+msgid "_Top dock"
+msgstr "_Górny dok"
+
+#: ../src/ui/theme-viewer.c:105
+msgid "_Bottom dock"
+msgstr "_Dolny dok"
+
+#: ../src/ui/theme-viewer.c:106
+msgid "_Left dock"
+msgstr "_Lewy dok"
+
+#: ../src/ui/theme-viewer.c:107
+msgid "_Right dock"
+msgstr "_Prawy dok"
+
+#: ../src/ui/theme-viewer.c:108
+msgid "_All docks"
+msgstr "_Wszystkie doki"
+
+#: ../src/ui/theme-viewer.c:109
+msgid "Des_ktop"
+msgstr "Pu_lpit"
+
+#: ../src/ui/theme-viewer.c:115
+msgid "Open another one of these windows"
+msgstr "Otwiera kolejne okno tego typu"
+
+#: ../src/ui/theme-viewer.c:117
+msgid "This is a demo button with an 'open' icon"
+msgstr "To jest przycisk demonstracyjny z ikoną \"otwórz\""
+
+#: ../src/ui/theme-viewer.c:119
+msgid "This is a demo button with a 'quit' icon"
+msgstr "To jest przycisk demonstracyjny z ikoną \"zakończ\""
+
+#: ../src/ui/theme-viewer.c:248
+msgid "This is a sample message in a sample dialog"
+msgstr "To jest przykładowy komunikat w prostym oknie dialogowym"
+
+#: ../src/ui/theme-viewer.c:328
+#, c-format
+msgid "Fake menu item %d\n"
+msgstr "Imitacja elementu menu %d\n"
+
+#: ../src/ui/theme-viewer.c:363
+msgid "Border-only window"
+msgstr "Okno zawierające tylko krawędzie"
+
+#: ../src/ui/theme-viewer.c:365
+msgid "Bar"
+msgstr "Pasek"
+
+#: ../src/ui/theme-viewer.c:382
+msgid "Normal Application Window"
+msgstr "Zwykłe okno programu"
+
+#: ../src/ui/theme-viewer.c:386
+msgid "Dialog Box"
+msgstr "Okno dialogowe"
+
+#: ../src/ui/theme-viewer.c:390
+msgid "Modal Dialog Box"
+msgstr "Modalne okno dialogowe"
+
+#: ../src/ui/theme-viewer.c:394
+msgid "Utility Palette"
+msgstr "Paleta narzędziowa"
+
+#: ../src/ui/theme-viewer.c:398
+msgid "Torn-off Menu"
+msgstr "Menu oderwane"
+
+#: ../src/ui/theme-viewer.c:402
+msgid "Border"
+msgstr "Krawędź"
+
+#: ../src/ui/theme-viewer.c:406
+msgid "Attached Modal Dialog"
+msgstr "Dołączone modalne okno dialogowe"
+
+#: ../src/ui/theme-viewer.c:737
+#, c-format
+msgid "Button layout test %d"
+msgstr "Test układu przycisków %d"
+
+#: ../src/ui/theme-viewer.c:766
+#, c-format
+msgid "%g milliseconds to draw one window frame"
+msgstr "%g milisekundy do narysowania jednej ramki okna"
+
+#: ../src/ui/theme-viewer.c:811
+#, c-format
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+msgstr "Użycie: metacity-theme-viewer [NAZWA_MOTYWU]\n"
+
+#: ../src/ui/theme-viewer.c:818
+#, c-format
+msgid "Error loading theme: %s\n"
+msgstr "Błąd podczas wczytywania motywu: %s\n"
+
+#: ../src/ui/theme-viewer.c:824
+#, c-format
+msgid "Loaded theme \"%s\" in %g seconds\n"
+msgstr "Wczytano motyw \"%s\" w ciągu %g sekund\n"
+
+#: ../src/ui/theme-viewer.c:869
+msgid "Normal Title Font"
+msgstr "Zwykła czcionka tytułu"
+
+#: ../src/ui/theme-viewer.c:875
+msgid "Small Title Font"
+msgstr "Mała czcionka tytułu"
+
+#: ../src/ui/theme-viewer.c:881
+msgid "Large Title Font"
+msgstr "Duża czcionka tytułu"
+
+#: ../src/ui/theme-viewer.c:886
+msgid "Button Layouts"
+msgstr "Układy przycisków"
+
+#: ../src/ui/theme-viewer.c:891
+msgid "Benchmark"
+msgstr "Test wydajności"
+
+#: ../src/ui/theme-viewer.c:947
+msgid "Window Title Goes Here"
+msgstr "Tutaj znajduje się tytuł okna"
+
+# FIXME - bełkot
+#: ../src/ui/theme-viewer.c:1053
+#, c-format
+msgid ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
+msgstr ""
+"Narysowano %d ramek w ciągu %g sekund klienta (%g milisekund na ramkę) oraz "
+"%g sekund rzeczywistych, włączając w to zasoby serwera X (%g milisekund na "
+"ramkę)\n"
+
+#: ../src/ui/theme-viewer.c:1273
+msgid "position expression test returned TRUE but set error"
+msgstr "Test wyrażenia pozycji zwrócił wartość PRAWDA, lecz ustawił błąd"
+
+#: ../src/ui/theme-viewer.c:1275
+msgid "position expression test returned FALSE but didn't set error"
+msgstr "Test wyrażenia pozycji zwrócił wartość FAŁSZ, lecz nie ustawił błędu"
+
+#: ../src/ui/theme-viewer.c:1279
+msgid "Error was expected but none given"
+msgstr "Oczekiwano błędu, lecz nie otrzymano żadnego"
+
+#: ../src/ui/theme-viewer.c:1281
+#, c-format
+msgid "Error %d was expected but %d given"
+msgstr "Oczekiwano błędu %d, lecz otrzymano %d"
+
+#: ../src/ui/theme-viewer.c:1287
+#, c-format
+msgid "Error not expected but one was returned: %s"
+msgstr "Nie oczekiwano błędu, lecz został on zwrócony: %s"
+
+#: ../src/ui/theme-viewer.c:1291
+#, c-format
+msgid "x value was %d, %d was expected"
+msgstr "Wartością X było %d, oczekiwano wartości %d"
+
+#: ../src/ui/theme-viewer.c:1294
+#, c-format
+msgid "y value was %d, %d was expected"
+msgstr "Wartością Y było %d, oczekiwano wartości %d"
+
+#: ../src/ui/theme-viewer.c:1359
+#, c-format
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+msgstr ""
+"Wyrażenia współrzędnych %d zostało przetworzone w %g sekund (średnio %g "
+"sekund)\n"
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-31 13:47+0000\n"
-"PO-Revision-Date: 2013-04-06 18:40+0900\n"
+"POT-Creation-Date: 2013-02-20 15:50+0000\n"
+"PO-Revision-Date: 2013-02-25 18:42+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "Language: \n"
@@ -208,18 +208,18 @@ msgstr "كۆزنەكنىڭ ئوڭ تەرىپىدە كۆرسەتسۇن"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:507
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "كۆرسەتكۈچ «%2$s» نىڭدىكى ئېكران %1$i دا بۆلەك باشقۇرغۇچ ئىجرا قىلىنىۋاتىدۇ."

-#: ../src/compositor/meta-background.c:1064
+#: ../src/compositor/meta-background.c:1116
 msgid "background texture could not be created from file"
 msgstr "ھۆججەتتىن تەگلىك texture نى قۇرغىلى بولمايدۇ"

-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "قوڭغۇراق ھادىسىسى"

@@ -251,59 +251,53 @@ msgstr "كۈت(_W)"
 msgid "_Force Quit"
 msgstr "مەجبۇرى ئاخىرلاشتۇر(_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:392
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "بىرىكتۈرۈش ئۈچۈن زۆرۈر بولغان كېڭەيتىلمە %s يوق"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:485
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "‏X كۆزنەك سىستېمىسى كۆرسەتكۈچى ‹%s› نى ئېچىش مەغلۇپ بولدى\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "باشقا پروگرامما %s كۇنۇپكىسى بىلەن سۈپەتلىگۈچى كۇنۇپكا %x نىڭ بىرىكمىسىنى ئىشلىتىۋاتىدۇ\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» ئىناۋەتلىك  تېزلەتكۈچ ئەمەس\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى ئىناۋەتسىز قىل"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "ئىجرا قىلىنىۋاتقان كۆزنەك باشقۇرغۇچنى ئالماشتۇر"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "ئەڭگىمە باشقۇرغۇ ID سېنى بەلگىلە"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "ئىشلىتىدىغان X كۆرسەتكۈچى"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "ساقلانغان ھۆججەتتىن ئەڭگىمەنى دەسلەپلەشتۈرۈش"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "X نى قەدەمداش قىلىپ ئىشلەت"

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

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -330,60 +324,60 @@ msgstr "نەشرىنى باس"
 msgid "Mutter plugin to use"
 msgstr "ئىشلىتىدىغان Mutter قىستۇرمىسى"

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

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings ئاچقۇچى %s نىڭ تەركىبىدىكى فونت چۈشەندۈرۈشى «%s»نى تەھلىل قىلغىنى بولمىدى\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr "سەپلىمە سانداندىن تېپىلغان «%s» چاشقىنەك توپچىسىنىڭ سۈپەتلىگۈچىسى ئۈچۈن ئىناۋەتسىز\n"

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

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

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:673
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "كۆرسەتكۈچ ‹%2$s› دىكى ئېكران %1$d ئىناۋەتسىز\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:689
 #, 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 "كۆرسەتكۈچ «%2$s» دىكى ئېكران %1$d نىڭ كۆزنەك باشقۇرغۇسى بار؛ ھازىرقى كۆزنەك باشقۇرغۇنى ئالماشتۇرۇش ئۈچۈن --replace تاللانمىسىنى ئىشلىتىپ كۆرۈپ بېقىڭ.\n"

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

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

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:979
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "«%2$s» دىكى %1$d  ئېكراننى بوشاتقىلى بولمىدى\n"
@@ -441,49 +435,49 @@ msgid ""
 "be restarted manually next time you log in."
 msgstr "بۇ كۆزنەكلەردە «ھازىرقى تەڭشەكنى ساقلاش» ئىقتىدارىنى ئىشلەتكىلى بولمايدۇ. كېيىن كىرگەندە يەنە قوزغىتىڭ."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "سازلاش خاتىرىسىنى ئېچىش مەغلۇپ بولدى:%s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "خاتىرە ھۆججىتى %s غا  fdopen()  مەشغۇلاتى قىلغىلى بولمىدى:%s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "ئاچقان خاتىرە ھۆججەت %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter تەرجىمە-تەھرىرلىگەندە تەپسىلات قوللاش ھالىتى قوشۇلمىغان\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "كۆزنەك باشقۇرغۇ: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "كۆزنەك باشقۇرغۇدىكى كەمتۈك: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "كۆزنەك باشقۇرغۇ ئاگاھلاندۇرۇشى: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "كۆزنەك باشقۇرغۇ خاتالىقى: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7503
 #, 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 "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېلىپتۇ.\n"
+msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېپتۇ.\n"

 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
 #. * authoritative source for that info. Some apps such as mplayer or
@@ -492,29 +486,29 @@ msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:8227
 #, 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 "كۆزنەك %s نىڭدا MWM بەلگىلەنگەن بولۇپ، بۇ كۆزنەك چوڭلۇقىنى ئۆزگەرتكىلى بولمايدۇ دېگەن مەنىدە. بىراق ئەڭ كىچىك چوڭلۇقى%d x %d، ۋە ئەڭ كىچىك چوڭلۇقى %d x %d قىلىپ بەلگىلىنىپتۇ. بۇنىڭ ھېچقانداق ئەھمىيىتى يوق.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:304
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "پروگرامما بىر ساختا _NET_WM_PID نى بەلگىلىدى%lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:423
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ھازىر %s نىڭ ئۈستىدە)"

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

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1517
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "%2$s نىڭ WM_TRANSIENT_FOR كۆزنەك0x%1$lx دەۋرىيلىك قۇرۇشى مۇمكىن.\n"
@@ -856,261 +850,261 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"

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

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

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

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

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى «%s» ئۆلچەمنى ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى گىرۋەك «%2$s» نىڭ ئۆلچىمى «%1$s» ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "توپچىنىڭ ئېگىزلىك ۋە كەڭلىك نىسبىتى %g مۇۋاپىق ئەمەس"

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

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

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr "GTK رەڭ ئۆلچىمىدە ھالەتتىن كېيىن چوقۇم رەڭ ئاتى ۋە زاپاس بولۇشى لازىم، مەسىلەن، gtk:custom(foo,bar) ھالەت؛ «%s» نى تەھلىل قىلالمايدۇ"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr "gtk:custom نىڭ color_name پارامېتىرىدىكى ئىناۋەتسىز ھەرپ '%c'، پەقەت A-Za-z0-9-_  نىلا ئىشلەتكىلى بولىدۇ"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr "Gtk:custom نىڭ پىچىمى \"gtk:custom(color_name,fallback)\" بولۇپ، «%s» پىچىمغا توغرا كەلمەيدۇ"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتى چوقۇم gtk:fg[NORMAL] نىڭدەك تىرناق ئىچىگە ئېلىنىشى كېرەك؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتىنىڭ ئارقىسىغا سول تىرناق يېزىلىشى كېرەك.  مەسىلەن gtk:fg[NORMAL] نىڭدەك بۇ يەردىكى «NORMAL» ھالەتنى بىلدۈرىدۇ؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

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

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

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "بىرىكمە رەڭنىڭ فورماتى \"blend/bg_color/fg_color/alpha\"،  «%s» بۇ پىچىمغا ماس كەلمىدى"

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

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

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "سايە پىچىمى «shade/base_color/factor»، «%s» بۇ پىچىمغا ماسلاشمىدى"

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

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

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "رەڭ «%s» نى ئانالىز قىلغىلى بولمىدى"

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

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

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

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

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

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "كوئوردېنات ئىپادىسى 0 نى بۆلگۈچى قىلغان"

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

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

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

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

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل «%2$c» نىڭ ئارقىسىدىن ئەمەل «%1$c» كېلىپتۇ، ئارىلىقتا سان يوق ئىكەن"

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

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

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

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

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

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ئۆرنەك تەركىبىدە خاتالىق چىقىرىدىغان ئىپادە بار: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/>بۇ كۆزنەكنىڭ ئۇسلۇبى ئۈچۈن بەلگىلىنىشى زۆرۈر"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> يوق"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ئۆرنەك «%s»  نى ئوقۇش مەغلۇپ بولدى: %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ئۆرنەك «%2$s» نىڭ <%1$s> ئى بەلگىلەنمىگەن"

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "ئۆرنەك «%2$s» نىڭ ئىچىدىكى كۆزنەك تىپى <%1$s> نىڭ كاندۇك ئۇسلۇبى بەلگىلەنمىگەن. بىر <window type=\"%3$s\" style_set=\"whatever\"/> ئېلېمېنتى قوشۇڭ"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "ئىشلەتكۈچى بەلگىلىگەن تۇراقلىق مىقدار چوقۇم چوڭ ھەرپ بىلەن باشلانسۇن؛ «%s» بولمايدۇ"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "تۇراقلىق سان «%s» غا ئېنىقلىما بېرىلگەن"
@@ -1470,7 +1464,7 @@ msgstr "ئېلېمېنت <%s> نىڭ ئىچىدە تېكىست بولسا بول
 msgid "<%s> specified twice for this theme"
 msgstr "بۇ ئۆرنەك ئۈچۈن <%s> ئىككى قېتىم بەلگىلەنگەن"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "ئۆرنەك %s  ئۈچۈن ئىناۋەتلىك ھۆججەتنى تېپىش مەغلۇپ بولدى\n"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@

 lib_LTLIBRARIES = libmutter.la

-SUBDIRS=compositor/plugins
+SUBDIRS=wm-tester tools compositor/plugins

 INCLUDES=								\
 	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
@@ -30,9 +30,7 @@ INCLUDES=								\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"

 mutter_built_sources = \
-	$(dbus_idle_built_sources)	\
-	$(dbus_xrandr_built_sources)	\
-	mutter-enum-types.h		\
+	mutter-enum-types.h \
 	mutter-enum-types.c

 libmutter_la_SOURCES =				\
@@ -96,8 +94,6 @@ libmutter_la_SOURCES =				\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
-	core/edid-parse.c			\
-	core/edid.h				\
 	core/errors.c				\
 	meta/errors.h				\
 	core/frame.c				\
@@ -114,15 +110,6 @@ libmutter_la_SOURCES =				\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
-	core/meta-cursor-tracker.c		\
-	core/meta-cursor-tracker-private.h	\
-	core/meta-idle-monitor.c		\
-	core/meta-idle-monitor-private.h	\
-	core/meta-xrandr-shared.h		\
-	core/monitor.c				\
-	core/monitor-config.c			\
-	core/monitor-private.h			\
-	core/monitor-xrandr.c			\
 	core/mutter-Xatomtype.h			\
 	core/place.c				\
 	core/place.h				\
@@ -152,6 +139,7 @@ libmutter_la_SOURCES =				\
 	meta/common.h				\
 	core/core.h				\
 	ui/ui.h					\
+	inlinepixbufs.h				\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@@ -169,6 +157,8 @@ libmutter_la_SOURCES =				\
 	meta/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
+	meta/preview-widget.h			\
+	ui/preview-widget.c			\
 	$(mutter_built_sources)

 libmutter_la_LDFLAGS = -no-undefined
@@ -191,8 +181,6 @@ libmutterinclude_base_headers =		\
 	meta/meta-background-actor.h		\
 	meta/meta-background-group.h		\
 	meta/meta-background.h			\
-	meta/meta-cursor-tracker.h		\
-	meta/meta-idle-monitor.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
@@ -208,6 +196,7 @@ libmutterinclude_base_headers =		\
 # Excluded from scanning for introspection but installed
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
+	meta/preview-widget.h			\
 	meta/atomnames.h

 libmutterincludedir = $(includedir)/mutter/meta
@@ -216,7 +205,10 @@ libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)

-bin_PROGRAMS=mutter
+mutter_theme_viewer_SOURCES=  \
+	ui/theme-viewer.c
+
+bin_PROGRAMS=mutter mutter-theme-viewer

 mutter_SOURCES = core/mutter.c
 mutter_LDADD = $(MUTTER_LIBS) libmutter.la
@@ -254,6 +246,8 @@ Meta-$(api_version).gir: libmutter.la

 endif

+mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
+
 testboxes_SOURCES = core/testboxes.c
 testgradient_SOURCES = ui/testgradient.c
 testasyncgetprop_SOURCES = core/testasyncgetprop.c
@@ -290,7 +284,14 @@ gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
 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 \
+          stock_minimize_data $(srcdir)/stock_minimize.png \
+          stock_delete_data $(srcdir)/stock_delete.png
+
+BUILT_SOURCES = inlinepixbufs.h
 CLEANFILES =					\
+	inlinepixbufs.h				\
 	mutter.desktop				\
 	mutter-wm.desktop			\
 	org.gnome.mutter.gschema.xml		\
@@ -299,6 +300,9 @@ CLEANFILES =					\
 	$(typelib_DATA)				\
 	$(gir_DATA)

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

 pkgconfig_DATA = libmutter.pc mutter-plugins.pc
@@ -310,15 +314,13 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_in_files)	\
 	$(xml_in_files)			\
 	org.gnome.mutter.gschema.xml.in \
-	idle-monitor.xml \
-	xrandr.xml \
 	mutter-schemas.convert \
 	libmutter.pc.in \
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
 	mutter-enum-types.c.in

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

@@ -340,22 +342,3 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc
-
-dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
-
-$(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-xrandr					\
-		$(srcdir)/xrandr.xml
-
-dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
-
-$(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-idle-monitor				\
-		--c-generate-object-manager						\
-		$(srcdir)/idle-monitor.xml
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@@ -50,7 +50,7 @@ meta_create_color_texture_4ub (guint8           red,
  CoglColor color;
  guint8 pixel[4];

-  cogl_color_init_from_4ub (&color, red, green, blue, alpha);
+  cogl_color_set_from_4ub (&color, red, green, blue, alpha);
  cogl_color_premultiply (&color);

  pixel[0] = cogl_color_get_red_byte (&color);
@@ -73,8 +73,10 @@ meta_create_color_texture_4ub (guint8           red,
 * @src_texture: (allow-none): texture to use initially for the layer
 *
 * Creates a pipeline with a single layer. Using a common template
- * makes it easier for Cogl to share a shader for different uses in
- * Mutter.
+ * allows sharing a shader for different uses in Mutter. To share the same
+ * shader with all other pipelines that are just texture plus opacity
+ * would require Cogl fixes.
+ * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
 *
 * Return value: (transfer full): a newly created #CoglPipeline
 */
@@ -84,21 +86,22 @@ meta_create_texture_pipeline (CoglTexture *src_texture)
  static CoglPipeline *texture_pipeline_template = NULL;
  CoglPipeline *pipeline;

-  /* The only state used in the pipeline that would affect the shader
-     generation is the texture type on the layer. Therefore we create
-     a template pipeline which sets this state and all texture
-     pipelines are created as a copy of this. That way Cogl can find
-     the shader state for the pipeline more quickly by looking at the
-     pipeline ancestry instead of resorting to the shader cache. */
+  /* We use a pipeline that has a dummy texture as a base for all
+     texture pipelines. The idea is that only the Cogl texture object
+     would be different in the children so it is likely that Cogl will
+     be able to share GL programs between all the textures. */
  if (G_UNLIKELY (texture_pipeline_template == NULL))
    {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      CoglTexture *dummy_texture;
+      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+
+      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
+                                                     COGL_TEXTURE_NONE);
+

      texture_pipeline_template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
-                                            0, /* layer */
-                                            COGL_TEXTURE_TYPE_2D);
+      cogl_pipeline_set_layer_texture (texture_pipeline_template, 0, dummy_texture);
+      cogl_object_unref (dummy_texture);
    }

  pipeline = cogl_pipeline_copy (texture_pipeline_template);
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -66,6 +66,8 @@ void meta_switch_workspace_completed (MetaScreen    *screen);

 gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
                                      MetaPlugin       *plugin,
+                                      Window            grab_window,
+                                      Cursor            cursor,
                                      MetaModalOptions  options,
                                      guint32           timestamp);
 void     meta_end_modal_for_plugin   (MetaScreen       *screen,
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -53,15 +53,17 @@
 *
 * # Containers #
 *
- * There's two containers in the stage that are used to place window actors, here
+ * There's three containers in the stage that can be used to place actors, here
 * are listed in the order in which they are painted:
 *
 * - window group, accessible with meta_get_window_group_for_screen()
 * - top window group, accessible with meta_get_top_window_group_for_screen()
+ * - overlay group, accessible with meta_get_overlay_group_for_screen()
 *
 * Mutter will place actors representing windows in the window group, except for
 * override-redirect windows (ie. popups and menus) which will be placed in the
- * top window group.
+ * top window group. Mutter won't put any actors in the overlay group, but it's
+ * intended for compositors to place there panel, dashes, status bars, etc.
 */

 #include <config.h>
@@ -253,6 +255,23 @@ meta_get_stage_for_screen (MetaScreen *screen)
  return info->stage;
 }

+/**
+ * meta_get_overlay_group_for_screen:
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none): The overlay group corresponding to @screen
+ */
+ClutterActor *
+meta_get_overlay_group_for_screen (MetaScreen *screen)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (!info)
+    return NULL;
+
+  return info->overlay_group;
+}
+
 /**
 * meta_get_window_group_for_screen:
 * @screen: a #MetaScreen
@@ -369,49 +388,11 @@ meta_empty_stage_input_region (MetaScreen *screen)
  meta_set_stage_input_region (screen, region);
 }

-void
-meta_focus_stage_window (MetaScreen *screen,
-                         guint32     timestamp)
-{
-  ClutterStage *stage;
-  Window window;
-
-  stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
-  if (!stage)
-    return;
-
-  window = clutter_x11_get_stage_window (stage);
-
-  if (window == None)
-    return;
-
-  meta_display_set_input_focus_xwindow (screen->display,
-                                        screen,
-                                        window,
-                                        timestamp);
-}
-
-gboolean
-meta_stage_is_focused (MetaScreen *screen)
-{
-  ClutterStage *stage;
-  Window window;
-
-  stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
-  if (!stage)
-    return FALSE;
-
-  window = clutter_x11_get_stage_window (stage);
-
-  if (window == None)
-    return FALSE;
-
-  return (screen->display->focus_xwindow == window);
-}
-
 gboolean
 meta_begin_modal_for_plugin (MetaScreen       *screen,
                             MetaPlugin       *plugin,
+                             Window            grab_window,
+                             Cursor            cursor,
                             MetaModalOptions  options,
                             guint32           timestamp)
 {
@@ -422,19 +403,10 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
  MetaDisplay    *display    = meta_screen_get_display (screen);
  Display        *xdpy       = meta_display_get_xdisplay (display);
  MetaCompositor *compositor = display->compositor;
-  ClutterStage *stage;
-  Window grab_window;
-  Cursor cursor = None;
  gboolean pointer_grabbed = FALSE;
  gboolean keyboard_grabbed = FALSE;
  int result;

-  stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
-  if (!stage)
-    return FALSE;
-
-  grab_window = clutter_x11_get_stage_window (stage);
-
  if (compositor->modal_plugin != NULL || display->grab_op != META_GRAB_OP_NONE)
    return FALSE;

@@ -542,20 +514,20 @@ meta_check_end_modal (MetaScreen *screen)
    {
      meta_end_modal_for_plugin (screen,
                                   compositor->modal_plugin,
-
-                                 CurrentTime);
+                                   CurrentTime);
    }
 }

-static void
-after_stage_paint (ClutterStage *stage,
-                   gpointer      data)
+static gboolean
+after_stage_paint (gpointer data)
 {
  MetaCompScreen *info = (MetaCompScreen*) data;
  GList *l;

  for (l = info->windows; l; l = l->next)
    meta_window_actor_post_paint (l->data);
+
+  return TRUE;
 }

 static void
@@ -636,10 +608,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  info->stage = clutter_stage_new ();

-  clutter_stage_set_paint_callback (CLUTTER_STAGE (info->stage),
-                                    after_stage_paint,
-                                    info,
-                                    NULL);
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         after_stage_paint,
+                                         info, NULL);

  clutter_stage_set_sync_delay (CLUTTER_STAGE (info->stage), META_SYNC_DELAY);

@@ -667,9 +638,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
    XISetMask (mask.mask, XI_FocusIn);
    XISetMask (mask.mask, XI_FocusOut);
    XISetMask (mask.mask, XI_Motion);
-    XIClearMask (mask.mask, XI_TouchBegin);
-    XIClearMask (mask.mask, XI_TouchEnd);
-    XIClearMask (mask.mask, XI_TouchUpdate);
    XISelectEvents (xdisplay, xwin, &mask, 1);

    event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;
@@ -681,9 +649,11 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  info->window_group = meta_window_group_new (screen);
  info->top_window_group = meta_window_group_new (screen);
+  info->overlay_group = clutter_actor_new ();

  clutter_actor_add_child (info->stage, info->window_group);
  clutter_actor_add_child (info->stage, info->top_window_group);
+  clutter_actor_add_child (info->stage, info->overlay_group);

  info->plugin_mgr = meta_plugin_manager_new (screen);

@@ -714,6 +684,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
      info->pending_input_region = None;
    }

+  clutter_actor_show (info->overlay_group);
+
  /* Map overlay window before redirecting windows offscreen so we catch their
   * contents until we show the stage.
   */
@@ -944,7 +916,10 @@ meta_compositor_process_event (MetaCompositor *compositor,
 {
  if (compositor->modal_plugin && is_grabbed_event (compositor->display, event))
    {
-      _meta_plugin_xevent_filter (compositor->modal_plugin, event);
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
+
+      if (klass->xevent_filter)
+        klass->xevent_filter (compositor->modal_plugin, event);

      /* We always consume events even if the plugin says it didn't handle them;
       * exclusive is exclusive */
@@ -1149,7 +1124,6 @@ sync_actor_stacking (MetaCompScreen *info)
   * we go ahead and do it */

  children = clutter_actor_get_children (info->window_group);
-  has_windows = FALSE;
  reordered = FALSE;

  /* We allow for actors in the window group other than the actors we
@@ -1592,10 +1566,8 @@ void
 meta_enable_unredirect_for_screen (MetaScreen *screen)
 {
  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL && info->disable_unredirect_count == 0)
-    g_warning ("Called enable_unredirect_for_screen while unredirection is enabled.");
-  if (info != NULL && info->disable_unredirect_count > 0)
-   info->disable_unredirect_count = info->disable_unredirect_count - 1;
+  if (info != NULL)
+   info->disable_unredirect_count = MAX(0, info->disable_unredirect_count - 1);
 }

 #define FLASH_TIME_MS 50
--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@@ -6,9 +6,9 @@
 #include <meta/screen.h>
 #include <meta/meta-background-actor.h>

-void meta_background_actor_set_clip_region  (MetaBackgroundActor *self,
-                                             cairo_region_t      *clip_region);
+void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
+                                                cairo_region_t      *visible_region);

-cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);
+cairo_region_t *meta_background_actor_get_visible_region (MetaBackgroundActor *self);

 #endif /* META_BACKGROUND_ACTOR_PRIVATE_H */
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -44,7 +44,7 @@

 struct _MetaBackgroundActorPrivate
 {
-  cairo_region_t *clip_region;
+  cairo_region_t *visible_region;
 };

 G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);
@@ -54,7 +54,7 @@ meta_background_actor_dispose (GObject *object)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);

-  meta_background_actor_set_clip_region (self, NULL);
+  meta_background_actor_set_visible_region (self, NULL);

  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
@@ -167,17 +167,17 @@ meta_background_actor_new (void)
 }

 /**
- * meta_background_actor_set_clip_region:
+ * meta_background_actor_set_visible_region:
 * @self: a #MetaBackgroundActor
- * @clip_region: (allow-none): the area of the actor (in allocate-relative
+ * @visible_region: (allow-none): the area of the actor (in allocate-relative
 *   coordinates) that is visible.
 *
 * Sets the area of the background that is unobscured by overlapping windows.
 * This is used to optimize and only paint the visible portions.
 */
 void
-meta_background_actor_set_clip_region (MetaBackgroundActor *self,
-                                       cairo_region_t      *clip_region)
+meta_background_actor_set_visible_region (MetaBackgroundActor *self,
+                                          cairo_region_t      *visible_region)
 {
  MetaBackgroundActorPrivate *priv;

@@ -185,16 +185,16 @@ meta_background_actor_set_clip_region (MetaBackgroundActor *self,

  priv = self->priv;

-  g_clear_pointer (&priv->clip_region,
+  g_clear_pointer (&priv->visible_region,
                   (GDestroyNotify)
                   cairo_region_destroy);

-  if (clip_region)
-    priv->clip_region = cairo_region_copy (clip_region);
+  if (visible_region)
+    priv->visible_region = cairo_region_copy (visible_region);
 }

 /**
- * meta_background_actor_get_clip_region:
+ * meta_background_actor_get_visible_region:
 * @self: a #MetaBackgroundActor
 *
 * Return value (transfer full): a #cairo_region_t that represents the part of
@@ -202,16 +202,16 @@ meta_background_actor_set_clip_region (MetaBackgroundActor *self,
 * #MetaWindowActor objects.
 */
 cairo_region_t *
-meta_background_actor_get_clip_region (MetaBackgroundActor *self)
+meta_background_actor_get_visible_region (MetaBackgroundActor *self)
 {
  MetaBackgroundActorPrivate *priv = self->priv;
  ClutterActorBox content_box;
  cairo_rectangle_int_t content_area = { 0 };
-  cairo_region_t *clip_region;
+  cairo_region_t *visible_region;

  g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);

-  if (!priv->clip_region)
+  if (!priv->visible_region)
      return NULL;

  clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
@@ -221,8 +221,8 @@ meta_background_actor_get_clip_region (MetaBackgroundActor *self)
  content_area.width = content_box.x2 - content_box.x1;
  content_area.height = content_box.y2 - content_box.y1;

-  clip_region = cairo_region_create_rectangle (&content_area);
-  cairo_region_intersect (clip_region, priv->clip_region);
+  visible_region = cairo_region_create_rectangle (&content_area);
+  cairo_region_intersect (visible_region, priv->visible_region);

-  return clip_region;
+  return visible_region;
 }
--- a/src/compositor/meta-background-group-private.h
+++ b/src/compositor/meta-background-group-private.h
@@ -6,6 +6,6 @@
 #include <meta/screen.h>
 #include <meta/meta-background-group.h>

-void meta_background_group_set_clip_region  (MetaBackgroundGroup *self,
-                                             cairo_region_t      *visible_region);
+void meta_background_group_set_visible_region  (MetaBackgroundGroup *self,
+                                                cairo_region_t      *visible_region);
 #endif /* META_BACKGROUND_GROUP_PRIVATE_H */
--- a/src/compositor/meta-background-group.c
+++ b/src/compositor/meta-background-group.c
@@ -62,16 +62,16 @@ meta_background_group_init (MetaBackgroundGroup *self)
 }

 /**
- * meta_background_group_set_clip_region:
+ * meta_background_group_set_visible_region:
 * @self: a #MetaBackgroundGroup
- * @region: (allow-none): the parts of the background to paint
+ * @visible_region: (allow-none): the parts of the background to paint
 *
 * Sets the area of the backgrounds that is unobscured by overlapping windows.
 * This is used to optimize and only paint the visible portions.
 */
 void
-meta_background_group_set_clip_region (MetaBackgroundGroup *self,
-                                       cairo_region_t      *region)
+meta_background_group_set_visible_region (MetaBackgroundGroup *self,
+                                          cairo_region_t      *region)
 {
  GList *children, *l;

@@ -82,7 +82,7 @@ meta_background_group_set_clip_region (MetaBackgroundGroup *self,

      if (META_IS_BACKGROUND_ACTOR (actor))
        {
-          meta_background_actor_set_clip_region (META_BACKGROUND_ACTOR (actor), region);
+          meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (actor), region);
        }
      else if (META_IS_BACKGROUND_GROUP (actor))
        {
@@ -92,7 +92,7 @@ meta_background_group_set_clip_region (MetaBackgroundGroup *self,
            continue;

          cairo_region_translate (region, -x, -y);
-          meta_background_group_set_clip_region (META_BACKGROUND_GROUP (actor), region);
+          meta_background_group_set_visible_region (META_BACKGROUND_GROUP (actor), region);
          cairo_region_translate (region, x, y);
        }
    }
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
@@ -412,13 +412,13 @@ meta_background_paint_content (ClutterContent   *content,
   */
  if (META_IS_BACKGROUND_ACTOR (actor))
    {
-      cairo_region_t *clip_region;
-      clip_region = meta_background_actor_get_clip_region (META_BACKGROUND_ACTOR (actor));
+      cairo_region_t *visible_region;
+      visible_region = meta_background_actor_get_visible_region (META_BACKGROUND_ACTOR (actor));

-      if (clip_region != NULL)
+      if (visible_region != NULL)
        {
-          cairo_region_intersect (paintable_region, clip_region);
-          cairo_region_destroy (clip_region);
+          cairo_region_intersect (paintable_region, visible_region);
+          cairo_region_destroy (visible_region);
        }
    }

@@ -472,17 +472,6 @@ meta_background_dispose (GObject *object)
  G_OBJECT_CLASS (meta_background_parent_class)->dispose (object);
 }

-static void
-meta_background_finalize (GObject *object)
-{
-  MetaBackground        *self = META_BACKGROUND (object);
-  MetaBackgroundPrivate *priv = self->priv;
-
-  g_free (priv->filename);
-
-  G_OBJECT_CLASS (meta_background_parent_class)->finalize (object);
-}
-
 static void
 ensure_pipeline (MetaBackground *self)
 {
@@ -654,7 +643,6 @@ meta_background_class_init (MetaBackgroundClass *klass)
  g_type_class_add_private (klass, sizeof (MetaBackgroundPrivate));

  object_class->dispose = meta_background_dispose;
-  object_class->finalize = meta_background_finalize;
  object_class->set_property = meta_background_set_property;
  object_class->get_property = meta_background_get_property;

@@ -1031,6 +1019,7 @@ meta_background_load_file_finish (MetaBackground  *self,
                                  GAsyncResult    *result,
                                  GError         **error)
 {
+  static CoglUserDataKey key;
  GTask *task;
  LoadFileTaskData *task_data;
  CoglTexture *texture;
@@ -1059,7 +1048,7 @@ meta_background_load_file_finish (MetaBackground  *self,

  texture = cogl_texture_new_from_data (width,
                                        height,
-                                        COGL_TEXTURE_NO_ATLAS,
+                                        COGL_TEXTURE_NO_SLICING,
                                        has_alpha ?
                                        COGL_PIXEL_FORMAT_RGBA_8888 :
                                        COGL_PIXEL_FORMAT_RGB_888,
@@ -1076,6 +1065,12 @@ meta_background_load_file_finish (MetaBackground  *self,
      goto out;
    }

+  cogl_object_set_user_data (COGL_OBJECT (texture),
+                             &key,
+                             g_object_ref (pixbuf),
+                             (CoglUserDataDestroyCallback)
+                             g_object_unref);
+
  ensure_pipeline (self);
  unset_texture (self);
  set_style (self, task_data->style);
--- a/src/compositor/meta-module.c
+++ b/src/compositor/meta-module.c
@@ -192,7 +192,10 @@ meta_module_class_init (MetaModuleClass *klass)
 static void
 meta_module_init (MetaModule *self)
 {
-  self->priv = META_MODULE_GET_PRIVATE (self);
+  MetaModulePrivate *priv;
+
+  self->priv = priv = META_MODULE_GET_PRIVATE (self);
+
 }

 GType
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -85,20 +85,12 @@ meta_plugin_manager_load (const gchar       *plugin_name)
  g_free (path);
 }

-static void
-on_confirm_display_change (MetaMonitorManager *monitors,
-                           MetaPluginManager  *plugin_mgr)
-{
-  meta_plugin_manager_confirm_display_change (plugin_mgr);
-}
-
 MetaPluginManager *
 meta_plugin_manager_new (MetaScreen *screen)
 {
  MetaPluginManager *plugin_mgr;
  MetaPluginClass *klass;
  MetaPlugin *plugin;
-  MetaMonitorManager *monitors;

  plugin_mgr = g_new0 (MetaPluginManager, 1);
  plugin_mgr->screen = screen;
@@ -109,10 +101,6 @@ meta_plugin_manager_new (MetaScreen *screen)
  if (klass->start)
    klass->start (plugin);

-  monitors = meta_monitor_manager_get ();
-  g_signal_connect (monitors, "confirm-display-change",
-                    G_CALLBACK (on_confirm_display_change), plugin_mgr);
-
  return plugin_mgr;
 }

@@ -306,23 +294,29 @@ meta_plugin_manager_filter_keybinding (MetaPluginManager *plugin_mgr,
  return FALSE;
 }

+/*
+ * The public method that the compositor hooks into for desktop switching.
+ *
+ * Returns TRUE if the plugin handled the event type (i.e.,
+ * if the return value is FALSE, there will be no subsequent call to the
+ * manager completed() callback, and the compositor must ensure that any
+ * appropriate post-effect cleanup is carried out.
+ */
 gboolean
 meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
                                   XEvent            *xev)
-{
-  MetaPlugin *plugin = plugin_mgr->plugin;
-
-  return _meta_plugin_xevent_filter (plugin, xev);
-}
-
-void
-meta_plugin_manager_confirm_display_change (MetaPluginManager *plugin_mgr)
 {
  MetaPlugin *plugin = plugin_mgr->plugin;
  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);

-  if (klass->confirm_display_change)
-    return klass->confirm_display_change (plugin);
+  /* We need to make sure that clutter gets certain events, like
+   * ConfigureNotify on the stage window. If there is a plugin that
+   * provides an xevent_filter function, then it's the responsibility
+   * of that plugin to pass events to Clutter. Otherwise, we send the
+   * event directly to Clutter ourselves.
+   */
+  if (klass->xevent_filter)
+    return klass->xevent_filter (plugin, xev);
  else
-    return meta_plugin_complete_display_change (plugin, TRUE);
+    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@@ -72,9 +72,5 @@ gboolean meta_plugin_manager_filter_keybinding (MetaPluginManager  *mgr,

 gboolean meta_plugin_manager_xevent_filter (MetaPluginManager *mgr,
                                            XEvent            *xev);
-gboolean _meta_plugin_xevent_filter (MetaPlugin *plugin,
-                                     XEvent     *xev);
-
-void     meta_plugin_manager_confirm_display_change (MetaPluginManager *mgr);

 #endif
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -41,7 +41,6 @@

 #include "compositor-private.h"
 #include "meta-window-actor-private.h"
-#include "monitor-private.h"

 G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT);

@@ -138,7 +137,9 @@ meta_plugin_class_init (MetaPluginClass *klass)
 static void
 meta_plugin_init (MetaPlugin *self)
 {
-  self->priv = META_PLUGIN_GET_PRIVATE (self);
+  MetaPluginPrivate *priv;
+
+  self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
 }

 gboolean
@@ -183,18 +184,6 @@ _meta_plugin_effect_started (MetaPlugin *plugin)
  priv->running++;
 }

-gboolean
-_meta_plugin_xevent_filter (MetaPlugin *plugin,
-                            XEvent     *xev)
-{
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-
-  if (klass->xevent_filter && klass->xevent_filter (plugin, xev))
-    return TRUE;
-  else
-    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
-}
-
 void
 meta_plugin_switch_workspace_completed (MetaPlugin *plugin)
 {
@@ -277,6 +266,10 @@ meta_plugin_destroy_completed (MetaPlugin      *plugin,
 /**
 * meta_plugin_begin_modal:
 * @plugin: a #MetaPlugin
+ * @grab_window: the X window to grab the keyboard and mouse on
+ * @cursor: the cursor to use for the pointer grab, or None,
+ *          to use the normal cursor for the grab window and
+ *          its descendants.
 * @options: flags that modify the behavior of the modal grab
 * @timestamp: the timestamp used for establishing grabs
 *
@@ -297,13 +290,15 @@ meta_plugin_destroy_completed (MetaPlugin      *plugin,
 */
 gboolean
 meta_plugin_begin_modal (MetaPlugin       *plugin,
+                         Window            grab_window,
+                         Cursor            cursor,
                         MetaModalOptions  options,
                         guint32           timestamp)
 {
  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;

  return meta_begin_modal_for_plugin (priv->screen, plugin,
-                                      options, timestamp);
+                                      grab_window, cursor, options, timestamp);
 }

 /**
@@ -343,13 +338,3 @@ meta_plugin_get_screen (MetaPlugin *plugin)

  return priv->screen;
 }
-
-void
-meta_plugin_complete_display_change (MetaPlugin *plugin,
-                                     gboolean    ok)
-{
-  MetaMonitorManager *manager;
-
-  manager = meta_monitor_manager_get ();
-  meta_monitor_manager_confirm_configuration (manager, ok);
-}
--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@@ -123,12 +123,12 @@ static guint signals[LAST_SIGNAL] = { 0 };
 /* The first element in this array also defines the default parameters
 * for newly created classes */
 MetaShadowClassInfo default_shadow_classes[] = {
-  { "normal",       { 6, -1, 0, 3, 128 }, { 3, -1, 0, 3, 32 } },
-  { "dialog",       { 6, -1, 0, 3, 128 }, { 3, -1, 0, 3, 32 } },
-  { "modal_dialog", { 6, -1, 0, 1, 128 }, { 3, -1, 0, 3, 32 } },
-  { "utility",      { 3, -1, 0, 1, 128 }, { 3, -1, 0, 1, 32 } },
-  { "border",       { 6, -1, 0, 3, 128 }, { 3, -1, 0, 3, 32 } },
-  { "menu",         { 6, -1, 0, 3, 128 }, { 3, -1, 0, 0, 32 } },
+  { "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",    { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } },

--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -68,9 +68,10 @@ struct _MetaShapedTexturePrivate
  Pixmap pixmap;
  CoglTexturePixmapX11 *texture;
  CoglTexture *mask_texture;
+  CoglPipeline *pipeline;
+  CoglPipeline *pipeline_unshaped;

  cairo_region_t *clip_region;
-  cairo_region_t *opaque_region;

  guint tex_width, tex_height;

@@ -117,6 +118,8 @@ meta_shaped_texture_dispose (GObject *object)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;

+  g_clear_pointer (&priv->pipeline, cogl_object_unref);
+  g_clear_pointer (&priv->pipeline_unshaped, cogl_object_unref);
  g_clear_pointer (&priv->texture, cogl_object_unref);

  meta_shaped_texture_set_mask_texture (self, NULL);
@@ -125,89 +128,19 @@ meta_shaped_texture_dispose (GObject *object)
  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }

-static CoglPipeline *
-get_unmasked_pipeline (CoglContext *ctx)
-{
-  return cogl_pipeline_new (ctx);
-}
-
-static CoglPipeline *
-get_masked_pipeline (CoglContext *ctx)
-{
-  static CoglPipeline *template = NULL;
-  if (G_UNLIKELY (template == NULL))
-    {
-      template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_combine (template, 1,
-                                       "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
-                                       NULL);
-    }
-
-  return cogl_pipeline_copy (template);
-}
-
-static CoglPipeline *
-get_unblended_pipeline (CoglContext *ctx)
-{
-  static CoglPipeline *template = NULL;
-  if (G_UNLIKELY (template == NULL))
-    {
-      CoglColor color;
-      template = cogl_pipeline_new (ctx);
-      cogl_color_init_from_4ub (&color, 255, 255, 255, 255);
-      cogl_pipeline_set_blend (template,
-                               "RGBA = ADD (SRC_COLOR, 0)",
-                               NULL);
-      cogl_pipeline_set_color (template, &color);
-    }
-
-  return cogl_pipeline_copy (template);
-}
-
-static void
-paint_clipped_rectangle (CoglFramebuffer       *fb,
-                         CoglPipeline          *pipeline,
-                         cairo_rectangle_int_t *rect,
-                         ClutterActorBox       *alloc)
-{
-  float coords[8];
-  float x1, y1, x2, y2;
-
-  x1 = rect->x;
-  y1 = rect->y;
-  x2 = rect->x + rect->width;
-  y2 = rect->y + rect->height;
-
-  coords[0] = rect->x / (alloc->x2 - alloc->x1);
-  coords[1] = rect->y / (alloc->y2 - alloc->y1);
-  coords[2] = (rect->x + rect->width) / (alloc->x2 - alloc->x1);
-  coords[3] = (rect->y + rect->height) / (alloc->y2 - alloc->y1);
-
-  coords[4] = coords[0];
-  coords[5] = coords[1];
-  coords[6] = coords[2];
-  coords[7] = coords[3];
-
-  cogl_framebuffer_draw_multitextured_rectangle (fb, pipeline,
-                                                 x1, y1, x2, y2,
-                                                 &coords[0], 8);
-
-}
-
-
 static void
 meta_shaped_texture_paint (ClutterActor *actor)
 {
  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
  MetaShapedTexturePrivate *priv = stex->priv;
-  guint tex_width, tex_height;
-  guchar opacity;
-  CoglContext *ctx;
-  CoglFramebuffer *fb;
-  CoglPipeline *pipeline = NULL;
  CoglTexture *paint_tex;
+  guint tex_width, tex_height;
  ClutterActorBox alloc;
-  cairo_region_t *blended_region = NULL;
+
+  static CoglPipeline *pipeline_template = NULL;
+  static CoglPipeline *pipeline_unshaped_template = NULL;
+
+  CoglPipeline *pipeline;

  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
    return;
@@ -244,74 +177,38 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;

-  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  fb = cogl_get_draw_framebuffer ();
-
-  opacity = clutter_actor_get_paint_opacity (actor);
-  clutter_actor_get_allocation_box (actor, &alloc);
-
-  if (priv->opaque_region != NULL && opacity == 255)
-    {
-      CoglPipeline *opaque_pipeline;
-      cairo_region_t *region;
-      int n_rects;
-      int i;
-
-      if (priv->clip_region != NULL)
-        {
-          region = cairo_region_copy (priv->clip_region);
-          cairo_region_intersect (region, priv->opaque_region);
-        }
-      else
-        {
-          region = cairo_region_reference (priv->opaque_region);
-        }
-
-      if (cairo_region_is_empty (region))
-        goto paint_blended;
-
-      opaque_pipeline = get_unblended_pipeline (ctx);
-      cogl_pipeline_set_layer_texture (opaque_pipeline, 0, paint_tex);
-
-      n_rects = cairo_region_num_rectangles (region);
-      for (i = 0; i < n_rects; i++)
-        {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (region, i, &rect);
-          paint_clipped_rectangle (fb, opaque_pipeline, &rect, &alloc);
-        }
-
-      cogl_object_unref (opaque_pipeline);
-
-      if (priv->clip_region != NULL)
-        {
-          blended_region = cairo_region_copy (priv->clip_region);
-        }
-      else
-        {
-          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-          blended_region = cairo_region_create_rectangle (&rect);
-        }
-
-      cairo_region_subtract (blended_region, priv->opaque_region);
-
-    paint_blended:
-      cairo_region_destroy (region);
-    }
-
-  if (blended_region == NULL && priv->clip_region != NULL)
-    blended_region = cairo_region_reference (priv->clip_region);
-
-  if (blended_region != NULL && cairo_region_is_empty (blended_region))
-    goto out;
-
  if (priv->mask_texture == NULL)
    {
-      pipeline = get_unmasked_pipeline (ctx);
+      /* Use a single-layer texture if we don't have a mask. */
+
+      if (priv->pipeline_unshaped == NULL)
+        {
+          if (G_UNLIKELY (pipeline_unshaped_template == NULL))
+            {
+              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+              pipeline_unshaped_template = cogl_pipeline_new (ctx);
+            }
+
+          priv->pipeline_unshaped = cogl_pipeline_copy (pipeline_unshaped_template);
+        }
+        pipeline = priv->pipeline_unshaped;
    }
  else
    {
-      pipeline = get_masked_pipeline (ctx);
+      if (priv->pipeline == NULL)
+	{
+	   if (G_UNLIKELY (pipeline_template == NULL))
+	    {
+              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+	      pipeline_template =  cogl_pipeline_new (ctx);
+	      cogl_pipeline_set_layer_combine (pipeline_template, 1,
+					   "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
+					   NULL);
+	    }
+	  priv->pipeline = cogl_pipeline_copy (pipeline_template);
+	}
+      pipeline = priv->pipeline;
+
      cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture);
    }

@@ -319,50 +216,66 @@ meta_shaped_texture_paint (ClutterActor *actor)

  {
    CoglColor color;
-    cogl_color_init_from_4ub (&color, opacity, opacity, opacity, opacity);
+    guchar opacity = clutter_actor_get_paint_opacity (actor);
+    cogl_color_set_from_4ub (&color, opacity, opacity, opacity, opacity);
    cogl_pipeline_set_color (pipeline, &color);
  }

-  if (blended_region != NULL)
+  cogl_set_source (pipeline);
+
+  clutter_actor_get_allocation_box (actor, &alloc);
+
+  if (priv->clip_region)
    {
      int n_rects;
+      int i;
+      cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };

      /* Limit to how many separate rectangles we'll draw; beyond this just
       * fall back and draw the whole thing */
 #     define MAX_RECTS 16

-      n_rects = cairo_region_num_rectangles (blended_region);
+      n_rects = cairo_region_num_rectangles (priv->clip_region);
      if (n_rects <= MAX_RECTS)
 	{
-          int i;
-          cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };
+	  float coords[8];
+          float x1, y1, x2, y2;

 	  for (i = 0; i < n_rects; i++)
 	    {
 	      cairo_rectangle_int_t rect;

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

 	      if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
 		continue;

-              paint_clipped_rectangle (fb, pipeline, &rect, &alloc);
+	      x1 = rect.x;
+	      y1 = rect.y;
+	      x2 = rect.x + rect.width;
+	      y2 = rect.y + rect.height;
+
+	      coords[0] = rect.x / (alloc.x2 - alloc.x1);
+	      coords[1] = rect.y / (alloc.y2 - alloc.y1);
+	      coords[2] = (rect.x + rect.width) / (alloc.x2 - alloc.x1);
+	      coords[3] = (rect.y + rect.height) / (alloc.y2 - alloc.y1);
+
+              coords[4] = coords[0];
+              coords[5] = coords[1];
+              coords[6] = coords[2];
+              coords[7] = coords[3];
+
+              cogl_rectangle_with_multitexture_coords (x1, y1, x2, y2,
+                                                       &coords[0], 8);
            }

-          goto out;
+	  return;
 	}
    }

-  cogl_framebuffer_draw_rectangle (fb, pipeline,
-                                   0, 0,
-                                   alloc.x2 - alloc.x1,
-                                   alloc.y2 - alloc.y1);
-
- out:
-  if (pipeline != NULL)
-    cogl_object_unref (pipeline);
-  if (blended_region != NULL)
-    cairo_region_destroy (blended_region);
+  cogl_rectangle (0, 0,
+		  alloc.x2 - alloc.x1,
+		  alloc.y2 - alloc.y1);
 }

 static void
@@ -374,16 +287,13 @@ meta_shaped_texture_pick (ClutterActor       *actor,

  /* If there is no region then use the regular pick */
  if (priv->mask_texture == NULL)
-    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)->pick (actor, color);
+    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
+      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
    {
      CoglTexture *paint_tex;
      ClutterActorBox alloc;
      guint tex_width, tex_height;
-      CoglPipeline *pipeline;
-      CoglContext *ctx;
-      CoglFramebuffer *fb;
-      CoglColor cogl_color;

      paint_tex = COGL_TEXTURE (priv->texture);

@@ -396,22 +306,17 @@ meta_shaped_texture_pick (ClutterActor       *actor,
      if (tex_width == 0 || tex_height == 0) /* no contents yet */
        return;

-      ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      fb = cogl_get_draw_framebuffer ();
-
-      cogl_color_init_from_4ub (&cogl_color, color->red, color->green, color->blue, color->alpha);
-
-      pipeline = get_masked_pipeline (ctx);
-      cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture);
-      cogl_pipeline_set_color (pipeline, &cogl_color);
+      cogl_set_source_color4ub (color->red, color->green, color->blue,
+                                 color->alpha);

      clutter_actor_get_allocation_box (actor, &alloc);

-      cogl_framebuffer_draw_rectangle (fb, pipeline,
-                                       0, 0,
-                                       alloc.x2 - alloc.x1,
-                                       alloc.y2 - alloc.y1);
-      cogl_object_unref (pipeline);
+      /* Paint the mask rectangle in the given color */
+      cogl_set_source_texture (priv->mask_texture);
+      cogl_rectangle_with_texture_coords (0, 0,
+                                          alloc.x2 - alloc.x1,
+                                          alloc.y2 - alloc.y1,
+                                          0, 0, 1, 1);
    }
 }

@@ -511,32 +416,12 @@ meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

-
-/**
- * meta_shaped_texture_update_area:
- * @stex: #MetaShapedTexture
- * @x: the x coordinate of the damaged area
- * @y: the y coordinate of the damaged area
- * @width: the width of the damaged area
- * @height: the height of the damaged area
- * @unobscured_region: The unobscured region of the window or %NULL if
- * there is no valid one (like when the actor is transformed or
- * has a mapped clone)
- *
- * Repairs the damaged area indicated by @x, @y, @width and @height
- * and queues a redraw for the intersection @visibible_region and
- * the damage area. If @visibible_region is %NULL a redraw will always
- * get queued.
- *
- * Return value: Whether a redraw have been queued or not
- */
-gboolean
+void
 meta_shaped_texture_update_area (MetaShapedTexture *stex,
 				 int                x,
 				 int                y,
 				 int                width,
-				 int                height,
-				 cairo_region_t    *unobscured_region)
+				 int                height)
 {
  MetaShapedTexturePrivate *priv;
  const cairo_rectangle_int_t clip = { x, y, width, height };
@@ -544,41 +429,14 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
  priv = stex->priv;

  if (priv->texture == NULL)
-    return FALSE;
+    return;

  cogl_texture_pixmap_x11_update_area (priv->texture,
                                       x, y, width, height);

  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);

-  if (unobscured_region)
-    {
-      cairo_region_t *intersection;
-
-      if (cairo_region_is_empty (unobscured_region))
-        return FALSE;
-
-      intersection = cairo_region_copy (unobscured_region);
-      cairo_region_intersect_rectangle (intersection, &clip);
-
-      if (!cairo_region_is_empty (intersection))
-        {
-          cairo_rectangle_int_t damage_rect;
-          cairo_region_get_extents (intersection, &damage_rect);
-          clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &damage_rect);
-          cairo_region_destroy (intersection);
-
-          return TRUE;
-        }
-
-      cairo_region_destroy (intersection);
-
-      return FALSE;
-    }
-
  clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip);
-
-  return TRUE;
 }

 static void
@@ -597,6 +455,12 @@ set_cogl_texture (MetaShapedTexture    *stex,

  priv->texture = cogl_tex;

+  if (priv->pipeline != NULL)
+    cogl_pipeline_set_layer_texture (priv->pipeline, 0, COGL_TEXTURE (cogl_tex));
+
+  if (priv->pipeline_unshaped != NULL)
+    cogl_pipeline_set_layer_texture (priv->pipeline_unshaped, 0, COGL_TEXTURE (cogl_tex));
+
  if (cogl_tex != NULL)
    {
      width = cogl_texture_get_width (COGL_TEXTURE (cogl_tex));
@@ -672,8 +536,8 @@ meta_shaped_texture_get_texture (MetaShapedTexture *stex)
 /**
 * meta_shaped_texture_set_clip_region:
 * @stex: a #MetaShapedTexture
- * @clip_region: the region of the texture that is visible and
- *   should be painted.
+ * @clip_region: (transfer full): the region of the texture that
+ *   is visible and should be painted.
 *
 * Provides a hint to the texture about what areas of the texture
 * are not completely obscured and thus need to be painted. This
@@ -694,7 +558,10 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
  priv = stex->priv;

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

  if (clip_region)
    priv->clip_region = cairo_region_copy (clip_region);
@@ -702,36 +569,6 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
    priv->clip_region = NULL;
 }

-/**
- * meta_shaped_texture_set_opaque_region:
- * @stex: a #MetaShapedTexture
- * @opaque_region: (transfer full): the region of the texture that
- *   can have blending turned off.
- *
- * As most windows have a large portion that does not require blending,
- * we can easily turn off blending if we know the areas that do not
- * require blending. This sets the region where we will not blend for
- * optimization purposes.
- */
-void
-meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
-                                       cairo_region_t    *opaque_region)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  if (priv->opaque_region)
-    cairo_region_destroy (priv->opaque_region);
-
-  if (opaque_region)
-    priv->opaque_region = cairo_region_reference (opaque_region);
-  else
-    priv->opaque_region = NULL;
-}
-
 /**
 * meta_shaped_texture_get_image:
 * @stex: A #MetaShapedTexture
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -62,7 +62,6 @@ struct _MetaTextureTower
  CoglTexture *textures[MAX_TEXTURE_LEVELS];
  CoglOffscreen *fbos[MAX_TEXTURE_LEVELS];
  Box invalid[MAX_TEXTURE_LEVELS];
-  CoglPipeline *pipeline_template;
 };

 /**
@@ -94,9 +93,6 @@ meta_texture_tower_free (MetaTextureTower *tower)
 {
  g_return_if_fail (tower != NULL);

-  if (tower->pipeline_template != NULL)
-    cogl_object_unref (tower->pipeline_template);
-
  meta_texture_tower_set_base_texture (tower, NULL);

  g_slice_free (MetaTextureTower, tower);
@@ -387,7 +383,7 @@ texture_tower_create_texture (MetaTextureTower *tower,
  tower->invalid[level].y2 = height;
 }

-static void
+static gboolean
 texture_tower_revalidate_fbo (MetaTextureTower *tower,
                              int               level)
 {
@@ -398,50 +394,174 @@ texture_tower_revalidate_fbo (MetaTextureTower *tower,
  int dest_texture_width = cogl_texture_get_width (dest_texture);
  int dest_texture_height = cogl_texture_get_height (dest_texture);
  Box *invalid = &tower->invalid[level];
-  CoglFramebuffer *fb;
-  CoglError *catch_error = NULL;
-  CoglPipeline *pipeline;
+  CoglMatrix modelview;

  if (tower->fbos[level] == NULL)
-    tower->fbos[level] = cogl_offscreen_new_with_texture (dest_texture);
+    tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);

-  fb = COGL_FRAMEBUFFER (tower->fbos[level]);
+  if (tower->fbos[level] == NULL)
+    return FALSE;

-  if (!cogl_framebuffer_allocate (fb, &catch_error))
+  cogl_push_framebuffer (COGL_FRAMEBUFFER (tower->fbos[level]));
+
+  cogl_ortho (0, dest_texture_width, dest_texture_height, 0, -1., 1.);
+
+  cogl_matrix_init_identity (&modelview);
+  cogl_set_modelview_matrix (&modelview);
+
+  cogl_set_source_texture (tower->textures[level - 1]);
+  cogl_rectangle_with_texture_coords (invalid->x1, invalid->y1,
+                                      invalid->x2, invalid->y2,
+                                      (2. * invalid->x1) / source_texture_width,
+                                      (2. * invalid->y1) / source_texture_height,
+                                      (2. * invalid->x2) / source_texture_width,
+                                      (2. * invalid->y2) / source_texture_height);
+
+  cogl_pop_framebuffer ();
+
+  return TRUE;
+}
+
+static void
+fill_copy (guchar       *buf,
+           const guchar *source,
+           int           width)
+{
+  memcpy (buf, source, width * 4);
+}
+
+static void
+fill_scale_down (guchar       *buf,
+                 const guchar *source,
+                 int           width)
+{
+  while (width > 1)
    {
-      cogl_error_free (catch_error);
-      return;
+      buf[0] = (source[0] + source[4]) / 2;
+      buf[1] = (source[1] + source[5]) / 2;
+      buf[2] = (source[2] + source[6]) / 2;
+      buf[3] = (source[3] + source[7]) / 2;
+
+      buf += 4;
+      source += 8;
+      width -= 2;
    }

-  cogl_framebuffer_orthographic (fb, 0, 0, dest_texture_width, dest_texture_height, -1., 1.);
-
-  if (!tower->pipeline_template)
+  if (width > 0)
    {
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      tower->pipeline_template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_blend (tower->pipeline_template, "RGBA = ADD (SRC_COLOR, 0)", NULL);
+      buf[0] = source[0] / 2;
+      buf[1] = source[1] / 2;
+      buf[2] = source[2] / 2;
+      buf[3] = source[3] / 2;
+    }
+}
+
+static void
+texture_tower_revalidate_client (MetaTextureTower *tower,
+                                 int               level)
+{
+  CoglTexture *source_texture = tower->textures[level - 1];
+  int source_texture_width = cogl_texture_get_width (source_texture);
+  int source_texture_height = cogl_texture_get_height (source_texture);
+  guint source_rowstride;
+  guchar *source_data;
+  CoglTexture *dest_texture = tower->textures[level];
+  int dest_texture_width = cogl_texture_get_width (dest_texture);
+  int dest_texture_height = cogl_texture_get_height (dest_texture);
+  int dest_x = tower->invalid[level].x1;
+  int dest_y = tower->invalid[level].y1;
+  int dest_width = tower->invalid[level].x2 - tower->invalid[level].x1;
+  int dest_height = tower->invalid[level].y2 - tower->invalid[level].y1;
+  guchar *dest_data;
+  guchar *source_tmp1 = NULL, *source_tmp2 = NULL;
+  int i, j;
+
+  source_rowstride = source_texture_width * 4;
+
+  source_data = g_malloc (source_texture_height * source_rowstride);
+  cogl_texture_get_data (source_texture, TEXTURE_FORMAT, source_rowstride,
+                         source_data);
+
+  dest_data = g_malloc (dest_height * dest_width * 4);
+
+  if (dest_texture_height < source_texture_height)
+    {
+      source_tmp1 = g_malloc (dest_width * 4);
+      source_tmp2 = g_malloc (dest_width * 4);
    }

-  pipeline = cogl_pipeline_copy (tower->pipeline_template);
-  cogl_pipeline_set_layer_texture (pipeline, 0, tower->textures[level - 1]);
+  for (i = 0; i < dest_height; i++)
+    {
+      guchar *dest_row = dest_data + i * dest_width * 4;
+      if (dest_texture_height < source_texture_height)
+        {
+          guchar *source1, *source2;
+          guchar *dest;

-  cogl_framebuffer_draw_textured_rectangle (fb, pipeline,
-                                            invalid->x1, invalid->y1,
-                                            invalid->x2, invalid->y2,
-                                            (2. * invalid->x1) / source_texture_width,
-                                            (2. * invalid->y1) / source_texture_height,
-                                            (2. * invalid->x2) / source_texture_width,
-                                            (2. * invalid->y2) / source_texture_height);
+          if (dest_texture_width < source_texture_width)
+            {
+              fill_scale_down (source_tmp1,
+                               source_data + ((i + dest_y) * 2) * source_rowstride + dest_x * 2 * 4,
+                               dest_width * 2);
+              fill_scale_down (source_tmp2,
+                               source_data + ((i + dest_y) * 2 + 1) * source_rowstride + dest_x * 2 * 4,
+                               dest_width * 2);
+            }
+          else
+            {
+              fill_copy (source_tmp1,
+                         source_data + ((i + dest_y) * 2) * source_rowstride + dest_x * 4,
+                         dest_width);
+              fill_copy (source_tmp2,
+                         source_data + ((i + dest_y) * 2 + 1) * source_rowstride + dest_x * 4,
+                         dest_width);
+            }

-  cogl_object_unref (pipeline);
+          source1 = source_tmp1;
+          source2 = source_tmp2;
+
+          dest = dest_row;
+          for (j = 0; j < dest_width * 4; j++)
+            *(dest++) = (*(source1++) + *(source2++)) / 2;
+        }
+      else
+        {
+          if (dest_texture_width < source_texture_width)
+            fill_scale_down (dest_row,
+                             source_data + (i + dest_y) * source_rowstride + dest_x * 2 * 4,
+                             dest_width * 2);
+          else
+            fill_copy (dest_row,
+                       source_data + (i + dest_y) * source_rowstride,
+                       dest_width);
+        }
+    }
+
+  cogl_texture_set_region (dest_texture,
+                           0, 0,
+                           dest_x, dest_y,
+                           dest_width, dest_height,
+                           dest_width, dest_height,
+                           TEXTURE_FORMAT,
+                           4 * dest_width,
+                           dest_data);
+
+  if (dest_texture_height < source_texture_height)
+    {
+      g_free (source_tmp1);
+      g_free (source_tmp2);
+    }
+
+  g_free (source_data);
+  g_free (dest_data);
 }

 static void
 texture_tower_revalidate (MetaTextureTower *tower,
                          int               level)
 {
-  texture_tower_revalidate_fbo (tower, level);
+  if (!texture_tower_revalidate_fbo (tower, level))
+    texture_tower_revalidate_client (tower, level);
 }

 /**
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -57,14 +57,11 @@ void     meta_window_actor_queue_frame_drawn   (MetaWindowActor *self,

 cairo_region_t *meta_window_actor_get_obscured_region (MetaWindowActor *self);

-void meta_window_actor_set_clip_region         (MetaWindowActor *self,
-                                                cairo_region_t  *clip_region);
-void meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
-                                                cairo_region_t  *beneath_region);
-void meta_window_actor_reset_clip_regions      (MetaWindowActor *self);
-
-void meta_window_actor_set_unobscured_region      (MetaWindowActor *self,
-                                                   cairo_region_t  *unobscured_region);
+void meta_window_actor_set_visible_region         (MetaWindowActor *self,
+                                                   cairo_region_t  *visible_region);
+void meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
+                                                   cairo_region_t  *beneath_region);
+void meta_window_actor_reset_visible_regions      (MetaWindowActor *self);

 void meta_window_actor_effect_completed (MetaWindowActor *actor,
                                         gulong           event);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -10,6 +10,7 @@

 #include <math.h>

+#include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xrender.h>
@@ -31,7 +32,6 @@
 #include "meta-window-actor-private.h"
 #include "meta-texture-rectangle.h"
 #include "region-utils.h"
-#include "monitor-private.h"

 enum {
  POSITION_CHANGED,
@@ -69,6 +69,9 @@ struct _MetaWindowActorPrivate
  Damage            damage;

  guint8            opacity;
+  guint8            shadow_opacity;
+
+  gchar *           desc;

  /* A region that matches the shape of the window, including frame bounds */
  cairo_region_t   *shape_region;
@@ -78,12 +81,6 @@ struct _MetaWindowActorPrivate
  /* The region we should clip to when painting the shadow */
  cairo_region_t   *shadow_clip;

-  /* The region that is visible, used to optimize out redraws */
-  cairo_region_t   *unobscured_region;
-
-  guint              send_frame_messages_timer;
-  gint64             frame_drawn_time;
-
  /* Extracted size-invariant shape used for shadows */
  MetaWindowShape  *shadow_shape;

@@ -133,6 +130,8 @@ struct _MetaWindowActorPrivate

  guint             no_shadow              : 1;

+  guint             no_more_x_calls        : 1;
+
  guint             unredirected           : 1;

  /* This is used to detect fullscreen windows that need to be unredirected */
@@ -183,12 +182,6 @@ static void meta_window_actor_handle_updates (MetaWindowActor *self);

 static void check_needs_reshape (MetaWindowActor *self);

-static void do_send_frame_drawn (MetaWindowActor *self, FrameData *frame);
-static void do_send_frame_timings (MetaWindowActor  *self,
-                                   FrameData        *frame,
-                                   gint             refresh_interval,
-                                   gint64           presentation_time);
-
 G_DEFINE_TYPE (MetaWindowActor, meta_window_actor, CLUTTER_TYPE_ACTOR);

 static void
@@ -330,6 +323,9 @@ window_decorated_notify (MetaWindow *mw,
      priv->damage = None;
    }

+  g_free (priv->desc);
+  priv->desc = NULL;
+
  priv->xwindow = new_xwindow;

  /*
@@ -381,10 +377,10 @@ meta_window_actor_constructed (GObject *object)
       */
      g_object_ref (priv->actor);

-      g_signal_connect_object (window, "notify::decorated",
-                               G_CALLBACK (window_decorated_notify), self, 0);
-      g_signal_connect_object (window, "notify::appears-focused",
-                               G_CALLBACK (window_appears_focused_notify), self, 0);
+      g_signal_connect (window, "notify::decorated",
+                        G_CALLBACK (window_decorated_notify), self);
+      g_signal_connect (window, "notify::appears-focused",
+                        G_CALLBACK (window_appears_focused_notify), self);
    }
  else
    {
@@ -399,7 +395,7 @@ meta_window_actor_constructed (GObject *object)

  /* Start off with an empty region to maintain the invariant that
     the shape region is always set */
-  priv->shape_region = cairo_region_create ();
+  priv->shape_region = cairo_region_create();
 }

 static void
@@ -424,13 +420,6 @@ meta_window_actor_dispose (GObject *object)

  meta_window_actor_detach (self);

-  if (priv->send_frame_messages_timer != 0)
-    {
-      g_source_remove (priv->send_frame_messages_timer);
-      priv->send_frame_messages_timer = 0;
-    }
-
-  g_clear_pointer (&priv->unobscured_region, cairo_region_destroy);
  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
  g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);
@@ -468,6 +457,7 @@ meta_window_actor_finalize (GObject *object)
  MetaWindowActorPrivate *priv = self->priv;

  g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free);
+  g_free (priv->desc);

  G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object);
 }
@@ -654,16 +644,6 @@ meta_window_actor_paint (ClutterActor *actor)
  gboolean appears_focused = meta_window_appears_focused (priv->window);
  MetaShadow *shadow = appears_focused ? priv->focused_shadow : priv->unfocused_shadow;

- /* This window got damage when obscured; we set up a timer
-  * to send frame completion events, but since we're drawing
-  * the window now (for some other reason) cancel the timer
-  * and send the completion events normally */
-  if (priv->send_frame_messages_timer != 0)
-    {
-      g_source_remove (priv->send_frame_messages_timer);
-      priv->send_frame_messages_timer = 0;
-    }
-
  if (shadow != NULL)
    {
      MetaShadowParams params;
@@ -872,6 +852,25 @@ meta_window_actor_is_override_redirect (MetaWindowActor *self)
  return meta_window_is_override_redirect (self->priv->window);
 }

+const char *meta_window_actor_get_description (MetaWindowActor *self)
+{
+  /*
+   * For windows managed by the WM, we just defer to the WM for the window
+   * description. For override-redirect windows, we create the description
+   * ourselves, but only on demand.
+   */
+  if (self->priv->window)
+    return meta_window_get_description (self->priv->window);
+
+  if (G_UNLIKELY (self->priv->desc == NULL))
+    {
+      self->priv->desc = g_strdup_printf ("Override Redirect (0x%x)",
+                                         (guint) self->priv->xwindow);
+    }
+
+  return self->priv->desc;
+}
+
 /**
 * meta_window_actor_get_workspace:
 * @self: #MetaWindowActor
@@ -925,66 +924,11 @@ meta_window_actor_freeze (MetaWindowActor *self)
  self->priv->freeze_count++;
 }

-static
-gboolean send_frame_messages_timeout (gpointer data)
-{
-  MetaWindowActor *self = (MetaWindowActor *) data;
-  MetaWindowActorPrivate *priv = self->priv;
-  FrameData *frame = g_slice_new0 (FrameData);
-
-  frame->sync_request_serial = priv->window->sync_request_serial;
-
-  do_send_frame_drawn (self, frame);
-  do_send_frame_timings (self, frame, 0, 0);
-
-  priv->needs_frame_drawn = FALSE;
-  priv->send_frame_messages_timer = 0;
-  frame_data_free (frame);
-
-  return FALSE;
-}
-
-static void
-queue_send_frame_messages_timeout (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaScreen  *screen  = priv->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  gint64 current_time = meta_compositor_monotonic_time_to_server_time (display, g_get_monotonic_time ());
-  MetaMonitorManager *monitor_manager = meta_monitor_manager_get ();
-  MetaWindow *window = priv->window;
-
-  MetaOutput *outputs;
-  guint n_outputs, i;
-  float refresh_rate = 60.0f;
-  gint interval, offset;
-
-  outputs = meta_monitor_manager_get_outputs (monitor_manager, &n_outputs);
-  for (i = 0; i < n_outputs; i++)
-    {
-      if (outputs[i].output_id == window->monitor->output_id && outputs[i].crtc)
-        {
-          refresh_rate = outputs[i].crtc->current_mode->refresh_rate;
-          break;
-        }
-    }
-
-  interval = (int)(1000000 / refresh_rate) * 6;
-  offset = MAX (0, current_time - priv->frame_drawn_time + interval) / 1000;
-
- /* The clutter master clock source has already been added with META_PRIORITY_REDRAW,
-  * so the timer will run *after* the clutter frame handling, if a frame is ready
-  * to be drawn when the timer expires.
-  */
-  priv->send_frame_messages_timer = g_timeout_add_full (META_PRIORITY_REDRAW, offset, send_frame_messages_timeout, self, NULL);
-}
-
 static void
 meta_window_actor_damage_all (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
  CoglTexture *texture;
-  gboolean redraw_queued;

  if (!priv->needs_damage_all)
    return;
@@ -994,16 +938,13 @@ meta_window_actor_damage_all (MetaWindowActor *self)
  if (!priv->mapped || priv->needs_pixmap)
    return;

-  redraw_queued = meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                                   0, 0,
-                                                   cogl_texture_get_width (texture),
-                                                   cogl_texture_get_height (texture),
-                                                   clutter_actor_has_mapped_clones (priv->actor) ?
-                                                   NULL : priv->unobscured_region);
-
-  priv->repaint_scheduled = priv->repaint_scheduled  || redraw_queued;
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   0, 0,
+                                   cogl_texture_get_width (texture),
+                                   cogl_texture_get_height (texture));

  priv->needs_damage_all = FALSE;
+  priv->repaint_scheduled = TRUE;
 }

 static void
@@ -1056,31 +997,14 @@ meta_window_actor_queue_frame_drawn (MetaWindowActor *self,

  if (!priv->repaint_scheduled)
    {
-      gboolean is_obscured = FALSE;
-
-      /* Find out whether the window is completly obscured */
-      if (priv->unobscured_region)
-        {
-          cairo_region_t *unobscured_window_region;
-          unobscured_window_region = cairo_region_copy (priv->shape_region);
-          cairo_region_intersect (unobscured_window_region, priv->unobscured_region);
-          is_obscured = cairo_region_is_empty (unobscured_window_region);
-          cairo_region_destroy (unobscured_window_region);
-        }
-
      /* A frame was marked by the client without actually doing any
-       * damage or any unobscured, or while we had the window frozen
-       * (e.g. during an interactive resize.) We need to make sure that the
+       * damage, or while we had the window frozen (e.g. during an
+       * interactive resize.) We need to make sure that the
       * pre_paint/post_paint functions get called, enabling us to
       * send a _NET_WM_FRAME_DRAWN. We do a 1-pixel redraw to get
-       * consistent timing with non-empty frames. If the window
-       * is completely obscured we fire off the send_frame_messages timeout.
+       * consistent timing with non-empty frames.
       */
-      if (is_obscured)
-        {
-          queue_send_frame_messages_timeout (self);
-        }
-      else if (priv->mapped && !priv->needs_pixmap)
+      if (priv->mapped && !priv->needs_pixmap)
        {
          const cairo_rectangle_int_t clip = { 0, 0, 1, 1 };
          clutter_actor_queue_redraw_with_clip (priv->actor, &clip);
@@ -1331,7 +1255,7 @@ meta_window_actor_should_unredirect (MetaWindowActor *self)
  if (priv->opacity != 0xff)
    return FALSE;

-  if (metaWindow->shape_region != NULL)
+  if (metaWindow->has_shape)
    return FALSE;

  if (priv->argb32 && !meta_window_requested_bypass_compositor (metaWindow))
@@ -1416,6 +1340,14 @@ meta_window_actor_destroy (MetaWindowActor *self)

  priv->needs_destroy = TRUE;

+  /*
+   * Once the window destruction is initiated we can no longer perform any
+   * furter X-based operations. For example, if we have a Map effect running,
+   * we cannot query the window geometry once the effect completes. So, flag
+   * this.
+   */
+  priv->no_more_x_calls = TRUE;
+
  if (!meta_window_actor_effect_in_progress (self))
    clutter_actor_destroy (CLUTTER_ACTOR (self));
 }
@@ -1713,7 +1645,7 @@ meta_window_actor_get_obscured_region (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

-  if (priv->back_pixmap && priv->opacity == 0xff && !priv->window->shaded)
+  if (priv->back_pixmap && priv->opacity == 0xff)
    return priv->opaque_region;
  else
    return NULL;
@@ -1761,67 +1693,40 @@ see_region (cairo_region_t *region,
 #endif

 /**
- * meta_window_actor_set_unobscured_region:
+ * meta_window_actor_set_visible_region:
 * @self: a #MetaWindowActor
- * @unobscured_region: the region of the screen that isn't completely
- *  obscured.
- *
- * Provides a hint as to what areas of the window need to queue
- * redraws when damaged. Regions not in @unobscured_region are completely obscured.
- * Unlike meta_window_actor_set_clip_region(), the region here
- * doesn't take into account any clipping that is in effect while drawing.
- */
-void
-meta_window_actor_set_unobscured_region (MetaWindowActor *self,
-                                         cairo_region_t  *unobscured_region)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-
-  if (priv->unobscured_region)
-    cairo_region_destroy (priv->unobscured_region);
-
-  if (unobscured_region)
-    priv->unobscured_region = cairo_region_copy (unobscured_region);
-  else
-    priv->unobscured_region = NULL;
-}
-
-/**
- * meta_window_actor_set_clip_region:
- * @self: a #MetaWindowActor
- * @clip_region: the region of the screen that isn't completely
+ * @visible_region: the region of the screen that isn't completely
 *  obscured.
 *
 * Provides a hint as to what areas of the window need to be
- * drawn. Regions not in @clip_region are completely obscured or
- * not drawn in this frame.
+ * drawn. Regions not in @visible_region are completely obscured.
 * This will be set before painting then unset afterwards.
 */
 void
-meta_window_actor_set_clip_region (MetaWindowActor *self,
-                                   cairo_region_t  *clip_region)
+meta_window_actor_set_visible_region (MetaWindowActor *self,
+                                      cairo_region_t  *visible_region)
 {
  MetaWindowActorPrivate *priv = self->priv;

  meta_shaped_texture_set_clip_region (META_SHAPED_TEXTURE (priv->actor),
-                                       clip_region);
+                                       visible_region);
 }

 /**
- * meta_window_actor_set_clip_region_beneath:
+ * meta_window_actor_set_visible_region_beneath:
 * @self: a #MetaWindowActor
- * @clip_region: the region of the screen that isn't completely
+ * @visible_region: the region of the screen that isn't completely
 *  obscured beneath the main window texture.
 *
 * Provides a hint as to what areas need to be drawn *beneath*
- * the main window texture.  This is the relevant clip region
+ * the main window texture.  This is the relevant visible region
 * when drawing the shadow, properly accounting for areas of the
 * shadow hid by the window itself. This will be set before painting
 * then unset afterwards.
 */
 void
-meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
-                                           cairo_region_t  *beneath_region)
+meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
+                                              cairo_region_t  *beneath_region)
 {
  MetaWindowActorPrivate *priv = self->priv;
  gboolean appears_focused = meta_window_appears_focused (priv->window);
@@ -1840,14 +1745,14 @@ meta_window_actor_set_clip_region_beneath (MetaWindowActor *self,
 }

 /**
- * meta_window_actor_reset_clip_regions:
+ * meta_window_actor_reset_visible_regions:
 * @self: a #MetaWindowActor
 *
- * Unsets the regions set by meta_window_actor_set_clip_region() and
- * meta_window_actor_set_clip_region_beneath()
+ * Unsets the regions set by meta_window_actor_reset_visible_region() and
+ * meta_window_actor_reset_visible_region_beneath()
 */
 void
-meta_window_actor_reset_clip_regions (MetaWindowActor *self)
+meta_window_actor_reset_visible_regions (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

@@ -2019,7 +1924,6 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
 {
  MetaWindowActorPrivate *priv = self->priv;
  MetaCompScreen *info = meta_screen_get_compositor_data (priv->screen);
-  gboolean redraw_queued;

  priv->received_damage = TRUE;

@@ -2067,16 +1971,12 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
  if (!priv->mapped || priv->needs_pixmap)
    return;

-  redraw_queued = meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
-                                                   event->area.x,
-                                                   event->area.y,
-                                                   event->area.width,
-                                                   event->area.height,
-                                                   clutter_actor_has_mapped_clones (priv->actor) ?
-                                                   NULL : priv->unobscured_region);
-
-  priv->repaint_scheduled = priv->repaint_scheduled  || redraw_queued;
-
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   event->area.x,
+                                   event->area.y,
+                                   event->area.width,
+                                   event->area.height);
+  priv->repaint_scheduled = TRUE;
 }

 void
@@ -2093,6 +1993,73 @@ meta_window_actor_sync_visibility (MetaWindowActor *self)
    }
 }

+#define TAU (2*M_PI)
+
+static void
+install_corners (MetaWindow       *window,
+                 MetaFrameBorders *borders,
+                 cairo_t          *cr)
+{
+  float top_left, top_right, bottom_left, bottom_right;
+  int x, y;
+  MetaRectangle outer;
+
+  meta_frame_get_corner_radiuses (window->frame,
+                                  &top_left,
+                                  &top_right,
+                                  &bottom_left,
+                                  &bottom_right);
+
+  meta_window_get_outer_rect (window, &outer);
+
+  /* top left */
+  x = borders->invisible.left;
+  y = borders->invisible.top;
+
+  cairo_arc (cr,
+             x + top_left,
+             y + top_left,
+             top_left,
+             2 * TAU / 4,
+             3 * TAU / 4);
+
+  /* top right */
+  x = borders->invisible.left + outer.width - top_right;
+  y = borders->invisible.top;
+
+  cairo_arc (cr,
+             x,
+             y + top_right,
+             top_right,
+             3 * TAU / 4,
+             4 * TAU / 4);
+
+  /* bottom right */
+  x = borders->invisible.left + outer.width - bottom_right;
+  y = borders->invisible.top + outer.height - bottom_right;
+
+  cairo_arc (cr,
+             x,
+             y,
+             bottom_right,
+             0 * TAU / 4,
+             1 * TAU / 4);
+
+  /* bottom left */
+  x = borders->invisible.left;
+  y = borders->invisible.top + outer.height - bottom_left;
+
+  cairo_arc (cr,
+             x + bottom_left,
+             y,
+             bottom_left,
+             1 * TAU / 4,
+             2 * TAU / 4);
+
+  cairo_set_source_rgba (cr, 1, 1, 1, 1);
+  cairo_fill (cr);
+}
+
 static cairo_region_t *
 scan_visible_region (guchar         *mask_data,
                     int             stride,
@@ -2132,6 +2099,7 @@ scan_visible_region (guchar         *mask_data,

 static void
 build_and_scan_frame_mask (MetaWindowActor       *self,
+                           MetaFrameBorders      *borders,
                           cairo_rectangle_int_t *client_area,
                           cairo_region_t        *shape_region)
 {
@@ -2177,7 +2145,7 @@ build_and_scan_frame_mask (MetaWindowActor       *self,
      gdk_cairo_region (cr, frame_paint_region);
      cairo_clip (cr);

-      meta_frame_get_mask (priv->window->frame, cr);
+      install_corners (priv->window, borders, cr);

      cairo_surface_flush (surface);
      scanned_region = scan_visible_region (mask_data, stride, frame_paint_region);
@@ -2219,53 +2187,102 @@ build_and_scan_frame_mask (MetaWindowActor       *self,
 }

 static void
-meta_window_actor_update_shape_region (MetaWindowActor       *self,
-                                       cairo_rectangle_int_t *client_area)
+check_needs_reshape (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
+  MetaScreen *screen = priv->screen;
+  MetaDisplay *display = meta_screen_get_display (screen);
+  MetaFrameBorders borders;
  cairo_region_t *region = NULL;
+  cairo_rectangle_int_t client_area;
+  gboolean needs_mask;

-  if (priv->window->frame != NULL && priv->window->shape_region != NULL)
+  if (!priv->mapped)
+    return;
+
+  if (!priv->needs_reshape)
+    return;
+
+  if (priv->shadow_shape != NULL)
    {
-      region = cairo_region_copy (priv->window->shape_region);
-      cairo_region_translate (region, client_area->x, client_area->y);
+      meta_window_shape_unref (priv->shadow_shape);
+      priv->shadow_shape = NULL;
    }
-  else if (priv->window->shape_region != NULL)
+
+  meta_frame_calc_borders (priv->window->frame, &borders);
+
+  client_area.x = borders.total.left;
+  client_area.y = borders.total.top;
+  client_area.width = priv->window->rect.width;
+  client_area.height = priv->window->rect.height;
+
+  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), NULL);
+  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
+  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
+
+#ifdef HAVE_SHAPE
+  if (priv->window->has_shape)
    {
-      region = cairo_region_reference (priv->window->shape_region);
+      /* Translate the set of XShape rectangles that we
+       * get from the X server to a cairo_region. */
+      Display *xdisplay = meta_display_get_xdisplay (display);
+      XRectangle *rects;
+      int n_rects, ordering;
+
+      meta_error_trap_push (display);
+      rects = XShapeGetRectangles (xdisplay,
+                                   priv->window->xwindow,
+                                   ShapeBounding,
+                                   &n_rects,
+                                   &ordering);
+      meta_error_trap_pop (display);
+
+      if (rects)
+        {
+          int i;
+          cairo_rectangle_int_t *cairo_rects = g_new (cairo_rectangle_int_t, n_rects);
+
+          for (i = 0; i < n_rects; i ++)
+            {
+              cairo_rects[i].x = rects[i].x + client_area.x;
+              cairo_rects[i].y = rects[i].y + client_area.y;
+              cairo_rects[i].width = rects[i].width;
+              cairo_rects[i].height = rects[i].height;
+            }
+
+          XFree (rects);
+          region = cairo_region_create_rectangles (cairo_rects, n_rects);
+          g_free (cairo_rects);
+        }
+    }
+#endif
+
+  needs_mask = (region != NULL) || (priv->window->frame != NULL);
+
+  if (region != NULL)
+    {
+      /* The shape we get back from the client may have coordinates
+       * outside of the frame. The X SHAPE Extension requires that
+       * the overall shape the client provides never exceeds the
+       * "bounding rectangle" of the window -- the shape that the
+       * window would have gotten if it was unshaped. In our case,
+       * this is simply the client area.
+       */
+      cairo_region_intersect_rectangle (region, &client_area);
    }
  else
    {
      /* If we don't have a shape on the server, that means that
       * we have an implicit shape of one rectangle covering the
       * entire window. */
-      region = cairo_region_create_rectangle (client_area);
+      region = cairo_region_create_rectangle (&client_area);
    }

-  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), NULL);
-  if ((priv->window->shape_region != NULL) || (priv->window->frame != NULL))
-    build_and_scan_frame_mask (self, client_area, region);
-
-  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
-  priv->shape_region = region;
-
-  g_clear_pointer (&priv->shadow_shape, meta_window_shape_unref);
-  meta_window_actor_invalidate_shadow (self);
-}
-
-static void
-meta_window_actor_update_opaque_region (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-
-  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
+  /* The region at this point should be constrained to the
+   * bounds of the client rectangle. */

  if (priv->argb32 && priv->window->opaque_region != NULL)
    {
-      MetaFrameBorders borders;
-
-      meta_frame_calc_borders (priv->window->frame, &borders);
-
      /* The opaque region is defined to be a part of the
       * window which ARGB32 will always paint with opaque
       * pixels. For these regions, we want to avoid painting
@@ -2277,43 +2294,24 @@ meta_window_actor_update_opaque_region (MetaWindowActor *self)
       * case, graphical glitches will occur.
       */
      priv->opaque_region = cairo_region_copy (priv->window->opaque_region);
-      cairo_region_translate (priv->opaque_region, borders.total.left, borders.total.top);
-      cairo_region_intersect (priv->opaque_region, priv->shape_region);
+      cairo_region_translate (priv->opaque_region, client_area.x, client_area.y);
+      cairo_region_intersect (priv->opaque_region, region);
    }
  else if (priv->argb32)
    priv->opaque_region = NULL;
  else
-    priv->opaque_region = cairo_region_reference (priv->shape_region);
+    priv->opaque_region = cairo_region_reference (region);

-  meta_shaped_texture_set_opaque_region (META_SHAPED_TEXTURE (priv->actor),
-                                         priv->opaque_region);
-}
+  if (needs_mask)
+    {
+      /* This takes the region, generates a mask using GTK+
+       * and scans the mask looking for all opaque pixels,
+       * adding it to region.
+       */
+      build_and_scan_frame_mask (self, &borders, &client_area, region);
+    }

-static void
-check_needs_reshape (MetaWindowActor *self)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaFrameBorders borders;
-  cairo_rectangle_int_t client_area;
-
-  if (!priv->mapped)
-    return;
-
-  if (!priv->needs_reshape)
-    return;
-
-  meta_frame_calc_borders (priv->window->frame, &borders);
-
-  client_area.x = borders.total.left;
-  client_area.y = borders.total.top;
-  client_area.width = priv->window->rect.width;
-  if (priv->window->shaded)
-    client_area.height = 0;
-  else
-    client_area.height = priv->window->rect.height;
-
-  meta_window_actor_update_shape_region (self, &client_area);
-  meta_window_actor_update_opaque_region (self);
+  priv->shape_region = region;

  priv->needs_reshape = FALSE;
  meta_window_actor_invalidate_shadow (self);
@@ -2407,35 +2405,6 @@ meta_window_actor_pre_paint (MetaWindowActor *self)
    }
 }

-static void
-do_send_frame_drawn (MetaWindowActor *self, FrameData *frame)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  MetaScreen  *screen  = priv->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  Display *xdisplay = meta_display_get_xdisplay (display);
-
-  XClientMessageEvent ev = { 0, };
-
-  frame->frame_drawn_time = meta_compositor_monotonic_time_to_server_time (display,
-                                                                           g_get_monotonic_time ());
-  priv->frame_drawn_time = frame->frame_drawn_time;
-
-  ev.type = ClientMessage;
-  ev.window = meta_window_get_xwindow (priv->window);
-  ev.message_type = display->atom__NET_WM_FRAME_DRAWN;
-  ev.format = 32;
-  ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
-  ev.data.l[1] = frame->sync_request_serial >> 32;
-  ev.data.l[2] = frame->frame_drawn_time & G_GUINT64_CONSTANT(0xffffffff);
-  ev.data.l[3] = frame->frame_drawn_time >> 32;
-
-  meta_error_trap_push (display);
-  XSendEvent (xdisplay, ev.window, False, 0, (XEvent*) &ev);
-  XFlush (xdisplay);
-  meta_error_trap_pop (display);
-}
-
 void
 meta_window_actor_post_paint (MetaWindowActor *self)
 {
@@ -2443,29 +2412,47 @@ meta_window_actor_post_paint (MetaWindowActor *self)

  priv->repaint_scheduled = FALSE;

- /* This window had damage, but wasn't actually redrawn because
-  * it is obscured. So we should wait until timer expiration
-  * before sending _NET_WM_FRAME_* messages.
-  */
-  if (priv->send_frame_messages_timer != 0)
-    return;
-
  if (priv->needs_frame_drawn)
    {
-      do_send_frame_drawn (self, priv->frames->data);
+      MetaScreen  *screen  = priv->screen;
+      MetaDisplay *display = meta_screen_get_display (screen);
+      Display *xdisplay = meta_display_get_xdisplay (display);
+
+      XClientMessageEvent ev = { 0, };
+
+      FrameData *frame = priv->frames->data;
+
+      frame->frame_drawn_time = meta_compositor_monotonic_time_to_server_time (display,
+                                                                               g_get_monotonic_time ());
+      ev.type = ClientMessage;
+      ev.window = meta_window_get_xwindow (priv->window);
+      ev.message_type = display->atom__NET_WM_FRAME_DRAWN;
+      ev.format = 32;
+      ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
+      ev.data.l[1] = frame->sync_request_serial >> 32;
+      ev.data.l[2] = frame->frame_drawn_time & G_GUINT64_CONSTANT(0xffffffff);
+      ev.data.l[3] = frame->frame_drawn_time >> 32;
+
+      meta_error_trap_push (display);
+      XSendEvent (xdisplay, ev.window, False, 0, (XEvent*) &ev);
+      XFlush (xdisplay);
+      meta_error_trap_pop (display);
+
      priv->needs_frame_drawn = FALSE;
    }
 }

 static void
-do_send_frame_timings (MetaWindowActor  *self,
-                       FrameData        *frame,
-                       gint             refresh_interval,
-                       gint64           presentation_time)
+send_frame_timings (MetaWindowActor  *self,
+                    FrameData        *frame,
+                    CoglFrameInfo    *frame_info,
+                    gint64            presentation_time)
 {
  MetaWindowActorPrivate *priv = self->priv;
  MetaDisplay *display = meta_screen_get_display (priv->screen);
  Display *xdisplay = meta_display_get_xdisplay (display);
+  float refresh_rate;
+  int refresh_interval;

  XClientMessageEvent ev = { 0, };

@@ -2476,6 +2463,13 @@ do_send_frame_timings (MetaWindowActor  *self,
  ev.data.l[0] = frame->sync_request_serial & G_GUINT64_CONSTANT(0xffffffff);
  ev.data.l[1] = frame->sync_request_serial >> 32;

+  refresh_rate = cogl_frame_info_get_refresh_rate (frame_info);
+  /* 0.0 is a flag for not known, but sanity-check against other odd numbers */
+  if (refresh_rate >= 1.0)
+    refresh_interval = (int) (0.5 + 1000000 / refresh_rate);
+  else
+    refresh_interval = 0;
+
  if (presentation_time != 0)
    {
      gint64 presentation_time_server = meta_compositor_monotonic_time_to_server_time (display,
@@ -2497,25 +2491,6 @@ do_send_frame_timings (MetaWindowActor  *self,
  meta_error_trap_pop (display);
 }

-static void
-send_frame_timings (MetaWindowActor  *self,
-                    FrameData        *frame,
-                    CoglFrameInfo    *frame_info,
-                    gint64            presentation_time)
-{
-  float refresh_rate;
-  int refresh_interval;
-
-  refresh_rate = cogl_frame_info_get_refresh_rate (frame_info);
-  /* 0.0 is a flag for not known, but sanity-check against other odd numbers */
-  if (refresh_rate >= 1.0)
-    refresh_interval = (int) (0.5 + 1000000 / refresh_rate);
-  else
-    refresh_interval = 0;
-
-  do_send_frame_timings (self, frame, refresh_interval, presentation_time);
-}
-
 void
 meta_window_actor_frame_complete (MetaWindowActor *self,
                                  CoglFrameInfo   *frame_info,
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -89,30 +89,16 @@ painting_untransformed (MetaWindowGroup *window_group,
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
-  cairo_region_t *clip_region;
-  cairo_region_t *unobscured_region;
-  ClutterActorIter iter;
-  ClutterActor *child;
-  cairo_rectangle_int_t visible_rect, clip_rect;
+  cairo_region_t *visible_region;
+  ClutterActor *stage;
+  cairo_rectangle_int_t visible_rect;
+  GList *children, *l;
  int paint_x_origin, paint_y_origin;
  int actor_x_origin, actor_y_origin;
  int paint_x_offset, paint_y_offset;

  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
  MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
-  ClutterActor *stage = clutter_actor_get_stage (actor);
-
-  /* Start off by treating all windows as completely unobscured, so damage anywhere
-   * in a window queues redraws, but confine it more below. */
-  clutter_actor_iter_init (&iter, actor);
-  while (clutter_actor_iter_next (&iter, &child))
-    {
-      if (META_IS_WINDOW_ACTOR (child))
-        {
-          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
-          meta_window_actor_set_unobscured_region (window_actor, NULL);
-        }
-    }

  /* Normally we expect an actor to be drawn at it's position on the screen.
   * However, if we're inside the paint of a ClutterClone, that won't be the
@@ -137,11 +123,12 @@ meta_window_group_paint (ClutterActor *actor)
  paint_x_offset = paint_x_origin - actor_x_origin;
  paint_y_offset = paint_y_origin - actor_y_origin;

-  visible_rect.x = visible_rect.y = 0;
-  visible_rect.width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
-  visible_rect.height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
-
-  unobscured_region = cairo_region_create_rectangle (&visible_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.
+   */
+  children = clutter_actor_get_children (actor);
+  children = g_list_reverse (children);

  /* Get the clipped redraw bounds from Clutter so that we can avoid
   * painting shadows on windows that don't need to be painted in this
@@ -149,10 +136,11 @@ meta_window_group_paint (ClutterActor *actor)
   * 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),
-                                        &clip_rect);
+                                        &visible_rect);

-  clip_region = cairo_region_create_rectangle (&clip_rect);
+  visible_region = cairo_region_create_rectangle (&visible_rect);

  if (info->unredirected_window != NULL)
    {
@@ -160,22 +148,15 @@ meta_window_group_paint (ClutterActor *actor)
      MetaWindow *window = meta_window_actor_get_meta_window (info->unredirected_window);

      meta_window_get_outer_rect (window, (MetaRectangle *)&unredirected_rect);
-      cairo_region_subtract_rectangle (unobscured_region, &unredirected_rect);
-      cairo_region_subtract_rectangle (clip_region, &unredirected_rect);
+      cairo_region_subtract_rectangle (visible_region, &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.
-   */
-  clutter_actor_iter_init (&iter, actor);
-  while (clutter_actor_iter_prev (&iter, &child))
+  for (l = children; l; l = l->next)
    {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+      if (!CLUTTER_ACTOR_IS_VISIBLE (l->data))
        continue;

-      if (info->unredirected_window != NULL &&
-          child == CLUTTER_ACTOR (info->unredirected_window))
+      if (l->data == info->unredirected_window)
        continue;

      /* If an actor has effects applied, then that can change the area
@@ -194,12 +175,12 @@ meta_window_group_paint (ClutterActor *actor)
       * as well for the same reason, but omitted for simplicity in the
       * hopes that no-one will do that.
       */
-      if (clutter_actor_has_effects (child))
+      if (clutter_actor_has_effects (l->data))
        continue;

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

          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
@@ -208,73 +189,65 @@ meta_window_group_paint (ClutterActor *actor)
          x += paint_x_offset;
          y += paint_y_offset;

-
          /* Temporarily move to the coordinate system of the actor */
-          cairo_region_translate (unobscured_region, - x, - y);
-          cairo_region_translate (clip_region, - x, - y);
+          cairo_region_translate (visible_region, - x, - y);

-          meta_window_actor_set_unobscured_region (window_actor, unobscured_region);
-          meta_window_actor_set_clip_region (window_actor, clip_region);
+          meta_window_actor_set_visible_region (window_actor, visible_region);

          if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
            {
              cairo_region_t *obscured_region = meta_window_actor_get_obscured_region (window_actor);
              if (obscured_region)
-                {
-                  cairo_region_subtract (unobscured_region, obscured_region);
-                  cairo_region_subtract (clip_region, obscured_region);
-                }
+                cairo_region_subtract (visible_region, obscured_region);
            }

-          meta_window_actor_set_clip_region_beneath (window_actor, clip_region);
-
-          cairo_region_translate (unobscured_region, x, y);
-          cairo_region_translate (clip_region, x, y);
+          meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
+          cairo_region_translate (visible_region, x, y);
        }
-      else if (META_IS_BACKGROUND_ACTOR (child) ||
-               META_IS_BACKGROUND_GROUP (child))
+      else if (META_IS_BACKGROUND_ACTOR (l->data) ||
+               META_IS_BACKGROUND_GROUP (l->data))
        {
+          ClutterActor *background_actor = l->data;
          int x, y;

-          if (!meta_actor_is_untransformed (child, &x, &y))
+          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (background_actor), &x, &y))
            continue;

          x += paint_x_offset;
          y += paint_y_offset;

-          cairo_region_translate (clip_region, - x, - y);
+          cairo_region_translate (visible_region, - x, - y);

-          if (META_IS_BACKGROUND_GROUP (child))
-            meta_background_group_set_clip_region (META_BACKGROUND_GROUP (child), clip_region);
+          if (META_IS_BACKGROUND_GROUP (background_actor))
+            meta_background_group_set_visible_region (META_BACKGROUND_GROUP (background_actor), visible_region);
          else
-            meta_background_actor_set_clip_region (META_BACKGROUND_ACTOR (child), clip_region);
-
-          cairo_region_translate (clip_region, x, y);
+            meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (background_actor), visible_region);
+          cairo_region_translate (visible_region, x, y);
        }
    }

-  cairo_region_destroy (unobscured_region);
-  cairo_region_destroy (clip_region);
+  cairo_region_destroy (visible_region);

  CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);

  /* Now that we are done painting, unset the visible regions (they will
   * mess up painting clones of our actors)
   */
-  clutter_actor_iter_init (&iter, actor);
-  while (clutter_actor_iter_next (&iter, &child))
+  for (l = children; l; l = l->next)
    {
-      if (META_IS_WINDOW_ACTOR (child))
+      if (META_IS_WINDOW_ACTOR (l->data))
        {
-          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
-          meta_window_actor_reset_clip_regions (window_actor);
+          MetaWindowActor *window_actor = l->data;
+          meta_window_actor_reset_visible_regions (window_actor);
        }
-      else if (META_IS_BACKGROUND_ACTOR (child))
+      else if (META_IS_BACKGROUND_ACTOR (l->data))
        {
-          MetaBackgroundActor *background_actor = META_BACKGROUND_ACTOR (child);
-          meta_background_actor_set_clip_region (background_actor, NULL);
+          MetaBackgroundActor *background_actor = l->data;
+          meta_background_actor_set_visible_region (background_actor, NULL);
        }
    }
+
+  g_list_free (children);
 }

 static gboolean
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -24,8 +24,6 @@
 #include <meta/meta-plugin.h>
 #include <meta/window.h>
 #include <meta/util.h>
-#include <meta/meta-background-group.h>
-#include <meta/meta-background-actor.h>

 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
@@ -100,8 +98,6 @@ static void kill_window_effects   (MetaPlugin      *plugin,
                                   MetaWindowActor *actor);
 static void kill_switch_workspace (MetaPlugin      *plugin);

-static void confirm_display_change (MetaPlugin *plugin);
-
 static const MetaPluginInfo * plugin_info (MetaPlugin *plugin);

 META_PLUGIN_DECLARE(MetaDefaultPlugin, meta_default_plugin);
@@ -117,8 +113,6 @@ struct _MetaDefaultPluginPrivate
  ClutterActor          *desktop1;
  ClutterActor          *desktop2;

-  ClutterActor          *background_group;
-
  MetaPluginInfo         info;
 };

@@ -209,7 +203,6 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
  plugin_class->plugin_info      = plugin_info;
  plugin_class->kill_window_effects   = kill_window_effects;
  plugin_class->kill_switch_workspace = kill_switch_workspace;
-  plugin_class->confirm_display_change = confirm_display_change;

  g_type_class_add_private (gobject_class, sizeof (MetaDefaultPluginPrivate));
 }
@@ -306,58 +299,9 @@ show_stage (MetaPlugin *plugin)
  return FALSE;
 }

-static void
-on_monitors_changed (MetaScreen *screen,
-                     MetaPlugin *plugin)
-{
-  MetaDefaultPlugin *self = META_DEFAULT_PLUGIN (plugin);
-  int i, n;
-
-  clutter_actor_destroy_all_children (self->priv->background_group);
-
-  n = meta_screen_get_n_monitors (screen);
-  for (i = 0; i < n; i++)
-    {
-      MetaRectangle rect;
-      ClutterActor *background;
-      ClutterColor color;
-
-      meta_screen_get_monitor_geometry (screen, i, &rect);
-
-      background = meta_background_actor_new ();
-
-      clutter_actor_set_position (background, rect.x, rect.y);
-      clutter_actor_set_size (background, rect.width, rect.height);
-
-      /* Don't use rand() here, mesa calls srand() internally when
-         parsing the driconf XML, but it's nice if the colors are
-         reproducible.
-      */
-      clutter_color_init (&color,
-                          g_random_int () % 255,
-                          g_random_int () % 255,
-                          g_random_int () % 255,
-                          255);
-      clutter_actor_set_background_color (background, &color);
-
-      clutter_actor_add_child (self->priv->background_group, background);
-    }
-}
-
 static void
 start (MetaPlugin *plugin)
 {
-  MetaDefaultPlugin *self = META_DEFAULT_PLUGIN (plugin);
-  MetaScreen *screen = meta_plugin_get_screen (plugin);
-
-  self->priv->background_group = meta_background_group_new ();
-  clutter_actor_insert_child_below (meta_get_window_group_for_screen (screen),
-                                    self->priv->background_group, NULL);
-
-  g_signal_connect (screen, "monitors-changed",
-                    G_CALLBACK (on_monitors_changed), plugin);
-  on_monitors_changed (screen, plugin);
-
  meta_later_add (META_LATER_BEFORE_REDRAW,
                  (GSourceFunc) show_stage,
                  plugin,
@@ -838,33 +782,3 @@ plugin_info (MetaPlugin *plugin)

  return &priv->info;
 }
-
-static void
-on_dialog_closed (GPid     pid,
-                  gint     status,
-                  gpointer user_data)
-{
-  MetaPlugin *plugin = user_data;
-  gboolean ok;
-
-  ok = g_spawn_check_exit_status (status, NULL);
-  meta_plugin_complete_display_change (plugin, ok);
-}
-
-static void
-confirm_display_change (MetaPlugin *plugin)
-{
-  GPid pid;
-
-  pid = meta_show_dialog ("--question",
-                          "Does the display look OK?",
-                          "20",
-                          NULL,
-                          "_Keep This Configuration",
-                          "_Restore Previous Configuration",
-                          "preferences-desktop-display",
-                          0,
-                          NULL, NULL);
-
-  g_child_watch_add (pid, on_dialog_closed, plugin);
-}
--- a/src/core/barrier.c
+++ b/src/core/barrier.c
@@ -59,8 +59,6 @@ struct _MetaBarrierPrivate
  PointerBarrier xbarrier;
 };

-static void meta_barrier_event_unref (MetaBarrierEvent *event);
-
 static void
 meta_barrier_get_property (GObject    *object,
                           guint       prop_id,
@@ -361,8 +359,6 @@ meta_barrier_fire_event (MetaBarrier    *barrier,
    default:
      g_assert_not_reached ();
    }
-
-  meta_barrier_event_unref (event);
 }

 gboolean
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -89,7 +89,7 @@ meta_core_get (Display *xdisplay,
  if (request != META_CORE_WINDOW_HAS_FRAME &&
      (window == NULL || window->frame == NULL)) {
    meta_bug ("No such frame window 0x%lx!\n", xwindow);
-    goto out;
+    return;
  }

  while (request != META_CORE_GET_END) {
@@ -99,7 +99,7 @@ meta_core_get (Display *xdisplay,
    switch (request) {
      case META_CORE_WINDOW_HAS_FRAME:
        *((gboolean*)answer) = window != NULL && window->frame != NULL;
-        if (!*((gboolean*)answer)) goto out; /* see above */
+        if (!*((gboolean*)answer)) return; /* see above */
        break; 
      case META_CORE_GET_CLIENT_WIDTH:
        *((gint*)answer) = window->rect.width;
@@ -160,7 +160,6 @@ meta_core_get (Display *xdisplay,
    request = va_arg (args, MetaCoreGetType);
  } 

- out:
  va_end (args);
 }

--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -103,20 +103,19 @@ struct _MetaDisplay
 #include <meta/atomnames.h>
 #undef item

-  /* The window and serial of the most recent FocusIn event. */
-  Window server_focus_window;
-  gulong server_focus_serial;
-
-  /* Our best guess as to the "currently" focused window (that is, the
-   * window that we expect will be focused at the point when the X
-   * server processes our next request), and the serial of the request
-   * or event that caused this.
+  /* This is the actual window from focus events,
+   * not the one we last set
   */
  MetaWindow *focus_window;
-  /* For windows we've focused that don't necessarily have an X window,
-   * like the no_focus_window or the stage X window. */
-  Window focus_xwindow;
-  gulong focus_serial;
+
+  /* window we are expecting a FocusIn event for or the current focus
+   * window if we are not expecting any FocusIn/FocusOut events; not
+   * perfect because applications can call XSetInputFocus directly.
+   * (It could also be messed up if a timestamp later than current
+   * time is sent to meta_display_set_input_focus_window, though that
+   * would be a programming error).  See bug 154598 for more info.
+   */
+  MetaWindow *expected_focus_window;

  /* last timestamp passed to XSetInputFocus */
  guint32 last_focus_time;
@@ -240,8 +239,6 @@ struct _MetaDisplay
  unsigned int meta_mask;
  MetaKeyCombo overlay_key_combo;
  gboolean overlay_key_only_pressed;
-  MetaKeyCombo *iso_next_group_combos;
-  int n_iso_next_group_combos;
  
  /* Monitor cache */
  unsigned int monitor_cache_invalidated : 1;
@@ -460,9 +457,8 @@ void meta_display_remove_autoraise_callback (MetaDisplay *display);
 void meta_display_overlay_key_activate (MetaDisplay *display);
 void meta_display_accelerator_activate (MetaDisplay *display,
                                        guint        action,
-                                        guint        deviceid,
-                                        guint        timestamp);
-gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
+                                        guint        deviceid);
+void meta_display_modifiers_accelerator_activate (MetaDisplay *display);

 /* In above-tab-keycode.c */
 guint meta_display_get_above_tab_keycode (MetaDisplay *display);
@@ -472,9 +468,4 @@ gboolean meta_display_process_barrier_event (MetaDisplay    *display,
                                             XIBarrierEvent *event);
 #endif /* HAVE_XI23 */

-void meta_display_set_input_focus_xwindow (MetaDisplay *display,
-                                           MetaScreen  *screen,
-                                           Window       window,
-                                           guint32      timestamp);
-
 #endif
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -53,7 +53,6 @@
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include "mutter-enum-types.h"
-#include "meta-idle-monitor-private.h"

 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
@@ -255,26 +254,15 @@ meta_display_class_init (MetaDisplayClass *klass)
                  G_SIGNAL_RUN_LAST,
                  0,
                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
+                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);

-  /**
-   * MetaDisplay::modifiers-accelerator-activated:
-   * @display: the #MetaDisplay instance
-   *
-   * The ::modifiers-accelerator-activated signal will be emitted when
-   * a special modifiers-only keybinding is activated.
-   *
-   * Returns: %TRUE means that the keyboard device should remain
-   *    frozen and %FALSE for the default behavior of unfreezing the
-   *    keyboard.
-   */
  display_signals[MODIFIERS_ACCELERATOR_ACTIVATED] =
    g_signal_new ("modifiers-accelerator-activated",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
                  0,
-                  g_signal_accumulator_first_wins, NULL, NULL,
-                  G_TYPE_BOOLEAN, 0);
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);

  display_signals[WINDOW_CREATED] =
    g_signal_new ("window-created",
@@ -540,9 +528,7 @@ meta_display_open (void)
  the_display->autoraise_timeout_id = 0;
  the_display->autoraise_window = NULL;
  the_display->focus_window = NULL;
-  the_display->focus_serial = 0;
-  the_display->server_focus_window = None;
-  the_display->server_focus_serial = 0;
+  the_display->expected_focus_window = NULL;
  the_display->grab_old_window_stacking = NULL;

  the_display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */
@@ -975,10 +961,8 @@ meta_display_open (void)

    meta_error_trap_pop (the_display);
  }
-
-  meta_idle_monitor_init_dbus ();
-
-  meta_display_ungrab (the_display);
+  
+  meta_display_ungrab (the_display);  

  /* Done opening new display */
  the_display->display_opening = FALSE;
@@ -1470,17 +1454,6 @@ meta_display_get_current_time (MetaDisplay *display)
  return display->current_time;
 }

-static Bool
-find_timestamp_predicate (Display  *xdisplay,
-                          XEvent   *ev,
-                          XPointer  arg)
-{
-  MetaDisplay *display = (MetaDisplay *) arg;
-
-  return (ev->type == PropertyNotify &&
-          ev->xproperty.atom == display->atom__MUTTER_TIMESTAMP_PING);
-}
-
 /* Get a timestamp, even if it means a roundtrip */
 guint32
 meta_display_get_current_time_roundtrip (MetaDisplay *display)
@@ -1492,13 +1465,17 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
    {
      XEvent property_event;

-      XChangeProperty (display->xdisplay, display->timestamp_pinging_window,
-                       display->atom__MUTTER_TIMESTAMP_PING,
-                       XA_STRING, 8, PropModeAppend, NULL, 0);
-      XIfEvent (display->xdisplay,
-                &property_event,
-                find_timestamp_predicate,
-                (XPointer) display);
+      /* Using the property XA_PRIMARY because it's safe; nothing
+       * would use it as a property. The type doesn't matter.
+       */
+      XChangeProperty (display->xdisplay,
+                       display->timestamp_pinging_window,
+                       XA_PRIMARY, XA_STRING, 8,
+                       PropModeAppend, NULL, 0);
+      XWindowEvent (display->xdisplay,
+                    display->timestamp_pinging_window,
+                    PropertyChangeMask,
+                    &property_event);
      timestamp = property_event.xproperty.time;
    }

@@ -1664,12 +1641,12 @@ meta_display_mouse_mode_focus (MetaDisplay *display,
       * alternative mechanism works great.
       */
      if (meta_prefs_get_focus_mode() == G_DESKTOP_FOCUS_MODE_MOUSE &&
-          display->focus_window != NULL)
+          display->expected_focus_window != NULL)
        {
          meta_topic (META_DEBUG_FOCUS,
                      "Unsetting focus from %s due to mouse entering "
                      "the DESKTOP window\n",
-                      display->focus_window->desc);
+                      display->expected_focus_window->desc);
          meta_display_focus_the_no_focus_window (display,
                                                  window->screen,
                                                  timestamp);
@@ -1855,17 +1832,14 @@ get_input_event (MetaDisplay *display,
        case XI_ButtonRelease:
          if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
            return input_event;
-          break;
        case XI_KeyPress:
        case XI_KeyRelease:
          if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
            return input_event;
-          break;
        case XI_FocusIn:
        case XI_FocusOut:
          if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
            return input_event;
-          break;
        case XI_Enter:
        case XI_Leave:
          if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
@@ -1886,246 +1860,6 @@ get_input_event (MetaDisplay *display,
  return NULL;
 }

-static void
-update_focus_window (MetaDisplay *display,
-                     MetaWindow  *window,
-                     Window       xwindow,
-                     gulong       serial)
-{
-  display->focus_serial = serial;
-
-  if (display->focus_xwindow == xwindow)
-    return;
-
-  if (display->focus_window)
-    {
-      MetaWindow *previous;
-
-      meta_topic (META_DEBUG_FOCUS,
-                  "%s is now the previous focus window due to being focused out or unmapped\n",
-                  display->focus_window->desc);
-
-      /* Make sure that signals handlers invoked by
-       * meta_window_set_focused_internal() don't see
-       * display->focus_window->has_focus == FALSE
-       */
-      previous = display->focus_window;
-      display->focus_window = NULL;
-      display->focus_xwindow = None;
-
-      meta_window_set_focused_internal (previous, FALSE);
-    }
-
-  display->focus_window = window;
-  display->focus_xwindow = xwindow;
-
-  if (display->focus_window)
-    {
-      meta_topic (META_DEBUG_FOCUS, "* Focus --> %s with serial %lu\n",
-                  display->focus_window->desc, serial);
-      meta_window_set_focused_internal (display->focus_window, TRUE);
-    }
-  else
-    meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL with serial %lu\n", serial);
-
-  g_object_notify (G_OBJECT (display), "focus-window");
-  meta_display_update_active_window_hint (display);
-}
-
-static gboolean
-timestamp_too_old (MetaDisplay *display,
-                   guint32     *timestamp)
-{
-  /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
-   * us to sanity check the timestamp here and ensure it doesn't correspond to
-   * a future time (though we would want to rename to
-   * timestamp_too_old_or_in_future).
-   */
-
-  if (*timestamp == CurrentTime)
-    {
-      *timestamp = meta_display_get_current_time_roundtrip (display);
-      return FALSE;
-    }
-  else if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_focus_time))
-    {
-      if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_user_time))
-        return TRUE;
-      else
-        {
-          *timestamp = display->last_focus_time;
-          return FALSE;
-        }
-    }
-
-  return FALSE;
-}
-
-static void
-request_xserver_input_focus_change (MetaDisplay *display,
-                                    MetaScreen  *screen,
-                                    Window       xwindow,
-                                    guint32      timestamp)
-{
-  MetaWindow *meta_window;
-  gulong serial;
-
-  if (timestamp_too_old (display, &timestamp))
-    return;
-
-  meta_window = meta_display_lookup_x_window (display, xwindow);
-
-  meta_error_trap_push (display);
-
-  /* In order for mutter to know that the focus request succeeded, we track
-   * the serial of the "focus request" we made, but if we take the serial
-   * of the XSetInputFocus request, then there's no way to determine the
-   * difference between focus events as a result of the SetInputFocus and
-   * focus events that other clients send around the same time. Ensure that
-   * we know which is which by making two requests that the server will
-   * process at the same time.
-   */
-  meta_display_grab (display);
-
-  serial = XNextRequest (display->xdisplay);
-
-  XSetInputFocus (display->xdisplay,
-                  xwindow,
-                  RevertToPointerRoot,
-                  timestamp);
-
-  XChangeProperty (display->xdisplay, display->timestamp_pinging_window,
-                   display->atom__MUTTER_FOCUS_SET,
-                   XA_STRING, 8, PropModeAppend, NULL, 0);
-
-  meta_display_ungrab (display);
-
-  update_focus_window (display,
-                       meta_window,
-                       xwindow,
-                       serial);
-
-  meta_error_trap_pop (display);
-
-  display->last_focus_time = timestamp;
-  display->active_screen = screen;
-
-  if (meta_window == NULL || meta_window != display->autoraise_window)
-    meta_display_remove_autoraise_callback (display);
-}
-
-static void
-handle_window_focus_event (MetaDisplay  *display,
-                           MetaWindow   *window,
-                           XIEnterEvent *event,
-                           unsigned long serial)
-{
-  MetaWindow *focus_window;
-#ifdef WITH_VERBOSE_MODE
-  const char *window_type;
-
-  /* Note the event can be on either the window or the frame,
-   * we focus the frame for shaded windows
-   */
-  if (window)
-    {
-      if (event->event == window->xwindow)
-        window_type = "client window";
-      else if (window->frame && event->event == window->frame->xwindow)
-        window_type = "frame window";
-      else
-        window_type = "unknown client window";
-    }
-  else if (meta_display_xwindow_is_a_no_focus_window (display, event->event))
-    window_type = "no_focus_window";
-  else if (meta_display_screen_for_root (display, event->event))
-    window_type = "root window";
-  else
-    window_type = "unknown window";
-
-  meta_topic (META_DEBUG_FOCUS,
-              "Focus %s event received on %s 0x%lx (%s) "
-              "mode %s detail %s serial %lu\n",
-              event->evtype == XI_FocusIn ? "in" :
-              event->evtype == XI_FocusOut ? "out" :
-              "???",
-              window ? window->desc : "",
-              event->event, window_type,
-              meta_event_mode_to_string (event->mode),
-              meta_event_detail_to_string (event->mode),
-              event->serial);
-#endif
-
-  /* FIXME our pointer tracking is broken; see how
-   * gtk+/gdk/x11/gdkevents-x11.c or XFree86/xc/programs/xterm/misc.c
-   * for how to handle it the correct way.  In brief you need to track
-   * pointer focus and regular focus, and handle EnterNotify in
-   * PointerRoot mode with no window manager.  However as noted above,
-   * accurate focus tracking will break things because we want to keep
-   * windows "focused" when using keybindings on them, and also we
-   * sometimes "focus" a window by focusing its frame or
-   * no_focus_window; so this all needs rethinking massively.
-   *
-   * My suggestion is to change it so that we clearly separate
-   * actual keyboard focus tracking using the xterm algorithm,
-   * and mutter's "pretend" focus window, and go through all
-   * the code and decide which one should be used in each place;
-   * a hard bit is deciding on a policy for that.
-   *
-   * http://bugzilla.gnome.org/show_bug.cgi?id=90382
-   */
-
-  /* We ignore grabs, though this is questionable. It may be better to
-   * increase the intelligence of the focus window tracking.
-   *
-   * The problem is that keybindings for windows are done with
-   * XGrabKey, which means focus_window disappears and the front of
-   * the MRU list gets confused from what the user expects once a
-   * keybinding is used.
-   */
-
-  if (event->mode == XINotifyGrab ||
-      event->mode == XINotifyUngrab ||
-      /* From WindowMaker, ignore all funky pointer root events */
-      event->detail > XINotifyNonlinearVirtual)
-    {
-      meta_topic (META_DEBUG_FOCUS,
-                  "Ignoring focus event generated by a grab or other weirdness\n");
-      return;
-    }
-
-  if (event->evtype == XI_FocusIn)
-    {
-      display->server_focus_window = event->event;
-      display->server_focus_serial = serial;
-      focus_window = window;
-    }
-  else if (event->evtype == XI_FocusOut)
-    {
-      if (event->detail == XINotifyInferior)
-        {
-          /* This event means the client moved focus to a subwindow */
-          meta_topic (META_DEBUG_FOCUS,
-                      "Ignoring focus out with NotifyInferior\n");
-          return;
-        }
-
-      display->server_focus_window = None;
-      display->server_focus_serial = serial;
-      focus_window = NULL;
-    }
-  else
-    g_return_if_reached ();
-
-  if (display->server_focus_serial > display->focus_serial)
-    {
-      update_focus_window (display,
-                           focus_window,
-                           focus_window ? focus_window->xwindow : None,
-                           display->server_focus_serial);
-    }
-}
-
 /**
 * event_callback:
 * @event: The event that just happened
@@ -2152,8 +1886,6 @@ event_callback (XEvent   *event,
  gboolean bypass_compositor;
  gboolean filter_out_event;
  XIEvent *input_event;
-  MetaMonitorManager *monitor;
-  MetaScreen *screen;

  display = data;
  
@@ -2165,39 +1897,12 @@ event_callback (XEvent   *event,
 #ifdef HAVE_STARTUP_NOTIFICATION
  sn_display_process_event (display->sn_display, event);
 #endif
-
-  /* Intercept XRandR events early and don't attempt any
-     processing for them. We still let them through to Gdk though,
-     so it can update its own internal state.
-  */
-  monitor = meta_monitor_manager_get ();
-  if (meta_monitor_manager_handle_xevent (monitor, event))
-    return FALSE;
  
  bypass_compositor = FALSE;
  filter_out_event = FALSE;
  display->current_time = event_get_time (display, event);
  display->monitor_cache_invalidated = TRUE;
-
-  if (event->xany.serial > display->focus_serial &&
-      display->focus_window &&
-      display->focus_window->xwindow != display->server_focus_window)
-    {
-      meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed\n",
-                  display->focus_window->desc);
-      update_focus_window (display,
-                           meta_display_lookup_x_window (display, display->server_focus_window),
-                           display->server_focus_window,
-                           display->server_focus_serial);
-    }
-
-  screen = meta_display_screen_for_root (display, event->xany.window);
-  if (screen)
-    {
-      if (meta_screen_handle_xevent (screen, event))
-        return TRUE;
-    }
-
+  
  modified = event_get_modified_window (display, event);

  input_event = get_input_event (display, event);
@@ -2270,8 +1975,6 @@ event_callback (XEvent   *event,
          meta_window_update_sync_request_counter (alarm_window, new_counter_value);
          filter_out_event = TRUE; /* GTK doesn't want to see this really */
        }
-      else
-        meta_idle_monitor_handle_xevent_all (event);
    }
 #endif /* HAVE_XSYNC */

@@ -2286,7 +1989,32 @@ event_callback (XEvent   *event,
          XShapeEvent *sev = (XShapeEvent*) event;

          if (sev->kind == ShapeBounding)
-            meta_window_update_shape_region_x11 (window);
+            {
+              if (sev->shaped && !window->has_shape)
+                {
+                  window->has_shape = TRUE;                  
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s now has a shape\n",
+                              window->desc);
+                }
+              else if (!sev->shaped && window->has_shape)
+                {
+                  window->has_shape = FALSE;
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s no longer has a shape\n",
+                              window->desc);
+                }
+              else
+                {
+                  meta_topic (META_DEBUG_SHAPES,
+                              "Window %s shape changed\n",
+                              window->desc);
+                }
+
+              if (display->compositor)
+                meta_compositor_window_shape_changed (display->compositor,
+                                                      window);
+            }
        }
      else
        {
@@ -2494,12 +2222,30 @@ event_callback (XEvent   *event,
                  /* This is from our synchronous grab since
                   * it has no modifiers and was on the client window
                   */
+                  int mode;
+              
+                  /* When clicking a different app in click-to-focus
+                   * in application-based mode, and the different
+                   * app is not a dock or desktop, eat the focus click.
+                   */
+                  if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+                      meta_prefs_get_application_based () &&
+                      !window->has_focus &&
+                      window->type != META_WINDOW_DOCK &&
+                      window->type != META_WINDOW_DESKTOP &&
+                      (display->focus_window == NULL ||
+                       !meta_window_same_application (window,
+                                                      display->focus_window)))
+                    mode = XIAsyncDevice; /* eat focus click */
+                  else
+                    mode = XIReplayDevice; /* give event back */

-                  meta_verbose ("Allowing events time %u\n",
+                  meta_verbose ("Allowing events mode %s time %u\n",
+                                mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
                                (unsigned int)device_event->time);

                  XIAllowEvents (display->xdisplay, device_event->deviceid,
-                                 XIReplayDevice, device_event->time);
+                                 mode, device_event->time);
                }

              if (begin_move && window->has_move_func)
@@ -2613,19 +2359,40 @@ event_callback (XEvent   *event,
          break;
        case XI_FocusIn:
        case XI_FocusOut:
-          /* libXi does not properly copy the serial to the XIEnterEvent, so pull it
-           * from the parent XAnyEvent.
-           * See: https://bugs.freedesktop.org/show_bug.cgi?id=64687
-           */
-          handle_window_focus_event (display, window, enter_event, event->xany.serial);
-          if (!window)
+          if (window)
+            {
+              meta_window_notify_focus (window, enter_event);
+            }
+          else if (meta_display_xwindow_is_a_no_focus_window (display,
+                                                              enter_event->event))
+            {
+              meta_topic (META_DEBUG_FOCUS,
+                          "Focus %s event received on no_focus_window 0x%lx "
+                          "mode %s detail %s\n",
+                          enter_event->evtype == XI_FocusIn ? "in" :
+                          enter_event->evtype == XI_FocusOut ? "out" :
+                          "???",
+                          enter_event->event,
+                          meta_event_mode_to_string (enter_event->mode),
+                          meta_event_detail_to_string (enter_event->detail));
+            }
+          else
            {
-              /* Check if the window is a root window. */
              MetaScreen *screen =
                meta_display_screen_for_root(display,
                                             enter_event->event);
              if (screen == NULL)
                break;
+
+              meta_topic (META_DEBUG_FOCUS,
+                          "Focus %s event received on root window 0x%lx "
+                          "mode %s detail %s\n",
+                          enter_event->evtype == XI_FocusIn ? "in" :
+                          enter_event->evtype == XI_FocusOut ? "out" :
+                          "???",
+                          enter_event->event,
+                          meta_event_mode_to_string (enter_event->mode),
+                          meta_event_detail_to_string (enter_event->detail));
          
              if (enter_event->evtype == XI_FocusIn &&
                  enter_event->mode == XINotifyDetailNone)
@@ -2763,6 +2530,13 @@ event_callback (XEvent   *event,
                                  window->unmaps_pending);
                    }
                }
+
+              /* Unfocus on UnmapNotify, do this after the possible
+               * window_free above so that window_free can see if window->has_focus
+               * and move focus to another window
+               */
+              if (window)
+                meta_window_lost_focus (window);
            }
          break;
        case MapNotify:
@@ -2822,10 +2596,32 @@ event_callback (XEvent   *event,
                meta_stack_tracker_configure_event (screen->stack_tracker,
                                                    &event->xconfigure);
            }
-
          if (window && window->override_redirect)
            meta_window_configure_notify (window, &event->xconfigure);
+          else
+            /* Handle screen resize */
+            {
+              MetaScreen *screen;

+              screen = meta_display_screen_for_root (display,
+                                                     event->xconfigure.window);
+
+              if (screen != NULL)
+                {
+#ifdef HAVE_RANDR
+                  /* do the resize the official way */
+                  XRRUpdateConfiguration (event);
+#else
+                  /* poke around in Xlib */
+                  screen->xscreen->width   = event->xconfigure.width;
+                  screen->xscreen->height  = event->xconfigure.height;
+#endif
+	      
+                  meta_screen_resize (screen, 
+                                      event->xconfigure.width,
+                                      event->xconfigure.height);
+                }
+            }
          break;
        case ConfigureRequest:
          /* This comment and code is found in both twm and fvwm */
@@ -3020,6 +2816,27 @@ event_callback (XEvent   *event,
                          meta_workspace_focus_default_window (screen->active_workspace, NULL, timestamp);
                        }
                    }
+                  else if (event->xclient.message_type ==
+                           display->atom__MUTTER_RELOAD_THEME_MESSAGE)
+                    {
+                      meta_verbose ("Received reload theme request\n");
+                      meta_ui_set_current_theme (meta_prefs_get_theme (),
+                                                 TRUE);
+                      meta_display_retheme_all ();
+                    }
+                  else if (event->xclient.message_type ==
+                           display->atom__MUTTER_SET_KEYBINDINGS_MESSAGE)
+                    {
+                      meta_verbose ("Received set keybindings request = %d\n",
+                                    (int) event->xclient.data.l[0]);
+                      meta_set_keybindings_disabled (!event->xclient.data.l[0]);
+                    }
+                  else if (event->xclient.message_type ==
+                           display->atom__MUTTER_TOGGLE_VERBOSE)
+                    {
+                      meta_verbose ("Received toggle verbose message\n");
+                      meta_set_verbose (!meta_is_verbose ());
+                    }
                  else if (event->xclient.message_type ==
                           display->atom_WM_PROTOCOLS) 
                    {
@@ -3729,12 +3546,6 @@ meta_spew_event (MetaDisplay *display,
  if (event->type == (display->damage_event_base + XDamageNotify))
    return;

-  if (event->type == (display->xsync_event_base + XSyncAlarmNotify))
-    return;
-
-  if (event->type == PropertyNotify && event->xproperty.atom == display->atom__NET_WM_USER_TIME)
-    return;
-
  input_event = get_input_event (display, event);

  if (input_event)
@@ -5759,74 +5570,98 @@ sanity_check_timestamps (MetaDisplay *display,
    }
 }

+static gboolean
+timestamp_too_old (MetaDisplay *display,
+                   MetaWindow  *window,
+                   guint32     *timestamp)
+{
+  /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
+   * us to sanity check the timestamp here and ensure it doesn't correspond to
+   * a future time (though we would want to rename to 
+   * timestamp_too_old_or_in_future).
+   */
+
+  if (*timestamp == CurrentTime)
+    {
+      meta_warning ("Got a request to focus %s with a timestamp of 0.  This "
+                    "shouldn't happen!\n",
+                    window ? window->desc : "the no_focus_window");
+      *timestamp = meta_display_get_current_time_roundtrip (display);
+      return FALSE;
+    }
+  else if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_focus_time))
+    {
+      if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_user_time))
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "Ignoring focus request for %s since %u "
+                      "is less than %u and %u.\n",
+                      window ? window->desc : "the no_focus_window",
+                      *timestamp,
+                      display->last_user_time,
+                      display->last_focus_time);
+          return TRUE;
+        }
+      else
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "Received focus request for %s which is newer than most "
+                      "recent user_time, but less recent than "
+                      "last_focus_time (%u < %u < %u); adjusting "
+                      "accordingly.  (See bug 167358)\n",
+                      window ? window->desc : "the no_focus_window",
+                      display->last_user_time,
+                      *timestamp,
+                      display->last_focus_time);
+          *timestamp = display->last_focus_time;
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
 void
 meta_display_set_input_focus_window (MetaDisplay *display, 
                                     MetaWindow  *window,
                                     gboolean     focus_frame,
                                     guint32      timestamp)
 {
-  request_xserver_input_focus_change (display,
-                                      window->screen,
-                                      focus_frame ? window->frame->xwindow : window->xwindow,
-                                      timestamp);
-}
-
-void
-meta_display_request_take_focus (MetaDisplay *display,
-                                 MetaWindow  *window,
-                                 guint32      timestamp)
-{
-  if (timestamp_too_old (display, &timestamp))
+  if (timestamp_too_old (display, window, &timestamp))
    return;

-  meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n",
-              window->desc, timestamp);
+  meta_error_trap_push (display);
+  XSetInputFocus (display->xdisplay,
+                  focus_frame ? window->frame->xwindow : window->xwindow,
+                  RevertToPointerRoot,
+                  timestamp);
+  meta_error_trap_pop (display);

-  if (window != display->focus_window)
-    {
-      /* The "Globally Active Input" window case, where the window
-       * doesn't want us to call XSetInputFocus on it, but does
-       * want us to send a WM_TAKE_FOCUS.
-       *
-       * We can't just set display->focus_window to @window, since we
-       * we don't know when (or even if) the window will actually take
-       * focus, so we could end up being wrong for arbitrarily long.
-       * But we also can't leave it set to the current window, or else
-       * bug #597352 would come back. So we focus the no_focus_window
-       * now (and set display->focus_window to that), send the
-       * WM_TAKE_FOCUS, and then just forget about @window
-       * until/unless we get a FocusIn.
-       */
-      meta_display_focus_the_no_focus_window (display,
-                                              window->screen,
-                                              timestamp);
-    }
-  meta_window_send_icccm_message (window,
-                                  display->atom_WM_TAKE_FOCUS,
-                                  timestamp);
+  display->expected_focus_window = window;
+  display->last_focus_time = timestamp;
+  display->active_screen = window->screen;
+
+  if (window != display->autoraise_window)
+    meta_display_remove_autoraise_callback (window->display);
 }

 void
-meta_display_set_input_focus_xwindow (MetaDisplay *display,
-                                      MetaScreen  *screen,
-                                      Window       window,
-                                      guint32      timestamp)
-{
-  request_xserver_input_focus_change (display,
-                                      screen,
-                                      window,
-                                      timestamp);
-}
-
-void
-meta_display_focus_the_no_focus_window (MetaDisplay *display,
+meta_display_focus_the_no_focus_window (MetaDisplay *display, 
                                        MetaScreen  *screen,
                                        guint32      timestamp)
 {
-  request_xserver_input_focus_change (display,
-                                      screen,
-                                      screen->no_focus_window,
-                                      timestamp);
+  if (timestamp_too_old (display, NULL, &timestamp))
+    return;
+
+  XSetInputFocus (display->xdisplay,
+                  screen->no_focus_window,
+                  RevertToPointerRoot,
+                  timestamp);
+  display->expected_focus_window = NULL;
+  display->last_focus_time = timestamp;
+  display->active_screen = screen;
+
+  meta_display_remove_autoraise_callback (display);
 }

 void
@@ -5849,21 +5684,16 @@ meta_display_overlay_key_activate (MetaDisplay *display)
 void
 meta_display_accelerator_activate (MetaDisplay *display,
                                   guint        action,
-                                   guint        deviceid,
-                                   guint        timestamp)
+                                   guint        deviceid)
 {
  g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
-                 0, action, deviceid, timestamp);
+                 0, action, deviceid);
 }

-gboolean
+void
 meta_display_modifiers_accelerator_activate (MetaDisplay *display)
 {
-  gboolean freeze;
-
-  g_signal_emit (display, display_signals[MODIFIERS_ACCELERATOR_ACTIVATED], 0, &freeze);
-
-  return freeze;
+  g_signal_emit (display, display_signals[MODIFIERS_ACCELERATOR_ACTIVATED], 0);
 }

 void
@@ -5947,9 +5777,11 @@ meta_display_has_shape (MetaDisplay *display)
 * meta_display_get_focus_window:
 * @display: a #MetaDisplay
 *
- * Get our best guess as to the "currently" focused window (that is,
- * the window that we expect will be focused at the point when the X
- * server processes our next request).
+ * Get the window that, according to events received from X server,
+ * currently has the input focus. We may have already sent a request
+ * to the X server to move the focus window elsewhere. (The
+ * expected_focus_window records where we've last set the input
+ * focus.)
 *
 * Return Value: (transfer none): The current focus window
 */
--- a/src/core/edid-parse.c
+++ b/src/core/edid-parse.c
@@ -1,539 +0,0 @@
-/*
- * Copyright 2007 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Author: Soren Sandmann <sandmann@redhat.com> */
-
-#include "edid.h"
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <glib.h>
-
-static int
-get_bit (int in, int bit)
-{
-  return (in & (1 << bit)) >> bit;
-}
-
-static int
-get_bits (int in, int begin, int end)
-{
-  int mask = (1 << (end - begin + 1)) - 1;
-
-  return (in >> begin) & mask;
-}
-
-static int
-decode_header (const uchar *edid)
-{
-  if (memcmp (edid, "\x00\xff\xff\xff\xff\xff\xff\x00", 8) == 0)
-    return TRUE;
-  return FALSE;
-}
-
-static int
-decode_vendor_and_product_identification (const uchar *edid, MonitorInfo *info)
-{
-  int is_model_year;
-
-  /* Manufacturer Code */
-  info->manufacturer_code[0]  = get_bits (edid[0x08], 2, 6);
-  info->manufacturer_code[1]  = get_bits (edid[0x08], 0, 1) << 3;
-  info->manufacturer_code[1] |= get_bits (edid[0x09], 5, 7);
-  info->manufacturer_code[2]  = get_bits (edid[0x09], 0, 4);
-  info->manufacturer_code[3]  = '\0';
-
-  info->manufacturer_code[0] += 'A' - 1;
-  info->manufacturer_code[1] += 'A' - 1;
-  info->manufacturer_code[2] += 'A' - 1;
-
-  /* Product Code */
-  info->product_code = edid[0x0b] << 8 | edid[0x0a];
-
-  /* Serial Number */
-  info->serial_number =
-    edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | edid[0x0f] << 24;
-
-  /* Week and Year */
-  is_model_year = FALSE;
-  switch (edid[0x10])
-    {
-    case 0x00:
-      info->production_week = -1;
-      break;
-
-    case 0xff:
-      info->production_week = -1;
-      is_model_year = TRUE;
-      break;
-
-    default:
-      info->production_week = edid[0x10];
-      break;
-    }
-
-  if (is_model_year)
-    {
-      info->production_year = -1;
-      info->model_year = 1990 + edid[0x11];
-    }
-  else
-    {
-      info->production_year = 1990 + edid[0x11];
-      info->model_year = -1;
-    }
-
-  return TRUE;
-}
-
-static int
-decode_edid_version (const uchar *edid, MonitorInfo *info)
-{
-  info->major_version = edid[0x12];
-  info->minor_version = edid[0x13];
-
-  return TRUE;
-}
-
-static int
-decode_display_parameters (const uchar *edid, MonitorInfo *info)
-{
-  /* Digital vs Analog */
-  info->is_digital = get_bit (edid[0x14], 7);
-
-  if (info->is_digital)
-    {
-      int bits;
-
-      static const int bit_depth[8] =
-        {
-          -1, 6, 8, 10, 12, 14, 16, -1
-        };
-
-      static const Interface interfaces[6] =
-        {
-          UNDEFINED, DVI, HDMI_A, HDMI_B, MDDI, DISPLAY_PORT
-        };
-
-      bits = get_bits (edid[0x14], 4, 6);
-      info->connector.digital.bits_per_primary = bit_depth[bits];
-
-      bits = get_bits (edid[0x14], 0, 3);
-
-      if (bits <= 5)
-        info->connector.digital.interface = interfaces[bits];
-      else
-        info->connector.digital.interface = UNDEFINED;
-    }
-  else
-    {
-      int bits = get_bits (edid[0x14], 5, 6);
-
-      static const double levels[][3] =
-        {
-          { 0.7,   0.3,    1.0 },
-          { 0.714, 0.286,  1.0 },
-          { 1.0,   0.4,    1.4 },
-          { 0.7,   0.0,    0.7 },
-        };
-
-      info->connector.analog.video_signal_level = levels[bits][0];
-      info->connector.analog.sync_signal_level = levels[bits][1];
-      info->connector.analog.total_signal_level = levels[bits][2];
-
-      info->connector.analog.blank_to_black = get_bit (edid[0x14], 4);
-
-      info->connector.analog.separate_hv_sync = get_bit (edid[0x14], 3);
-      info->connector.analog.composite_sync_on_h = get_bit (edid[0x14], 2);
-      info->connector.analog.composite_sync_on_green = get_bit (edid[0x14], 1);
-
-      info->connector.analog.serration_on_vsync = get_bit (edid[0x14], 0);
-    }
-
-  /* Screen Size / Aspect Ratio */
-  if (edid[0x15] == 0 && edid[0x16] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1;
-      info->aspect_ratio = -1.0;
-    }
-  else if (edid[0x16] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1; 
-      info->aspect_ratio = 100.0 / (edid[0x15] + 99);
-    }
-  else if (edid[0x15] == 0)
-    {
-      info->width_mm = -1;
-      info->height_mm = -1;
-      info->aspect_ratio = 100.0 / (edid[0x16] + 99);
-      info->aspect_ratio = 1/info->aspect_ratio; /* portrait */
-    }
-  else
-    {
-      info->width_mm = 10 * edid[0x15];
-      info->height_mm = 10 * edid[0x16];
-    }
-
-  /* Gamma */
-  if (edid[0x17] == 0xFF)
-    info->gamma = -1.0;
-  else
-    info->gamma = (edid[0x17] + 100.0) / 100.0;
-
-  /* Features */
-  info->standby = get_bit (edid[0x18], 7);
-  info->suspend = get_bit (edid[0x18], 6);
-  info->active_off = get_bit (edid[0x18], 5);
-
-  if (info->is_digital)
-    {
-      info->connector.digital.rgb444 = TRUE;
-      if (get_bit (edid[0x18], 3))
-        info->connector.digital.ycrcb444 = 1;
-      if (get_bit (edid[0x18], 4))
-        info->connector.digital.ycrcb422 = 1;
-    }
-  else
-    {
-      int bits = get_bits (edid[0x18], 3, 4);
-      ColorType color_type[4] =
-        {
-          MONOCHROME, RGB, OTHER_COLOR, UNDEFINED_COLOR
-        };
-
-      info->connector.analog.color_type = color_type[bits];
-    }
-
-  info->srgb_is_standard = get_bit (edid[0x18], 2);
-
-  /* In 1.3 this is called "has preferred timing" */
-  info->preferred_timing_includes_native = get_bit (edid[0x18], 1);
-
-  /* FIXME: In 1.3 this indicates whether the monitor accepts GTF */
-  info->continuous_frequency = get_bit (edid[0x18], 0);
-  return TRUE;
-}
-
-static double
-decode_fraction (int high, int low)
-{
-  double result = 0.0;
-  int i;
-
-  high = (high << 2) | low;
-
-  for (i = 0; i < 10; ++i)
-    result += get_bit (high, i) * pow (2, i - 10);
-
-  return result;
-}
-
-static int
-decode_color_characteristics (const uchar *edid, MonitorInfo *info)
-{
-  info->red_x = decode_fraction (edid[0x1b], get_bits (edid[0x19], 6, 7));
-  info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 5, 4));
-  info->green_x = decode_fraction (edid[0x1d], get_bits (edid[0x19], 2, 3));
-  info->green_y = decode_fraction (edid[0x1e], get_bits (edid[0x19], 0, 1));
-  info->blue_x = decode_fraction (edid[0x1f], get_bits (edid[0x1a], 6, 7));
-  info->blue_y = decode_fraction (edid[0x20], get_bits (edid[0x1a], 4, 5));
-  info->white_x = decode_fraction (edid[0x21], get_bits (edid[0x1a], 2, 3));
-  info->white_y = decode_fraction (edid[0x22], get_bits (edid[0x1a], 0, 1));
-
-  return TRUE;
-}
-
-static int
-decode_established_timings (const uchar *edid, MonitorInfo *info)
-{
-  static const Timing established[][8] = 
-    {
-      {
-        { 800, 600, 60 },
-        { 800, 600, 56 },
-        { 640, 480, 75 },
-        { 640, 480, 72 },
-        { 640, 480, 67 },
-        { 640, 480, 60 },
-        { 720, 400, 88 },
-        { 720, 400, 70 }
-      },
-      {
-        { 1280, 1024, 75 },
-        { 1024, 768, 75 },
-        { 1024, 768, 70 },
-        { 1024, 768, 60 },
-        { 1024, 768, 87 },
-        { 832, 624, 75 },
-        { 800, 600, 75 },
-        { 800, 600, 72 }
-	},
-      {
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 0, 0, 0 },
-        { 1152, 870, 75 }
-      },
-    };
-
-  int i, j, idx;
-
-  idx = 0;
-  for (i = 0; i < 3; ++i)
-    {
-      for (j = 0; j < 8; ++j)
-	{
-          int byte = edid[0x23 + i];
-
-          if (get_bit (byte, j) && established[i][j].frequency != 0)
-            info->established[idx++] = established[i][j];
-	}
-    }
-  return TRUE;
-}
-
-static int
-decode_standard_timings (const uchar *edid, MonitorInfo *info)
-{
-  int i;
-
-  for (i = 0; i < 8; i++)
-    {
-      int first = edid[0x26 + 2 * i];
-      int second = edid[0x27 + 2 * i];
-
-      if (first != 0x01 && second != 0x01)
-	{
-          int w = 8 * (first + 31);
-          int h = 0;
-
-          switch (get_bits (second, 6, 7))
-            {
-	    case 0x00: h = (w / 16) * 10; break;
-	    case 0x01: h = (w / 4) * 3; break;
-	    case 0x02: h = (w / 5) * 4; break;
-	    case 0x03: h = (w / 16) * 9; break;
-	    }
-
-          info->standard[i].width = w;
-          info->standard[i].height = h;
-          info->standard[i].frequency = get_bits (second, 0, 5) + 60;
-	}
-    }
-
-  return TRUE;
-}
-
-static void
-decode_lf_string (const uchar *s, int n_chars, char *result)
-{
-  int i;
-  for (i = 0; i < n_chars; ++i)
-    {
-      if (s[i] == 0x0a)
-	{
-          *result++ = '\0';
-          break;
-	}
-      else if (s[i] == 0x00)
-	{
-          /* Convert embedded 0's to spaces */
-          *result++ = ' ';
-	}
-      else
-	{
-          *result++ = s[i];
-	}
-    }
-}
-
-static void
-decode_display_descriptor (const uchar *desc,
-			   MonitorInfo *info)
-{
-  switch (desc[0x03])
-    {
-    case 0xFC:
-      decode_lf_string (desc + 5, 13, info->dsc_product_name);
-      break;
-    case 0xFF:
-      decode_lf_string (desc + 5, 13, info->dsc_serial_number);
-      break;
-    case 0xFE:
-      decode_lf_string (desc + 5, 13, info->dsc_string);
-      break;
-    case 0xFD:
-      /* Range Limits */
-      break;
-    case 0xFB:
-      /* Color Point */
-      break;
-    case 0xFA:
-      /* Timing Identifications */
-      break;
-    case 0xF9:
-      /* Color Management */
-      break;
-    case 0xF8:
-      /* Timing Codes */
-      break;
-    case 0xF7:
-      /* Established Timings */
-      break;
-    case 0x10:
-      break;
-    }
-}
-
-static void
-decode_detailed_timing (const uchar *timing,
-			DetailedTiming *detailed)
-{
-  int bits;
-  StereoType stereo[] =
-    {
-      NO_STEREO, NO_STEREO, FIELD_RIGHT, FIELD_LEFT,
-      TWO_WAY_RIGHT_ON_EVEN, TWO_WAY_LEFT_ON_EVEN,
-      FOUR_WAY_INTERLEAVED, SIDE_BY_SIDE
-    };
-
-  detailed->pixel_clock = (timing[0x00] | timing[0x01] << 8) * 10000;
-  detailed->h_addr = timing[0x02] | ((timing[0x04] & 0xf0) << 4);
-  detailed->h_blank = timing[0x03] | ((timing[0x04] & 0x0f) << 8);
-  detailed->v_addr = timing[0x05] | ((timing[0x07] & 0xf0) << 4);
-  detailed->v_blank = timing[0x06] | ((timing[0x07] & 0x0f) << 8);
-  detailed->h_front_porch = timing[0x08] | get_bits (timing[0x0b], 6, 7) << 8;
-  detailed->h_sync = timing[0x09] | get_bits (timing[0x0b], 4, 5) << 8;
-  detailed->v_front_porch =
-    get_bits (timing[0x0a], 4, 7) | get_bits (timing[0x0b], 2, 3) << 4;
-  detailed->v_sync =
-    get_bits (timing[0x0a], 0, 3) | get_bits (timing[0x0b], 0, 1) << 4;
-  detailed->width_mm =  timing[0x0c] | get_bits (timing[0x0e], 4, 7) << 8;
-  detailed->height_mm = timing[0x0d] | get_bits (timing[0x0e], 0, 3) << 8;
-  detailed->right_border = timing[0x0f];
-  detailed->top_border = timing[0x10];
-
-  detailed->interlaced = get_bit (timing[0x11], 7);
-
-  /* Stereo */
-  bits = get_bits (timing[0x11], 5, 6) << 1 | get_bit (timing[0x11], 0);
-  detailed->stereo = stereo[bits];
-
-  /* Sync */
-  bits = timing[0x11];
-
-  detailed->digital_sync = get_bit (bits, 4);
-  if (detailed->digital_sync)
-    {
-      detailed->connector.digital.composite = !get_bit (bits, 3);
-
-      if (detailed->connector.digital.composite)
-	{
-          detailed->connector.digital.serrations = get_bit (bits, 2);
-          detailed->connector.digital.negative_vsync = FALSE;
-	}
-      else
-	{
-          detailed->connector.digital.serrations = FALSE;
-          detailed->connector.digital.negative_vsync = !get_bit (bits, 2);
-	}
-
-      detailed->connector.digital.negative_hsync = !get_bit (bits, 0);
-    }
-  else
-    {
-      detailed->connector.analog.bipolar = get_bit (bits, 3);
-      detailed->connector.analog.serrations = get_bit (bits, 2);
-      detailed->connector.analog.sync_on_green = !get_bit (bits, 1);
-    }
-}
-
-static int
-decode_descriptors (const uchar *edid, MonitorInfo *info)
-{
-  int i;
-  int timing_idx;
-
-  timing_idx = 0;
-
-  for (i = 0; i < 4; ++i)
-    {
-      int index = 0x36 + i * 18;
-
-      if (edid[index + 0] == 0x00 && edid[index + 1] == 0x00)
-	{
-          decode_display_descriptor (edid + index, info);
-	}
-      else
-	{
-          decode_detailed_timing (edid + index, &(info->detailed_timings[timing_idx++]));
-	}
-    }
-
-  info->n_detailed_timings = timing_idx;
-
-  return TRUE;
-}
-
-static void
-decode_check_sum (const uchar *edid,
-		  MonitorInfo *info)
-{
-  int i;
-  uchar check = 0;
-
-  for (i = 0; i < 128; ++i)
-    check += edid[i];
-
-  info->checksum = check;
-}
-
-MonitorInfo *
-decode_edid (const uchar *edid)
-{
-  MonitorInfo *info = g_new0 (MonitorInfo, 1);
-
-  decode_check_sum (edid, info);
-
-  if (decode_header (edid)
-      && decode_vendor_and_product_identification (edid, info)
-      && decode_edid_version (edid, info)
-      && decode_display_parameters (edid, info)
-      && decode_color_characteristics (edid, info)
-      && decode_established_timings (edid, info)
-      && decode_standard_timings (edid, info)
-      && decode_descriptors (edid, info))
-    {
-      return info;
-    }
-  else
-    {
-      g_free (info);
-      return NULL;
-    }
-}
--- a/src/core/edid.h
+++ b/src/core/edid.h
@@ -1,195 +0,0 @@
-/* edid.h
- *
- * Copyright 2007, 2008, Red Hat, Inc.
- * 
- * This file is part of the Gnome Library.
- * 
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- * 
- * Author: Soren Sandmann <sandmann@redhat.com>
- */
-
-#ifndef EDID_H
-#define EDID_H
-
-typedef unsigned char uchar;
-typedef struct MonitorInfo MonitorInfo;
-typedef struct Timing Timing;
-typedef struct DetailedTiming DetailedTiming;
-
-typedef enum
-{
-  UNDEFINED,
-  DVI,
-  HDMI_A,
-  HDMI_B,
-  MDDI,
-  DISPLAY_PORT
-} Interface;
-
-typedef enum
-{
-  UNDEFINED_COLOR,
-  MONOCHROME,
-  RGB,
-  OTHER_COLOR
-} ColorType;
-
-typedef enum
-{
-  NO_STEREO,
-  FIELD_RIGHT,
-  FIELD_LEFT,
-  TWO_WAY_RIGHT_ON_EVEN,
-  TWO_WAY_LEFT_ON_EVEN,
-  FOUR_WAY_INTERLEAVED,
-  SIDE_BY_SIDE
-} StereoType;
-
-struct Timing
-{
-  int width;
-  int height;
-  int frequency;
-};
-
-struct DetailedTiming
-{
-  int		pixel_clock;
-  int		h_addr;
-  int		h_blank;
-  int		h_sync;
-  int		h_front_porch;
-  int		v_addr;
-  int		v_blank;
-  int		v_sync;
-  int		v_front_porch;
-  int		width_mm;
-  int		height_mm;
-  int		right_border;
-  int		top_border;
-  int		interlaced;
-  StereoType	stereo;
-
-  int		digital_sync;
-  union
-  {
-    struct
-    {
-      int bipolar;
-      int serrations;
-      int sync_on_green;
-    } analog;
-
-    struct
-    {
-      int composite;
-      int serrations;
-      int negative_vsync;
-      int negative_hsync;
-    } digital;
-  } connector;
-};
-
-struct MonitorInfo
-{
-  int		checksum;
-  char		manufacturer_code[4];
-  int		product_code;
-  unsigned int	serial_number;
-
-  int		production_week;	/* -1 if not specified */
-  int		production_year;	/* -1 if not specified */
-  int		model_year;		/* -1 if not specified */
-
-  int		major_version;
-  int		minor_version;
-
-  int		is_digital;
-
-  union
-  {
-    struct
-    {
-      int	bits_per_primary;
-      Interface	interface;
-      int	rgb444;
-      int	ycrcb444;
-      int	ycrcb422;
-    } digital;
-
-    struct
-    {
-      double	video_signal_level;
-      double	sync_signal_level;
-      double	total_signal_level;
-
-      int	blank_to_black;
-
-      int	separate_hv_sync;
-      int	composite_sync_on_h;
-      int	composite_sync_on_green;
-      int	serration_on_vsync;
-      ColorType	color_type;
-    } analog;
-  } connector;
-
-  int		width_mm;		/* -1 if not specified */
-  int		height_mm;		/* -1 if not specified */
-  double	aspect_ratio;		/* -1.0 if not specififed */
-
-  double	gamma;			/* -1.0 if not specified */
-
-  int		standby;
-  int		suspend;
-  int		active_off;
-
-  int		srgb_is_standard;
-  int		preferred_timing_includes_native;
-  int		continuous_frequency;
-
-  double	red_x;
-  double	red_y;
-  double	green_x;
-  double	green_y;
-  double	blue_x;
-  double	blue_y;
-  double	white_x;
-  double	white_y;
-
-  Timing	established[24];	/* Terminated by 0x0x0 */
-  Timing	standard[8];
-
-  int		n_detailed_timings;
-  DetailedTiming detailed_timings[4];	/* If monitor has a preferred
-                                         * mode, it is the first one
-                                         * (whether it has, is
-                                         * determined by the 
-                                         * preferred_timing_includes
-                                         * bit.
-                                         */
-
-  /* Optional product description */
-  char		dsc_serial_number[14];
-  char		dsc_product_name[14];
-  char		dsc_string[14];		/* Unspecified ASCII data */
-};
-
-MonitorInfo *decode_edid (const uchar *data);
-char *make_display_name (const MonitorInfo *info);
-char *make_display_size_string (int width_mm, int height_mm);
-
-#endif
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -332,6 +332,19 @@ meta_frame_calc_borders (MetaFrame        *frame,
                               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,
@@ -387,14 +400,6 @@ meta_frame_get_frame_bounds (MetaFrame *frame)
                                   frame->rect.height);
 }

-void
-meta_frame_get_mask (MetaFrame                    *frame,
-                     cairo_t                      *cr)
-{
-  meta_ui_get_frame_mask (frame->window->screen->ui, frame->xwindow,
-                          frame->rect.width, frame->rect.height, cr);
-}
-
 void
 meta_frame_queue_draw (MetaFrame *frame)
 {
--- a/src/core/frame.h
+++ b/src/core/frame.h
@@ -63,6 +63,12 @@ Window         meta_frame_get_xwindow (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,
@@ -70,9 +76,6 @@ gboolean meta_frame_sync_to_window (MetaFrame         *frame,

 cairo_region_t *meta_frame_get_frame_bounds (MetaFrame *frame);

-void meta_frame_get_mask (MetaFrame *frame,
-                          cairo_t   *cr);
-
 void meta_frame_set_screen_cursor (MetaFrame	*frame,
 				   MetaCursor	cursor);

--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -69,6 +69,7 @@ void     meta_window_ungrab_all_keys        (MetaWindow  *window,
 gboolean meta_display_process_key_event     (MetaDisplay   *display,
                                             MetaWindow    *window,
                                             XIDeviceEvent *event);
+void     meta_set_keybindings_disabled      (gboolean     setting);
 void     meta_display_process_mapping_event (MetaDisplay *display,
                                             XEvent      *event);

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -56,6 +56,8 @@
 #define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
 #define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"

+static gboolean all_bindings_disabled = FALSE;
+
 static gboolean add_builtin_keybinding (MetaDisplay          *display,
                                        const char           *name,
                                        GSettings            *settings,
@@ -152,6 +154,10 @@ static void ungrab_key_bindings         (MetaDisplay *display);
 static GHashTable *key_handlers;
 static GHashTable *external_grabs;

+static char         *iso_next_group_option;
+static MetaKeyCombo *iso_next_group_combos;
+static int           n_iso_next_group_combos;
+
 #define HANDLER(name) g_hash_table_lookup (key_handlers, (name))

 static void
@@ -300,8 +306,6 @@ reload_modmap (MetaDisplay *display)
              display->meta_mask);
 }

-/* Original code from gdk_x11_keymap_get_entries_for_keyval() in
- * gdkkeys-x11.c */
 static int
 get_keycodes_for_keysym (MetaDisplay  *display,
                         int           keysym,
@@ -339,17 +343,15 @@ get_keycodes_for_keysym (MetaDisplay  *display,
 static void
 reload_iso_next_group_combos (MetaDisplay *display)
 {
-  const char *iso_next_group_option;
  MetaKeyCombo *combos;
  int *keycodes;
  int n_keycodes;
  int n_combos;
  int i;

-  g_clear_pointer (&display->iso_next_group_combos, g_free);
-  display->n_iso_next_group_combos = 0;
+  g_clear_pointer (&iso_next_group_combos, g_free);
+  n_iso_next_group_combos = 0;

-  iso_next_group_option = meta_prefs_get_iso_next_group_option ();
  if (iso_next_group_option == NULL)
    return;

@@ -462,8 +464,8 @@ reload_iso_next_group_combos (MetaDisplay *display)

  g_free (keycodes);

-  display->n_iso_next_group_combos = n_combos;
-  display->iso_next_group_combos = combos;
+  n_iso_next_group_combos = n_combos;
+  iso_next_group_combos = combos;
 }

 static guint
@@ -695,6 +697,9 @@ rebuild_special_bindings (MetaDisplay *display)

  meta_prefs_get_overlay_binding (&combo);
  display->overlay_key_combo = combo;
+
+  g_free (iso_next_group_option);
+  iso_next_group_option = meta_prefs_get_iso_next_group_option ();
 }

 static void
@@ -1192,17 +1197,17 @@ meta_screen_change_keygrabs (MetaScreen *screen,
                         display->overlay_key_combo.keycode,
                         display->overlay_key_combo.modifiers);

-  if (display->iso_next_group_combos)
+  if (iso_next_group_combos)
    {
      int i = 0;
-      while (i < display->n_iso_next_group_combos)
+      while (i < n_iso_next_group_combos)
        {
-          if (display->iso_next_group_combos[i].keycode != 0)
+          if (iso_next_group_combos[i].keycode != 0)
            {
              meta_change_keygrab (display, screen->xroot, grab,
-                                   display->iso_next_group_combos[i].keysym,
-                                   display->iso_next_group_combos[i].keycode,
-                                   display->iso_next_group_combos[i].modifiers);
+                                   iso_next_group_combos[i].keysym,
+                                   iso_next_group_combos[i].keycode,
+                                   iso_next_group_combos[i].modifiers);
            }
          ++i;
        }
@@ -1310,7 +1315,7 @@ handle_external_grab (MetaDisplay    *display,
  guint action = meta_display_get_keybinding_action (display,
                                                     binding->keycode,
                                                     binding->mask);
-  meta_display_accelerator_activate (display, action, event->deviceid, event->time);
+  meta_display_accelerator_activate (display, action, event->deviceid);
 }


@@ -1463,22 +1468,13 @@ grab_keyboard (MetaDisplay *display,
   */
  meta_error_trap_push_with_return (display);

-  /* Strictly, we only need to set grab_mode on the keyboard device
-   * while the pointer should always be XIGrabModeAsync. Unfortunately
-   * there is a bug in the X server, only fixed (link below) in 1.15,
-   * which swaps these arguments for keyboard devices. As such, we set
-   * both the device and the paired device mode which works around
-   * that bug and also works on fixed X servers.
-   *
-   * http://cgit.freedesktop.org/xorg/xserver/commit/?id=9003399708936481083424b4ff8f18a16b88b7b3
-   */
  grab_status = XIGrabDevice (display->xdisplay,
                              META_VIRTUAL_CORE_KEYBOARD_ID,
                              xwindow,
                              timestamp,
                              None,
                              grab_mode, grab_mode,
-                              False, /* owner_events */
+                              True, /* owner_events */
                              &mask);

  if (grab_status != Success)
@@ -1612,9 +1608,9 @@ meta_window_ungrab_all_keys (MetaWindow *window, guint32 timestamp)
 }

 void
-meta_display_freeze_keyboard (MetaDisplay *display, Window window, guint32 timestamp)
+meta_display_grab_keyboard (MetaDisplay *display, guint32 timestamp)
 {
-  grab_keyboard (display, window, timestamp, XIGrabModeSync);
+  grab_keyboard (display, DefaultRootWindow (display->xdisplay), timestamp, XIGrabModeSync);
 }

 void
@@ -1623,17 +1619,29 @@ meta_display_ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
  ungrab_keyboard (display, timestamp);
 }

+void
+meta_display_freeze_keyboard (MetaDisplay *display, guint32 timestamp)
+{
+  meta_error_trap_push (display);
+
+  meta_topic (META_DEBUG_KEYBINDINGS,
+              "Freezing keyboard with timestamp %u\n",
+              timestamp);
+  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
+                 XISyncDevice, timestamp);
+  meta_error_trap_pop (display);
+}
+
 void
 meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
 {
  meta_error_trap_push (display);
+
+  meta_topic (META_DEBUG_KEYBINDINGS,
+              "Unfreezing keyboard with timestamp %u\n",
+              timestamp);
  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID,
                 XIAsyncDevice, timestamp);
-  /* We shouldn't need to unfreeze the pointer device here, however we
-   * have to, due to the workaround we do in grab_keyboard().
-   */
-  XIAllowEvents (display->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
-                 XIAsyncDevice, timestamp);
  meta_error_trap_pop (display);
 }

@@ -1965,23 +1973,6 @@ process_overlay_key (MetaDisplay *display,
            return TRUE;
          meta_display_overlay_key_activate (display);
        }
-      else
-        {
-          /* In some rare race condition, mutter might not receive the Super_L
-           * KeyRelease event because:
-           * - the compositor might end the modal mode and call XIUngrabDevice
-           *   while the key is still down
-           * - passive grabs are only activated on KeyPress and not KeyRelease.
-           *
-           * In this case, display->overlay_key_only_pressed might be wrong.
-           * Mutter still ought to acknowledge events, otherwise the X server
-           * will not send the next events.
-           *
-           * https://bugzilla.gnome.org/show_bug.cgi?id=666101
-           */
-          XIAllowEvents (display->xdisplay, event->deviceid,
-                         XIAsyncDevice, event->time);
-        }

      return TRUE;
    }
@@ -2016,22 +2007,19 @@ process_iso_next_group (MetaDisplay *display,
  activate = FALSE;
  mods = (event->mods.effective & 0xff & ~(display->ignored_modifier_mask));

-  for (i = 0; i < display->n_iso_next_group_combos; ++i)
+  for (i = 0; i < n_iso_next_group_combos; ++i)
    {
-      if (event->detail == (int)display->iso_next_group_combos[i].keycode &&
-          mods == display->iso_next_group_combos[i].modifiers)
+      if (event->detail == (int)iso_next_group_combos[i].keycode &&
+          mods == iso_next_group_combos[i].modifiers)
        {
-          /* If the signal handler returns TRUE the keyboard will
-             remain frozen. It's the signal handler's responsibility
-             to unfreeze it. */
-          if (!meta_display_modifiers_accelerator_activate (display))
-            XIAllowEvents (display->xdisplay, event->deviceid,
-                           XIAsyncDevice, event->time);
          activate = TRUE;
          break;
        }
    }

+  if (activate)
+      meta_display_modifiers_accelerator_activate (display);
+
  return activate;
 }

@@ -2061,6 +2049,21 @@ meta_display_process_key_event (MetaDisplay   *display,
  const char *str;
  MetaScreen *screen;

+  if (all_bindings_disabled)
+    {
+      /* In this mode, we try to pretend we don't have grabs, so we
+       * immediately replay events and drop the grab. (This still
+       * messes up global passive grabs from other clients.) The
+       * FALSE return here is a little suspect, but we don't really
+       * know if we'll see the event again or not, and it's pretty
+       * poorly defined how this mode is supposed to interact with
+       * plugins.
+       */
+      XIAllowEvents (display->xdisplay, event->deviceid,
+                     XIReplayDevice, event->time);
+      return FALSE;
+    }
+
  /* if key event was on root window, we have a shortcut */
  screen = meta_display_screen_for_root (display, event->event);

@@ -4098,6 +4101,14 @@ handle_set_spew_mark (MetaDisplay    *display,
  meta_verbose ("-- MARK MARK MARK MARK --\n");
 }

+void
+meta_set_keybindings_disabled (gboolean setting)
+{
+  all_bindings_disabled = setting;
+  meta_topic (META_DEBUG_KEYBINDINGS,
+              "Keybindings %s\n", all_bindings_disabled ? "disabled" : "enabled");
+}
+
 /**
 * meta_keybindings_set_custom_handler:
 * @name: The name of the keybinding to set
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -514,14 +514,14 @@ meta_run (void)
  if (g_getenv ("MUTTER_G_FATAL_WARNINGS") != NULL)
    g_log_set_always_fatal (G_LOG_LEVEL_MASK);
  
-  meta_ui_set_current_theme (meta_prefs_get_theme ());
+  meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);

  /* Try to find some theme that'll work if the theme preference
   * doesn't exist.  First try Simple (the default theme) then just
   * try anything in the themes directory.
   */
  if (!meta_ui_have_a_theme ())
-    meta_ui_set_current_theme ("Simple");
+    meta_ui_set_current_theme ("Simple", FALSE);
  
  if (!meta_ui_have_a_theme ())
    {
@@ -539,7 +539,7 @@ meta_run (void)
          while (((dir_entry = g_dir_read_name (themes_dir)) != NULL) && 
                 (!meta_ui_have_a_theme ()))
            {
-              meta_ui_set_current_theme (dir_entry);
+              meta_ui_set_current_theme (dir_entry, FALSE);
            }
          
          g_dir_close (themes_dir);
@@ -598,7 +598,7 @@ prefs_changed_callback (MetaPreference pref,
    {
    case META_PREF_THEME:
    case META_PREF_DRAGGABLE_BORDER_WIDTH:
-      meta_ui_set_current_theme (meta_prefs_get_theme ());
+      meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
      meta_display_retheme_all ();
      break;

--- a/src/core/meta-cursor-tracker-private.h
+++ b/src/core/meta-cursor-tracker-private.h
@@ -1,34 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Giovanni Campagna <gcampagn@redhat.com>
- */
-
-#ifndef META_CURSOR_TRACKER_PRIVATE_H
-#define META_CURSOR_TRACKER_PRIVATE_H
-
-#include <meta/meta-cursor-tracker.h>
-
-gboolean meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
-					    XEvent            *xevent);
-
-void     meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
-                                              MetaCursor         cursor);
-#endif
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -1,312 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* 
- * Copyright 2013 Red Hat, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Giovanni Campagna <gcampagn@redhat.com>
- */
-
-/**
- * SECTION:cursor-tracker
- * @title: MetaCursorTracker
- * @short_description: Mutter cursor tracking helper
- */
-
-#include <config.h>
-#include <meta/main.h>
-#include <meta/util.h>
-#include <meta/errors.h>
-
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-
-#include <gdk/gdk.h>
-
-#include <X11/extensions/Xfixes.h>
-
-#include "meta-cursor-tracker-private.h"
-#include "screen-private.h"
-
-#define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_X 7
-#define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_Y 4
-
-struct _MetaCursorTracker {
-  GObject parent_instance;
-
-  MetaScreen *screen;
-
-  gboolean is_showing;
-
-  CoglTexture2D *sprite;
-  int hot_x, hot_y;
-};
-
-struct _MetaCursorTrackerClass {
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
-
-enum {
-    CURSOR_CHANGED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-static void
-meta_cursor_tracker_init (MetaCursorTracker *self)
-{
-  /* (JS) Best (?) that can be assumed since XFixes doesn't provide a way of
-   * detecting if the system mouse cursor is showing or not.
-   *
-   * On wayland we start with the cursor showing
-   */
-  self->is_showing = TRUE;
-}
-
-static void
-meta_cursor_tracker_finalize (GObject *object)
-{
-  MetaCursorTracker *self = META_CURSOR_TRACKER (object);
-
-  if (self->sprite)
-    cogl_object_unref (self->sprite);
-
-  G_OBJECT_CLASS (meta_cursor_tracker_parent_class)->finalize (object);
-}
-
-static void
-meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = meta_cursor_tracker_finalize;
-
-  signals[CURSOR_CHANGED] = g_signal_new ("cursor-changed",
-                                          G_TYPE_FROM_CLASS (klass),
-                                          G_SIGNAL_RUN_LAST,
-                                          0,
-                                          NULL, NULL, NULL,
-                                          G_TYPE_NONE, 0);
-}
-
-static MetaCursorTracker *
-make_x11_cursor_tracker (MetaScreen *screen)
-{
-  MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
-  self->screen = screen;
-
-  XFixesSelectCursorInput (screen->display->xdisplay,
-                           screen->xroot,
-                           XFixesDisplayCursorNotifyMask);
-
-  return self;
-}
-
-/**
- * meta_cursor_tracker_get_for_screen:
- * @screen: the #MetaScreen
- *
- * Retrieves the cursor tracker object for @screen.
- *
- * Returns: (transfer none):
- */
-MetaCursorTracker *
-meta_cursor_tracker_get_for_screen (MetaScreen *screen)
-{
-  MetaCursorTracker *self;
-
-  if (screen->cursor_tracker)
-    return screen->cursor_tracker;
-
-  self = make_x11_cursor_tracker (screen);
-
-  screen->cursor_tracker = self;
-  return self;
-}
-
-gboolean
-meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
-                                   XEvent            *xevent)
-{
-  XFixesCursorNotifyEvent *notify_event;
-
-  if (xevent->xany.type != tracker->screen->display->xfixes_event_base + XFixesCursorNotify)
-    return FALSE;
-
-  notify_event = (XFixesCursorNotifyEvent *)xevent;
-  if (notify_event->subtype != XFixesDisplayCursorNotify)
-    return FALSE;
-
-  g_clear_pointer (&tracker->sprite, cogl_object_unref);
-  g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
-
-  return TRUE;
-}
-
-static void
-ensure_xfixes_cursor (MetaCursorTracker *tracker)
-{
-  XFixesCursorImage *cursor_image;
-  CoglTexture2D *sprite;
-  guint8 *cursor_data;
-  gboolean free_cursor_data;
-  CoglContext *ctx;
-
-  if (tracker->sprite)
-    return;
-
-  cursor_image = XFixesGetCursorImage (tracker->screen->display->xdisplay);
-  if (!cursor_image)
-    return;
-
-  /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit
-   * quantities as arrays of long; we need to convert on 64 bit */
-  if (sizeof(long) == 4)
-    {
-      cursor_data = (guint8 *)cursor_image->pixels;
-      free_cursor_data = FALSE;
-    }
-  else
-    {
-      int i, j;
-      guint32 *cursor_words;
-      gulong *p;
-      guint32 *q;
-
-      cursor_words = g_new (guint32, cursor_image->width * cursor_image->height);
-      cursor_data = (guint8 *)cursor_words;
-
-      p = cursor_image->pixels;
-      q = cursor_words;
-      for (j = 0; j < cursor_image->height; j++)
-        for (i = 0; i < cursor_image->width; i++)
-          *(q++) = *(p++);
-
-      free_cursor_data = TRUE;
-    }
-
-  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-  sprite = cogl_texture_2d_new_from_data (ctx,
-                                          cursor_image->width,
-                                          cursor_image->height,
-                                          CLUTTER_CAIRO_FORMAT_ARGB32,
-                                          COGL_PIXEL_FORMAT_ANY,
-                                          cursor_image->width * 4, /* stride */
-                                          cursor_data,
-                                          NULL);
-
-  if (free_cursor_data)
-    g_free (cursor_data);
-
-  if (sprite != NULL)
-    {
-      tracker->sprite = sprite;
-      tracker->hot_x = cursor_image->xhot;
-      tracker->hot_y = cursor_image->yhot;
-    }
-  XFree (cursor_image);
-}
-
-/**
- * meta_cursor_tracker_get_sprite:
- *
- * Returns: (transfer none):
- */
-CoglTexture *
-meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)
-{
-  g_return_val_if_fail (META_IS_CURSOR_TRACKER (tracker), NULL);
-
-  ensure_xfixes_cursor (tracker);
-
-  return COGL_TEXTURE (tracker->sprite);
-}
-
-/**
- * meta_cursor_tracker_get_hot:
- * @tracker:
- * @x: (out):
- * @y: (out):
- *
- */
-void
-meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
-                             int               *x,
-                             int               *y)
-{
-  g_return_if_fail (META_IS_CURSOR_TRACKER (tracker));
-
-  ensure_xfixes_cursor (tracker);
-
-  if (x)
-    *x = tracker->hot_x;
-  if (y)
-    *y = tracker->hot_y;
-}
-
-void
-meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
-                                     MetaCursor         cursor)
-{
-  Cursor xcursor;
-  MetaDisplay *display = tracker->screen->display;
-
-  /* First create a cursor for X11 applications that don't specify their own */
-  xcursor = meta_display_create_x_cursor (display, cursor);
-
-  XDefineCursor (display->xdisplay, tracker->screen->xroot, xcursor);
-  XFlush (display->xdisplay);
-  XFreeCursor (display->xdisplay, xcursor);
-}
-
-void
-meta_cursor_tracker_get_pointer (MetaCursorTracker   *tracker,
-                                 int                 *x,
-                                 int                 *y,
-                                 ClutterModifierType *mods)
-{
-  GdkDeviceManager *gmanager;
-  GdkDevice *gdevice;
-  GdkScreen *gscreen;
-
-  gmanager = gdk_display_get_device_manager (gdk_display_get_default ());
-  gdevice = gdk_device_manager_get_client_pointer (gmanager);
-
-  gdk_device_get_position (gdevice, &gscreen, x, y);
-  gdk_device_get_state (gdevice,
-                        gdk_screen_get_root_window (gscreen),
-                        NULL, (GdkModifierType*)mods);
-}
-
-void
-meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
-                                         gboolean           visible)
-{
-  if (visible == tracker->is_showing)
-    return;
-  tracker->is_showing = visible;
-
-  if (visible)
-    XFixesShowCursor (tracker->screen->display->xdisplay,
-                      tracker->screen->xroot);
-  else
-    XFixesHideCursor (tracker->screen->display->xdisplay,
-                      tracker->screen->xroot);
-}
--- a/src/core/meta-idle-monitor-private.h
+++ b/src/core/meta-idle-monitor-private.h
@@ -1,30 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* 
- * Copyright 2013 Red Hat, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
- *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
- */
-
-#include <meta/meta-idle-monitor.h>
-
-void meta_idle_monitor_handle_xevent_all (XEvent *xevent);
-
-
-void meta_idle_monitor_init_dbus (void);
--- a/src/core/meta-idle-monitor.c
+++ b/src/core/meta-idle-monitor.c
@@ -1,858 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* 
- * Copyright 2013 Red Hat, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
- *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
- */
-
-/**
- * SECTION:idle-monitor
- * @title: MetaIdleMonitor
- * @short_description: Mutter idle counter (similar to X's IDLETIME)
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <clutter/clutter.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/sync.h>
-
-#include <meta/util.h>
-#include <meta/main.h>
-#include <meta/meta-idle-monitor.h>
-#include "display-private.h"
-#include "meta-idle-monitor-private.h"
-#include "meta-dbus-idle-monitor.h"
-
-G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
-
-struct _MetaIdleMonitor
-{
-  GObject parent_instance;
-
-  GHashTable  *watches;
-  GHashTable  *alarms;
-  int          device_id;
-
-  /* X11 implementation */
-  Display     *display;
-  int          sync_event_base;
-  XSyncCounter counter;
-  XSyncAlarm   user_active_alarm;
-};
-
-struct _MetaIdleMonitorClass
-{
-  GObjectClass parent_class;
-};
-
-typedef struct
-{
-  MetaIdleMonitor          *monitor;
-  guint	                    id;
-  MetaIdleMonitorWatchFunc  callback;
-  gpointer		    user_data;
-  GDestroyNotify            notify;
-  guint64                   timeout_msec;
-
-  /* x11 */
-  XSyncAlarm	            xalarm;
-} MetaIdleMonitorWatch;
-
-enum
-{
-  PROP_0,
-  PROP_DEVICE_ID,
-  PROP_LAST,
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-G_DEFINE_TYPE (MetaIdleMonitor, meta_idle_monitor, G_TYPE_OBJECT)
-
-static MetaIdleMonitor *device_monitors[256];
-static int              device_id_max;
-
-static gint64
-_xsyncvalue_to_int64 (XSyncValue value)
-{
-  return ((guint64) XSyncValueHigh32 (value)) << 32
-    | (guint64) XSyncValueLow32 (value);
-}
-
-#define GUINT64_TO_XSYNCVALUE(value, ret) XSyncIntsToValue (ret, (value) & 0xFFFFFFFF, ((guint64)(value)) >> 32)
-
-static void
-fire_watch (MetaIdleMonitorWatch *watch)
-{
-  MetaIdleMonitor *monitor;
-  guint id;
-  gboolean is_user_active_watch;
-
-  monitor = watch->monitor;
-  g_object_ref (monitor);
-
-  id = watch->id;
-  is_user_active_watch = (watch->timeout_msec == 0);
-
-  if (watch->callback)
-    watch->callback (monitor, id, watch->user_data);
-
-  if (is_user_active_watch)
-    meta_idle_monitor_remove_watch (monitor, id);
-
-  g_object_unref (monitor);
-}
-
-static XSyncAlarm
-_xsync_alarm_set (MetaIdleMonitor	*monitor,
-		  XSyncTestType          test_type,
-		  guint64                interval,
-		  gboolean               want_events)
-{
-  XSyncAlarmAttributes attr;
-  XSyncValue	     delta;
-  guint		     flags;
-
-  flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType |
-    XSyncCAValue | XSyncCADelta | XSyncCAEvents;
-
-  XSyncIntToValue (&delta, 0);
-  attr.trigger.counter = monitor->counter;
-  attr.trigger.value_type = XSyncAbsolute;
-  attr.delta = delta;
-  attr.events = want_events;
-
-  GUINT64_TO_XSYNCVALUE (interval, &attr.trigger.wait_value);
-  attr.trigger.test_type = test_type;
-  return XSyncCreateAlarm (monitor->display, flags, &attr);
-}
-
-static void
-ensure_alarm_rescheduled (Display    *dpy,
-			  XSyncAlarm  alarm)
-{
-  XSyncAlarmAttributes attr;
-
-  /* Some versions of Xorg have an issue where alarms aren't
-   * always rescheduled. Calling XSyncChangeAlarm, even
-   * without any attributes, will reschedule the alarm. */
-  XSyncChangeAlarm (dpy, alarm, 0, &attr);
-}
-
-static void
-set_alarm_enabled (Display    *dpy,
-		   XSyncAlarm  alarm,
-		   gboolean    enabled)
-{
-  XSyncAlarmAttributes attr;
-  attr.events = enabled;
-  XSyncChangeAlarm (dpy, alarm, XSyncCAEvents, &attr);
-}
-
-static void
-check_x11_watch (gpointer data,
-                 gpointer user_data)
-{
-  MetaIdleMonitorWatch *watch = data;
-  XSyncAlarm alarm = (XSyncAlarm) user_data;
-
-  if (watch->xalarm != alarm)
-    return;
-
-  fire_watch (watch);
-}
-
-static void
-meta_idle_monitor_handle_xevent (MetaIdleMonitor       *monitor,
-                                 XSyncAlarmNotifyEvent *alarm_event)
-{
-  XSyncAlarm alarm;
-  GList *watches;
-  gboolean has_alarm;
-
-  if (alarm_event->state != XSyncAlarmActive)
-    return;
-
-  alarm = alarm_event->alarm;
-
-  has_alarm = FALSE;
-
-  if (alarm == monitor->user_active_alarm)
-    {
-      set_alarm_enabled (monitor->display,
-                         alarm,
-                         FALSE);
-      has_alarm = TRUE;
-    }
-  else if (g_hash_table_contains (monitor->alarms, (gpointer) alarm))
-    {
-      ensure_alarm_rescheduled (monitor->display,
-                                alarm);
-      has_alarm = TRUE;
-    }
-
-  if (has_alarm)
-    {
-      watches = g_hash_table_get_values (monitor->watches);
-
-      g_list_foreach (watches, check_x11_watch, (gpointer) alarm);
-      g_list_free (watches);
-    }
-}
-
-void
-meta_idle_monitor_handle_xevent_all (XEvent *xevent)
-{
-  int i;
-
-  for (i = 0; i <= device_id_max; i++)
-    if (device_monitors[i])
-      meta_idle_monitor_handle_xevent (device_monitors[i], (XSyncAlarmNotifyEvent*)xevent);
-}
-
-static char *
-counter_name_for_device (int device_id)
-{
-  if (device_id > 0)
-    return g_strdup_printf ("DEVICEIDLETIME %d", device_id);
-
-  return g_strdup ("IDLETIME");
-}
-
-static XSyncCounter
-find_idletime_counter (MetaIdleMonitor *monitor)
-{
-  int		      i;
-  int		      ncounters;
-  XSyncSystemCounter *counters;
-  XSyncCounter        counter = None;
-  char               *counter_name;
-
-  counter_name = counter_name_for_device (monitor->device_id);
-  counters = XSyncListSystemCounters (monitor->display, &ncounters);
-  for (i = 0; i < ncounters; i++)
-    {
-      if (counters[i].name != NULL && strcmp (counters[i].name, counter_name) == 0)
-        {
-          counter = counters[i].counter;
-          break;
-        }
-    }
-  XSyncFreeSystemCounterList (counters);
-  g_free (counter_name);
-
-  return counter;
-}
-
-static guint32
-get_next_watch_serial (void)
-{
-  static guint32 serial = 0;
-  g_atomic_int_inc (&serial);
-  return serial;
-}
-
-static void
-idle_monitor_watch_free (MetaIdleMonitorWatch *watch)
-{
-  MetaIdleMonitor *monitor;
-
-  if (watch == NULL)
-    return;
-
-  monitor = watch->monitor;
-
-  if (watch->notify != NULL)
-    watch->notify (watch->user_data);
-
-  if (watch->xalarm != monitor->user_active_alarm &&
-      watch->xalarm != None)
-    {
-      XSyncDestroyAlarm (monitor->display, watch->xalarm);
-      g_hash_table_remove (monitor->alarms, (gpointer) watch->xalarm);
-    }
-
-  g_slice_free (MetaIdleMonitorWatch, watch);
-}
-
-static void
-init_xsync (MetaIdleMonitor *monitor)
-{
-  monitor->counter = find_idletime_counter (monitor);
-  /* IDLETIME counter not found? */
-  if (monitor->counter == None)
-    {
-      meta_warning ("IDLETIME counter not found\n");
-      return;
-    }
-
-  monitor->user_active_alarm = _xsync_alarm_set (monitor, XSyncNegativeTransition, 1, FALSE);
-}
-
-static void
-meta_idle_monitor_dispose (GObject *object)
-{
-  MetaIdleMonitor *monitor;
-
-  monitor = META_IDLE_MONITOR (object);
-
-  g_clear_pointer (&monitor->watches, g_hash_table_destroy);
-  g_clear_pointer (&monitor->alarms, g_hash_table_destroy);
-
-  if (monitor->user_active_alarm != None)
-    {
-      XSyncDestroyAlarm (monitor->display, monitor->user_active_alarm);
-      monitor->user_active_alarm = None;
-    }
-
-  G_OBJECT_CLASS (meta_idle_monitor_parent_class)->dispose (object);
-}
-
-static void
-meta_idle_monitor_get_property (GObject    *object,
-                                guint       prop_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  MetaIdleMonitor *monitor = META_IDLE_MONITOR (object);
-
-  switch (prop_id)
-    {
-    case PROP_DEVICE_ID:
-      g_value_set_int (value, monitor->device_id);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_idle_monitor_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  MetaIdleMonitor *monitor = META_IDLE_MONITOR (object);
-  switch (prop_id)
-    {
-    case PROP_DEVICE_ID:
-      monitor->device_id = g_value_get_int (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_idle_monitor_constructed (GObject *object)
-{
-  MetaIdleMonitor *monitor = META_IDLE_MONITOR (object);
-
-  monitor->display = meta_get_display ()->xdisplay;
-  init_xsync (monitor);
-}
-
-static void
-meta_idle_monitor_class_init (MetaIdleMonitorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = meta_idle_monitor_dispose;
-  object_class->constructed = meta_idle_monitor_constructed;
-  object_class->get_property = meta_idle_monitor_get_property;
-  object_class->set_property = meta_idle_monitor_set_property;
-
-  /**
-   * MetaIdleMonitor:device_id:
-   *
-   * The device to listen to idletime on.
-   */
-  obj_props[PROP_DEVICE_ID] =
-    g_param_spec_int ("device-id",
-                      "Device ID",
-                      "The device to listen to idletime on",
-                      0, 255, 0,
-                      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (object_class, PROP_DEVICE_ID, obj_props[PROP_DEVICE_ID]);
-}
-
-static void
-meta_idle_monitor_init (MetaIdleMonitor *monitor)
-{
-  monitor->watches = g_hash_table_new_full (NULL,
-                                                  NULL,
-                                                  NULL,
-                                                  (GDestroyNotify)idle_monitor_watch_free);
-
-  monitor->alarms = g_hash_table_new (NULL, NULL);
-}
-
-static void
-ensure_device_monitor (int device_id)
-{
-  if (device_monitors[device_id])
-    return;
-
-  device_monitors[device_id] = g_object_new (META_TYPE_IDLE_MONITOR, "device-id", device_id, NULL);
-  device_id_max = MAX (device_id_max, device_id);
-}
-
-/**
- * meta_idle_monitor_get_core:
- *
- * Returns: (transfer none): the #MetaIdleMonitor that tracks the server-global
- * idletime for all devices. To track device-specific idletime,
- * use meta_idle_monitor_get_for_device().
- */
-MetaIdleMonitor *
-meta_idle_monitor_get_core (void)
-{
-  ensure_device_monitor (0);
-  return device_monitors[0];
-}
-
-/**
- * meta_idle_monitor_get_for_device:
- * @device_id: the device to get the idle time for.
- *
- * Returns: (transfer none): a new #MetaIdleMonitor that tracks the
- * device-specific idletime for @device. To track server-global idletime
- * for all devices, use meta_idle_monitor_get_core().
- */
-MetaIdleMonitor *
-meta_idle_monitor_get_for_device (int device_id)
-{
-  g_return_val_if_fail (device_id > 0 && device_id < 256, NULL);
-
-  ensure_device_monitor (device_id);
-  return device_monitors[device_id];
-}
-
-static MetaIdleMonitorWatch *
-make_watch (MetaIdleMonitor           *monitor,
-            guint64                    timeout_msec,
-	    MetaIdleMonitorWatchFunc   callback,
-	    gpointer                   user_data,
-	    GDestroyNotify             notify)
-{
-  MetaIdleMonitorWatch *watch;
-
-  watch = g_slice_new0 (MetaIdleMonitorWatch);
-  watch->monitor = monitor;
-  watch->id = get_next_watch_serial ();
-  watch->callback = callback;
-  watch->user_data = user_data;
-  watch->notify = notify;
-  watch->timeout_msec = timeout_msec;
-
-  if (timeout_msec != 0)
-    {
-      watch->xalarm = _xsync_alarm_set (monitor, XSyncPositiveTransition, timeout_msec, TRUE);
-
-      g_hash_table_add (monitor->alarms, (gpointer) watch->xalarm);
-    }
-  else
-    {
-      watch->xalarm = monitor->user_active_alarm;
-
-      set_alarm_enabled (monitor->display, monitor->user_active_alarm, TRUE);
-    }
-
-  g_hash_table_insert (monitor->watches,
-                       GUINT_TO_POINTER (watch->id),
-                       watch);
-  return watch;
-}
-
-/**
- * meta_idle_monitor_add_idle_watch:
- * @monitor: A #MetaIdleMonitor
- * @interval_msec: The idletime interval, in milliseconds
- * @callback: (allow-none): The callback to call when the user has
- *     accumulated @interval_msec milliseconds of idle time.
- * @user_data: (allow-none): The user data to pass to the callback
- * @notify: A #GDestroyNotify
- *
- * Returns: a watch id
- *
- * Adds a watch for a specific idle time. The callback will be called
- * when the user has accumulated @interval_msec milliseconds of idle time.
- * This function will return an ID that can either be passed to
- * meta_idle_monitor_remove_watch(), or can be used to tell idle time
- * watches apart if you have more than one.
- *
- * Also note that this function will only care about positive transitions
- * (user's idle time exceeding a certain time). If you want to know about
- * when the user has become active, use
- * meta_idle_monitor_add_user_active_watch().
- */
-guint
-meta_idle_monitor_add_idle_watch (MetaIdleMonitor	       *monitor,
-                                  guint64	                interval_msec,
-                                  MetaIdleMonitorWatchFunc      callback,
-                                  gpointer			user_data,
-                                  GDestroyNotify		notify)
-{
-  MetaIdleMonitorWatch *watch;
-
-  g_return_val_if_fail (META_IS_IDLE_MONITOR (monitor), 0);
-  g_return_val_if_fail (interval_msec > 0, 0);
-
-  watch = make_watch (monitor,
-                      interval_msec,
-                      callback,
-                      user_data,
-                      notify);
-
-  return watch->id;
-}
-
-/**
- * meta_idle_monitor_add_user_active_watch:
- * @monitor: A #MetaIdleMonitor
- * @callback: (allow-none): The callback to call when the user is
- *     active again.
- * @user_data: (allow-none): The user data to pass to the callback
- * @notify: A #GDestroyNotify
- *
- * Returns: a watch id
- *
- * Add a one-time watch to know when the user is active again.
- * Note that this watch is one-time and will de-activate after the
- * function is called, for efficiency purposes. It's most convenient
- * to call this when an idle watch, as added by
- * meta_idle_monitor_add_idle_watch(), has triggered.
- */
-guint
-meta_idle_monitor_add_user_active_watch (MetaIdleMonitor          *monitor,
-                                         MetaIdleMonitorWatchFunc  callback,
-                                         gpointer		   user_data,
-                                         GDestroyNotify	           notify)
-{
-  MetaIdleMonitorWatch *watch;
-
-  g_return_val_if_fail (META_IS_IDLE_MONITOR (monitor), 0);
-
-  watch = make_watch (monitor,
-                      0,
-                      callback,
-                      user_data,
-                      notify);
-
-  return watch->id;
-}
-
-/**
- * meta_idle_monitor_remove_watch:
- * @monitor: A #MetaIdleMonitor
- * @id: A watch ID
- *
- * Removes an idle time watcher, previously added by
- * meta_idle_monitor_add_idle_watch() or
- * meta_idle_monitor_add_user_active_watch().
- */
-void
-meta_idle_monitor_remove_watch (MetaIdleMonitor *monitor,
-                                guint	         id)
-{
-  g_return_if_fail (META_IS_IDLE_MONITOR (monitor));
-
-  g_hash_table_remove (monitor->watches,
-                       GUINT_TO_POINTER (id));
-}
-
-/**
- * meta_idle_monitor_get_idletime:
- * @monitor: A #MetaIdleMonitor
- *
- * Returns: The current idle time, in milliseconds, or -1 for not supported
- */
-gint64
-meta_idle_monitor_get_idletime (MetaIdleMonitor *monitor)
-{
-  XSyncValue value;
-
-  if (!XSyncQueryCounter (monitor->display, monitor->counter, &value))
-    return -1;
-
-  return _xsyncvalue_to_int64 (value);
-}
-
-static gboolean
-handle_get_idletime (MetaDBusIdleMonitor   *skeleton,
-                     GDBusMethodInvocation *invocation,
-                     MetaIdleMonitor       *monitor)
-{
-  guint64 idletime;
-
-  idletime = meta_idle_monitor_get_idletime (monitor);
-  meta_dbus_idle_monitor_complete_get_idletime (skeleton, invocation, idletime);
-
-  return TRUE;
-}
-
-typedef struct {
-  MetaDBusIdleMonitor *dbus_monitor;
-  MetaIdleMonitor *monitor;
-  char *dbus_name;
-  guint watch_id;
-  guint name_watcher_id;
-} DBusWatch;
-
-static void
-destroy_dbus_watch (gpointer data)
-{
-  DBusWatch *watch = data;
-
-  g_object_unref (watch->dbus_monitor);
-  g_object_unref (watch->monitor);
-  g_free (watch->dbus_name);
-  g_bus_unwatch_name (watch->name_watcher_id);
-
-  g_slice_free (DBusWatch, watch);
-}
-
-static void
-dbus_idle_callback (MetaIdleMonitor *monitor,
-                    guint            watch_id,
-                    gpointer         user_data)
-{
-  DBusWatch *watch = user_data;
-  GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (watch->dbus_monitor);
-
-  g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (skeleton),
-                                 watch->dbus_name,
-                                 g_dbus_interface_skeleton_get_object_path (skeleton),
-                                 "org.gnome.Mutter.IdleMonitor",
-                                 "WatchFired",
-                                 g_variant_new ("(u)", watch_id),
-                                 NULL);
-}
-
-static void
-name_vanished_callback (GDBusConnection *connection,
-                        const char      *name,
-                        gpointer         user_data)
-{
-  DBusWatch *watch = user_data;
-
-  meta_idle_monitor_remove_watch (watch->monitor, watch->watch_id);
-}
-
-static DBusWatch *
-make_dbus_watch (MetaDBusIdleMonitor   *skeleton,
-                 GDBusMethodInvocation *invocation,
-                 MetaIdleMonitor       *monitor)
-{
-  DBusWatch *watch;
-
-  watch = g_slice_new (DBusWatch);
-  watch->dbus_monitor = g_object_ref (skeleton);
-  watch->monitor = g_object_ref (monitor);
-  watch->dbus_name = g_strdup (g_dbus_method_invocation_get_sender (invocation));
-  watch->name_watcher_id = g_bus_watch_name_on_connection (g_dbus_method_invocation_get_connection (invocation),
-                                                           watch->dbus_name,
-                                                           G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                                           NULL, /* appeared */
-                                                           name_vanished_callback,
-                                                           watch, NULL);
-
-  return watch;
-}
-
-static gboolean
-handle_add_idle_watch (MetaDBusIdleMonitor   *skeleton,
-                       GDBusMethodInvocation *invocation,
-                       guint64                interval,
-                       MetaIdleMonitor       *monitor)
-{
-  DBusWatch *watch;
-
-  watch = make_dbus_watch (skeleton, invocation, monitor);
-  watch->watch_id = meta_idle_monitor_add_idle_watch (monitor, interval,
-                                                      dbus_idle_callback, watch, destroy_dbus_watch);
-
-  meta_dbus_idle_monitor_complete_add_idle_watch (skeleton, invocation, watch->watch_id);
-
-  return TRUE;
-}
-
-static gboolean
-handle_add_user_active_watch (MetaDBusIdleMonitor   *skeleton,
-                              GDBusMethodInvocation *invocation,
-                              MetaIdleMonitor       *monitor)
-{
-  DBusWatch *watch;
-
-  watch = make_dbus_watch (skeleton, invocation, monitor);
-  watch->watch_id = meta_idle_monitor_add_user_active_watch (monitor,
-                                                             dbus_idle_callback, watch,
-                                                             destroy_dbus_watch);
-
-  meta_dbus_idle_monitor_complete_add_user_active_watch (skeleton, invocation, watch->watch_id);
-
-  return TRUE;
-}
-
-static gboolean
-handle_remove_watch (MetaDBusIdleMonitor   *skeleton,
-                     GDBusMethodInvocation *invocation,
-                     guint                  id,
-                     MetaIdleMonitor       *monitor)
-{
-  meta_idle_monitor_remove_watch (monitor, id);
-  meta_dbus_idle_monitor_complete_remove_watch (skeleton, invocation);
-
-  return TRUE;
-}
-
-static void
-create_monitor_skeleton (GDBusObjectManagerServer *manager,
-                         MetaIdleMonitor          *monitor,
-                         const char               *path)
-{
-  MetaDBusIdleMonitor *skeleton;
-  MetaDBusObjectSkeleton *object;
-
-  skeleton = meta_dbus_idle_monitor_skeleton_new ();
-  g_signal_connect_object (skeleton, "handle-add-idle-watch",
-                           G_CALLBACK (handle_add_idle_watch), monitor, 0);
-  g_signal_connect_object (skeleton, "handle-add-user-active-watch",
-                           G_CALLBACK (handle_add_user_active_watch), monitor, 0);
-  g_signal_connect_object (skeleton, "handle-remove-watch",
-                           G_CALLBACK (handle_remove_watch), monitor, 0);
-  g_signal_connect_object (skeleton, "handle-get-idletime",
-                           G_CALLBACK (handle_get_idletime), monitor, 0);
-
-  object = meta_dbus_object_skeleton_new (path);
-  meta_dbus_object_skeleton_set_idle_monitor (object, skeleton);
-
-  g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
-}
-
-static void
-on_device_added (ClutterDeviceManager     *device_manager,
-                 ClutterInputDevice       *device,
-                 GDBusObjectManagerServer *manager)
-{
-
-  MetaIdleMonitor *monitor;
-  int device_id;
-  char *path;
-
-  device_id = clutter_input_device_get_device_id (device);
-  monitor = meta_idle_monitor_get_for_device (device_id);
-  path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
-
-  create_monitor_skeleton (manager, monitor, path);
-  g_free (path);
-}
-
-static void
-on_device_removed (ClutterDeviceManager     *device_manager,
-                   ClutterInputDevice       *device,
-                   GDBusObjectManagerServer *manager)
-{
-  int device_id;
-  char *path;
-
-  device_id = clutter_input_device_get_device_id (device);
-  path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
-  g_dbus_object_manager_server_unexport (manager, path);
-  g_free (path);
-
-  g_clear_object (&device_monitors[device_id]);
-  if (device_id == device_id_max)
-    device_id_max--;
-}
-
-static void
-on_bus_acquired (GDBusConnection *connection,
-                 const char      *name,
-                 gpointer         user_data)
-{
-  GDBusObjectManagerServer *manager;
-  ClutterDeviceManager *device_manager;
-  MetaIdleMonitor *monitor;
-  GSList *devices, *iter;
-  char *path;
-
-  manager = g_dbus_object_manager_server_new ("/org/gnome/Mutter/IdleMonitor");
-
-  /* We never clear the core monitor, as that's supposed to cumulate idle times from
-     all devices */
-  monitor = meta_idle_monitor_get_core ();
-  path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
-  create_monitor_skeleton (manager, monitor, path);
-  g_free (path);
-
-  device_manager = clutter_device_manager_get_default ();
-  devices = clutter_device_manager_list_devices (device_manager);
-
-  for (iter = devices; iter; iter = iter->next)
-    on_device_added (device_manager, iter->data, manager);
-
-  g_signal_connect_object (device_manager, "device-added",
-                           G_CALLBACK (on_device_added), manager, 0);
-  g_signal_connect_object (device_manager, "device-removed",
-                           G_CALLBACK (on_device_removed), manager, 0);
-
-  g_dbus_object_manager_server_set_connection (manager, connection);
-}
-
-static void
-on_name_acquired (GDBusConnection *connection,
-                  const char      *name,
-                  gpointer         user_data)
-{
-  meta_verbose ("Acquired name %s\n", name);
-}
-
-static void
-on_name_lost (GDBusConnection *connection,
-              const char      *name,
-              gpointer         user_data)
-{
-  meta_verbose ("Lost or failed to acquire name %s\n", name);
-}
-
-void
-meta_idle_monitor_init_dbus (void)
-{
-  static int dbus_name_id;
-
-  if (dbus_name_id > 0)
-    return;
-
-  dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                 "org.gnome.Mutter.IdleMonitor",
-                                 G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
-                                 (meta_get_replace_current_wm () ?
-                                  G_BUS_NAME_OWNER_FLAGS_REPLACE : 0),
-                                 on_bus_acquired,
-                                 on_name_acquired,
-                                 on_name_lost,
-                                 NULL, NULL);
-}
-
--- a/src/core/meta-xrandr-shared.h
+++ b/src/core/meta-xrandr-shared.h
@@ -1,40 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* 
- * Copyright (C) 2013 Red Hat Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-/* This file is shared between mutter (src/core/meta-xrandr-shared.h)
-   and gnome-desktop (libgnome-desktop/meta-xrandr-shared.h).
-
-   The canonical place for all changes is mutter.
-
-   There should be no includes in this file.
-*/
-
-#ifndef META_XRANDR_SHARED_H
-#define META_XRANDR_SHARED_H
-
-typedef enum {
-  META_POWER_SAVE_UNKNOWN = -1,
-  META_POWER_SAVE_ON = 0,
-  META_POWER_SAVE_STANDBY,
-  META_POWER_SAVE_SUSPEND,
-  META_POWER_SAVE_OFF,
-} MetaPowerSave;
-
-#endif
--- a/src/core/monitor-config.c
+++ b/src/core/monitor-config.c
--- a/src/core/monitor-private.h
+++ b/src/core/monitor-private.h
@@ -1,395 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/**
- * \file screen-private.h  Handling of monitor configuration
- *
- * Managing multiple monitors
- * This file contains structures and functions that handle
- * multiple monitors, including reading the current configuration
- * and available hardware, and applying it.
- *
- * This interface is private to mutter, API users should look
- * at MetaScreen instead.
- */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * Copyright (C) 2003 Rob Adams
- * Copyright (C) 2004-2006 Elijah Newren
- * Copyright (C) 2013 Red Hat Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_MONITOR_PRIVATE_H
-#define META_MONITOR_PRIVATE_H
-
-#include <cogl/cogl.h>
-#include <libgnome-desktop/gnome-pnp-ids.h>
-
-#include "display-private.h"
-#include <meta/screen.h>
-#include "stack-tracker.h"
-#include "ui.h"
-#ifdef HAVE_WAYLAND
-#include <wayland-server.h>
-#endif
-#include "meta-xrandr-shared.h"
-
-#include "meta-dbus-xrandr.h"
-
-typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;
-typedef struct _MetaMonitorManager         MetaMonitorManager;
-typedef struct _MetaMonitorConfigClass    MetaMonitorConfigClass;
-typedef struct _MetaMonitorConfig         MetaMonitorConfig;
-
-#ifndef HAVE_WAYLAND
-enum wl_output_transform {
-  WL_OUTPUT_TRANSFORM_NORMAL,
-  WL_OUTPUT_TRANSFORM_90,
-  WL_OUTPUT_TRANSFORM_180,
-  WL_OUTPUT_TRANSFORM_270,
-  WL_OUTPUT_TRANSFORM_FLIPPED,
-  WL_OUTPUT_TRANSFORM_FLIPPED_90,
-  WL_OUTPUT_TRANSFORM_FLIPPED_180,
-  WL_OUTPUT_TRANSFORM_FLIPPED_270
-};
-#endif
-
-typedef struct _MetaOutput MetaOutput;
-typedef struct _MetaCRTC MetaCRTC;
-typedef struct _MetaMonitorMode MetaMonitorMode;
-typedef struct _MetaMonitorInfo MetaMonitorInfo;
-typedef struct _MetaCRTCInfo MetaCRTCInfo;
-typedef struct _MetaOutputInfo MetaOutputInfo;
-
-struct _MetaOutput
-{
-  /* The CRTC driving this output, NULL if the output is not enabled */
-  MetaCRTC *crtc;
-  /* The low-level ID of this output, used to apply back configuration */
-  glong output_id;
-  char *name;
-  char *vendor;
-  char *product;
-  char *serial;
-  int width_mm;
-  int height_mm;
-  CoglSubpixelOrder subpixel_order;
-
-  MetaMonitorMode *preferred_mode;
-  MetaMonitorMode **modes;
-  unsigned int n_modes;
-
-  MetaCRTC **possible_crtcs;
-  unsigned int n_possible_crtcs;
-
-  MetaOutput **possible_clones;
-  unsigned int n_possible_clones;
-
-  int backlight;
-  int backlight_min;
-  int backlight_max;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-
-  /* The low-level bits used to build the high-level info
-     in MetaMonitorInfo
-
-     XXX: flags maybe?
-     There is a lot of code that uses MonitorInfo->is_primary,
-     but nobody uses MetaOutput yet
-  */
-  gboolean is_primary;
-  gboolean is_presentation;
-};
-
-struct _MetaCRTC
-{
-  glong crtc_id;
-  MetaRectangle rect;
-  MetaMonitorMode *current_mode;
-  enum wl_output_transform transform;
-  unsigned int all_transforms;
-
-  /* Only used to build the logical configuration
-     from the HW one
-  */
-  MetaMonitorInfo *logical_monitor;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-};
-
-struct _MetaMonitorMode
-{
-  /* The low-level ID of this mode, used to apply back configuration */
-  glong mode_id;
-
-  int width;
-  int height;
-  float refresh_rate;
-};
-
-/**
- * MetaMonitorInfo:
- *
- * A structure with high-level information about monitors.
- * This corresponds to a subset of the compositor coordinate space.
- * Clones are only reported once, irrespective of the way
- * they're implemented (two CRTCs configured for the same
- * coordinates or one CRTCs driving two outputs). Inactive CRTCs
- * are ignored, and so are disabled outputs.
- */
-struct _MetaMonitorInfo
-{
-  int number;
-  int xinerama_index;
-  MetaRectangle rect;
-  gboolean is_primary;
-  gboolean is_presentation; /* XXX: not yet used */
-  gboolean in_fullscreen;
-
-  /* The primary or first output for this monitor, 0 if we can't figure out.
-     It can be matched to an output_id of a MetaOutput.
-
-     This is used as an opaque token on reconfiguration when switching from
-     clone to extened, to decide on what output the windows should go next
-     (it's an attempt to keep windows on the same monitor, and preferably on
-     the primary one).
-  */
-  glong output_id;
-};
-
-/*
- * MetaCRTCInfo:
- * This represents the writable part of a CRTC, as deserialized from DBus
- * or built by MetaMonitorConfig
- *
- * Note: differently from the other structures in this file, MetaCRTCInfo
- * is handled by pointer. This is to accomodate the usage in MetaMonitorConfig
- */
-struct _MetaCRTCInfo {
-  MetaCRTC                 *crtc;
-  MetaMonitorMode          *mode;
-  int                       x;
-  int                       y;
-  enum wl_output_transform  transform;
-  GPtrArray                *outputs;
-};
-
-/*
- * MetaOutputInfo:
- * this is the same as MetaOutputInfo, but for CRTCs
- */
-struct _MetaOutputInfo {
-  MetaOutput  *output;
-  gboolean     is_primary;
-  gboolean     is_presentation;
-};
-
-#define META_TYPE_MONITOR_MANAGER            (meta_monitor_manager_get_type ())
-#define META_MONITOR_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER, MetaMonitorManager))
-#define META_MONITOR_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass))
-#define META_IS_MONITOR_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER))
-#define META_IS_MONITOR_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER))
-#define META_MONITOR_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass))
-
-struct _MetaMonitorManager
-{
-  MetaDBusDisplayConfigSkeleton parent_instance;
-
-  /* XXX: this structure is very badly
-     packed, but I like the logical organization
-     of fields */
-
-  gboolean in_init;
-  unsigned int serial;
-
-  MetaPowerSave power_save_mode;
-
-  int max_screen_width;
-  int max_screen_height;
-  int screen_width;
-  int screen_height;
-
-  /* Outputs refer to physical screens,
-     CRTCs refer to stuff that can drive outputs
-     (like encoders, but less tied to the HW),
-     while monitor_infos refer to logical ones.
-
-     See also the comment in monitor-private.h
-  */
-  MetaOutput *outputs;
-  unsigned int n_outputs;
-
-  MetaMonitorMode *modes;
-  unsigned int n_modes;
-
-  MetaCRTC *crtcs;
-  unsigned int n_crtcs;
-
-  MetaMonitorInfo *monitor_infos;
-  unsigned int n_monitor_infos;
-  int primary_monitor_index;
-
-  int dbus_name_id;
-
-  int persistent_timeout_id;
-  MetaMonitorConfig *config;
-
-  GnomePnpIds *pnp_ids;
-};
-
-struct _MetaMonitorManagerClass
-{
-  MetaDBusDisplayConfigSkeletonClass parent_class;
-
-  void (*read_current) (MetaMonitorManager *);
-
-  char* (*get_edid_file) (MetaMonitorManager *,
-                          MetaOutput         *);
-  GBytes* (*read_edid) (MetaMonitorManager *,
-                        MetaOutput         *);
-
-  void (*apply_configuration) (MetaMonitorManager  *,
-                               MetaCRTCInfo       **,
-                               unsigned int         ,
-                               MetaOutputInfo     **,
-                               unsigned int);
-
-  void (*set_power_save_mode) (MetaMonitorManager *,
-                               MetaPowerSave);
-
-  void (*change_backlight) (MetaMonitorManager *,
-                            MetaOutput         *,
-                            int);
-
-  void (*get_crtc_gamma) (MetaMonitorManager  *,
-                          MetaCRTC            *,
-                          gsize               *,
-                          unsigned short     **,
-                          unsigned short     **,
-                          unsigned short     **);
-  void (*set_crtc_gamma) (MetaMonitorManager *,
-                          MetaCRTC           *,
-                          gsize               ,
-                          unsigned short     *,
-                          unsigned short     *,
-                          unsigned short     *);
-
-  gboolean (*handle_xevent) (MetaMonitorManager *,
-                             XEvent             *);
-};
-
-GType meta_monitor_manager_get_type (void);
-
-void                meta_monitor_manager_initialize (void);
-MetaMonitorManager *meta_monitor_manager_get  (void);
-
-void                meta_monitor_manager_rebuild_derived   (MetaMonitorManager *manager);
-
-MetaMonitorInfo    *meta_monitor_manager_get_monitor_infos (MetaMonitorManager *manager,
-							    unsigned int       *n_infos);
-
-MetaOutput         *meta_monitor_manager_get_outputs       (MetaMonitorManager *manager,
-							    unsigned int       *n_outputs);
-
-void                meta_monitor_manager_get_resources     (MetaMonitorManager  *manager,
-                                                            MetaMonitorMode    **modes,
-                                                            unsigned int        *n_modes,
-                                                            MetaCRTC           **crtcs,
-                                                            unsigned int        *n_crtcs,
-                                                            MetaOutput         **outputs,
-                                                            unsigned int        *n_outputs);
-
-int                 meta_monitor_manager_get_primary_index (MetaMonitorManager *manager);
-
-gboolean            meta_monitor_manager_handle_xevent     (MetaMonitorManager *manager,
-                                                            XEvent             *event);
-
-void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *manager,
-                                                            int                *width,
-                                                            int                *height);
-
-void                meta_monitor_manager_get_screen_limits (MetaMonitorManager *manager,
-                                                            int                *width,
-                                                            int                *height);
-
-void                meta_monitor_manager_apply_configuration (MetaMonitorManager  *manager,
-                                                              MetaCRTCInfo       **crtcs,
-                                                              unsigned int         n_crtcs,
-                                                              MetaOutputInfo     **outputs,
-                                                              unsigned int         n_outputs);
-
-void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
-                                                                gboolean            ok);
-
-#define META_TYPE_MONITOR_MANAGER_XRANDR            (meta_monitor_manager_xrandr_get_type ())
-#define META_MONITOR_MANAGER_XRANDR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandr))
-#define META_MONITOR_MANAGER_XRANDR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandrClass))
-#define META_IS_MONITOR_MANAGER_XRANDR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER_XRANDR))
-#define META_IS_MONITOR_MANAGER_XRANDR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER_XRANDR))
-#define META_MONITOR_MANAGER_XRANDR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER_XRANDR, MetaMonitorManagerXrandrClass))
-
-typedef struct _MetaMonitorManagerXrandrClass    MetaMonitorManagerXrandrClass;
-typedef struct _MetaMonitorManagerXrandr         MetaMonitorManagerXrandr;
-
-GType meta_monitor_manager_xrandr_get_type (void);
-
-#define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
-#define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, MetaMonitorConfig))
-#define META_MONITOR_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_CONFIG, MetaMonitorConfigClass))
-#define META_IS_MONITOR_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_CONFIG))
-#define META_IS_MONITOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_CONFIG))
-#define META_MONITOR_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_CONFIG, MetaMonitorConfigClass))
-
-GType meta_monitor_config_get_type (void) G_GNUC_CONST;
-
-MetaMonitorConfig *meta_monitor_config_new (void);
-
-gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config,
-                                                      MetaMonitorManager *manager);
-
-gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_make_default (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_update_current (MetaMonitorConfig  *config,
-                                                       MetaMonitorManager *manager);
-void               meta_monitor_config_make_persistent (MetaMonitorConfig *config);
-
-void               meta_monitor_config_restore_previous (MetaMonitorConfig  *config,
-                                                         MetaMonitorManager *manager);
-
-void               meta_crtc_info_free   (MetaCRTCInfo   *info);
-void               meta_output_info_free (MetaOutputInfo *info);
-
-void               meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
-                                                           int         n_old_outputs);
-
-/* Returns true if transform causes width and height to be inverted
-   This is true for the odd transforms in the enum */
-static inline gboolean
-meta_monitor_transform_is_rotated (enum wl_output_transform transform)
-{
-  return (transform % 2);
-}
-
-#endif
--- a/src/core/monitor-xrandr.c
+++ b/src/core/monitor-xrandr.c
--- a/src/core/monitor.c
+++ b/src/core/monitor.c
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -89,6 +89,7 @@ static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_
 static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
 static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
 static gboolean dynamic_workspaces = FALSE;
+static gboolean application_based = FALSE;
 static gboolean disable_workarounds = FALSE;
 static gboolean auto_raise = FALSE;
 static gboolean auto_raise_delay = 500;
@@ -124,6 +125,7 @@ static gboolean update_binding         (MetaKeyPref *binding,
                                        gchar      **strokes);
 static gboolean update_key_binding     (const char  *key,
                                        gchar      **strokes);
+static gboolean update_workspace_names (void);

 static void settings_changed (GSettings      *settings,
                              gchar          *key,
@@ -146,6 +148,7 @@ static gboolean iso_next_group_handler (GVariant*, gpointer*, gpointer);
 static void     do_override               (char *key, char *schema);

 static void     init_bindings             (void);
+static void     init_workspace_names      (void);


 typedef struct
@@ -199,13 +202,6 @@ typedef struct
  gchar **target;
 } MetaStringPreference;

-typedef struct
-{
-  MetaBasePreference base;
-  GSettingsGetMapping handler;
-  gchar ***target;
-} MetaStringArrayPreference;
-
 typedef struct
 {
  MetaBasePreference base;
@@ -297,6 +293,13 @@ static MetaBoolPreference preferences_bool[] =
      },
      &dynamic_workspaces,
    },
+    {
+      { "application-based",
+        SCHEMA_GENERAL,
+        META_PREF_APPLICATION_BASED,
+      },
+      NULL, /* feature is known but disabled */
+    },
    {
      { "disable-workarounds",
        SCHEMA_GENERAL,
@@ -434,21 +437,8 @@ static MetaStringPreference preferences_string[] =
      overlay_key_handler,
      NULL,
    },
-    { { NULL, 0, 0 }, NULL },
-  };
-
-static MetaStringArrayPreference preferences_string_array[] =
-  {
    {
-      { KEY_WORKSPACE_NAMES,
-        SCHEMA_GENERAL,
-        META_PREF_KEYBINDINGS,
-      },
-      NULL,
-      &workspace_names,
-    },
-    {
-      { KEY_XKB_OPTIONS,
+      { "xkb-options",
        SCHEMA_INPUT_SOURCES,
        META_PREF_KEYBINDINGS,
      },
@@ -577,42 +567,6 @@ handle_preference_init_string (void)
    }
 }

-static void
-handle_preference_init_string_array (void)
-{
-  MetaStringArrayPreference *cursor = preferences_string_array;
-
-  while (cursor->base.key != NULL)
-    {
-      char **value;
-
-      /* Complex keys have a mapping function to check validity */
-      if (cursor->handler)
-        {
-          if (cursor->target)
-            meta_bug ("%s has both a target and a handler\n", cursor->base.key);
-
-          g_settings_get_mapped (SETTINGS (cursor->base.schema),
-                                 cursor->base.key, cursor->handler, NULL);
-        }
-      else
-        {
-          if (!cursor->target)
-            meta_bug ("%s must have handler or target\n", cursor->base.key);
-
-          if (*(cursor->target))
-            g_strfreev (*(cursor->target));
-
-          value = g_settings_get_strv (SETTINGS (cursor->base.schema),
-                                       cursor->base.key);
-
-          *(cursor->target) = value;
-        }
-
-      ++cursor;
-    }
-}
-
 static void
 handle_preference_init_int (void)
 {
@@ -731,56 +685,6 @@ handle_preference_update_string (GSettings *settings,
    queue_changed (cursor->base.pref);
 }

-static void
-handle_preference_update_string_array (GSettings *settings,
-                                       gchar *key)
-{
-  MetaStringArrayPreference *cursor = preferences_string_array;
-  gboolean inform_listeners = FALSE;
-
-  while (cursor->base.key != NULL && strcmp (key, cursor->base.key) != 0)
-    ++cursor;
-
-  if (cursor->base.key==NULL)
-    /* Didn't recognise that key. */
-    return;
-
-  /* Complex keys have a mapping function to check validity */
-  if (cursor->handler)
-    {
-      if (cursor->target)
-        meta_bug ("%s has both a target and a handler\n", cursor->base.key);
-
-      g_settings_get_mapped (SETTINGS (cursor->base.schema),
-                             cursor->base.key, cursor->handler, NULL);
-    }
-  else
-    {
-      char **values, **previous;
-      int n_values, n_previous, i;
-
-      if (!cursor->target)
-        meta_bug ("%s must have handler or target\n", cursor->base.key);
-
-      values = g_settings_get_strv (SETTINGS (cursor->base.schema),
-                                    cursor->base.key);
-      n_values = g_strv_length (values);
-      previous = *(cursor->target);
-      n_previous = previous ? g_strv_length (previous) : 0;
-
-      inform_listeners = n_previous != n_values;
-      for (i = 0; i < n_values && !inform_listeners; i++)
-        inform_listeners = g_strcmp0 (values[i], previous[i]) != 0;
-
-      if (*(cursor->target))
-        g_strfreev (*(cursor->target));
-      *(cursor->target) = values;
-    }
-
-  if (inform_listeners)
-    queue_changed (cursor->base.pref);
-}
-
 static void
 handle_preference_update_int (GSettings *settings,
                              gchar *key)
@@ -982,10 +886,10 @@ meta_prefs_init (void)
  handle_preference_init_enum ();
  handle_preference_init_bool ();
  handle_preference_init_string ();
-  handle_preference_init_string_array ();
  handle_preference_init_int ();

  init_bindings ();
+  init_workspace_names ();
 }

 static gboolean
@@ -1133,6 +1037,14 @@ settings_changed (GSettings *settings,
  MetaEnumPreference *cursor;
  gboolean found_enum;

+  /* String array, handled separately */
+  if (strcmp (key, KEY_WORKSPACE_NAMES) == 0)
+    {
+      if (update_workspace_names ())
+        queue_changed (META_PREF_WORKSPACE_NAMES);
+      return;
+    }
+
  value = g_settings_get_value (settings, key);
  type = g_variant_get_type (value);

@@ -1140,9 +1052,8 @@ settings_changed (GSettings *settings,
    handle_preference_update_bool (settings, key);
  else if (g_variant_type_equal (type, G_VARIANT_TYPE_INT32))
    handle_preference_update_int (settings, key);
-  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING_ARRAY))
-    handle_preference_update_string_array (settings, key);
-  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
+  else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING) ||
+           g_variant_type_equal (type, G_VARIANT_TYPE_STRING_ARRAY))
    {
      cursor = preferences_enum;
      found_enum = FALSE;
@@ -1661,14 +1572,24 @@ overlay_key_handler (GVariant *value,
  return TRUE;
 }

+static void
+set_iso_next_group_option (const char *option)
+{
+  if (g_strcmp0 (option, iso_next_group_option) == 0)
+    return;
+
+  g_free (iso_next_group_option);
+  iso_next_group_option = g_strdup (option);
+
+  queue_changed (META_PREF_KEYBINDINGS);
+}
+
 static gboolean
 iso_next_group_handler (GVariant *value,
                        gpointer *result,
                        gpointer  data)
 {
  const char **xkb_options, **p;
-  const char *option = NULL;
-  gboolean changed = FALSE;

  *result = NULL; /* ignored */
  xkb_options = g_variant_get_strv (value, NULL);
@@ -1676,18 +1597,13 @@ iso_next_group_handler (GVariant *value,
  for (p = xkb_options; p && *p; ++p)
    if (g_str_has_prefix (*p, "grp:"))
      {
-        option = (*p + 4);
+        set_iso_next_group_option (*p + 4);
        break;
      }

-  changed = (g_strcmp0 (option, iso_next_group_option) != 0);
-
-  if (changed)
-    {
-      g_free (iso_next_group_option);
-      iso_next_group_option = g_strdup (option);
-      queue_changed (META_PREF_KEYBINDINGS);
-    }
+  /* If we didn't find it, it still needs to be disabled. */
+  if (p && *p == NULL)
+    set_iso_next_group_option (NULL);

  g_free (xkb_options);

@@ -1715,6 +1631,14 @@ meta_prefs_get_dynamic_workspaces (void)
  return dynamic_workspaces;
 }

+gboolean
+meta_prefs_get_application_based (void)
+{
+  return FALSE; /* For now, we never want this to do anything */
+  
+  return application_based;
+}
+
 gboolean
 meta_prefs_get_disable_workarounds (void)
 {
@@ -1752,6 +1676,9 @@ meta_preference_to_string (MetaPreference pref)
    case META_PREF_NUM_WORKSPACES:
      return "NUM_WORKSPACES";

+    case META_PREF_APPLICATION_BASED:
+      return "APPLICATION_BASED";
+
    case META_PREF_KEYBINDINGS:
      return "KEYBINDINGS";

@@ -1837,13 +1764,12 @@ meta_prefs_set_num_workspaces (int n_workspaces)
 {
  MetaBasePreference *pref;

-  if (find_pref (preferences_int, sizeof(MetaIntPreference),
-                 KEY_NUM_WORKSPACES, &pref))
-    {
-      g_settings_set_int (SETTINGS (pref->schema),
-                          KEY_NUM_WORKSPACES,
-                          n_workspaces);
-    }
+  find_pref (preferences_int, sizeof(MetaIntPreference),
+             KEY_NUM_WORKSPACES, &pref);
+
+  g_settings_set_int (SETTINGS (pref->schema),
+                      KEY_NUM_WORKSPACES,
+                      n_workspaces);
 }

 static GHashTable *key_bindings;
@@ -1877,6 +1803,12 @@ init_bindings (void)
  g_hash_table_insert (key_bindings, g_strdup ("overlay-key"), pref);
 }

+static void
+init_workspace_names (void)
+{
+  update_workspace_names ();
+}
+
 static gboolean
 update_binding (MetaKeyPref *binding,
                gchar      **strokes)
@@ -1987,6 +1919,41 @@ update_key_binding (const char *key,
    return FALSE;
 }

+static gboolean
+update_workspace_names (void)
+{
+  int i;
+  char **names;
+  int n_workspace_names, n_names;
+  gboolean changed = FALSE;
+
+  names = g_settings_get_strv (SETTINGS (SCHEMA_GENERAL), KEY_WORKSPACE_NAMES);
+  n_names = g_strv_length (names);
+  n_workspace_names = workspace_names ? g_strv_length (workspace_names) : 0;
+
+  for (i = 0; i < n_names; i++)
+    if (n_workspace_names < i + 1 || !workspace_names[i] ||
+        g_strcmp0 (names[i], workspace_names[i]) != 0)
+      {
+        changed = TRUE;
+        break;
+      }
+
+  if (n_workspace_names != n_names)
+    changed = TRUE;
+
+  if (changed)
+    {
+      if (workspace_names)
+        g_strfreev (workspace_names);
+      workspace_names = names;
+    }
+  else
+    g_strfreev (names);
+
+  return changed;
+}
+
 const char*
 meta_prefs_get_workspace_name (int i)
 {
@@ -2186,10 +2153,10 @@ meta_prefs_get_overlay_binding (MetaKeyCombo *combo)
  *combo = overlay_key_combo;
 }

-const char *
+char *
 meta_prefs_get_iso_next_group_option (void)
 {
-  return iso_next_group_option;
+  return g_strdup (iso_next_group_option);
 }

 GDesktopTitlebarAction
@@ -2334,11 +2301,9 @@ meta_prefs_set_no_tab_popup (gboolean whether)
 {
  MetaBasePreference *pref;

-  if (find_pref (preferences_bool, sizeof(MetaBoolPreference),
-                 KEY_NO_TAB_POPUP, &pref))
-    {
-      g_settings_set_boolean (SETTINGS (pref->schema), KEY_NO_TAB_POPUP, whether);
-    }
+  find_pref (preferences_bool, sizeof(MetaBoolPreference),
+             KEY_NO_TAB_POPUP, &pref);
+  g_settings_set_boolean (SETTINGS (pref->schema), KEY_NO_TAB_POPUP, whether);
 }

 int
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -38,7 +38,17 @@
 #include <X11/Xutil.h>
 #include "stack-tracker.h"
 #include "ui.h"
-#include "monitor-private.h"
+
+typedef struct _MetaMonitorInfo MetaMonitorInfo;
+
+struct _MetaMonitorInfo
+{
+  int number;
+  MetaRectangle rect;
+  gboolean is_primary;
+  gboolean in_fullscreen;
+  XID output; /* The primary or first output for this crtc, None if no xrandr */
+};

 typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
                                       gpointer user_data);
@@ -83,7 +93,6 @@ struct _MetaScreen
  MetaStack *stack;
  MetaStackTracker *stack_tracker;

-  MetaCursorTracker *cursor_tracker;
  MetaCursor current_cursor;

  Window flash_window;
@@ -91,11 +100,10 @@ struct _MetaScreen
  Window wm_sn_selection_window;
  Atom wm_sn_atom;
  guint32 wm_sn_timestamp;
-
+  
  MetaMonitorInfo *monitor_infos;
-  int n_monitor_infos;
  int primary_monitor_index;
-  gboolean has_xinerama_indices;
+  int n_monitor_infos;

  /* Cache the current monitor */
  int last_monitor_index;
@@ -179,9 +187,6 @@ MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *scre
                                                MetaWindow                 *not_this_one);

 const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen);
-const MetaMonitorInfo* meta_screen_get_current_monitor_info_for_pos   (MetaScreen    *screen,
-                                                                       int x,
-                                                                       int y);
 const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen,
                                                           MetaRectangle *rect);
 const MetaMonitorInfo* meta_screen_get_monitor_for_window (MetaScreen    *screen,
@@ -223,6 +228,10 @@ void meta_screen_calc_workspace_layout (MetaScreen          *screen,
                                        MetaWorkspaceLayout *layout);
 void meta_screen_free_workspace_layout (MetaWorkspaceLayout *layout);

+void meta_screen_resize (MetaScreen *screen,
+                         int         width,
+                         int         height);
+
 void     meta_screen_minimize_all_on_active_workspace_except (MetaScreen *screen,
                                                              MetaWindow *keep);

@@ -245,12 +254,4 @@ void     meta_screen_workspace_switched (MetaScreen         *screen,

 void meta_screen_set_active_workspace_hint (MetaScreen *screen);

-int meta_screen_xinerama_index_to_monitor_index (MetaScreen *screen,
-                                                 int         index);
-int meta_screen_monitor_index_to_xinerama_index (MetaScreen *screen,
-                                                 int         index);
-
-gboolean meta_screen_handle_xevent (MetaScreen *screen,
-                                    XEvent     *xevent);
-
 #endif
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -45,10 +45,13 @@
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
 #include "core.h"
-#include "meta-cursor-tracker-private.h"

 #include <X11/extensions/Xinerama.h>

+#ifdef HAVE_RANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+
 #include <X11/Xatom.h>
 #include <locale.h>
 #include <string.h>
@@ -73,9 +76,6 @@ static void meta_screen_sn_event   (SnMonitorEvent *event,
                                    void           *user_data);
 #endif

-static void on_monitors_changed (MetaMonitorManager *manager,
-                                 MetaScreen         *screen);
-
 enum
 {
  PROP_N_WORKSPACES = 1,
@@ -309,8 +309,6 @@ set_supported_hint (MetaScreen *screen)
 #include <meta/atomnames.h>
 #undef item
 #undef EWMH_ATOMS_ONLY
-
-    screen->display->atom__GTK_FRAME_EXTENTS,
  };

  XChangeProperty (screen->display->xdisplay, screen->xroot,
@@ -352,93 +350,250 @@ 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
-meta_screen_ensure_xinerama_indices (MetaScreen *screen)
+filter_mirrored_monitors (MetaScreen *screen)
 {
-  XineramaScreenInfo *infos;
-  int n_infos, i, j;
+  int i, j;

-  if (screen->has_xinerama_indices)
-    return;
+  /* Currently always true and simplifies things */
+  g_assert (screen->primary_monitor_index == 0);

-  screen->has_xinerama_indices = TRUE;
-
-  if (!XineramaIsActive (screen->display->xdisplay))
-    return;
-
-  infos = XineramaQueryScreens (screen->display->xdisplay, &n_infos);
-  if (n_infos <= 0 || infos == NULL)
+  for (i = 1; i < screen->n_monitor_infos; i++)
    {
-      meta_XFree (infos);
-      return;
-    }
+      /* In case we've filtered previous monitors */
+      screen->monitor_infos[i].number = i;

-  for (i = 0; i < screen->n_monitor_infos; ++i)
-    {
-      for (j = 0; j < n_infos; ++j)
+      for (j = 0; j < i; j++)
        {
-          if (screen->monitor_infos[i].rect.x == infos[j].x_org &&
-	      screen->monitor_infos[i].rect.y == infos[j].y_org &&
-	      screen->monitor_infos[i].rect.width == infos[j].width &&
-	      screen->monitor_infos[i].rect.height == infos[j].height)
-            screen->monitor_infos[i].xinerama_index = 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;
+            }
        }
    }
-
-  meta_XFree (infos);
 }

-int
-meta_screen_monitor_index_to_xinerama_index (MetaScreen *screen,
-                                             int         index)
-{
-  meta_screen_ensure_xinerama_indices (screen);
-
-  return screen->monitor_infos[index].xinerama_index;
-}
-
-int
-meta_screen_xinerama_index_to_monitor_index (MetaScreen *screen,
-                                             int         index)
+#ifdef HAVE_RANDR
+static MetaMonitorInfo *
+find_monitor_with_rect (MetaScreen *screen, int x, int y, int w, int h)
 {
+  MetaMonitorInfo *info;
  int i;

-  meta_screen_ensure_xinerama_indices (screen);
-
  for (i = 0; i < screen->n_monitor_infos; i++)
-    if (screen->monitor_infos[i].xinerama_index == index)
-      return i;
-
-  return -1;
+    {
+      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)
 {
-  GList *tmp;
-  MetaMonitorManager *manager;
+  MetaDisplay *display;

-  tmp = screen->workspaces;
-  while (tmp != NULL)
-    {
-      MetaWorkspace *space = tmp->data;
+  {
+    GList *tmp;

-      meta_workspace_invalidate_work_area (space);
-      
-      tmp = tmp->next;
-    }
+    tmp = screen->workspaces;
+    while (tmp != NULL)
+      {
+        MetaWorkspace *space = tmp->data;

-  /* Any previous screen->monitor_infos or screen->outputs is freed by the caller */
+        meta_workspace_invalidate_work_area (space);
+        
+        tmp = tmp->next;
+      }
+  }

+  display = screen->display;
+
+  /* Any previous screen->monitor_infos is freed by the caller */
+
+  screen->monitor_infos = NULL;
+  screen->n_monitor_infos = 0;
  screen->last_monitor_index = 0;
-  screen->has_xinerama_indices = FALSE;
+
+  /* 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;

-  manager = meta_monitor_manager_get ();
+  if (g_getenv ("MUTTER_DEBUG_XINERAMA"))
+    {
+      meta_topic (META_DEBUG_XINERAMA,
+                  "Pretending a single monitor has two Xinerama screens\n");

-  screen->monitor_infos = meta_monitor_manager_get_monitor_infos (manager,
-                                                                  (unsigned*)&screen->n_monitor_infos);
-  screen->primary_monitor_index = meta_monitor_manager_get_primary_index (manager);
+      screen->monitor_infos = g_new0 (MetaMonitorInfo, 2);
+      screen->n_monitor_infos = 2;
+
+      screen->monitor_infos[0].number = 0;
+      screen->monitor_infos[0].rect = screen->rect;
+      screen->monitor_infos[0].rect.width = screen->rect.width / 2;
+      screen->monitor_infos[0].in_fullscreen = -1;
+
+      screen->monitor_infos[1].number = 1;
+      screen->monitor_infos[1].rect = screen->rect;
+      screen->monitor_infos[1].rect.x = screen->rect.width / 2;
+      screen->monitor_infos[1].rect.width = screen->rect.width / 2;
+      screen->monitor_infos[0].in_fullscreen = -1;
+    }
+
+  if (screen->n_monitor_infos == 0 &&
+      XineramaIsActive (display->xdisplay))
+    {
+      XineramaScreenInfo *infos;
+      int n_infos;
+      int i;
+      
+      n_infos = 0;
+      infos = XineramaQueryScreens (display->xdisplay, &n_infos);
+
+      meta_topic (META_DEBUG_XINERAMA,
+                  "Found %d Xinerama screens on display %s\n",
+                  n_infos, display->name);
+
+      if (n_infos > 0)
+        {
+          screen->monitor_infos = g_new0 (MetaMonitorInfo, n_infos);
+          screen->n_monitor_infos = n_infos;
+          
+          i = 0;
+          while (i < n_infos)
+            {
+              screen->monitor_infos[i].number = infos[i].screen_number;
+              screen->monitor_infos[i].rect.x = infos[i].x_org;
+              screen->monitor_infos[i].rect.y = infos[i].y_org;
+              screen->monitor_infos[i].rect.width = infos[i].width;
+              screen->monitor_infos[i].rect.height = infos[i].height;
+              screen->monitor_infos[i].in_fullscreen = -1;
+
+              meta_topic (META_DEBUG_XINERAMA,
+                          "Monitor %d is %d,%d %d x %d\n",
+                          screen->monitor_infos[i].number,
+                          screen->monitor_infos[i].rect.x,
+                          screen->monitor_infos[i].rect.y,
+                          screen->monitor_infos[i].rect.width,
+                          screen->monitor_infos[i].rect.height);
+              
+              ++i;
+            }
+        }
+      
+      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)
+    {
+      meta_topic (META_DEBUG_XINERAMA,
+                  "No Xinerama extension or Xinerama inactive on display %s\n",
+                  display->name);
+    }
+
+  /* If no Xinerama, fill in the single screen info so
+   * we can use the field unconditionally
+   */
+  if (screen->n_monitor_infos == 0)
+    {
+      meta_topic (META_DEBUG_XINERAMA,
+                  "No Xinerama screens, using default screen info\n");
+          
+      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;
+      screen->monitor_infos[0].in_fullscreen = -1;
+    }
+
+  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);
 }

 /* The guard window allows us to leave minimized windows mapped so
@@ -513,7 +668,6 @@ meta_screen_new (MetaDisplay *display,
  char buf[128];
  guint32 manager_timestamp;
  gulong current_workspace;
-  MetaMonitorManager *manager;
  
  replace_current_wm = meta_get_replace_current_wm ();
  
@@ -672,17 +826,8 @@ meta_screen_new (MetaDisplay *display,
  screen->xscreen = ScreenOfDisplay (xdisplay, number);
  screen->xroot = xroot;
  screen->rect.x = screen->rect.y = 0;
-  
-  meta_monitor_manager_initialize ();
-
-  manager = meta_monitor_manager_get ();
-  g_signal_connect (manager, "monitors-changed",
-                    G_CALLBACK (on_monitors_changed), screen);
-
-  meta_monitor_manager_get_screen_size (manager,
-                                        &screen->rect.width,
-                                        &screen->rect.height);
-
+  screen->rect.width = WidthOfScreen (screen->xscreen);
+  screen->rect.height = HeightOfScreen (screen->xscreen);
  screen->current_cursor = -1; /* invalid/unset */
  screen->default_xvisual = DefaultVisualOfScreen (screen->xscreen);
  screen->default_depth = DefaultDepthOfScreen (screen->xscreen);
@@ -707,9 +852,12 @@ meta_screen_new (MetaDisplay *display,
  screen->compositor_data = NULL;
  screen->guard_window = None;

+  screen->monitor_infos = NULL;
+  screen->n_monitor_infos = 0;
+  screen->last_monitor_index = 0;  
+  
  reload_monitor_infos (screen);
-
-  meta_cursor_tracker_get_for_screen (screen);
+  
  meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);

  /* Handle creating a no_focus_window for this screen */  
@@ -793,7 +941,7 @@ meta_screen_new (MetaDisplay *display,

  meta_verbose ("Added screen %d ('%s') root 0x%lx\n",
                screen->number, screen->screen_name, screen->xroot);
-
+  
  return screen;
 }

@@ -1465,18 +1613,29 @@ void
 meta_screen_set_cursor (MetaScreen *screen,
                        MetaCursor  cursor)
 {
+  Cursor xcursor;
+
  if (cursor == screen->current_cursor)
    return;

  screen->current_cursor = cursor;
-  meta_cursor_tracker_set_root_cursor (screen->cursor_tracker, cursor);
+  
+  xcursor = meta_display_create_x_cursor (screen->display, cursor);
+  XDefineCursor (screen->display->xdisplay, screen->xroot, xcursor);
+  XFlush (screen->display->xdisplay);
+  XFreeCursor (screen->display->xdisplay, xcursor);
 }

 void
 meta_screen_update_cursor (MetaScreen *screen)
 {
-  meta_cursor_tracker_set_root_cursor (screen->cursor_tracker,
-                                       screen->current_cursor);
+  Cursor xcursor;
+
+  xcursor = meta_display_create_x_cursor (screen->display, 
+					  screen->current_cursor);
+  XDefineCursor (screen->display->xdisplay, screen->xroot, xcursor);
+  XFlush (screen->display->xdisplay);
+  XFreeCursor (screen->display->xdisplay, xcursor);
 }

 void
@@ -2057,65 +2216,6 @@ meta_screen_get_current_monitor_info (MetaScreen *screen)
    return &screen->monitor_infos[monitor_index];
 }

-const MetaMonitorInfo*
-meta_screen_get_current_monitor_info_for_pos (MetaScreen *screen,
-                                              int x,
-                                              int y)
-{
-    int monitor_index;
-    monitor_index = meta_screen_get_current_monitor_for_pos (screen, x, y);
-    return &screen->monitor_infos[monitor_index];
-}
-
-
-/**
- * meta_screen_get_current_monitor_for_pos:
- * @screen: a #MetaScreen
- * @x: The x coordinate
- * @y: The y coordinate
- *
- * Gets the index of the monitor that contains the passed coordinates.
- *
- * Return value: a monitor index
- */
-int
-meta_screen_get_current_monitor_for_pos (MetaScreen *screen,
-                                         int x,
-                                         int y)
-{
-  if (screen->n_monitor_infos == 1)
-    return 0;
-  else if (screen->display->monitor_cache_invalidated)
-    {
-      int i;
-      MetaRectangle pointer_position;
-      pointer_position.x = x;
-      pointer_position.y = y;
-      pointer_position.width = pointer_position.height = 1;
-
-      screen->display->monitor_cache_invalidated = FALSE;
-      screen->last_monitor_index = 0;
-
-      for (i = 0; i < screen->n_monitor_infos; i++)
-        {
-          if (meta_rectangle_contains_rect (&screen->monitor_infos[i].rect,
-                                            &pointer_position))
-            {
-              screen->last_monitor_index = i;
-              break;
-            }
-        }
-
-      meta_topic (META_DEBUG_XINERAMA,
-                  "Rechecked current monitor, now %d\n",
-                  screen->last_monitor_index);
-
-    }
-
-    return screen->last_monitor_index;
-}
-
-
 /**
 * meta_screen_get_current_monitor:
 * @screen: a #MetaScreen
@@ -2141,7 +2241,11 @@ meta_screen_get_current_monitor (MetaScreen *screen)
      XIButtonState buttons;
      XIModifierState mods;
      XIGroupState group;
+      int i;
+      MetaRectangle pointer_position;

+      screen->display->monitor_cache_invalidated = FALSE;
+      
      XIQueryPointer (screen->display->xdisplay,
                      META_VIRTUAL_CORE_POINTER_ID,
                      screen->xroot,
@@ -2156,7 +2260,24 @@ meta_screen_get_current_monitor (MetaScreen *screen)
                      &group);
      free (buttons.mask);

-      meta_screen_get_current_monitor_for_pos (screen, root_x_return, root_y_return);
+      pointer_position.x = root_x_return;
+      pointer_position.y = root_y_return;
+      pointer_position.width = pointer_position.height = 1;
+
+      screen->last_monitor_index = 0;
+      for (i = 0; i < screen->n_monitor_infos; i++)
+        {
+          if (meta_rectangle_contains_rect (&screen->monitor_infos[i].rect,
+                                            &pointer_position))
+            {
+              screen->last_monitor_index = i;
+              break;
+            }
+        }
+      
+      meta_topic (META_DEBUG_XINERAMA,
+                  "Rechecked current monitor, now %d\n",
+                  screen->last_monitor_index);
    }

  return screen->last_monitor_index;
@@ -2838,15 +2959,19 @@ meta_screen_resize_func (MetaScreen *screen,
  meta_window_recalc_features (window);
 }

-static void
-on_monitors_changed (MetaMonitorManager *manager,
-                     MetaScreen         *screen)
+void
+meta_screen_resize (MetaScreen *screen,
+                    int         width,
+                    int         height)
 {
-  GSList *tmp, *windows;
+  GSList *windows, *tmp;
+  MetaMonitorInfo *old_monitor_infos;

-  meta_monitor_manager_get_screen_size (manager,
-                                        &screen->rect.width,
-                                        &screen->rect.height);
+  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);
@@ -2858,8 +2983,8 @@ on_monitors_changed (MetaMonitorManager *manager,

      changes.x = 0;
      changes.y = 0;
-      changes.width = screen->rect.width;
-      changes.height = screen->rect.height;
+      changes.width = width;
+      changes.height = height;

      XConfigureWindow(screen->display->xdisplay,
                       screen->guard_window,
@@ -2869,15 +2994,14 @@ on_monitors_changed (MetaMonitorManager *manager,

  if (screen->display->compositor)
    meta_compositor_sync_screen_size (screen->display->compositor,
-				      screen,
-                                      screen->rect.width, screen->rect.height);
+				      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);
+                                       META_LIST_DEFAULT);
  for (tmp = windows; tmp != NULL; tmp = tmp->next)
    {
      MetaWindow *window = tmp->data;
@@ -2886,6 +3010,7 @@ on_monitors_changed (MetaMonitorManager *manager,
        meta_window_update_for_monitors_changed (window);
    }

+  g_free (old_monitor_infos);
  g_slist_free (windows);

  meta_screen_queue_check_fullscreen (screen);
@@ -3681,17 +3806,3 @@ meta_screen_get_monitor_in_fullscreen (MetaScreen  *screen,
  /* We use -1 as a flag to mean "not known yet" for notification purposes */
  return screen->monitor_infos[monitor].in_fullscreen == TRUE;
 }
-
-gboolean
-meta_screen_handle_xevent (MetaScreen *screen,
-                           XEvent     *xevent)
-{
-  /* Go through our helpers and see if they want this event.
-     Currently, only MetaCursorTracker.
-  */
-
-  if (meta_cursor_tracker_handle_xevent (screen->cursor_tracker, xevent))
-    return TRUE;
-
-  return FALSE;
-}
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -278,7 +278,7 @@ static gboolean
 is_focused_foreach (MetaWindow *window,
                    void       *data)
 {
-  if (window->has_focus)
+  if (window == window->display->expected_focus_window)
    {
      *((gboolean*) data) = TRUE;
      return FALSE;
@@ -335,11 +335,11 @@ get_standalone_layer (MetaWindow *window)
        layer = META_LAYER_BOTTOM;
      else if (window->fullscreen &&
               (focused_transient ||
-                window == window->display->focus_window ||
-                window->display->focus_window == NULL ||
-                (window->display->focus_window != NULL &&
+                window == window->display->expected_focus_window ||
+                window->display->expected_focus_window == NULL ||
+                (window->display->expected_focus_window != NULL &&
                 windows_on_different_monitor (window,
-                                               window->display->focus_window))))
+                                               window->display->expected_focus_window))))
        layer = META_LAYER_FULLSCREEN;
      else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window))
        layer = META_LAYER_TOP;
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -332,8 +332,6 @@ topic_name (MetaDebugTopic topic)
      return "COMPOSITOR";
    case META_DEBUG_EDGE_RESISTANCE:
      return "EDGE_RESISTANCE";
-    case META_DEBUG_DBUS:
-      return "DBUS";
    case META_DEBUG_VERBOSE:
      return "VERBOSE";
    }
@@ -639,13 +637,8 @@ meta_show_dialog (const char *type,

  append_argument (args, "zenity");
  append_argument (args, type);
-
-  if (display)
-    {
-      append_argument (args, "--display");
-      append_argument (args, display);
-    }
-
+  append_argument (args, "--display");
+  append_argument (args, display);
  append_argument (args, "--class");
  append_argument (args, "mutter-dialog");
  append_argument (args, "--title");
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -165,7 +165,7 @@ struct _MetaWindow
   * been overridden (via a client message), the window will cover the union of
   * these monitors.  If not, this is the single monitor which the window's
   * origin is on. */
-  gint fullscreen_monitors[4];
+  long fullscreen_monitors[4];
  
  /* Whether we're trying to constrain the window to be fully onscreen */
  guint require_fully_onscreen : 1;
@@ -277,7 +277,7 @@ struct _MetaWindow
  /* EWHH demands attention flag */
  guint wm_state_demands_attention : 1;
  
-  /* TRUE iff window == window->display->focus_window */
+  /* this flag tracks receipt of focus_in focus_out */
  guint has_focus : 1;

  /* Have we placed this window? */
@@ -325,6 +325,9 @@ struct _MetaWindow
  guint using_net_wm_icon_name         : 1; /* vs. plain wm_icon_name */
  guint using_net_wm_visible_icon_name : 1; /* tracked so we can clear it */

+  /* has a shape mask */
+  guint has_shape : 1;
+
  /* icon props have changed */
  guint need_reread_icon : 1;
  
@@ -346,9 +349,6 @@ struct _MetaWindow
  /* if non-NULL, the bounds of the window frame */
  cairo_region_t *frame_bounds;

-  /* if non-NULL, the bounding shape region of the window */
-  cairo_region_t *shape_region;
-
  /* if non-NULL, the opaque region _NET_WM_OPAQUE_REGION */
  cairo_region_t *opaque_region;

@@ -394,9 +394,6 @@ struct _MetaWindow
   */
  MetaRectangle rect;

-  gboolean has_custom_frame_extents;
-  GtkBorder custom_frame_extents;
-
  /* The geometry to restore when we unmaximize.  The position is in
   * root window coords, even if there's a frame, which contrasts with
   * window->rect above.  Note that this gives the position and size
@@ -593,8 +590,9 @@ gboolean meta_window_property_notify   (MetaWindow *window,
                                        XEvent     *event);
 gboolean meta_window_client_message    (MetaWindow *window,
                                        XEvent     *event);
-void     meta_window_set_focused_internal (MetaWindow *window,
-                                           gboolean    focused);
+gboolean meta_window_notify_focus      (MetaWindow *window,
+                                        XIEnterEvent *event);
+void     meta_window_lost_focus        (MetaWindow *window);

 void     meta_window_set_current_workspace_hint (MetaWindow *window);

@@ -665,6 +663,7 @@ void meta_window_update_icon_now (MetaWindow *window);

 void meta_window_update_role (MetaWindow *window);
 void meta_window_update_net_wm_type (MetaWindow *window);
+void meta_window_update_opaque_region (MetaWindow *window);
 void meta_window_update_for_monitors_changed (MetaWindow *window);
 void meta_window_update_on_all_workspaces (MetaWindow *window);

@@ -678,12 +677,4 @@ void meta_window_compute_tile_match (MetaWindow *window);

 gboolean meta_window_updates_are_frozen (MetaWindow *window);

-void meta_window_set_opaque_region        (MetaWindow     *window,
-                                           cairo_region_t *region);
-void meta_window_update_opaque_region_x11 (MetaWindow *window);
-
-void meta_window_set_shape_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
-void meta_window_update_shape_region_x11  (MetaWindow *window);
-
 #endif
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -289,35 +289,6 @@ reload_icon_geometry (MetaWindow    *window,
    }
 }

-static void
-reload_gtk_frame_extents (MetaWindow    *window,
-                          MetaPropValue *value,
-                          gboolean       initial)
-{
-  if (value->type != META_PROP_VALUE_INVALID)
-    {
-      if (value->v.cardinal_list.n_cardinals != 4)
-        {
-          meta_verbose ("_GTK_FRAME_EXTENTS on %s has %d values instead of 4\n",
-                        window->desc, value->v.cardinal_list.n_cardinals);
-        }
-      else
-        {
-          GtkBorder *extents = &window->custom_frame_extents;
-
-          window->has_custom_frame_extents = TRUE;
-          extents->left   = (int)value->v.cardinal_list.cardinals[0];
-          extents->right  = (int)value->v.cardinal_list.cardinals[1];
-          extents->top    = (int)value->v.cardinal_list.cardinals[2];
-          extents->bottom = (int)value->v.cardinal_list.cardinals[3];
-        }
-    }
-  else
-    {
-      window->has_custom_frame_extents = FALSE;
-    }
-}
-
 static void
 reload_struts (MetaWindow    *window,
               MetaPropValue *value,
@@ -565,7 +536,7 @@ reload_opaque_region (MetaWindow    *window,
                      MetaPropValue *value,
                      gboolean       initial)
 {
-  meta_window_update_opaque_region_x11 (window);
+  meta_window_update_opaque_region (window);
 }

 static void
@@ -1795,7 +1766,6 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
    { display->atom__GTK_WINDOW_OBJECT_PATH,           META_PROP_VALUE_UTF8,         reload_gtk_window_object_path,           TRUE, FALSE },
    { display->atom__GTK_APP_MENU_OBJECT_PATH,         META_PROP_VALUE_UTF8,         reload_gtk_app_menu_object_path,         TRUE, FALSE },
    { display->atom__GTK_MENUBAR_OBJECT_PATH,          META_PROP_VALUE_UTF8,         reload_gtk_menubar_object_path,          TRUE, FALSE },
-    { display->atom__GTK_FRAME_EXTENTS,                META_PROP_VALUE_CARDINAL_LIST,reload_gtk_frame_extents,                TRUE, FALSE },
    { display->atom__NET_WM_USER_TIME_WINDOW, META_PROP_VALUE_WINDOW, reload_net_wm_user_time_window, TRUE, FALSE },
    { display->atom_WM_STATE,          META_PROP_VALUE_INVALID,  NULL,                     FALSE, FALSE },
    { display->atom__NET_WM_ICON,      META_PROP_VALUE_INVALID,  reload_net_wm_icon,       FALSE, FALSE },
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -145,8 +145,6 @@ static void meta_window_move_between_rects (MetaWindow          *window,
 static void unmaximize_window_before_freeing (MetaWindow        *window);
 static void unminimize_window_and_all_transient_parents (MetaWindow *window);

-static void meta_window_update_monitor (MetaWindow *window);
-
 /* Idle handlers for the three queues (run with meta_later_add()). The
 * "data" parameter in each case will be a GINT_TO_POINTER of the
 * index into the queue arrays to use.
@@ -255,8 +253,6 @@ meta_window_finalize (GObject *object)
  g_free (window->gtk_window_object_path);
  g_free (window->gtk_app_menu_object_path);
  g_free (window->gtk_menubar_object_path);
-
-  G_OBJECT_CLASS (meta_window_parent_class)->finalize (object);
 }

 static void
@@ -825,6 +821,7 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  gulong existing_wm_state;
  gulong event_mask;
  MetaMoveResizeFlags flags;
+  gboolean has_shape;
  MetaScreen *screen;

  g_assert (attrs != NULL);
@@ -958,9 +955,29 @@ meta_window_new_with_attrs (MetaDisplay       *display,
    XISelectEvents (display->xdisplay, xwindow, &mask, 1);
  }

+  has_shape = FALSE;
 #ifdef HAVE_SHAPE
  if (META_DISPLAY_HAS_SHAPE (display))
-    XShapeSelectInput (display->xdisplay, xwindow, ShapeNotifyMask);
+    {
+      int x_bounding, y_bounding, x_clip, y_clip;
+      unsigned w_bounding, h_bounding, w_clip, h_clip;
+      int bounding_shaped, clip_shaped;
+
+      XShapeSelectInput (display->xdisplay, xwindow, ShapeNotifyMask);
+
+      XShapeQueryExtents (display->xdisplay, xwindow,
+                          &bounding_shaped, &x_bounding, &y_bounding,
+                          &w_bounding, &h_bounding,
+                          &clip_shaped, &x_clip, &y_clip,
+                          &w_clip, &h_clip);
+
+      has_shape = bounding_shaped != FALSE;
+
+      meta_topic (META_DEBUG_SHAPES,
+                  "Window has_shape = %d extents %d,%d %u x %u\n",
+                  has_shape, x_bounding, y_bounding,
+                  w_bounding, h_bounding);
+    }
 #endif

  /* Get rid of any borders */
@@ -1020,6 +1037,8 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  /* avoid tons of stack updates */
  meta_stack_freeze (window->screen->stack);

+  window->has_shape = has_shape;
+
  window->rect.x = attrs->x;
  window->rect.y = attrs->y;
  window->rect.width = attrs->width;
@@ -1190,8 +1209,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,

  meta_display_register_x_window (display, &window->xwindow, window);

-  meta_window_update_shape_region_x11 (window);
-
  /* Assign this #MetaWindow a sequence number which can be used
   * for sorting.
   */
@@ -1735,6 +1752,16 @@ meta_window_unmanage (MetaWindow  *window,
                                           window,
                                           timestamp);
    }
+  else if (window->display->expected_focus_window == window)
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "Focusing default window since expected focus window freed %s\n",
+                  window->desc);
+      window->display->expected_focus_window = NULL;
+      meta_workspace_focus_default_window (window->screen->active_workspace,
+                                           window,
+                                           timestamp);
+    }
  else
    {
      meta_topic (META_DEBUG_FOCUS,
@@ -1742,8 +1769,6 @@ meta_window_unmanage (MetaWindow  *window,
                  window->desc);
    }

-  g_assert (window->display->focus_window != window);
-
  if (window->struts)
    {
      meta_free_gslist_and_elements (window->struts);
@@ -1766,6 +1791,12 @@ meta_window_unmanage (MetaWindow  *window,

  g_assert (window->display->grab_window != window);

+  if (window->display->focus_window == window)
+    {
+      window->display->focus_window = NULL;
+      g_object_notify (G_OBJECT (window->display), "focus-window");
+    }
+
  if (window->maximized_horizontally || window->maximized_vertically)
    unmaximize_window_before_freeing (window);

@@ -2087,14 +2118,10 @@ set_net_wm_state (MetaWindow *window)

  if (window->fullscreen)
    {
-      data[0] = meta_screen_monitor_index_to_xinerama_index (window->screen,
-                                                             window->fullscreen_monitors[0]);
-      data[1] = meta_screen_monitor_index_to_xinerama_index (window->screen,
-                                                             window->fullscreen_monitors[1]);
-      data[2] = meta_screen_monitor_index_to_xinerama_index (window->screen,
-                                                             window->fullscreen_monitors[2]);
-      data[3] = meta_screen_monitor_index_to_xinerama_index (window->screen,
-                                                             window->fullscreen_monitors[3]);
+      data[0] = window->fullscreen_monitors[0];
+      data[1] = window->fullscreen_monitors[1];
+      data[2] = window->fullscreen_monitors[2];
+      data[3] = window->fullscreen_monitors[3];

      meta_verbose ("Setting _NET_WM_FULLSCREEN_MONITORS\n");
      meta_error_trap_push (window->display);
@@ -3303,7 +3330,14 @@ meta_window_hide (MetaWindow *window)
      invalidate_work_areas (window);
    }

-  if (window->has_focus)
+  /* The check on expected_focus_window is a temporary workaround for
+   *  https://bugzilla.gnome.org/show_bug.cgi?id=597352
+   * We may have already switched away from this window but not yet
+   * gotten FocusIn/FocusOut events. A more complete comprehensive
+   * fix for these type of issues is described in the bug.
+   */
+  if (window->has_focus &&
+      window == window->display->expected_focus_window)
    {
      MetaWindow *not_this_one = NULL;
      MetaWorkspace *my_workspace = meta_window_get_workspace (window);
@@ -4752,12 +4786,6 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
  if (window->type == META_WINDOW_DESKTOP)
    return;

-  if (window->override_redirect)
-    {
-      meta_window_update_monitor (window);
-      return;
-    }
-
  old = window->monitor;

  /* Start on primary */
@@ -4768,8 +4796,7 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
    {
      MetaMonitorInfo *info = &window->screen->monitor_infos[i];

-      if (info->output_id != 0 &&
-          info->output_id == old->output_id)
+      if (info->output == old->output)
        {
          new = info;
          break;
@@ -5805,18 +5832,7 @@ meta_window_get_outer_rect (const MetaWindow *window,
      rect->height -= borders.invisible.top  + borders.invisible.bottom;
    }
  else
-    {
-      *rect = window->rect;
-
-      if (window->has_custom_frame_extents)
-        {
-          const GtkBorder *extents = &window->custom_frame_extents;
-          rect->x += extents->left;
-          rect->y += extents->top;
-          rect->width -= extents->left + extents->right;
-          rect->height -= extents->top + extents->bottom;
-        }
-    }
+    *rect = window->rect;
 }

 const char*
@@ -5957,10 +5973,10 @@ meta_window_focus (MetaWindow  *window,
          meta_topic (META_DEBUG_FOCUS,
                      "Sending WM_TAKE_FOCUS to %s since take_focus = true\n",
                      window->desc);
-
-          meta_display_request_take_focus (window->display,
-                                           window,
-                                           timestamp);
+          meta_window_send_icccm_message (window,
+                                          window->display->atom_WM_TAKE_FOCUS,
+                                          timestamp);
+          window->display->expected_focus_window = window;
        }
    }

@@ -6500,7 +6516,7 @@ meta_window_configure_request (MetaWindow *window,
  if (event->xconfigurerequest.value_mask & CWStackMode)
    {
      MetaWindow *active_window;
-      active_window = window->display->focus_window;
+      active_window = window->display->expected_focus_window;
      if (meta_prefs_get_disable_workarounds ())
        {
          meta_topic (META_DEBUG_STACK,
@@ -6608,41 +6624,6 @@ meta_window_change_workspace_by_index (MetaWindow *window,
 #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD    10
 #define _NET_WM_MOVERESIZE_CANCEL           11

-static int
-query_pressed_buttons (MetaWindow *window)
-{
-  double x, y, query_root_x, query_root_y;
-  Window root, child;
-  XIButtonState buttons;
-  XIModifierState mods;
-  XIGroupState group;
-  int button = 0;
-
-  meta_error_trap_push (window->display);
-  XIQueryPointer (window->display->xdisplay,
-                  META_VIRTUAL_CORE_POINTER_ID,
-                  window->xwindow,
-                  &root, &child,
-                  &query_root_x, &query_root_y,
-                  &x, &y,
-                  &buttons, &mods, &group);
-
-  if (meta_error_trap_pop_with_return (window->display) != Success)
-    goto out;
-
-  if (XIMaskIsSet (buttons.mask, Button1))
-    button |= 1 << 1;
-  if (XIMaskIsSet (buttons.mask, Button2))
-    button |= 1 << 2;
-  if (XIMaskIsSet (buttons.mask, Button3))
-    button |= 1 << 3;
-
-  free (buttons.mask);
-
- out:
-  return button;
-}
-
 gboolean
 meta_window_client_message (MetaWindow *window,
                            XEvent     *event)
@@ -7001,58 +6982,56 @@ meta_window_client_message (MetaWindow *window,
                (op != META_GRAB_OP_MOVING &&
                 op != META_GRAB_OP_KEYBOARD_MOVING))))
        {
-          int button_mask;
-
-          meta_topic (META_DEBUG_WINDOW_OPS,
-                      "Beginning move/resize with button = %d\n", button);
-          meta_display_begin_grab_op (window->display,
-                                      window->screen,
-                                      window,
-                                      op,
-                                      FALSE,
-                                      frame_action,
-                                      button, 0,
-                                      timestamp,
-                                      x_root,
-                                      y_root);
-
-          button_mask = query_pressed_buttons (window);
-
+          /*
+           * the button SHOULD already be included in the message
+           */
          if (button == 0)
            {
-              /*
-               * the button SHOULD already be included in the message
+              double x, y, query_root_x, query_root_y;
+              Window root, child;
+              XIButtonState buttons;
+              XIModifierState mods;
+              XIGroupState group;
+
+              /* The race conditions in this _NET_WM_MOVERESIZE thing
+               * are mind-boggling
               */
-              if ((button_mask & (1 << 1)) != 0)
+              meta_error_trap_push (window->display);
+              XIQueryPointer (window->display->xdisplay,
+                              META_VIRTUAL_CORE_POINTER_ID,
+                              window->xwindow,
+                              &root, &child,
+                              &query_root_x, &query_root_y,
+                              &x, &y,
+                              &buttons, &mods, &group);
+              meta_error_trap_pop (window->display);
+
+              if (XIMaskIsSet (buttons.mask, Button1))
                button = 1;
-              else if ((button_mask & (1 << 2)) != 0)
+              else if (XIMaskIsSet (buttons.mask, Button2))
                button = 2;
-              else if ((button_mask & (1 << 3)) != 0)
+              else if (XIMaskIsSet (buttons.mask, Button3))
                button = 3;
-
-              if (button != 0)
-                window->display->grab_button = button;
              else
-                meta_display_end_grab_op (window->display,
-                                          timestamp);
-            }
-          else
-            {
-              /* There is a potential race here. If the user presses and
-               * releases their mouse button very fast, it's possible for
-               * both the ButtonPress and ButtonRelease to be sent to the
-               * client before it can get a chance to send _NET_WM_MOVERESIZE
-               * to us. When that happens, we'll become stuck in a grab
-               * state, as we haven't received a ButtonRelease to cancel the
-               * grab.
-               *
-               * We can solve this by querying after we take the explicit
-               * pointer grab -- if the button isn't pressed, we cancel the
-               * drag immediately.
-               */
+                button = 0;

-              if ((button_mask & (1 << button)) == 0)
-                meta_display_end_grab_op (window->display, timestamp);
+              free (buttons.mask);
+            }
+
+          if (button != 0)
+            {
+              meta_topic (META_DEBUG_WINDOW_OPS,
+                          "Beginning move/resize with button = %d\n", button);
+              meta_display_begin_grab_op (window->display,
+                                          window->screen,
+                                          window,
+                                          op,
+                                          FALSE,
+                                          frame_action,
+                                          button, 0,
+                                          timestamp,
+                                          x_root,
+                                          y_root);
            }
        }

@@ -7114,14 +7093,10 @@ meta_window_client_message (MetaWindow *window,
      meta_verbose ("_NET_WM_FULLSCREEN_MONITORS request for window '%s'\n",
                    window->desc);

-      top = meta_screen_xinerama_index_to_monitor_index (window->screen,
-                                                         event->xclient.data.l[0]);
-      bottom = meta_screen_xinerama_index_to_monitor_index (window->screen,
-                                                            event->xclient.data.l[1]);
-      left = meta_screen_xinerama_index_to_monitor_index (window->screen,
-                                                          event->xclient.data.l[2]);
-      right = meta_screen_xinerama_index_to_monitor_index (window->screen,
-                                                           event->xclient.data.l[3]);
+      top = event->xclient.data.l[0];
+      bottom = event->xclient.data.l[1];
+      left = event->xclient.data.l[2];
+      right = event->xclient.data.l[3];
      /* source_indication = event->xclient.data.l[4]; */

      meta_window_update_fullscreen_monitors (window, top, bottom, left, right);
@@ -7183,7 +7158,8 @@ meta_window_propagate_focus_appearance (MetaWindow *window,
          parent->attached_focus_window = NULL;
        }

-      if (child_focus_state_changed && !parent->has_focus)
+      if (child_focus_state_changed && !parent->has_focus &&
+          parent != window->display->expected_focus_window)
        {
          meta_window_appears_focused_changed (parent);
        }
@@ -7194,85 +7170,23 @@ meta_window_propagate_focus_appearance (MetaWindow *window,
 }

 void
-meta_window_set_focused_internal (MetaWindow *window,
-                                  gboolean    focused)
+meta_window_lost_focus (MetaWindow *window)
 {
-  if (focused)
+  if (window == window->display->focus_window)
    {
-      window->has_focus = TRUE;
-      if (window->override_redirect)
-        return;
+      meta_topic (META_DEBUG_FOCUS,
+                  "%s is now the previous focus window due to being focused out or unmapped\n",
+                  window->desc);

-      /* Move to the front of the focusing workspace's MRU list.
-       * We should only be "removing" it from the MRU list if it's
-       * not already there.  Note that it's possible that we might
-       * be processing this FocusIn after we've changed to a
-       * different workspace; we should therefore update the MRU
-       * list only if the window is actually on the active
-       * workspace.
-       */
-      if (window->screen->active_workspace &&
-          meta_window_located_on_workspace (window,
-                                            window->screen->active_workspace))
-        {
-          GList* link;
-          link = g_list_find (window->screen->active_workspace->mru_list,
-                              window);
-          g_assert (link);
-
-          window->screen->active_workspace->mru_list =
-            g_list_remove_link (window->screen->active_workspace->mru_list,
-                                link);
-          g_list_free (link);
-
-          window->screen->active_workspace->mru_list =
-            g_list_prepend (window->screen->active_workspace->mru_list,
-                            window);
-        }
-
-      if (window->frame)
-        meta_frame_queue_draw (window->frame);
-
-      meta_error_trap_push (window->display);
-      XInstallColormap (window->display->xdisplay,
-                        window->colormap);
-      meta_error_trap_pop (window->display);
-
-      /* move into FOCUSED_WINDOW layer */
-      meta_window_update_layer (window);
-
-      /* Ungrab click to focus button since the sync grab can interfere
-       * with some things you might do inside the focused window, by
-       * causing the client to get funky enter/leave events.
-       *
-       * The reason we usually have a passive grab on the window is
-       * so that we can intercept clicks and raise the window in
-       * response. For click-to-focus we don't need that since the
-       * focused window is already raised. When raise_on_click is
-       * FALSE we also don't need that since we don't do anything
-       * when the window is clicked.
-       *
-       * There is dicussion in bugs 102209, 115072, and 461577
-       */
-      if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
-          !meta_prefs_get_raise_on_click())
-        meta_display_ungrab_focus_window_button (window->display, window);
-
-      g_signal_emit (window, window_signals[FOCUS], 0);
-
-      if (!window->attached_focus_window)
-        meta_window_appears_focused_changed (window);
-
-      meta_window_propagate_focus_appearance (window, TRUE);
-    }
-  else
-    {
-      window->has_focus = FALSE;
-      if (window->override_redirect)
-        return;
+      meta_topic (META_DEBUG_FOCUS,
+                  "* Focus --> NULL (was %s)\n", window->desc);

      meta_window_propagate_focus_appearance (window, FALSE);

+      window->display->focus_window = NULL;
+      g_object_notify (G_OBJECT (window->display), "focus-window");
+      window->has_focus = FALSE;
+
      if (!window->attached_focus_window)
        meta_window_appears_focused_changed (window);

@@ -7291,6 +7205,176 @@ meta_window_set_focused_internal (MetaWindow *window,
    }
 }

+gboolean
+meta_window_notify_focus (MetaWindow   *window,
+                          XIEnterEvent *event)
+{
+  /* note the event can be on either the window or the frame,
+   * we focus the frame for shaded windows
+   */
+
+  /* The event can be FocusIn, FocusOut, or UnmapNotify.
+   * On UnmapNotify we have to pretend it's focus out,
+   * because we won't get a focus out if it occurs, apparently.
+   */
+
+  /* We ignore grabs, though this is questionable.
+   * It may be better to increase the intelligence of
+   * the focus window tracking.
+   *
+   * The problem is that keybindings for windows are done with
+   * XGrabKey, which means focus_window disappears and the front of
+   * the MRU list gets confused from what the user expects once a
+   * keybinding is used.
+   */
+  meta_topic (META_DEBUG_FOCUS,
+              "Focus %s event received on %s 0x%lx (%s) "
+              "mode %s detail %s\n",
+              event->evtype == XI_FocusIn ? "in" :
+              event->evtype == XI_FocusOut ? "out" :
+              "???",
+              window->desc, event->event,
+              event->event == window->xwindow ?
+              "client window" :
+              (window->frame && event->event == window->frame->xwindow) ?
+              "frame window" :
+              "unknown window",
+              meta_event_mode_to_string (event->mode),
+              meta_event_detail_to_string (event->detail));
+
+  /* FIXME our pointer tracking is broken; see how
+   * gtk+/gdk/x11/gdkevents-x11.c or XFree86/xc/programs/xterm/misc.c
+   * handle it for the correct way.  In brief you need to track
+   * pointer focus and regular focus, and handle EnterNotify in
+   * PointerRoot mode with no window manager.  However as noted above,
+   * accurate focus tracking will break things because we want to keep
+   * windows "focused" when using keybindings on them, and also we
+   * sometimes "focus" a window by focusing its frame or
+   * no_focus_window; so this all needs rethinking massively.
+   *
+   * My suggestion is to change it so that we clearly separate
+   * actual keyboard focus tracking using the xterm algorithm,
+   * and mutter's "pretend" focus window, and go through all
+   * the code and decide which one should be used in each place;
+   * a hard bit is deciding on a policy for that.
+   *
+   * http://bugzilla.gnome.org/show_bug.cgi?id=90382
+   */
+
+  if ((event->evtype == XI_FocusIn ||
+       event->evtype == XI_FocusOut) &&
+      (event->mode == NotifyGrab ||
+       event->mode == NotifyUngrab ||
+       /* From WindowMaker, ignore all funky pointer root events */
+       event->detail > NotifyNonlinearVirtual))
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "Ignoring focus event generated by a grab or other weirdness\n");
+      return TRUE;
+    }
+
+  if (event->evtype == XI_FocusIn)
+    {
+      if (window->override_redirect)
+        {
+          window->display->focus_window = NULL;
+          g_object_notify (G_OBJECT (window->display), "focus-window");
+          return FALSE;
+        }
+
+      if (window != window->display->focus_window)
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "* Focus --> %s\n", window->desc);
+          window->display->focus_window = window;
+          window->has_focus = TRUE;
+
+          /* Move to the front of the focusing workspace's MRU list.
+           * We should only be "removing" it from the MRU list if it's
+           * not already there.  Note that it's possible that we might
+           * be processing this FocusIn after we've changed to a
+           * different workspace; we should therefore update the MRU
+           * list only if the window is actually on the active
+           * workspace.
+           */
+          if (window->screen->active_workspace &&
+              meta_window_located_on_workspace (window,
+                                                window->screen->active_workspace))
+            {
+              GList* link;
+              link = g_list_find (window->screen->active_workspace->mru_list,
+                                  window);
+              g_assert (link);
+
+              window->screen->active_workspace->mru_list =
+                g_list_remove_link (window->screen->active_workspace->mru_list,
+                                    link);
+              g_list_free (link);
+
+              window->screen->active_workspace->mru_list =
+                g_list_prepend (window->screen->active_workspace->mru_list,
+                                window);
+            }
+
+          if (window->frame)
+            meta_frame_queue_draw (window->frame);
+
+          meta_error_trap_push (window->display);
+          XInstallColormap (window->display->xdisplay,
+                            window->colormap);
+          meta_error_trap_pop (window->display);
+
+          /* move into FOCUSED_WINDOW layer */
+          meta_window_update_layer (window);
+
+          /* Ungrab click to focus button since the sync grab can interfere
+           * with some things you might do inside the focused window, by
+           * causing the client to get funky enter/leave events.
+           *
+           * The reason we usually have a passive grab on the window is
+           * so that we can intercept clicks and raise the window in
+           * response. For click-to-focus we don't need that since the
+           * focused window is already raised. When raise_on_click is
+           * FALSE we also don't need that since we don't do anything
+           * when the window is clicked.
+           *
+           * There is dicussion in bugs 102209, 115072, and 461577
+           */
+          if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
+              !meta_prefs_get_raise_on_click())
+            meta_display_ungrab_focus_window_button (window->display, window);
+
+          g_signal_emit (window, window_signals[FOCUS], 0);
+          g_object_notify (G_OBJECT (window->display), "focus-window");
+
+          if (!window->attached_focus_window)
+            meta_window_appears_focused_changed (window);
+
+          meta_window_propagate_focus_appearance (window, TRUE);
+        }
+    }
+  else if (event->evtype == XI_FocusOut)
+    {
+      if (event->detail == NotifyInferior)
+        {
+          /* This event means the client moved focus to a subwindow */
+          meta_topic (META_DEBUG_FOCUS,
+                      "Ignoring focus out on %s with NotifyInferior\n",
+                      window->desc);
+          return TRUE;
+        }
+      else
+        {
+          meta_window_lost_focus (window);
+        }
+    }
+
+  /* Now set _NET_ACTIVE_WINDOW hint */
+  meta_display_update_active_window_hint (window->display);
+
+  return FALSE;
+}
+
 static gboolean
 process_property_notify (MetaWindow     *window,
                         XPropertyEvent *event)
@@ -7616,25 +7700,14 @@ meta_window_update_net_wm_type (MetaWindow *window)
 }

 void
-meta_window_set_opaque_region (MetaWindow     *window,
-                               cairo_region_t *region)
-{
-  g_clear_pointer (&window->opaque_region, cairo_region_destroy);
-
-  if (region != NULL)
-    window->opaque_region = cairo_region_reference (region);
-
-  if (window->display->compositor)
-    meta_compositor_window_shape_changed (window->display->compositor, window);
-}
-
-void
-meta_window_update_opaque_region_x11 (MetaWindow *window)
+meta_window_update_opaque_region (MetaWindow *window)
 {
  cairo_region_t *opaque_region = NULL;
  gulong *region = NULL;
  int nitems;

+  g_clear_pointer (&window->opaque_region, cairo_region_destroy);
+
  if (meta_prop_get_cardinal_list (window->display,
                                   window->xwindow,
                                   window->display->atom__NET_WM_OPAQUE_REGION,
@@ -7677,108 +7750,13 @@ meta_window_update_opaque_region_x11 (MetaWindow *window)
    }

 out:
+  window->opaque_region = opaque_region;
  meta_XFree (region);

-  meta_window_set_opaque_region (window, opaque_region);
-  cairo_region_destroy (opaque_region);
-}
-
-static cairo_region_t *
-region_create_from_x_rectangles (const XRectangle *rects,
-                                 int n_rects)
-{
-  int i;
-  cairo_rectangle_int_t *cairo_rects = g_newa (cairo_rectangle_int_t, n_rects);
-
-  for (i = 0; i < n_rects; i ++)
-    {
-      cairo_rects[i].x = rects[i].x;
-      cairo_rects[i].y = rects[i].y;
-      cairo_rects[i].width = rects[i].width;
-      cairo_rects[i].height = rects[i].height;
-    }
-
-  return cairo_region_create_rectangles (cairo_rects, n_rects);
-}
-
-void
-meta_window_set_shape_region (MetaWindow     *window,
-                              cairo_region_t *region)
-{
-  g_clear_pointer (&window->shape_region, cairo_region_destroy);
-
-  if (region != NULL)
-    window->shape_region = cairo_region_reference (region);
-
  if (window->display->compositor)
    meta_compositor_window_shape_changed (window->display->compositor, window);
 }

-void
-meta_window_update_shape_region_x11 (MetaWindow *window)
-{
-  cairo_region_t *region = NULL;
-
-#ifdef HAVE_SHAPE
-  if (META_DISPLAY_HAS_SHAPE (window->display))
-    {
-      /* Translate the set of XShape rectangles that we
-       * get from the X server to a cairo_region. */
-      XRectangle *rects = NULL;
-      int n_rects, ordering;
-
-      int x_bounding, y_bounding, x_clip, y_clip;
-      unsigned w_bounding, h_bounding, w_clip, h_clip;
-      int bounding_shaped, clip_shaped;
-
-      meta_error_trap_push (window->display);
-      XShapeQueryExtents (window->display->xdisplay, window->xwindow,
-                          &bounding_shaped, &x_bounding, &y_bounding,
-                          &w_bounding, &h_bounding,
-                          &clip_shaped, &x_clip, &y_clip,
-                          &w_clip, &h_clip);
-
-      if (bounding_shaped)
-        {
-          rects = XShapeGetRectangles (window->display->xdisplay,
-                                       window->xwindow,
-                                       ShapeBounding,
-                                       &n_rects,
-                                       &ordering);
-        }
-      meta_error_trap_pop (window->display);
-
-      if (rects)
-        {
-          region = region_create_from_x_rectangles (rects, n_rects);
-          XFree (rects);
-        }
-    }
-#endif
-
-  if (region != NULL)
-    {
-      cairo_rectangle_int_t client_area;
-
-      client_area.x = 0;
-      client_area.y = 0;
-      client_area.width = window->rect.width;
-      client_area.height = window->rect.height;
-
-      /* The shape we get back from the client may have coordinates
-       * outside of the frame. The X SHAPE Extension requires that
-       * the overall shape the client provides never exceeds the
-       * "bounding rectangle" of the window -- the shape that the
-       * window would have gotten if it was unshaped. In our case,
-       * this is simply the client area.
-       */
-      cairo_region_intersect_rectangle (region, &client_area);
-    }
-
-  meta_window_set_shape_region (window, region);
-  cairo_region_destroy (region);
-}
-
 static void
 redraw_icon (MetaWindow *window)
 {
@@ -8356,6 +8334,9 @@ recalc_window_features (MetaWindow *window)
  if (window->type == META_WINDOW_TOOLBAR)
    window->decorated = FALSE;

+  if (meta_window_is_attached_dialog (window))
+    window->border_only = TRUE;
+
  if (window->type == META_WINDOW_DESKTOP ||
      window->type == META_WINDOW_DOCK ||
      window->override_redirect)
@@ -8480,13 +8461,10 @@ recalc_window_features (MetaWindow *window)

    case META_WINDOW_DIALOG:
    case META_WINDOW_MODAL_DIALOG:
-      /* only skip taskbar if we have a real transient parent
-         (and ignore the application hints) */
+      /* only skip taskbar if we have a real transient parent */
      if (window->xtransient_for != None &&
          window->xtransient_for != window->screen->xroot)
        window->skip_taskbar = TRUE;
-      else
-        window->skip_taskbar = FALSE;
      break;

    case META_WINDOW_NORMAL:
@@ -9029,7 +9007,7 @@ update_move (MetaWindow  *window,
       * refers to the monitor which contains the largest part of the window,
       * the latter to the one where the pointer is located.
       */
-      monitor = meta_screen_get_current_monitor_info_for_pos (window->screen, x, y);
+      monitor = meta_screen_get_current_monitor_info (window->screen);
      meta_window_get_work_area_for_monitor (window,
                                             monitor->number,
                                             &work_area);
@@ -11091,7 +11069,7 @@ meta_window_get_frame_type (MetaWindow *window)
      /* can't add border if undecorated */
      return META_FRAME_TYPE_LAST;
    }
-  else if (window->border_only ||
+  else if ((window->border_only && base_type != META_FRAME_TYPE_ATTACHED) ||
           (window->hide_titlebar_when_maximized && META_WINDOW_MAXIMIZED (window)) ||
           (window->hide_titlebar_when_maximized && META_WINDOW_TILED_SIDE_BY_SIDE (window)))
    {
@@ -11238,9 +11216,3 @@ meta_window_compute_tile_match (MetaWindow *window)
      window->tile_match = match;
    }
 }
-
-gboolean
-meta_window_can_close (MetaWindow *window)
-{
-  return window->has_close_func;
-}
--- a/src/idle-monitor.xml
+++ b/src/idle-monitor.xml
@@ -1,35 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-  <!--
-      org.gnome.Mutter.IdleMonitor:
-      @short_description: idle monitor interface
-
-      This interface is used by gnome-desktop to implement
-      user activity monitoring.
-  -->
-
-  <interface name="org.gnome.Mutter.IdleMonitor">
-    <method name="GetIdletime">
-      <arg name="idletime" direction="out" type="t"/>
-    </method>
-
-    <method name="AddIdleWatch">
-      <arg name="interval" direction="in" type="t" />
-      <arg name="id" direction="out" type="u" />
-    </method>
-
-    <method name="AddUserActiveWatch">
-      <arg name="id" direction="out" type="u" />
-    </method>
-
-    <method name="RemoveWatch">
-      <arg name="id" direction="in" type="u" />
-    </method>
-
-    <signal name="WatchFired">
-      <arg name="id" direction="out" type="u" />
-    </signal>
-  </interface>
-</node>
--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -54,6 +54,9 @@ item(WM_WINDOW_ROLE)
 item(UTF8_STRING)
 item(WM_ICON_SIZE)
 item(_KWM_WIN_ICON)
+item(_MUTTER_RELOAD_THEME_MESSAGE)
+item(_MUTTER_SET_KEYBINDINGS_MESSAGE)
+item(_MUTTER_TOGGLE_VERBOSE)
 item(_MUTTER_HINTS)
 item(_GTK_THEME_VARIANT)
 item(_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED)
@@ -63,16 +66,12 @@ item(_GTK_APPLICATION_OBJECT_PATH)
 item(_GTK_WINDOW_OBJECT_PATH)
 item(_GTK_APP_MENU_OBJECT_PATH)
 item(_GTK_MENUBAR_OBJECT_PATH)
-item(_GTK_FRAME_EXTENTS)
 item(_GNOME_WM_KEYBINDINGS)
 item(_GNOME_PANEL_ACTION)
 item(_GNOME_PANEL_ACTION_MAIN_MENU)
 item(_GNOME_PANEL_ACTION_RUN_DIALOG)
-item(_MUTTER_TIMESTAMP_PING)
-item(_MUTTER_FOCUS_SET)
 item(_MUTTER_SENTINEL)
 item(_MUTTER_VERSION)
-item(_MUTTER_PRESENTATION_OUTPUT)
 item(WM_CLIENT_MACHINE)
 item(MANAGER)
 item(TARGETS)
@@ -80,7 +79,6 @@ item(MULTIPLE)
 item(TIMESTAMP)
 item(VERSION)
 item(ATOM_PAIR)
-item(BACKLIGHT)

 /* Oddities: These are used, and we need atoms for them,
 * but when we need all _NET_WM hints (i.e. when we're making
--- a/src/meta/compositor-mutter.h
+++ b/src/meta/compositor-mutter.h
@@ -35,6 +35,7 @@

 /* Public compositor API */
 ClutterActor *meta_get_stage_for_screen         (MetaScreen *screen);
+ClutterActor *meta_get_overlay_group_for_screen (MetaScreen *screen);
 Window        meta_get_overlay_window           (MetaScreen *screen);
 GList        *meta_get_window_actors            (MetaScreen *screen);
 ClutterActor *meta_get_window_group_for_screen  (MetaScreen *screen);
@@ -46,8 +47,5 @@ void        meta_enable_unredirect_for_screen   (MetaScreen *screen);
 void meta_set_stage_input_region     (MetaScreen    *screen,
                                      XserverRegion  region);
 void meta_empty_stage_input_region   (MetaScreen    *screen);
-void meta_focus_stage_window         (MetaScreen    *screen,
-                                      guint32        timestamp);
-gboolean meta_stage_is_focused       (MetaScreen    *screen);

 #endif
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -165,10 +165,6 @@ void meta_display_set_input_focus_window   (MetaDisplay *display,
                                            gboolean     focus_frame,
                                            guint32      timestamp);

-void meta_display_request_take_focus       (MetaDisplay *display,
-                                            MetaWindow  *window,
-                                            guint32      timestamp);
-
 /* meta_display_focus_the_no_focus_window is called when the
 * designated no_focus_window should be focused, but is otherwise the
 * same as meta_display_set_input_focus_window
@@ -191,11 +187,12 @@ void meta_display_unmanage_screen (MetaDisplay *display,

 void meta_display_clear_mouse_mode (MetaDisplay *display);

-void meta_display_freeze_keyboard (MetaDisplay *display,
-                                   Window       window,
-                                   guint32      timestamp);
+void meta_display_grab_keyboard (MetaDisplay *display,
+                                 guint32      timestamp);
 void meta_display_ungrab_keyboard (MetaDisplay *display,
                                   guint32      timestamp);
+void meta_display_freeze_keyboard (MetaDisplay *display,
+                                   guint32      timestamp);
 void meta_display_unfreeze_keyboard (MetaDisplay *display,
                                     guint32      timestamp);
 #endif
--- a/src/meta/meta-cursor-tracker.h
+++ b/src/meta/meta-cursor-tracker.h
@@ -1,58 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Giovanni Campagna <gcampagn@redhat.com>
- */
-
-#ifndef META_CURSOR_TRACKER_H
-#define META_CURSOR_TRACKER_H
-
-#include <glib-object.h>
-#include <meta/types.h>
-#include <meta/workspace.h>
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-
-#define META_TYPE_CURSOR_TRACKER            (meta_cursor_tracker_get_type ())
-#define META_CURSOR_TRACKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_TRACKER, MetaCursorTracker))
-#define META_CURSOR_TRACKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_TRACKER, MetaCursorTrackerClass))
-#define META_IS_CURSOR_TRACKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_TRACKER))
-#define META_IS_CURSOR_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_TRACKER))
-#define META_CURSOR_TRACKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_TRACKER, MetaCursorTrackerClass))
-
-typedef struct _MetaCursorTrackerClass   MetaCursorTrackerClass;
-
-GType meta_cursor_tracker_get_type (void);
-
-MetaCursorTracker *meta_cursor_tracker_get_for_screen (MetaScreen *screen);
-
-void           meta_cursor_tracker_get_hot    (MetaCursorTracker *tracker,
-                                               int               *x,
-                                               int               *y);
-CoglTexture   *meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker);
-
-void           meta_cursor_tracker_get_pointer (MetaCursorTracker   *tracker,
-                                                int                 *x,
-                                                int                 *y,
-                                                ClutterModifierType *mods);
-void           meta_cursor_tracker_set_pointer_visible (MetaCursorTracker *tracker,
-                                                        gboolean           visible);
-
-#endif
--- a/src/meta/meta-idle-monitor.h
+++ b/src/meta/meta-idle-monitor.h
@@ -1,62 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef META_IDLE_MONITOR_H
-#define META_IDLE_MONITOR_H
-
-#include <glib-object.h>
-#include <meta/types.h>
-
-#define META_TYPE_IDLE_MONITOR            (meta_idle_monitor_get_type ())
-#define META_IDLE_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_IDLE_MONITOR, MetaIdleMonitor))
-#define META_IDLE_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_IDLE_MONITOR, MetaIdleMonitorClass))
-#define META_IS_IDLE_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_IDLE_MONITOR))
-#define META_IS_IDLE_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_IDLE_MONITOR))
-#define META_IDLE_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_IDLE_MONITOR, MetaIdleMonitorClass))
-
-typedef struct _MetaIdleMonitor        MetaIdleMonitor;
-typedef struct _MetaIdleMonitorClass   MetaIdleMonitorClass;
-
-GType meta_idle_monitor_get_type (void);
-
-typedef void (*MetaIdleMonitorWatchFunc) (MetaIdleMonitor *monitor,
-                                          guint            watch_id,
-                                          gpointer         user_data);
-
-MetaIdleMonitor *meta_idle_monitor_get_core (void);
-MetaIdleMonitor *meta_idle_monitor_get_for_device (int device_id);
-
-guint         meta_idle_monitor_add_idle_watch        (MetaIdleMonitor          *monitor,
-						       guint64                   interval_msec,
-						       MetaIdleMonitorWatchFunc  callback,
-						       gpointer                  user_data,
-						       GDestroyNotify            notify);
-
-guint         meta_idle_monitor_add_user_active_watch (MetaIdleMonitor          *monitor,
-						       MetaIdleMonitorWatchFunc  callback,
-						       gpointer                  user_data,
-						       GDestroyNotify            notify);
-
-void          meta_idle_monitor_remove_watch          (MetaIdleMonitor          *monitor,
-						       guint                     id);
-gint64        meta_idle_monitor_get_idletime          (MetaIdleMonitor          *monitor);
-
-#endif
--- a/src/meta/meta-plugin.h
+++ b/src/meta/meta-plugin.h
@@ -205,21 +205,6 @@ struct _MetaPluginClass
  gboolean (*keybinding_filter) (MetaPlugin     *plugin,
                                 MetaKeyBinding *binding);

-  /**
-   * MetaPluginClass::confirm_display_config:
-   * @plugin: a #MetaPlugin
-   *
-   * Virtual function called when the display configuration changes.
-   * The common way to implement this function is to show some form
-   * of modal dialog that should ask the user if everything was ok.
-   *
-   * When confirmed by the user, the plugin must call meta_plugin_complete_display_change()
-   * to make the configuration permanent. If that function is not
-   * called within the timeout, the previous configuration will be
-   * reapplied.
-   */
-  void (*confirm_display_change) (MetaPlugin *plugin);
-
  /**
   * MetaPluginClass::plugin_info:
   * @plugin: a #MetaPlugin
@@ -229,7 +214,6 @@ struct _MetaPluginClass
   * Returns: a #MetaPluginInfo.
   */
  const MetaPluginInfo * (*plugin_info) (MetaPlugin *plugin);
-
 };

 /**
@@ -376,10 +360,6 @@ void
 meta_plugin_destroy_completed (MetaPlugin      *plugin,
                               MetaWindowActor *actor);

-void
-meta_plugin_complete_display_change (MetaPlugin *plugin,
-                                     gboolean    ok);
-
 /**
 * MetaModalOptions:
 * @META_MODAL_POINTER_ALREADY_GRABBED: if set the pointer is already
@@ -396,6 +376,8 @@ typedef enum {

 gboolean
 meta_plugin_begin_modal (MetaPlugin      *plugin,
+                         Window           grab_window,
+                         Cursor           cursor,
                         MetaModalOptions options,
                         guint32          timestamp);

--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.h
@@ -69,12 +69,11 @@ ClutterActor *meta_shaped_texture_new (void);
 void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 					     gboolean           create_mipmaps);

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

 void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
                                     Pixmap             pixmap);
@@ -84,12 +83,10 @@ CoglTexture * meta_shaped_texture_get_texture (MetaShapedTexture *stex);
 void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
                                           CoglTexture       *mask_texture);

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

-void meta_shaped_texture_set_opaque_region (MetaShapedTexture *stex,
-                                            cairo_region_t    *opaque_region);
-
 cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture     *stex,
                                                 cairo_rectangle_int_t *clip);

--- a/src/meta/meta-window-actor.h
+++ b/src/meta/meta-window-actor.h
@@ -64,6 +64,7 @@ gint               meta_window_actor_get_workspace        (MetaWindowActor *self
 MetaWindow *       meta_window_actor_get_meta_window      (MetaWindowActor *self);
 ClutterActor *     meta_window_actor_get_texture          (MetaWindowActor *self);
 gboolean           meta_window_actor_is_override_redirect (MetaWindowActor *self);
+const char *       meta_window_actor_get_description      (MetaWindowActor *self);
 gboolean       meta_window_actor_showing_on_its_workspace (MetaWindowActor *self);
 gboolean       meta_window_actor_is_destroyed (MetaWindowActor *self);

--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -49,6 +49,7 @@
 * @META_PREF_TITLEBAR_FONT: title-bar font
 * @META_PREF_NUM_WORKSPACES: number of workspaces
 * @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
+ * @META_PREF_APPLICATION_BASED: application-based
 * @META_PREF_KEYBINDINGS: keybindings
 * @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
 * @META_PREF_BUTTON_LAYOUT: button layout
@@ -87,6 +88,7 @@ typedef enum
  META_PREF_TITLEBAR_FONT,
  META_PREF_NUM_WORKSPACES,
  META_PREF_DYNAMIC_WORKSPACES,
+  META_PREF_APPLICATION_BASED,
  META_PREF_KEYBINDINGS,
  META_PREF_DISABLE_WORKAROUNDS,
  META_PREF_BUTTON_LAYOUT,
@@ -134,6 +136,7 @@ const char*                 meta_prefs_get_theme              (void);
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
 int                         meta_prefs_get_num_workspaces     (void);
 gboolean                    meta_prefs_get_dynamic_workspaces (void);
+gboolean                    meta_prefs_get_application_based  (void);
 gboolean                    meta_prefs_get_disable_workarounds (void);
 gboolean                    meta_prefs_get_auto_raise         (void);
 int                         meta_prefs_get_auto_raise_delay   (void);
@@ -440,7 +443,7 @@ void meta_prefs_get_window_binding (const char          *name,
                                    MetaVirtualModifier *modifiers);

 void meta_prefs_get_overlay_binding (MetaKeyCombo *combo);
-const char *meta_prefs_get_iso_next_group_option (void);
+char *meta_prefs_get_iso_next_group_option (void);

 gboolean           meta_prefs_get_visual_bell      (void);
 gboolean           meta_prefs_bell_is_audible      (void);
--- a/src/meta/preview-widget.h
+++ b/src/meta/preview-widget.h
@@ -0,0 +1,87 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Metacity theme preview widget */
+
+/* 
+ * Copyright (C) 2002 Havoc Pennington
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#include <meta/common.h>
+#include <meta/theme.h>
+#include <gtk/gtk.h>
+
+#ifndef META_PREVIEW_WIDGET_H
+#define META_PREVIEW_WIDGET_H
+
+#define META_TYPE_PREVIEW			 (meta_preview_get_type ())
+#define META_PREVIEW(obj)			 (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_PREVIEW, MetaPreview))
+#define META_PREVIEW_CLASS(klass)		 (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_PREVIEW, MetaPreviewClass))
+#define META_IS_PREVIEW(obj)		 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_PREVIEW))
+#define META_IS_PREVIEW_CLASS(klass)	 (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_PREVIEW))
+#define META_PREVIEW_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_PREVIEW, MetaPreviewClass))
+
+typedef struct _MetaPreview	MetaPreview;
+typedef struct _MetaPreviewClass	MetaPreviewClass;
+
+struct _MetaPreview
+{
+  GtkBin bin;
+
+  GtkStyleContext *style_context;
+
+  MetaTheme *theme;
+  char *title;
+  MetaFrameType type;
+  MetaFrameFlags flags;  
+
+  PangoLayout *layout;
+  int text_height;
+
+  MetaFrameBorders borders;
+  guint            borders_cached : 1;
+
+  MetaButtonLayout button_layout;
+};
+
+struct _MetaPreviewClass
+{
+  /*< private >*/
+  GtkBinClass parent_class;
+};
+
+
+GType    meta_preview_get_type (void) G_GNUC_CONST;
+GtkWidget* meta_preview_new	 (void);
+
+void meta_preview_set_theme         (MetaPreview            *preview,
+                                     MetaTheme              *theme);
+void meta_preview_set_title         (MetaPreview            *preview,
+                                     const char             *title);
+void meta_preview_set_frame_type    (MetaPreview            *preview,
+                                     MetaFrameType           type);
+void meta_preview_set_frame_flags   (MetaPreview            *preview,
+                                     MetaFrameFlags          flags);
+void meta_preview_set_button_layout (MetaPreview            *preview,
+                                     const MetaButtonLayout *button_layout);
+
+GdkPixbuf* meta_preview_get_icon (void);
+GdkPixbuf* meta_preview_get_mini_icon (void);
+
+#endif
--- a/src/meta/screen.h
+++ b/src/meta/screen.h
@@ -78,9 +78,6 @@ MetaWorkspace * meta_screen_get_active_workspace (MetaScreen *screen);
 int  meta_screen_get_n_monitors       (MetaScreen    *screen);
 int  meta_screen_get_primary_monitor  (MetaScreen    *screen);
 int  meta_screen_get_current_monitor  (MetaScreen    *screen);
-int  meta_screen_get_current_monitor_for_pos  (MetaScreen    *screen,
-                                               int x,
-                                               int y);
 void meta_screen_get_monitor_geometry (MetaScreen    *screen,
                                       int            monitor,
                                       MetaRectangle *geometry);
--- a/src/meta/theme.h
+++ b/src/meta/theme.h
@@ -33,7 +33,8 @@
 typedef struct _MetaTheme MetaTheme;

 MetaTheme* meta_theme_get_current (void);
-void       meta_theme_set_current (const char *name);
+void       meta_theme_set_current (const char *name,
+                                   gboolean    force_reload);

 MetaTheme* meta_theme_new      (void);
 void       meta_theme_free     (MetaTheme *theme);
--- a/src/meta/types.h
+++ b/src/meta/types.h
@@ -38,6 +38,5 @@ typedef struct _MetaWorkspace   MetaWorkspace;
 */
 typedef struct _MetaGroup       MetaGroup;
 typedef struct _MetaKeyBinding  MetaKeyBinding;
-typedef struct _MetaCursorTracker MetaCursorTracker;

 #endif
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -100,8 +100,7 @@ typedef enum
  META_DEBUG_RESIZING        = 1 << 18,
  META_DEBUG_SHAPES          = 1 << 19,
  META_DEBUG_COMPOSITOR      = 1 << 20,
-  META_DEBUG_EDGE_RESISTANCE = 1 << 21,
-  META_DEBUG_DBUS            = 1 << 22
+  META_DEBUG_EDGE_RESISTANCE = 1 << 21
 } MetaDebugTopic;

 void meta_topic_real      (MetaDebugTopic topic,
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -237,6 +237,4 @@ void meta_window_begin_grab_op (MetaWindow *window,
                                gboolean    frame_action,
                                guint32     timestamp);

-gboolean meta_window_can_close (MetaWindow *window);
-
 #endif
--- a/src/stock_delete.png
+++ b/src/stock_delete.png
--- a/src/stock_maximize.png
+++ b/src/stock_maximize.png
--- a/src/stock_minimize.png
+++ b/src/stock_minimize.png
--- a/src/tools/.cvsignore
+++ b/src/tools/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+metacity-grayscale
+metacity-message
+metacity-mag
+metacity-properties
+metacity-properties.desktop
+metacity-window-demo
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -0,0 +1,34 @@
+@INTLTOOL_DESKTOP_RULE@
+
+icondir=$(pkgdatadir)/icons
+icon_DATA=mutter-window-demo.png
+
+INCLUDES=@MUTTER_WINDOW_DEMO_CFLAGS@ @MUTTER_MESSAGE_CFLAGS@ \
+	-I$(top_srcdir)/src \
+	-DMUTTER_ICON_DIR=\"$(pkgdatadir)/icons\" \
+	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+
+mutter_message_SOURCES= 				\
+	mutter-message.c
+
+mutter_window_demo_SOURCES=				\
+	mutter-window-demo.c
+
+mutter_mag_SOURCES=					\
+	mutter-mag.c
+
+mutter_grayscale_SOURCES=				\
+	mutter-grayscale.c
+
+bin_PROGRAMS=mutter-message mutter-window-demo
+
+## cheesy hacks I use, don't really have any business existing. ;-)
+noinst_PROGRAMS=mutter-mag mutter-grayscale
+
+mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
+mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
+
+EXTRA_DIST=$(icon_DATA)
+
--- a/src/tools/mutter-grayscale.c
+++ b/src/tools/mutter-grayscale.c
@@ -0,0 +1,107 @@
+/* Hack for grayscaling an image */
+
+/* 
+ * Copyright (C) 2002 Red Hat Inc.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <math.h>
+
+#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
+
+static GdkPixbuf*
+grayscale_pixbuf (GdkPixbuf *pixbuf)
+{
+  GdkPixbuf *gray;
+  guchar *pixels;
+  int rowstride;
+  int pixstride;
+  int row;
+  int n_rows;
+  int width;
+  
+  gray = gdk_pixbuf_copy (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (gray);
+  pixstride = gdk_pixbuf_get_has_alpha (gray) ? 4 : 3;
+  
+  pixels = gdk_pixbuf_get_pixels (gray);
+  n_rows = gdk_pixbuf_get_height (gray);
+  width = gdk_pixbuf_get_width (gray);
+  
+  row = 0;
+  while (row < n_rows)
+    {
+      guchar *p = pixels + row * rowstride;
+      guchar *end = p + (pixstride * width);
+
+      while (p != end)
+        {
+          double v = INTENSITY (p[0], p[1], p[2]);
+
+          p[0] = (guchar) v;
+          p[1] = (guchar) v;
+          p[2] = (guchar) v;
+          
+          p += pixstride;
+        }
+      
+      ++row;
+    }
+  
+  return gray;
+}
+
+int
+main (int argc, char **argv)
+{
+  GdkPixbuf *pixbuf;
+  GdkPixbuf *gray;
+  GError *err;
+  
+  if (argc != 2)
+    {
+      g_printerr ("specify a single image on the command line\n");
+      return 1;
+    }
+
+  err = NULL;
+  pixbuf = gdk_pixbuf_new_from_file (argv[1], &err);
+  if (err != NULL)
+    {
+      g_printerr ("failed to load image: %s\n", err->message);
+      g_error_free (err);
+      return 1;
+    }
+
+  gray = grayscale_pixbuf (pixbuf);
+  
+  err = NULL;
+  gdk_pixbuf_save (gray, "grayscale.png", "png", &err, NULL);
+  if (err != NULL)
+    {
+      g_printerr ("failed to save image: %s\n", err->message);
+      g_error_free (err);
+      return 1;
+    }
+
+  g_print ("wrote grayscale.png\n");
+  
+  return 0;
+}
--- a/src/tools/mutter-mag.c
+++ b/src/tools/mutter-mag.c
@@ -0,0 +1,299 @@
+/* Hack for use instead of xmag */
+
+/* 
+ * Copyright (C) 2002 Red Hat Inc.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE 600 /* C99 -- for rint() */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <math.h>
+
+static GtkWidget *grab_widget = NULL;
+static GtkWidget *display_window = NULL;
+static int last_grab_x = 0;
+static int last_grab_y = 0;
+static int last_grab_width = 150;
+static int last_grab_height = 150;
+static GtkAllocation last_grab_allocation;
+static double width_factor = 4.0;
+static double height_factor = 4.0;
+static GdkInterpType interp_mode = GDK_INTERP_NEAREST;
+static guint regrab_idle_id = 0;
+
+static GdkPixbuf*
+get_pixbuf (void)
+{
+  GdkPixbuf *screenshot;
+  GdkPixbuf *magnified;
+
+#if 0
+  g_print ("Size %d x %d\n",
+           last_grab_width, last_grab_height);
+#endif
+  
+  screenshot = gdk_pixbuf_get_from_window (gdk_get_default_root_window (),
+                                           last_grab_x, last_grab_y,
+                                           last_grab_width, last_grab_height);
+
+  if (screenshot == NULL)
+    {
+      g_printerr ("Screenshot failed\n");
+      exit (1);
+    }
+
+  magnified = gdk_pixbuf_scale_simple (screenshot, last_grab_width * width_factor,
+                                       last_grab_height * height_factor,
+                                       interp_mode);
+
+
+  g_object_unref (G_OBJECT (screenshot));
+
+  return magnified;
+}
+
+static gboolean
+regrab_idle (GtkWidget *image)
+{
+  GtkAllocation allocation;
+  GdkPixbuf *magnified;
+
+  gtk_widget_get_allocation (image, &allocation);
+
+  if (allocation.width != last_grab_allocation.width ||
+      allocation.height != last_grab_allocation.height)
+    {
+      last_grab_width = rint (allocation.width / width_factor);
+      last_grab_height = rint (allocation.height / height_factor);
+      last_grab_allocation = allocation;
+      
+      magnified = get_pixbuf ();
+
+      gtk_image_set_from_pixbuf (GTK_IMAGE (image), magnified);
+
+      g_object_unref (G_OBJECT (magnified));
+    }
+
+  regrab_idle_id = 0;
+  
+  return FALSE;
+}
+
+static void
+image_resized (GtkWidget *image)
+{
+  if (regrab_idle_id == 0)
+    regrab_idle_id = g_idle_add_full (G_PRIORITY_LOW + 100, (GSourceFunc) regrab_idle,
+                                      image, NULL);
+}
+
+static void
+grab_area_at_mouse (GtkWidget *invisible,
+                    int        x_root,
+                    int        y_root)
+{
+  GdkPixbuf *magnified;
+  int width, height;
+  GtkWidget *widget;
+  
+  width = last_grab_width;
+  height = last_grab_height;
+
+  last_grab_x = x_root;
+  last_grab_y = y_root;
+  last_grab_width = width;
+  last_grab_height = height;
+  
+  magnified = get_pixbuf ();
+  
+  display_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_default_size (GTK_WINDOW (display_window),
+                               last_grab_width, last_grab_height);
+  widget = gtk_image_new_from_pixbuf (magnified);
+  gtk_widget_set_size_request (widget, 40, 40);
+  gtk_container_add (GTK_CONTAINER (display_window), widget);
+  g_object_unref (G_OBJECT (magnified));
+
+  g_object_add_weak_pointer (G_OBJECT (display_window),
+                             (gpointer) &display_window);
+
+  g_signal_connect (G_OBJECT (display_window), "destroy",
+                    G_CALLBACK (gtk_main_quit), NULL);
+
+  g_signal_connect_after (G_OBJECT (widget), "size_allocate", G_CALLBACK (image_resized), NULL);
+  
+  gtk_widget_show_all (display_window);
+}
+
+static void
+shutdown_grab (void)
+{
+  GdkDeviceManager *manager;
+  GdkDevice *device;
+
+  manager = gdk_display_get_device_manager (gdk_display_get_default ());
+  device = gdk_device_manager_get_client_pointer (manager);
+
+  gdk_device_ungrab (device, gtk_get_current_event_time ());
+  gdk_device_ungrab (gdk_device_get_associated_device (device),
+                     gtk_get_current_event_time ());
+  gtk_grab_remove (grab_widget);
+}
+
+static void
+mouse_motion (GtkWidget      *invisible,
+	      GdkEventMotion *event,
+	      gpointer        data)
+{
+  
+}
+
+static gboolean
+mouse_release (GtkWidget      *invisible,
+	       GdkEventButton *event,
+	       gpointer        data)
+{
+  if (event->button != 1)
+    return FALSE;
+
+  grab_area_at_mouse (invisible, event->x_root, event->y_root);
+
+  shutdown_grab ();
+  
+  g_signal_handlers_disconnect_by_func (invisible, mouse_motion, NULL);
+  g_signal_handlers_disconnect_by_func (invisible, mouse_release, NULL);
+
+  return TRUE;
+}
+
+/* Helper Functions */
+
+static gboolean mouse_press (GtkWidget      *invisible,
+                             GdkEventButton *event,
+                             gpointer        data);
+
+static gboolean
+key_press (GtkWidget   *invisible,
+           GdkEventKey *event,
+           gpointer     data)
+{  
+  if (event->keyval == GDK_KEY_Escape)
+    {
+      shutdown_grab ();
+
+      g_signal_handlers_disconnect_by_func (invisible, mouse_press, NULL);
+      g_signal_handlers_disconnect_by_func (invisible, key_press, NULL);
+      
+      gtk_main_quit ();
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+mouse_press (GtkWidget      *invisible,
+	     GdkEventButton *event,
+	     gpointer        data)
+{  
+  if (event->type == GDK_BUTTON_PRESS &&
+      event->button == 1)
+    {
+      g_signal_connect (invisible, "motion_notify_event",
+                        G_CALLBACK (mouse_motion), NULL);
+      g_signal_connect (invisible, "button_release_event",
+                        G_CALLBACK (mouse_release), NULL);
+      g_signal_handlers_disconnect_by_func (invisible, mouse_press, NULL);
+      g_signal_handlers_disconnect_by_func (invisible, key_press, NULL);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+begin_area_grab (void)
+{
+  GdkWindow *window;
+  GdkDeviceManager *manager;
+  GdkDevice *device;
+
+  if (grab_widget == NULL)
+    {
+      grab_widget = gtk_invisible_new ();
+
+      gtk_widget_add_events (grab_widget,
+                             GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
+      
+      gtk_widget_show (grab_widget);
+    }
+
+  window = gtk_widget_get_window (grab_widget);
+  manager = gdk_display_get_device_manager (gdk_display_get_default ());
+  device = gdk_device_manager_get_client_pointer (manager);
+
+  if (gdk_device_grab (device,
+                       window,
+                       GDK_OWNERSHIP_NONE,
+                       FALSE,
+                       GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,
+                       NULL,
+                       gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
+    {
+      g_warning ("Failed to grab pointer to do eyedropper");
+      return;
+    }
+
+  if (gdk_device_grab (gdk_device_get_associated_device (device),
+                       window,
+                       GDK_OWNERSHIP_NONE,
+                       FALSE,
+                       GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+                       NULL,
+                       gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
+    {
+      gdk_device_ungrab (device, gtk_get_current_event_time ());
+      g_warning ("Failed to grab keyboard to do eyedropper");
+      return;
+    }
+
+  gtk_grab_add (grab_widget);
+  
+  g_signal_connect (grab_widget, "button_press_event",
+                    G_CALLBACK (mouse_press), NULL);
+  g_signal_connect (grab_widget, "key_press_event",
+                    G_CALLBACK (key_press), NULL);
+}
+
+int
+main (int argc, char **argv)
+{
+  gtk_init (&argc, &argv);
+
+  begin_area_grab ();
+  
+  gtk_main ();
+  
+  return 0;
+}
--- a/src/tools/mutter-message.c
+++ b/src/tools/mutter-message.c
@@ -0,0 +1,160 @@
+/* Mutter send-magic-messages app */
+
+/*
+ * Copyright (C) 2002 Havoc Pennington
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libintl.h>
+#define _(x) dgettext (GETTEXT_PACKAGE, x)
+#define N_(x) x
+
+static Display *display;
+
+static void
+send_reload_theme (void)
+{
+  XEvent xev;
+
+  xev.xclient.type = ClientMessage;
+  xev.xclient.serial = 0;
+  xev.xclient.send_event = True;
+  xev.xclient.display = display;
+  xev.xclient.window = gdk_x11_get_default_root_xwindow ();
+  xev.xclient.message_type = XInternAtom (display,
+                                          "_MUTTER_RELOAD_THEME_MESSAGE",
+                                          False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = 0;
+  xev.xclient.data.l[1] = 0;
+  xev.xclient.data.l[2] = 0;
+
+  XSendEvent (display,
+              gdk_x11_get_default_root_xwindow (),
+              False,
+	      SubstructureRedirectMask | SubstructureNotifyMask,
+	      &xev);
+
+  XFlush (display);
+  XSync (display, False);
+}
+
+static void
+send_set_keybindings (gboolean enabled)
+{
+  XEvent xev;
+
+  xev.xclient.type = ClientMessage;
+  xev.xclient.serial = 0;
+  xev.xclient.send_event = True;
+  xev.xclient.display = display;
+  xev.xclient.window = gdk_x11_get_default_root_xwindow ();
+  xev.xclient.message_type = XInternAtom (display,
+                                          "_MUTTER_SET_KEYBINDINGS_MESSAGE",
+                                          False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = enabled;
+  xev.xclient.data.l[1] = 0;
+  xev.xclient.data.l[2] = 0;
+
+  XSendEvent (display,
+              gdk_x11_get_default_root_xwindow (),
+              False,
+	      SubstructureRedirectMask | SubstructureNotifyMask,
+	      &xev);
+
+  XFlush (display);
+  XSync (display, False);
+}
+
+#ifdef WITH_VERBOSE_MODE
+static void
+send_toggle_verbose (void)
+{
+  XEvent xev;
+
+  xev.xclient.type = ClientMessage;
+  xev.xclient.serial = 0;
+  xev.xclient.send_event = True;
+  xev.xclient.display = display;
+  xev.xclient.window = gdk_x11_get_default_root_xwindow ();
+  xev.xclient.message_type = XInternAtom (display,
+                                          "_MUTTER_TOGGLE_VERBOSE",
+                                          False);
+  xev.xclient.format = 32;
+  xev.xclient.data.l[0] = 0;
+  xev.xclient.data.l[1] = 0;
+  xev.xclient.data.l[2] = 0;
+
+  XSendEvent (display,
+              gdk_x11_get_default_root_xwindow (),
+              False,
+	      SubstructureRedirectMask | SubstructureNotifyMask,
+	      &xev);
+
+  XFlush (display);
+  XSync (display, False);
+}
+#endif
+
+static void
+usage (void)
+{
+  g_printerr (_("Usage: %s\n"),
+              "mutter-message (reload-theme|enable-keybindings|disable-keybindings|toggle-verbose)");
+  exit (1);
+}
+
+int
+main (int argc, char **argv)
+{
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  
+  gtk_init (&argc, &argv);
+
+  if (argc < 2)
+    usage ();
+
+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+  if (strcmp (argv[1], "reload-theme") == 0)
+    send_reload_theme ();
+  else if (strcmp (argv[1], "enable-keybindings") == 0)
+    send_set_keybindings (TRUE);
+  else if (strcmp (argv[1], "disable-keybindings") == 0)
+    send_set_keybindings (FALSE);
+  else if (strcmp (argv[1], "toggle-verbose") == 0)
+    {
+#ifndef WITH_VERBOSE_MODE
+      g_printerr (_("Mutter was compiled without support for verbose mode\n"));
+      return 1;
+#else      
+      send_toggle_verbose ();
+#endif
+    }
+  else
+    usage ();
+  
+  return 0;
+}
+
--- a/src/tools/mutter-window-demo.c
+++ b/src/tools/mutter-window-demo.c
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rui Matos	2467439d94	keybindings: Fix ungrabbing of keys XUngrabKey() doesn't work for XI2 grabs and XI2 doesn't provide API with similar functionality. As such, we have to refactor the code a bit to be able to call XIUngrabKeycode() for each key binding, then reload keybindings and finally grab the new ones. https://bugzilla.gnome.org/show_bug.cgi?id=697003	2013-04-04 12:00:08 +02:00
Rui Matos	0e83b748d5	Grab and emit a signal when XK_ISO_Next_Group is pressed This will make it possible to implement input source switching in gnome-shell using the popular modifiers-only keybinding that's implemented on the X server through an XKB option. https://bugzilla.gnome.org/show_bug.cgi?id=697002	2013-04-04 12:00:07 +02:00
Rui Matos	bda4af5504	keybindings: Add API to freeze/unfreeze the keyboard We'll use this in gnome-shell to freeze the keyboard right before switching input source and unfreeze it after that's finished so that we don't lose any key events to the wrong input source. https://bugzilla.gnome.org/show_bug.cgi?id=697001	2013-04-01 14:21:03 +02:00
Rui Matos	f97d8dfb6c	prefs: Fix binding remaining grabbed after clearing all strokes If a binding is updated with a clear set of strokes (effectively disabling it) we aren't signaling that the binding changed and thus the previous strokes will continue to be grabbed. This fixes that and tries to do a better effort at checking if the binding changed or not. https://bugzilla.gnome.org/show_bug.cgi?id=697000	2013-04-01 14:21:03 +02:00