Consistently use meta_grab_op_is_resizing() for _NET_WM_SYNC_REQUEST

In different places we checked the grab op differently when determing
whether we are using _NET_WM_SYNC_REQUEST. This was somewhat covered
up previously by the fact that we only had a sync alarm when using
_NET_WM_SYNC_REQUEST, but that is no longer the case, so consistently
use meta_grab_op_is_resizing() everywhere.

.gitignore

@@ -19,6 +19,8 @@ libtool
 ltmain.sh
 missing
 .deps
+src/50-mutter-navigation.xml
+src/50-mutter-system.xml
 src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop

NEWS

@@ -1,3 +1,259 @@
+3.7.4
+=====
+* Add support for bypass compositor hints [Adel; #683020]
+* Make automaximization optional [Adel; #680990]
+* Add method for checking if the application is responding [Giovanni; #684340]
+* Expose the xinput opcode [Jasper; #690590]
+* Rebrand "minimize" as "hide" [Florian; #682887]
+* Misc bug fixes and cleanups [Giovanni, Ray, Jasper, Matthias, Debarshi,
+  Florian, Rui; #690454, #690573, #690593, #690956, #691363, #690609, #690317,
+  #689263]
+
+Contributors:
+  Giovanni Campagna, Matthias Clasen, Adel Gadllah, Rui Matos, Florian Müllner,
+  Debarshi Ray, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Mattias Põldaru [et], Yaron Shahrabani [he], Daniel Mustieles [es],
+  Khaled Hosny [ar], Fran Diéguez [gl], A S Alam [pa], Piotr Drąg [pl],
+  Rafael Ferreira [pt_BR], Nilamdyuti Goswami [as], Alexander Shopov [bg],
+  Matej Urbančič [sl]
+
+3.7.3
+=====
+* Fix maximized windows jumping to other monitors [Alban; #556696]
+* Add 'switch-applications' keybinding [Florian; #688913]
+* Add a convenience method to focus the default window [Jasper; #689652]
+* Increase typical icon size to 96 [Jasper; #689651]
+* Port to XInput2 [Jasper; #688779]
+* Give dynamic keybindings a keybinding action [Florian; #682315]
+* Misc. fixes and cleanups [Jasper, Rui; #688777]
+
+Contributors:
+  Alban Crequy, Rui Matos, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Nilamdyuti Goswami [as], Piotr Drąg [pl], Yaron Shahrabani [he],
+  Dr.T.Vasudevan [ta], ManojKumar Giri [or], Shankar Prasad [kn]
+
+3.7.2
+=====
+* Fix spurious focus changes when showing desktop [Florian; #686928]
+* MetaPluginManager: don't send events to Clutter twice [Owen; #686406]
+* Add the ability to add shader hooks to MetaBackgroundActor [Giovanni; #669798]
+* Only process keyboard mapping events for the core X keyboard [Rui; #674859]
+* Import keybinding files from Metacity [Florian; #687672]
+* Add compositor hook to process keybindings selectively [Florian; #688202]
+* MetaBackgroundActor: add a setter for GLSL uniforms [Giovanni; #682536]
+* Misc. fixes and cleanups [Jasper, Rui, Florian, Rico; #688182]
+
+Contributors:
+  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
+  Owen Taylor, Rico Tzschichholz
+
+Translations:
+  Rafael Ferreira [pt_BR], Tobias Endrigkeit [de], Yaron Shahrabani [he]
+
+3.7.1
+=====
+* screen: Ignore num-workspaces when using dynamic workspaces [Florian; #685439]
+
+Contributors:
+  Florian Müllner
+
+Translations:
+  Mattias Põldaru [et], Kjartan Maraas [nb], Мирослав Николић [sr, sr@latin],
+  Marek Černocký [cs], Andika Triwidada [id], Daniel Mustieles [es],
+  Fran Diéguez [gl], Matej Urbančič [sl]
+
+3.6.1
+=====
+* Fix crash when opening large popup menus [Jasper; #681676]
+* window: Don't move the desktop window after monitor hotplug [Jasper; #681159]
+* Expose MetaPlugin to introspection [Evan; #671098]
+* Optionally delay focus changes in focus-follows-mouse mode [Florian; #678169]
+* Resize the guard window when the X screen is resized [Benjamin; #670396]
+* display: Only manage the default X screen [Jürg; #648156]
+* Misc cleanups: [Owen; #587255]
+
+Contributors:
+  Benjamin Berg, Jürg Billeter, Evan Broder, Florian Müllner, Jasper St. Pierre,
+  Owen Taylor
+
+Translations:
+  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Sayak Sarkar [bn_IN],
+  Sandeep Sheshrao Shedmake [mr], Ask H. Larsen [da], Shankar Prasad [kn],
+  Alexander Shopov [bg], Aurimas Černius [lt], Ihar Hrachyshka [be],
+  Kjartan Maraas [nb], Daniel Mustieles [es], Changwoo Ryu [ko],
+  Yuri Myasoedov [ru], Tom Tryfonidis [el], Rūdolfs Mazurs [lv],
+  Chris Leonard [en_GB], Piotr Drąg [pl], Fran Diéguez [gl], Gil Forcada [ca],
+  Matej Urbančič [sl], Andika Triwidada [id], Carles Ferrando [ca]
+
+3.6.0
+=====
+
+Translations:
+  Alexander Shopov [bg], Daniel Korostil [uk], Rajesh Ranjan [hi],
+  Krishnababu Krothapalli [te], Ani Peter [ml], Rūdolfs Mazurs [lv],
+  Sweta Kothari [gu], Ihar Hrachyshka [be], Noriko Mizumoto [ja],
+  Timo Jyrinki [fi], Mattias Põldaru [et]
+
+3.5.92
+======
+* screen: Allow NULL out arguments in meta_screen_get_size [Tomeu]
+* display: Add API to set wm_name / wm_keybindings [Florian; #671010]
+* Improve the not responding dialog [Jon, Florian; #684306]
+* Misc. bugfixes [Jasper]
+
+Contributors:
+  William Jon McCann, Florian Müllner, Jasper St. Pierre, Tomeu Vizoso
+
+Translations:
+  Gabor Kelemen [hu], Piotr Drąg [pl], Dr.T.Vasudevan [ta], Bruce Cowan [en_GB],
+  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Gil Forcada [ca],
+  Carles Ferrando [ca@valencia], Tobias Endrigkeit [de], Tom Tryfonidis [el],
+  Nguyễn Thái Ngọc Duy [vi], Changwoo Ryu [ko], Ask H. Larsen [da],
+  Rafael Ferreira [pt_BR], Marek Černocký [cs]
+
+3.5.91
+======
+* Do not include markup in app not responding dialog [Alex]
+* Fix subtracting unredirected windows from visible region [Jasper; #677116]
+* Minor improvements and bugfixes [Jasper, Florian; #682648, #682993]
+
+Contributors:
+  Alexander Larsson, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Dirgita [id], Piotr Drąg [pl], A S Alam [pa], Yuri Myasoedov [ru],
+  Milo Casagrande [it], Nilamdyuti Goswami [as], Tom Tryfonidis [el],
+  Duarte Loreto [pt], Fran Diéguez [gl], Nguyễn Thái Ngọc Duy [vi],
+  Aurimas Černius [lt], Daniel Nylander [sv]
+
+3.5.90
+======
+* Fix logic for handling translations of the windows group [Owen; #681221]
+* Handle painting inside a Clutter clone [Owen; #681953]
+* Update overlay-key on settings changes [Florian; #681906]
+* Add keybinding for overlay-key [Florian; #665547]
+* Minor fixes and improvements [Javier, Florian]
+
+Contributors:
+  Javier Jardón, Florian Müllner, Owen Taylor
+
+Translations:
+  Sweta Kothari [gu], Muhammet Kara [tr], Khaled Hosny [ar],
+  Sandeep Sheshrao Shedmake [mr]
+
+3.5.5
+=====
+* Fix flickering around windows when using window group [Tom; #681221]
+
+Contributor(s):
+  Tom Beckmann
+
+Translations:
+  Chao-Hsiung Liao [zh_HK, zh_TW], Matej Urbančič [sl], Fran Diéguez [gl],
+  Мирослав Николић [sr, sr@latin], Yaron Shahrabani [he], Kjartan Maraas [nb]
+
+3.5.4
+=====
+* Make it possible to reimplement move-to-workspace keybindings from plugins
+  [Giovanni; #674104]
+* Add a preference to ignore hide-titlebar-when-maximized hint [Rico; #678947]
+* window: Also use hide-titlebar-when-maximized when tiled [Florian; #679290]
+* Center modal dialogs on their parent instead [Florian; #674499]
+* Reduce amount of markup in translated messages [Matthias; #679660]
+* Fix focus problem after closing a window with focus-follows-mouse
+  [Jasper; #675982]
+* Handle changes of the attach-modal-dialogs preference [Florian; #679904]
+* Do not restore tiling on unmaximize [Florian; #677565]
+* Misc. fixes and cleanups [Jasper Adriaanse, Jasper, Debarshi, Pavel;
+  #679153, 673824]
+
+Contributors:
+ Jasper Lievisse Adriaanse, Giovanni Campagna, Matthias Clasen, Florian Müllner,
+ Debarshi Ray, Jasper St. Pierre, Rico Tzschichholz, Pavel Vasin
+
+Translations:
+ Alexander Shopov [bg], Kjartan Maraas [nb], Yaron Shahrabani [he],
+ Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Daniel Mustieles [es]
+
+3.5.3
+=====
+* Simplify plugin system [Jasper; #676855]
+* meta-window-actor: Don't unredirect shaped windows [Jasper; #677657]
+* screen: Add new public meta_screen_get_current_monitor API [Tim; #642591]
+* frames: Increase the size of resize corners [Jasper; #677669]
+* window: Make some window methods public [Jasper; #678126]
+* Fix crash when running mutter stand-alone [Jasper; #678238]
+* meta-window-actor: Fix potential crash in shaping code [Jasper; #677977]
+* Misc. fixes [Jasper, Marc-Antoine, Rico]
+
+Contributors:
+ Tim L, Marc-Antoine Perennou, Jasper St. Pierre, Rico Tzschichholz
+
+Translations:
+
+ Daniel Mustieles [es], Matej Urbančič [sl], Khaled Hosny [ar],
+ Bruno Brouard [fr], Fran Diéguez [gl]
+
+3.5.2
+=====
+* keybindings: Remove 'toggle-recording' binding [Florian; #674376]
+* Switch to gtk-doc syntax [Jasper; #673752]
+* shaped-texture: never slice shape mask texture [Robert; #674731]
+* Make Mutter stop relying on Cogl including a GL header [Neil; #672711]
+* Make support for "XFree86" Xinerama mandatory [Owen; #674727]
+* meta_window_move_frame(): fix crash when frame is NULL [Owen; #675254]
+* Fix memory leaks [Pavel; #672640]
+* Code cleanups [Jasper; #671104 #674876 #676052]
+* Look for themes in XDG user data dir [Jasper; #675316]
+* Remove frame pixel caching [Jasper; #675111]
+* stack: Ignore keep-on-top property on maximized windows [Florian; #673581]
+* Misc. fixes [Javier, Jasper, Owen, Rico]
+
+Contributors:
+ Robert Bragg, Javier Járdon, Florian Müllner, Neil Roberts, Jasper St. Pierre, 
+ Owen Taylor, Rico Tzschichholz, Pavel Vasin
+
+Translations:
+ Praveen Illa [te], Luca Ferretti [it], Daniel Mustieles [es]
+
+3.4.1
+=====
+* API change: the meta_display_add_keybinding() function added in 3.4
+  wasn't usable from a GNOME Shell extension, so has been changed to take
+  a GSettings object rather than the name of a schema [Jasper; #673014]
+* Don't try to auto-maximize not-maximizable windows; this fixes the problem
+  with the Nautilus desktop window being mis-positioned when enabled
+  [Owen; #673566]
+* Fix a crash in the default plugin (not used in GNOME) [Giovanni; #673809]
+* Make the <Super> key work when set as the mouse button modifier
+  [Florian; #662476]
+
+Contributors:
+ Giovanni Campagna, Florian Muellner, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Khaled Hosny [ar], Jordi Serratosa [ca], Carles Ferrando [ca@valencia],
+ Christian Kirbach [de], Kristjan Schmidt [eo], Arash Mousavi [fa],
+ Jiro Matsuzawa [ja], Shankar Prasad [kn], Aurimas Černius [lt],
+ Yinghua Wang [zh_CN]
+
+3.4.0
+=====
+* Fix crash when a full-screen window is opened [Jasper; #672797]
+* Fix memory leaks [Pavel; #672640]
+
+Contributors:
+ Jasper St. Pierre, Pavel Vasin
+
+Translations:
+ Marek Černocký, Petr Kovar [cz], Bruno Brouard [fr], Sweta Kothari [gu],
+ Yaron Shahrabani [he], Changwoo Ryu [kr], Enrico Nicoletto [pt_BR],
+ Yuri Myasoedov [ru], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi]
+
 3.3.92
 ======
 * Automaximize large windows on map [Adel; #671677]

README

@@ -1,16 +1,10 @@
-Metacity is not a meta-City as in an urban center, but rather
-Meta-ness as in the state of being meta. i.e. metacity : meta as
-opacity : opaque. Also it may have something to do with the Meta key
-on UNIX keyboards.
+The original codebase named "Metacity" is not a meta-City as in an
+urban center, but rather Meta-ness as in the state of being
+meta. i.e. metacity : meta as opacity : opaque. Also it may have
+something to do with the Meta key on UNIX keyboards.
 
-The first release of Metacity was version 2.3. Metacity has no need for
-your petty hangups about version numbers.
-
-The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
-2.10.x, 2.12.x, 2.14.x, 2.16.x.
-
-Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
-2.15.x, 2.17.x.
+Since then, it has been renamed mutter after a rebase on top of
+clutter as a compositing manager.
 
 COMPILING MUTTER
 ===

autogen.sh

@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.10
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level metacity directory"

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [3])
-m4_define([mutter_micro_version], [92])
+m4_define([mutter_minor_version], [7])
+m4_define([mutter_micro_version], [4])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -72,8 +72,8 @@ MUTTER_PC_MODULES="
    pango >= 1.2.0
    cairo >= 1.10.0
    gsettings-desktop-schemas >= 3.3.0
-   xcomposite >= 0.2 xfixes xrender xdamage
-   $CLUTTER_PACKAGE >= 1.9.10
+   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
+   $CLUTTER_PACKAGE >= 1.13.2
    cogl-1.0 >= 1.9.6
 "
 
@@ -113,9 +113,6 @@ AC_ARG_ENABLE(shape,
                  [disable mutter's use of the shaped window extension]),,
   enable_shape=auto)
 
-## try definining HAVE_BACKTRACE
-AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
-
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
@@ -212,60 +209,31 @@ AC_PATH_XTRA
 
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
-# Check for Xinerama extension (Solaris impl or Xfree impl)
+# Check for Xinerama extension - we only support the "XFree86" style,
+# and not the older Solaris-only version; recent Solaris supports the
+# XFree86 style.
 mutter_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
-AC_ARG_ENABLE(xinerama,
-  AC_HELP_STRING([--disable-xinerama],
-                 [disable mutter's use of the Xinerama extension]),
-  try_xinerama=$enable_xinerama,try_xinerama=yes)
-
-use_solaris_xinerama=no
-use_xfree_xinerama=no
-if test "${try_xinerama}" != no; then
-    case "$host" in
-        *-*-solaris*)
-            # Check for solaris
-            use_solaris_xinerama=yes
-            AC_CHECK_LIB(Xext, XineramaGetInfo,
-                         use_solaris_xinerama=yes, use_solaris_xinerama=no,
-                         $ALL_X_LIBS)
-            if test "x$use_solaris_xinerama" = "xyes"; then
-                AC_CHECK_HEADER(X11/extensions/xinerama.h,
-                                if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                    X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                fi
-                                AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
-                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
-                                use_solaris_xinerama=no,
-                                [#include <X11/Xlib.h>])
-            fi
-            AC_MSG_CHECKING(for Xinerama support on Solaris)
-            AC_MSG_RESULT($use_solaris_xinerama);
-            ;;
-        *)
-            # Check for XFree
-            use_xfree_xinerama=yes
-            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
-                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                 fi
-                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
-                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
-                                 use_xfree_xinerama=no,
-                                 [#include <X11/Xlib.h>])],
-                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
-            AC_MSG_CHECKING(for Xinerama support on XFree86)
-            AC_MSG_RESULT($use_xfree_xinerama);
-            ;;
-    esac
-fi
+have_xinerama=yes
+AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+    [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+		     [X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
+		     if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+			 X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+		     fi],
+		     have_xinerama=no,
+		     [#include <X11/Xlib.h>])],
+    have_xinerama=no, -lXext $ALL_X_LIBS)
+AC_MSG_CHECKING(for Xinerama support)
+AC_MSG_RESULT($have_xinerama)
 
 CPPFLAGS="$mutter_save_cppflags"
 
+if test x$have_xinerama = xno; then
+   AC_MSG_ERROR([Xinerama extension was not found])
+fi
+
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
@@ -393,12 +361,6 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 
-# For fix-meta-rectangle.py
-AM_PATH_PYTHON([2.5])
-
-# Use gnome-doc-utils:
-GNOME_DOC_INIT([0.8.0])
-
 #### Warnings (last since -Werror can disturb other tests)
 
 # Stay command-line compatible with the gnome-common configure option. Here
@@ -496,8 +458,6 @@ mutter-$VERSION
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 
-	XFree86 Xinerama:         ${use_xfree_xinerama}
-	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}

mutter.doap

@@ -39,4 +39,11 @@ environment.</description>
       <gnome:userid>otaylor</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Florian Müllner</foaf:name>
+      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
+      <gnome:userid>fmuellner</gnome:userid>
+    </foaf:Person>
+  </maintainer>
 </Project>

po/POTFILES.in

@@ -1,5 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+src/50-mutter-navigation.xml.in
+src/50-mutter-system.xml.in
 src/50-mutter-windows.xml.in
 src/compositor/compositor.c
 src/core/bell.c

po/ast.po

@@ -37,7 +37,6 @@ msgstr "Petición d'información ventana desconocida: %d"
 #. Translators: %s is a window title
 #: ../src/core/delete.c:95
 #, c-format
-#, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> nun ta respondiendo."
 
@@ -122,7 +121,6 @@ msgstr "Comandu de terminal nun definíu.\n"
 
 #: ../src/core/main.c:130
 #, c-format
-#, c-format
 msgid ""
 "mutter %s\n"
 "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@@ -261,7 +259,6 @@ msgstr "Error axustando númberu d'arees de trabayu a %d: %s\n"
 
 #: ../src/core/prefs.c:2028 ../src/core/prefs.c:2531
 #, c-format
-#, c-format
 msgid "Workspace %d"
 msgstr "Espaciu de Trabayu %d"
 
@@ -275,7 +272,6 @@ msgstr "\"%s\" atopau na base de datos de configuración nun ye un valor válidu
 
 #: ../src/core/prefs.c:2612
 #, c-format
-#, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fallu al afitar nome pal espaciu de trabayu %d a \"%s\": %s\n"
 
@@ -286,19 +282,16 @@ msgstr "Fallu al afitar l'estáu del compositor: %s\n"
 
 #: ../src/core/prefs.c:2845
 #, c-format
-#, c-format
 msgid "Error setting clutter plugin list: %s\n"
 msgstr "Fallu al afitar la llista desordenada de plugin: %s\n"
 
 #: ../src/core/prefs.c:2889
 #, c-format
-#, c-format
 msgid "Error setting live hidden windows status status: %s\n"
 msgstr "Fallu al afitar l'estáu de les ventanes anubríes: %s\n"
 
 #: ../src/core/prefs.c:2917
 #, c-format
-#, c-format
 msgid "Error setting no tab popup status: %s\n"
 msgstr "Fallu al afitar l'estáu de les llingüetes emerxentes: %s\n"
 
@@ -358,7 +351,6 @@ msgstr "Falló analizar ficheru de sesión guardáu: %s\n"
 
 #: ../src/core/session.c:1198
 #, c-format
-#, c-format
 msgid "<mutter_session> attribute seen but we already have the session ID"
 msgstr "Vióse l'atributu <mutter_session> pero yá tenemos la ID de sesión"
 
@@ -404,7 +396,6 @@ msgstr "Abiertu archivu log %s\n"
 
 #: ../src/core/util.c:139 ../src/tools/mutter-message.c:176
 #, c-format
-#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter compilose ensin sofitu pal mou testu\n"
 
@@ -499,19 +490,19 @@ msgid ""
 msgstr "La propiedá %s del ventanu 0x%lx contien un códigu UTF-8 non válidu pal "
 "elementu %d na llista\n"
 
-#: ../src/include/all-keybindings.h:88
+#: ../src/include/all-keybindings.h:88 ../src/50-mutter-navigation.xml.in.h:18
 msgid "Switch to workspace 1"
 msgstr "Cambiar a espaciu de trabayu 1"
 
-#: ../src/include/all-keybindings.h:90
+#: ../src/include/all-keybindings.h:90 ../src/50-mutter-navigation.xml.in.h:19
 msgid "Switch to workspace 2"
 msgstr "Cambiar a espaciu de trabayu 2"
 
-#: ../src/include/all-keybindings.h:92
+#: ../src/include/all-keybindings.h:92 ../src/50-mutter-navigation.xml.in.h:20
 msgid "Switch to workspace 3"
 msgstr "Cambiar a espaciu de trabayu 3"
 
-#: ../src/include/all-keybindings.h:94
+#: ../src/include/all-keybindings.h:94 ../src/50-mutter-navigation.xml.in.h:21
 msgid "Switch to workspace 4"
 msgstr "Cambiar a espaciu de trabayu 4"
 
@@ -640,47 +631,57 @@ msgstr "Saca una semeya d'una ventana"
 msgid "Run a terminal"
 msgstr "Executar una terminal"
 
-#: ../src/include/all-keybindings.h:271
+#: ../src/include/all-keybindings.h:271 ../src/50-mutter-windows.xml.in.h:1
 msgid "Activate the window menu"
 msgstr "Activar el menú de la ventana"
 
-#: ../src/include/all-keybindings.h:274
+#: ../src/include/all-keybindings.h:274 ../src/50-mutter-windows.xml.in.h:13
+#, fuzzy
 msgid "Toggle fullscreen mode"
-msgstr "Camudar a modu pantalla completa"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a modu pantalla completa\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a mou pantalla completa"
 
-#: ../src/include/all-keybindings.h:276
+#: ../src/include/all-keybindings.h:276 ../src/50-mutter-windows.xml.in.h:14
+#, fuzzy
 msgid "Toggle maximization state"
-msgstr "Camudar a estáu maximizáu"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Camudar a estáu maximizáu\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Conmutar l'estáu maximizáu"
 
 #: ../src/include/all-keybindings.h:278
 msgid "Toggle whether a window will always be visible over other windows"
 msgstr "Conmutar si una ventana siempres se verá encima d'otres ventanes"
 
-#: ../src/include/all-keybindings.h:280
+#: ../src/include/all-keybindings.h:280 ../src/50-mutter-windows.xml.in.h:4
 msgid "Maximize window"
 msgstr "Maximizar ventana"
 
-#: ../src/include/all-keybindings.h:282
+#: ../src/include/all-keybindings.h:282 ../src/50-mutter-windows.xml.in.h:12
 msgid "Restore window"
 msgstr "Restaurar la ventana"
 
-#: ../src/include/all-keybindings.h:284
+#: ../src/include/all-keybindings.h:284 ../src/50-mutter-windows.xml.in.h:15
 msgid "Toggle shaded state"
 msgstr "Activa estáu endolcáu"
 
-#: ../src/include/all-keybindings.h:286
+#: ../src/include/all-keybindings.h:286 ../src/50-mutter-windows.xml.in.h:7
 msgid "Minimize window"
 msgstr "Minimizar ventana"
 
-#: ../src/include/all-keybindings.h:288
+#: ../src/include/all-keybindings.h:288 ../src/50-mutter-windows.xml.in.h:2
 msgid "Close window"
 msgstr "Zarrar ventana"
 
-#: ../src/include/all-keybindings.h:290
+#: ../src/include/all-keybindings.h:290 ../src/50-mutter-windows.xml.in.h:8
 msgid "Move window"
 msgstr "Mover ventana"
 
-#: ../src/include/all-keybindings.h:292
+#: ../src/include/all-keybindings.h:292 ../src/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Cambiar el tamañu la ventana"
 
@@ -689,18 +690,22 @@ msgid "Toggle whether window is on all workspaces or just one"
 msgstr "Conmutar si la ventana apaez en toles árees de trabayu o namái nuna"
 
 #: ../src/include/all-keybindings.h:299
+#: ../src/50-mutter-navigation.xml.in.h:10
 msgid "Move window to workspace 1"
 msgstr "Mover ventana al espaciu de trabayu 1"
 
 #: ../src/include/all-keybindings.h:302
+#: ../src/50-mutter-navigation.xml.in.h:11
 msgid "Move window to workspace 2"
 msgstr "Mover ventana al espaciu de trabayu 2"
 
 #: ../src/include/all-keybindings.h:305
+#: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Move window to workspace 3"
 msgstr "Mover ventana al espaciu de trabayu 3"
 
 #: ../src/include/all-keybindings.h:308
+#: ../src/50-mutter-navigation.xml.in.h:13
 msgid "Move window to workspace 4"
 msgstr "Mover ventana al espaciu de trabayu 4"
 
@@ -736,19 +741,24 @@ msgstr "Mover ventana al espaciu de trabayu 11"
 msgid "Move window to workspace 12"
 msgstr "Mover ventana al espaciu de trabayu 12"
 
-#: ../src/include/all-keybindings.h:344
+#: ../src/include/all-keybindings.h:344 ../src/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Mover ventana un espaciu de trabayu a manzorga"
 
-#: ../src/include/all-keybindings.h:347
+#: ../src/include/all-keybindings.h:347 ../src/50-mutter-navigation.xml.in.h:8
+#, fuzzy
 msgid "Move window one workspace to the right"
-msgstr "Mover ventana un espaciu de trabayu a derecha"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Mover ventana un espaciu de trabayu a derecha\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Mover ventana un espaciu de trabayu a madrecha"
 
-#: ../src/include/all-keybindings.h:350
+#: ../src/include/all-keybindings.h:350 ../src/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Mover ventana un espaciu de trabayu p'arriba"
 
-#: ../src/include/all-keybindings.h:353
+#: ../src/include/all-keybindings.h:353 ../src/50-mutter-navigation.xml.in.h:6
 msgid "Move window one workspace down"
 msgstr "Mover ventana un espaciu de trabayu p'abaxo"
 
@@ -757,19 +767,29 @@ msgid "Raise window if it's covered by another window, otherwise lower it"
 msgstr ""
 "Llevantar la ventana si ta cubierta por otra ventana, minimizala n'otru casu"
 
-#: ../src/include/all-keybindings.h:358
+#: ../src/include/all-keybindings.h:358 ../src/50-mutter-windows.xml.in.h:9
+#, fuzzy
 msgid "Raise window above other windows"
-msgstr "Poner el ventanu en primer planu"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Poner el ventanu en primer planu\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Poner la ventana en primer planu"
 
-#: ../src/include/all-keybindings.h:360
+#: ../src/include/all-keybindings.h:360 ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
 msgid "Lower window below other windows"
-msgstr "Ventanu más baxu per debaxo d'otros ventanos"
+msgstr ""
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Ventanu más baxu per debaxo d'otros ventanos\n"
+"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
+"Ventana más baxa per debaxo d'otres ventanes"
 
-#: ../src/include/all-keybindings.h:364
+#: ../src/include/all-keybindings.h:364 ../src/50-mutter-windows.xml.in.h:6
 msgid "Maximize window vertically"
 msgstr "Maximizar ventana verticalmente"
 
-#: ../src/include/all-keybindings.h:368
+#: ../src/include/all-keybindings.h:368 ../src/50-mutter-windows.xml.in.h:5
 msgid "Maximize window horizontally"
 msgstr "Maximizar ventana horizontalmente"
 
@@ -983,7 +1003,6 @@ msgstr "Espaciu de Trabayu %d%n"
 
 #: ../src/ui/menu.c:213
 #, c-format
-#, c-format
 msgid "Workspace 1_0"
 msgstr "Espaciu de Trabayu 1_0"
 
@@ -1724,7 +1743,6 @@ msgstr "Nun se permite testu dientro del elementu <%s>"
 #: ../src/ui/theme-parser.c:3748 ../src/ui/theme-parser.c:3760
 #: ../src/ui/theme-parser.c:3772
 #, c-format
-#, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> especificáu dos vegaes pa esti tema"
 
@@ -1936,6 +1954,96 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d espresiones de coordenaes interpretaes en %g segundos (%g segundos de "
 "media)\n"
 
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Hide all normal windows"
+msgstr "Anubrir toles ventanes normales"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+#, fuzzy
+msgid "Move to workspace above"
+msgstr "Mover al área de trabayu d'arriba"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+#, fuzzy
+msgid "Move to workspace below"
+msgstr "Mover al área de trabayu d'abaxo"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+#, fuzzy
+msgid "Move to workspace left"
+msgstr "Mover al área de trabayu de la izquierda"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+#, fuzzy
+msgid "Move to workspace right"
+msgstr "Mover al área de trabayu de la derecha"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+#, fuzzy
+msgid "Navigation"
+msgstr "Navegación"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+#, fuzzy
+msgid "Switch applications"
+msgstr "Movese ente aplicaciones"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+#, fuzzy
+msgid "Switch system controls"
+msgstr "Cambiar ente controles del sistema"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+#, fuzzy
+msgid "Switch system controls directly"
+msgstr "Movese ente los controles del sistema direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+#, fuzzy
+msgid "Switch windows directly"
+msgstr "Cambiar ventanes direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+#, fuzzy
+msgid "Switch windows of an app directly"
+msgstr "Movese ente les ventanes d'una aplicación direutamente"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+#, fuzzy
+msgid "Switch windows of an application"
+msgstr "Movese ente les ventanes d'una aplicación"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "Show the activities overview"
+msgstr "Amosar el resume d'actividaes"
+
+#: ../src/50-mutter-system.xml.in.h:2
+#, fuzzy
+msgid "Show the run command prompt"
+msgstr "Amosar l'elementu «executar comando»"
+
+#: ../src/50-mutter-system.xml.in.h:3
+#, fuzzy
+msgid "System"
+msgstr "Sistema"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+#, fuzzy
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Llevantar la ventana si ta cubierta, minimizala n'otru casu"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+#, fuzzy
+msgid "Toggle window on all workspaces or one"
+msgstr "Conmutar la ventana en toles árees de trabayu o namái nuna"
+
+#: ../src/50-mutter-windows.xml.in.h:17
+#, fuzzy
+msgid "Windows"
+msgstr "Ventanes"
+
 #~ msgid "Desktop"
 #~ msgstr "Escritoriu"
 

po/et.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-11 22:19+0000\n"
-"PO-Revision-Date: 2012-03-12 00:47+0200\n"
+"POT-Creation-Date: 2012-12-18 22:30+0000\n"
+"PO-Revision-Date: 2012-12-19 18:06+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -24,9 +24,141 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+msgid "Navigation"
+msgstr "Navigeerimine"
+
+msgid "Move window to workspace 1"
+msgstr "Akna liigutamine 1. tööalale"
+
+msgid "Move window to workspace 2"
+msgstr "Akna liigutamine 2. tööalale"
+
+msgid "Move window to workspace 3"
+msgstr "Akna liigutamine 3. tööalale"
+
+msgid "Move window to workspace 4"
+msgstr "Akna liigutamine 4. tööalale"
+
+msgid "Move window one workspace to the left"
+msgstr "Akna tõstmine vasakpoolsele tööalale"
+
+msgid "Move window one workspace to the right"
+msgstr "Akna tõstmine parempoolsele tööalale"
+
+msgid "Move window one workspace up"
+msgstr "Akna tõstmine ülemisele tööalale"
+
+msgid "Move window one workspace down"
+msgstr "Akna tõstmine alumisele tööalale"
+
+msgid "Switch applications"
+msgstr "Rakenduste vahetamine"
+
+msgid "Switch windows"
+msgstr "Akende vahetamine"
+
+msgid "Switch windows of an application"
+msgstr "Rakenduse akende vahetamine"
+
+msgid "Switch system controls"
+msgstr "Süsteemi juhtalade vahetamine"
+
+msgid "Switch windows directly"
+msgstr "Akende kohene vahetamine"
+
+msgid "Switch windows of an app directly"
+msgstr "Rakenduse akende kohene vahetamine"
+
+msgid "Switch system controls directly"
+msgstr "Süsteemi juhtalade kohene vahetamine"
+
+msgid "Hide all normal windows"
+msgstr "Kõigi tavaliste akende peitmine"
+
+msgid "Switch to workspace 1"
+msgstr "1. tööalale liikumine"
+
+msgid "Switch to workspace 2"
+msgstr "2. tööalale liikumine"
+
+msgid "Switch to workspace 3"
+msgstr "3. tööalale liikumine"
+
+msgid "Switch to workspace 4"
+msgstr "4. tööalale liikumine"
+
+msgid "Move to workspace left"
+msgstr "Vasakpoolsele tööalale liikumine"
+
+msgid "Move to workspace right"
+msgstr "Parempoolsele tööalale liikumine"
+
+msgid "Move to workspace above"
+msgstr "Ülemisele tööalale liikumine"
+
+msgid "Move to workspace below"
+msgstr "Alumisele tööalale liikumine"
+
+msgid "System"
+msgstr "Süsteem"
+
+msgid "Show the run command prompt"
+msgstr "Käsuviiba kuvamine"
+
+msgid "Show the activities overview"
+msgstr "Tegevuste ülevaate avamine"
+
 msgid "Windows"
 msgstr "Aknad"
 
+msgid "Activate the window menu"
+msgstr "Aknamenüü avamine"
+
+msgid "Toggle fullscreen mode"
+msgstr "Täisekraanoleku vahetamine"
+
+msgid "Toggle maximization state"
+msgstr "Maksimeeritud oleku vahetamine"
+
+msgid "Maximize window"
+msgstr "Akna maksimeerimine"
+
+msgid "Restore window"
+msgstr "Akna taastamine"
+
+msgid "Toggle shaded state"
+msgstr "Varjatud oleku vahetamine"
+
+msgid "Close window"
+msgstr "Akna sulgemine"
+
+msgid "Minimize window"
+msgstr "Akna minimeerimine"
+
+msgid "Move window"
+msgstr "Akna liigutamine"
+
+msgid "Resize window"
+msgstr "Akna suuruse muutmine"
+
+msgid "Toggle window on all workspaces or one"
+msgstr "Akna kõigil või ühel tööalal olemise vahetamine"
+
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Akna tõstmine, kui see on kaetud, muul juhul langetamine"
+
+msgid "Raise window above other windows"
+msgstr "Akna tõstmine teiste kohale"
+
+msgid "Lower window below other windows"
+msgstr "Akna langetamine teiste taha"
+
+msgid "Maximize window vertically"
+msgstr "Akna vertikaalne maksimeerimine"
+
+msgid "Maximize window horizontally"
+msgstr "Akna horisontaalne maksimeerimine"
+
 msgid "View split on left"
 msgstr "Vaade poolitatakse vasakult"
 
@@ -49,8 +181,8 @@ msgid "Unknown window information request: %d"
 msgstr "Tundmatu aknateabe päring: %d"
 
 #, c-format
-msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s</tt> ei vasta."
+msgid "“%s” is not responding."
+msgstr "„%s” ei vasta."
 
 msgid "Application is not responding."
 msgstr "Rakendus ei vasta."
@@ -128,8 +260,8 @@ msgstr ""
 msgid "Print version"
 msgstr "Versiooni printimine"
 
-msgid "Comma-separated list of compositor plugins"
-msgstr "Komaga eraldatud nimekiri komposiitmontaaži pluginatest"
+msgid "Mutter plugin to use"
+msgstr "Millist Mutteri pluginat kasutada"
 
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
@@ -353,16 +485,6 @@ msgstr ""
 "Kui märgitud, siis eraldi tiitliribade asemel on moodaalsed dialoogid "
 "emaakna tiitliribade küljes ning liiguvad koos emaaknaga."
 
-msgid "Live Hidden Windows"
-msgstr "Varjatud akende aktiivsus"
-
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"Määrab, kas varjatud aknaid (nt minimeeritud ja teistel tööaladel aknad) "
-"hoitakse elus."
-
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Akna ümberpaigutamine selle lohistamisel ekraani serva"
 
@@ -406,6 +528,17 @@ msgstr ""
 "Kui märgitud, siis on hüpikaken ja esiletõstmise raam keelatud akende "
 "vahetamisel."
 
+msgid "Delay focus changes until the pointer stops moving"
+msgstr "Fookusemuutused lükatakse edasi kuni kursor peatub"
+
+msgid ""
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
+msgstr ""
+"Kui tõene ning fookusrežiim on kas \"sloppy\" või \"mouse\", siis fookust ei "
+"vahetata kohe, kui kursor aknale liigub, vaid alles pärast kursori peatumist."
+
 msgid "Draggable border width"
 msgstr "Lohistatava äärise laius."
 
@@ -426,39 +559,6 @@ msgstr "Tabulaatori hüpikakna katkestamine"
 msgid "Usage: %s\n"
 msgstr "Kasutamine: %s\n"
 
-msgid "Close Window"
-msgstr "Sulge aken"
-
-msgid "Window Menu"
-msgstr "Aknamenüü"
-
-msgid "Minimize Window"
-msgstr "Akna minimeerimine"
-
-msgid "Maximize Window"
-msgstr "Akna maksimeerimine"
-
-msgid "Restore Window"
-msgstr "Akna taastamine"
-
-msgid "Roll Up Window"
-msgstr "Akna kokkukerimine"
-
-msgid "Unroll Window"
-msgstr "Akna lahtikerimine"
-
-msgid "Keep Window On Top"
-msgstr "Akna kõige pealmiseks määramine"
-
-msgid "Remove Window From Top"
-msgstr "Eemalda aken kõige pealmise kohalt"
-
-msgid "Always On Visible Workspace"
-msgstr "Alati nähtaval tööalal"
-
-msgid "Put Window On Only One Workspace"
-msgstr "Tõsta aken ainult ühele tööalale"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 msgid "Mi_nimize"
 msgstr "_Minimeeri"

po/eu.po

@@ -31,7 +31,7 @@ msgstr "Ikusi zatia ezkerrean"
 msgid "View split on right"
 msgstr "Ikusi zatia eskuinean"
 
-#: ../src/50-mutter-windows.xml.in.h:3
+#: ../src/50-mutter-windows.xml.in.h:3 ../src/50-mutter-windows.xml.in.h:17
 msgid "Windows"
 msgstr "Leihoak"
 
@@ -1630,17 +1630,224 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d koordenada adierazpen analizatua %g segundotan (%g segundo batazbesteko)\n"
 
-#~ msgid "Switch to workspace 1"
-#~ msgstr "Aldatu 1. laneko areara"
+#: ../src/50-mutter-navigation.xml.in.h:18
+#, fuzzy
+msgid "Switch to workspace 1"
+msgstr "Aldatu 1. laneko areara"
 
-#~ msgid "Switch to workspace 2"
-#~ msgstr "Aldatu 2. laneko areara"
+#: ../src/50-mutter-navigation.xml.in.h:19
+#, fuzzy
+msgid "Switch to workspace 2"
+msgstr "Aldatu 2. laneko areara"
 
-#~ msgid "Switch to workspace 3"
-#~ msgstr "Aldatu 3. laneko areara"
+#: ../src/50-mutter-navigation.xml.in.h:20
+#, fuzzy
+msgid "Switch to workspace 3"
+msgstr "Aldatu 3. laneko areara"
 
-#~ msgid "Switch to workspace 4"
-#~ msgstr "Aldatu 4. laneko areara"
+#: ../src/50-mutter-navigation.xml.in.h:21
+#, fuzzy
+msgid "Switch to workspace 4"
+msgstr "Aldatu 4. laneko areara"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+#, fuzzy
+msgid "Activate the window menu"
+msgstr "Aktibatu leiho-menua"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+#, fuzzy
+msgid "Toggle fullscreen mode"
+msgstr "Txandakatu pantaila osoaren modua"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+#, fuzzy
+msgid "Toggle maximization state"
+msgstr "Txandakatu maximizatze-egoera"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+#, fuzzy
+msgid "Maximize window"
+msgstr "Maximizatu leihoa"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+#, fuzzy
+msgid "Restore window"
+msgstr "Leheneratu leihoa"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+#, fuzzy
+msgid "Toggle shaded state"
+msgstr "Txandakatu bildutako egoera"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+#, fuzzy
+msgid "Minimize window"
+msgstr ""
+"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
+"Ikonotu leihoa\n"
+"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
+"Minimizatu leihoa"
+
+#: ../src/50-mutter-windows.xml.in.h:2
+#, fuzzy
+msgid "Close window"
+msgstr "Itxi leihoa"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+#, fuzzy
+msgid "Move window"
+msgstr "Lekuz aldatu leihoa"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+#, fuzzy
+msgid "Resize window"
+msgstr "Aldatu leihoaren tamaina"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Eraman leihoa 1. laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Eraman leihoa 2. laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Eraman leihoa 3. laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Eraman leihoa 4. laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+#, fuzzy
+msgid "Move window one workspace to the left"
+msgstr "Eraman leihoa laneko area bat ezkerrera"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+#, fuzzy
+msgid "Move window one workspace to the right"
+msgstr "Eraman leihoa laneko area bat eskuinera"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+#, fuzzy
+msgid "Move window one workspace up"
+msgstr "Eraman leihoa laneko area bat gora"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+#, fuzzy
+msgid "Move window one workspace down"
+msgstr "Eraman leihoa laneko area bat behera"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+#, fuzzy
+msgid "Raise window above other windows"
+msgstr "Goratu leihoa beste leihoen gainera"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
+msgid "Lower window below other windows"
+msgstr "Beheratu leihoa beste leihoen azpira"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Maximizatu leihoa bertikalki"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Maximizatu leihoa horizontalki"
+
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Hide all normal windows"
+msgstr "Ezkutatu leiho arrunt guztiak"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+#, fuzzy
+msgid "Move to workspace above"
+msgstr "Eraman gaineko laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+#, fuzzy
+msgid "Move to workspace below"
+msgstr "Eraman azpiko laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+#, fuzzy
+msgid "Move to workspace left"
+msgstr "Eraman ezkerreko laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+#, fuzzy
+msgid "Move to workspace right"
+msgstr "Eraman eskuineko laneko areara"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+#, fuzzy
+msgid "Navigation"
+msgstr "Nabigazioa"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+#, fuzzy
+msgid "Switch applications"
+msgstr "Aldatu aplikazioz"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+#, fuzzy
+msgid "Switch system controls"
+msgstr "Aldatu sistemaren kontrolak"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+#, fuzzy
+msgid "Switch system controls directly"
+msgstr "Aldatu sistemaren kontrolak zuzenean"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+#, fuzzy
+msgid "Switch windows directly"
+msgstr "Aldatu leihoa zuzenean"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+#, fuzzy
+msgid "Switch windows of an app directly"
+msgstr "Aldatu aplikazio baten leihoa zuzenean"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+#, fuzzy
+msgid "Switch windows of an application"
+msgstr "Aldatu aplikazio baten leihoen artean"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "Show the activities overview"
+msgstr "Erakutsi jardueren aurkezpen orokorra"
+
+#: ../src/50-mutter-system.xml.in.h:2
+#, fuzzy
+msgid "Show the run command prompt"
+msgstr "Erakutsi gonbitea komandoa exekutatzeko"
+
+#: ../src/50-mutter-system.xml.in.h:3
+#, fuzzy
+msgid "System"
+msgstr "Sistema"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+#, fuzzy
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Goratu leihoa beste leiho batek estaltzen badu, bestela beheratu"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+#, fuzzy
+msgid "Toggle window on all workspaces or one"
+msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Aldatu 5. laneko areara"
@@ -1738,55 +1945,13 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Exekutatu terminala"
 
-#~ msgid "Activate the window menu"
-#~ msgstr "Aktibatu leiho-menua"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "Txandakatu pantaila osoaren modua"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "Txandakatu maximizatze-egoera"
-
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Txandakatu leiho bat beste leiho guztien gainean ikusgai egongo den edo ez"
 
-#~ msgid "Maximize window"
-#~ msgstr "Maximizatu leihoa"
-
-#~ msgid "Restore window"
-#~ msgstr "Leheneratu leihoa"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Txandakatu bildutako egoera"
-
-#~ msgid "Minimize window"
-#~ msgstr "Ikonotu leihoa"
-
-#~ msgid "Close window"
-#~ msgstr "Itxi leihoa"
-
-#~ msgid "Move window"
-#~ msgstr "Lekuz aldatu leihoa"
-
-#~ msgid "Resize window"
-#~ msgstr "Aldatu leihoaren tamaina"
-
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
 
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Eraman leihoa 1. laneko areara"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Eraman leihoa 2. laneko areara"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Eraman leihoa 3. laneko areara"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Eraman leihoa 4. laneko areara"
-
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Eraman leihoa 5. laneko areara"
 
@@ -1811,33 +1976,9 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Eraman leihoa 12. laneko areara"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Eraman leihoa laneko area bat ezkerrera"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Eraman leihoa laneko area bat eskuinera"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "Eraman leihoa laneko area bat gora"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "Eraman leihoa laneko area bat behera"
-
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Goratu leihoa beste leiho batek estaltzen badu, bestela beheratu"
 
-#~ msgid "Raise window above other windows"
-#~ msgstr "Goratu leihoa beste leihoen gainera"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "Beheratu leihoa beste leihoen azpira"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizatu leihoa bertikalki"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizatu leihoa horizontalki"
-
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Eraman leihoa ipar-mendebaldeko (goi-ezkerreko) ertzera"
 

po/nl.po

@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1
+#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
 msgid "Windows"
 msgstr "Vensters"
 
@@ -1589,17 +1589,220 @@ msgstr ""
 "%d coördinatenexpressies verwerkt in %g seconden (gemiddelde van %g "
 "seconden)\n"
 
-#~ msgid "Switch to workspace 1"
-#~ msgstr "Schakelen naar werkblad 1"
+#: ../src/50-mutter-navigation.xml.in.h:18
+#, fuzzy
+msgid "Switch to workspace 1"
+msgstr "Schakelen naar werkblad 1"
 
-#~ msgid "Switch to workspace 2"
-#~ msgstr "Schakelen naar werkblad 2"
+#: ../src/50-mutter-navigation.xml.in.h:19
+#, fuzzy
+msgid "Switch to workspace 2"
+msgstr "Schakelen naar werkblad 2"
 
-#~ msgid "Switch to workspace 3"
-#~ msgstr "Schakelen naar werkblad 3"
+#: ../src/50-mutter-navigation.xml.in.h:20
+#, fuzzy
+msgid "Switch to workspace 3"
+msgstr "Schakelen naar werkblad 3"
 
-#~ msgid "Switch to workspace 4"
-#~ msgstr "Schakelen naar werkblad 4"
+#: ../src/50-mutter-navigation.xml.in.h:21
+#, fuzzy
+msgid "Switch to workspace 4"
+msgstr "Schakelen naar werkblad 4"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+#, fuzzy
+msgid "Activate the window menu"
+msgstr "Venstermenu activeren"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+#, fuzzy
+msgid "Toggle fullscreen mode"
+msgstr "Volledig scherm-modus omschakelen"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+#, fuzzy
+msgid "Toggle maximization state"
+msgstr "Maximalisatie in- of uitschakelen"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+#, fuzzy
+msgid "Maximize window"
+msgstr "Venster maximaliseren"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+#, fuzzy
+msgid "Restore window"
+msgstr "Venster herstellen"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+#, fuzzy
+msgid "Toggle shaded state"
+msgstr "Oprollen in- of uitschakelen"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+#, fuzzy
+msgid "Minimize window"
+msgstr "Venster minimaliseren"
+
+#: ../src/50-mutter-windows.xml.in.h:2
+#, fuzzy
+msgid "Close window"
+msgstr "Venster sluiten"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+#, fuzzy
+msgid "Move window"
+msgstr "Venster verplaatsen"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+#, fuzzy
+msgid "Resize window"
+msgstr "Vensterafmetingen veranderen"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+#, fuzzy
+msgid "Move window to workspace 1"
+msgstr "Venster verplaatsen naar werkblad 1"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+#, fuzzy
+msgid "Move window to workspace 2"
+msgstr "Venster verplaatsen naar werkblad 2"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+#, fuzzy
+msgid "Move window to workspace 3"
+msgstr "Venster verplaatsen naar werkblad 3"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+#, fuzzy
+msgid "Move window to workspace 4"
+msgstr "Venster verplaatsen naar werkblad 4"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+#, fuzzy
+msgid "Move window one workspace to the left"
+msgstr "Venster één werkblad naar links verplaatsen"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+#, fuzzy
+msgid "Move window one workspace to the right"
+msgstr "Venster één werkblad naar rechts verplaatsen"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+#, fuzzy
+msgid "Move window one workspace up"
+msgstr "Venster één werkblad naar boven verplaatsen"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+#, fuzzy
+msgid "Move window one workspace down"
+msgstr "Venster één werkblad naar beneden verplaatsen"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+#, fuzzy
+msgid "Raise window above other windows"
+msgstr "Venster voor andere vensters brengen"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
+msgid "Lower window below other windows"
+msgstr "Venster achter andere vensters brengen"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+#, fuzzy
+msgid "Maximize window vertically"
+msgstr "Een venster verticaal maximaliseren"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+#, fuzzy
+msgid "Maximize window horizontally"
+msgstr "Een venster horizontaal maximaliseren"
+
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Hide all normal windows"
+msgstr "Alle normale vensters verbergen"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+#, fuzzy
+msgid "Move to workspace above"
+msgstr "Verplaatsen naar werkblad hierboven"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+#, fuzzy
+msgid "Move to workspace below"
+msgstr "Verplaatsen naar werkblad hieronder"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+#, fuzzy
+msgid "Move to workspace left"
+msgstr "Verplaatsen naar werkblad links"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+#, fuzzy
+msgid "Move to workspace right"
+msgstr "Verplaatsen naar werkblad rechts"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+#, fuzzy
+msgid "Navigation"
+msgstr "Navigatie"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+#, fuzzy
+msgid "Switch applications"
+msgstr "Tussen toepassingen schakelen"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+#, fuzzy
+msgid "Switch system controls"
+msgstr "Systeemschermen wisselen"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+#, fuzzy
+msgid "Switch system controls directly"
+msgstr "Direct tussen systeemschermen schakelen"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+#, fuzzy
+msgid "Switch windows directly"
+msgstr "Direct tussen vensters schakelen"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+#, fuzzy
+msgid "Switch windows of an app directly"
+msgstr "Direct wisselen van venster binnen een toepassing"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+#, fuzzy
+msgid "Switch windows of an application"
+msgstr "Wisselen van venster binnen een toepassing"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "Show the activities overview"
+msgstr "Het activiteitenoverzicht tonen"
+
+#: ../src/50-mutter-system.xml.in.h:2
+#, fuzzy
+msgid "Show the run command prompt"
+msgstr "Het opdrachtregelvenster tonen"
+
+#: ../src/50-mutter-system.xml.in.h:3
+#, fuzzy
+msgid "System"
+msgstr "Systeem"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+#, fuzzy
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Deels bedekte vensters naar voren halen of anders naar achter halen"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+#, fuzzy
+msgid "Toggle window on all workspaces or one"
+msgstr "‘Venster is op alle werkbladen zichtbaar’ in- of uitschakelen"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Schakelen naar werkblad 5"
@@ -1699,54 +1902,12 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Een terminal opstarten"
 
-#~ msgid "Activate the window menu"
-#~ msgstr "Venstermenu activeren"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "Volledig scherm-modus omschakelen"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "Maximalisatie in- of uitschakelen"
-
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "‘Altijd bovenop’-instelling omschakelen"
 
-#~ msgid "Maximize window"
-#~ msgstr "Venster maximaliseren"
-
-#~ msgid "Restore window"
-#~ msgstr "Venster herstellen"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Oprollen in- of uitschakelen"
-
-#~ msgid "Minimize window"
-#~ msgstr "Venster minimaliseren"
-
-#~ msgid "Close window"
-#~ msgstr "Venster sluiten"
-
-#~ msgid "Move window"
-#~ msgstr "Venster verplaatsen"
-
-#~ msgid "Resize window"
-#~ msgstr "Vensterafmetingen veranderen"
-
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "‘Venster is op alle werkbladen zichtbaar’ omschakelen"
 
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Venster verplaatsen naar werkblad 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Venster verplaatsen naar werkblad 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Venster verplaatsen naar werkblad 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Venster verplaatsen naar werkblad 4"
-
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Venster verplaatsen naar werkblad 5"
 
@@ -1771,35 +1932,11 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Venster verplaatsen naar werkblad 12"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Venster één werkblad naar links verplaatsen"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Venster één werkblad naar rechts verplaatsen"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "Venster één werkblad naar boven verplaatsen"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "Venster één werkblad naar beneden verplaatsen"
-
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Venster naar boven halen indien overlapt door een ander venster, anders "
 #~ "naar beneden halen"
 
-#~ msgid "Raise window above other windows"
-#~ msgstr "Venster voor andere vensters brengen"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "Venster achter andere vensters brengen"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "Een venster verticaal maximaliseren"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Een venster horizontaal maximaliseren"
-
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Venster verplaatsen naar de noordwest-hoek (linksboven)"
 

po/ro.po

@@ -1944,6 +1944,33 @@ msgstr ""
 "Expresiile pentru coordonate %d parsate în %g secunde (o medie de %g "
 "secunde)\n"
 
+#: ../src/50-mutter-launchers.xml.in.h:1
+#, fuzzy
+msgid "Launchers"
+msgstr "Lansatori"
+
+#: ../src/50-mutter-navigation.xml.in.h:1
+#, fuzzy
+msgid "Navigation"
+msgstr "Navigare"
+
+#: ../src/50-mutter-screenshot.xml.in.h:1
+#, fuzzy
+#| msgid "Take a screenshot"
+msgid "Screenshots"
+msgstr "Capturi de ecran"
+
+#: ../src/50-mutter-system.xml.in.h:1
+#, fuzzy
+msgid "System"
+msgstr "Sistem"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+#, fuzzy
+#| msgid "/_Windows"
+msgid "Windows"
+msgstr "Ferestre"
+
 #~ msgid "Window Management"
 #~ msgstr "Administrare ferestre"
 

po/tr.po

@@ -6,36 +6,35 @@
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2008, 2009.
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
-# Muhammet Kara <muhammet.k@gmail.com>, 2011.
+# Muhammet Kara <muhammetk@acikkaynak.name.tr>, 2011, 2012.
 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: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2011-12-24 16:54+0200\n"
-"Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
+"POT-Creation-Date: 2012-08-06 23:35+0000\n"
+"PO-Revision-Date: 2012-08-09 16:48+0000\n"
+"Last-Translator: Muhammet Kara <muhammetk@acikkaynak.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"Language: tr\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=1; plural=0;\n"
-"Language: tr\n"
 
 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Pencereler"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Solda bölünmüş olarak göster"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Sağda bölünmüş olarak göster"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Pencereler"
-
 #. 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:492
@@ -47,7 +46,7 @@ msgstr ""
 "\"%2$s\" monitöründeki %1$i ekranında zaten başka bir birleştirme yöneticisi "
 "çalışıyor."
 
-#: ../src/core/bell.c:307
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Etkinlik zili"
 
@@ -56,16 +55,17 @@ msgstr "Etkinlik zili"
 msgid "Unknown window information request: %d"
 msgstr "Bilinmeyen pencere bilgi isteği: %d"
 
-#: ../src/core/delete.c:111
-#, c-format
-msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s</tt> cevap vermiyor."
-
 #: ../src/core/delete.c:114
+#, c-format
+#| msgid "<tt>%s</tt> is not responding."
+msgid "%s is not responding."
+msgstr "%s yanıt vermiyor."
+
+#: ../src/core/delete.c:118
 msgid "Application is not responding."
 msgstr "Uygulama cevap vermiyor"
 
-#: ../src/core/delete.c:119
+#: ../src/core/delete.c:123
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -73,25 +73,25 @@ msgstr ""
 "Uygulamanın devam etmesi için bir müddet bekleyi seçebilirsiniz ya d a "
 "uygulamanın tamamen çıkması için onu zorlayabilirsiniz."
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Wait"
 msgstr "_Bekle"
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Force Quit"
 msgstr "_Sonlandır"
 
-#: ../src/core/display.c:365
+#: ../src/core/display.c:380
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Kompozisyon için gerekli olan %s eklentisi eksik"
 
-#: ../src/core/display.c:431
+#: ../src/core/display.c:446
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Pencere Sistemi '%s' ekranı açılamadı\n"
 
-#: ../src/core/keybindings.c:852
+#: ../src/core/keybindings.c:844
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -100,36 +100,36 @@ msgstr ""
 "%s tuşu %x değiştiricileriyle birlikte başka bir uygulama tarafından tuş "
 "bağıolarak kullanılıyor\n"
 
-#: ../src/core/main.c:206
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Ortam yöneticisine olan bağlantıyı kapat"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Çalışan pencere yöneticisinin yerini al"
 
-#: ../src/core/main.c:218
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Ortam yönetim ID'sini belirtin"
 
-#: ../src/core/main.c:223
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "Kullanılacak X Ekranı"
 
-#: ../src/core/main.c:229
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Ortamı kayıtlı dosyadan başlat"
 
-#: ../src/core/main.c:235
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "X çağrılarını eşazamanlı yap"
 
-#: ../src/core/main.c:504
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Tema dizini taranırken hata oluştu: %s\n"
 
-#: ../src/core/main.c:520
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -137,7 +137,7 @@ msgstr ""
 "Hiç tema bulunamadı! %s varlığından ve bildiğimiz temaları içerdiğinden emin "
 "olun.\n"
 
-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -151,15 +151,15 @@ msgstr ""
 "Bu bir özgür yazılımdır; telif koşullarını öğrenmek için kaynak koda bakın.\n"
 "Hiç bir garantisi, BELİRLİ BİR AMACA UYGUNLUĞU için dahi, YOKTUR.\n"
 
-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Sürümü yazdır"
 
-#: ../src/core/mutter.c:62
-msgid "Comma-separated list of compositor plugins"
-msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"
+#: ../src/core/mutter.c:60
+msgid "Mutter plugin to use"
+msgstr "Kullanılacak Mutter eklentisi"
 
-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1065
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -167,14 +167,13 @@ msgstr ""
 "Hatalı uygulamalara yönelik çözümler devre dışı. Bazı uygulamalar düzgün "
 "işlemeyebilir.\n"
 
-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1140
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "\"%s\" yazıtipi tanımlaması, %s GSettings anahtarından ayrıştırılamadı\n"
 
-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1206
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -183,7 +182,7 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", fare düğme düzenleyicisi olarak "
 "geçerli bir değer değil\n"
 
-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1724
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -192,17 +191,17 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", \"%s\" tuş bağı olarak geçerli "
 "bir değer değil\n"
 
-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1821
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
 
-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' X oturumundaki ekran %1$d geçersiz\n"
 
-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:668
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -212,7 +211,7 @@ msgstr ""
 "geçerli pencere yöneticisinin yerine bir başkasını koymak için --replace "
 "seçeneğini kullanmayı deneyin.\n"
 
-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:695
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -220,13 +219,13 @@ msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d hangi pencere yöneticisine "
 "sahipöğrenilemedi\n"
 
-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:750
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d bir pencere yöneticisine zaten sahip\n"
 
-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:935
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "\"%2$s\" X oturumundaki ekran %1$d serberst bırakılamadı\"\n"
@@ -288,44 +287,44 @@ msgstr ""
 "Bu pencereler, &quot;geçerli ayarları kaydet&quot; özelliğini desteklemiyor "
 "ve bir dahaki girişinizde elle yeniden başlatmanız gerekecek."
 
-#: ../src/core/util.c:111
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Hata ayıklama günlüğü açılamadı: %s\n"
 
-#: ../src/core/util.c:121
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "fdopen() günlük dosyası %s açılamadı: %s\n"
 
-#: ../src/core/util.c:127
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "%s günlük dosyası açıldı\n"
 
-#: ../src/core/util.c:146 ../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, ayrıntılı kip desteği olmadan derlenmiş\n"
 
-#: ../src/core/util.c:290
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Pencere yöneticisi: "
 
-#: ../src/core/util.c:438
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Pencere yöneticisinde hata: "
 
-#: ../src/core/util.c:471
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Pencere yöneticisi uyarısı: "
 
-#: ../src/core/util.c:499
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Pencere yöneticisi hatası: "
 
 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7234
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -341,32 +340,32 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7899
 #, 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"
+"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 penceresi bir yandan yeniden boyutlandırılamaz olduğunu gösteren bir MWM "
 "ipucu verirken anlamsız bir biçimde en küçük (%d x %d) ve en büyük (%d x %d) "
 "boyut sınırlarını da atıyor.\n"
 
-#: ../src/core/window-props.c:309
+#: ../src/core/window-props.c:310
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Uygulama geçersiz _NET_WM_PID %lu atadı\n"
 
-#: ../src/core/window-props.c:426
+#: ../src/core/window-props.c:429
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s üzerinde)"
 
-#: ../src/core/window-props.c:1481
+#: ../src/core/window-props.c:1484
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Geçersiz WM_TRANSIENT_FOR pencere 0x%lx belirtilen %s.\n"
 
-#: ../src/core/window-props.c:1492
+#: ../src/core/window-props.c:1495
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR penceresi 0x%lx  (%s için) döngü oluşturacak.\n"
@@ -404,87 +403,10 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
-msgid "Attach modal dialogs"
-msgstr "Yardımcı diyalogları ekle"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Sekmeyi yeni pencerede açmayı iptal et"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma alanındaki "
-"pencereler) çalışır bırakılıp bırakılmayacağını belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr ""
-"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
-"kapatılıp "
-"kapatılmayacağını belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
-"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Sürüklenebilir kenarlık genişliği"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Pencereler ekran kenarlarında bırakıldığında kenar döşemeyi etkinleştir."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
-msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them "
-"vertically and resizes them horizontally to cover half of the available "
-"area. Dropping windows on the top screen edge maximizes them completely."
-msgstr ""
-"Eğer etkinleştirilirse, dikey ekran kenarlarına bırakılan pencereler dikey "
-"olarak "
-"ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak şekilde "
-"yeniden "
-"boyutlandırılır. Ekranın tepedeki kenarına bırakılan pencereler ekranı "
-"tamamen kaplar."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Çalışır Durumdaki Gizli Pencereler"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 msgid "Modifier to use for extended window management operations"
 msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
-msgid "No tab popup"
-msgstr "Sekme açılır penceresi yok"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Remove Window From Top"
-msgid "Select window from tab popup"
-msgstr "Pencereyi, sekme açılır penceresinden seç"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
-"not enough, invisible borders will be added to meet this value."
-msgstr ""
-"Sürüklenebilir kenarlıkların toplam miktarı. Eğer temanın görünür "
-"kenarlıkları yetersiz gelirse, bu değere ulaşmak için görünmez kenarlıklar "
-"eklenir."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -496,7 +418,11 @@ msgstr ""
 "donanımındaki \"windows tuşu\" olması tasarlanmıştır. Bağlayıcı varsayılan "
 "olarak veya boş dize olarak ayarlanması beklenir."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr "Yardımcı diyalogları ekle"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -506,59 +432,86 @@ msgstr ""
 "diyalogları üst pencerenin başlık çubuğunda ekli gözükür ve üst pencere ile "
 "birlikte hareket eder."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Pencereler ekran kenarlarında bırakıldığında kenar döşemeyi etkinleştir."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+"Eğer etkinleştirilirse, dikey ekran kenarlarına bırakılan pencereler dikey "
+"olarak ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak "
+"şekilde yeniden boyutlandırılır. Ekranın tepedeki kenarına bırakılan "
+"pencereler ekranı tamamen kaplar."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Workspaces are managed dynamically"
+msgstr "Çalışma alanları dinamik olarak yönetilir"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Çalışma alanlarının dinamik olarak mı yönetileceğini yoksa sabit sayıda "
+"çalışma alanı mı olacağını belirler (org.gnome.desktop.wm.preferences "
+"içindeki num-workspaces değişkeni tarafından belirlenir)."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Sadece birincil monitördeki çalışma alanları"
 
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
+"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "No tab popup"
+msgstr "Sekme açılır penceresi yok"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
+"kapatılıp kapatılmayacağını belirler."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Draggable border width"
+msgstr "Sürüklenebilir kenarlık genişliği"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+"Sürüklenebilir kenarlıkların toplam miktarı. Eğer temanın görünür "
+"kenarlıkları yetersiz gelirse, bu değere ulaşmak için görünmez kenarlıklar "
+"eklenir."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Select window from tab popup"
+msgstr "Pencereyi, sekme açılır penceresinden seç"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+msgid "Cancel tab popup"
+msgstr "Sekmeyi yeni pencerede açmayı iptal et"
+
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kullanım: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Pencereyi Kapat"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Pencere Menüsü"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Pencereyi Küçült"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Pencereyi Büyült"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Pencere Geri Getir"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Pencereyi Yukarı Sar"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Pencereyi Geri Sar"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Pencereyi Üstte Tut"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Pencereyi Üstten Kaldır"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Her Zaman Görünen Çalışma Alanında"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -758,49 +711,49 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/ui/theme.c:253
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "üst"
 
-#: ../src/ui/theme.c:255
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "alt"
 
-#: ../src/ui/theme.c:257
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "sol"
 
-#: ../src/ui/theme.c:259
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "sağ"
 
-#: ../src/ui/theme.c:286
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "çerçeve geometrisi \"%s\" boyutunu tanımlamıyor"
 
-#: ../src/ui/theme.c:305
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "çerçeve geometrisi \"%s\" boyutunu \"%s\" pencere kenarı için tanımlamıyor"
 
-#: ../src/ui/theme.c:342
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "%g kabul edilebilir bir düğme en-boy oranı değil"
 
-#: ../src/ui/theme.c:354
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Çerçeve geometrisi düğmelerin boyutunu tanımlamıyor"
 
-#: ../src/ui/theme.c:1067
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Renk geçişlerinde en az iki renk olmalı"
 
-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -809,7 +762,7 @@ msgstr ""
 "GTK özel renk belirtiminde parantez içinde renk adı ve fallback kelimesi yer "
 "almalıdır; örneğin, gtk:custom[foo,bar]; \"%s\" ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1235
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -818,7 +771,7 @@ msgstr ""
 "gtk:custom color_name parametresinin adında geçersiz karakter '%c'; sadece A-"
 "Za-z0-9-_ karakterleri geçerlidir"
 
-#: ../src/ui/theme.c:1249
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -827,7 +780,7 @@ msgstr ""
 "Gtk:custom biçimi \"gtk:custom(color_name,fallback)\" şeklindedir; \"%s\" "
 "biçime uymuyor"
 
-#: ../src/ui/theme.c:1294
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -837,7 +790,7 @@ msgstr ""
 "örneğin, gtk:fg[NORMAL] belirtiminde NORMAL, durumu gösterir; \"%s\" "
 "ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1308
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -847,17 +800,17 @@ msgstr ""
 "örneğin, gtk:fg[NORMAL] belirtiminde NORMAL, durumu gösterir; \"%s\" "
 "ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1319
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Renk belirtimindeki \"%s\" durumu anlaşılamadı"
 
-#: ../src/ui/theme.c:1332
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Renk belirtimindeki \"%s\" renk bileşeni anlaşılamadı"
 
-#: ../src/ui/theme.c:1361
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -866,17 +819,17 @@ msgstr ""
 "Renk karışımının doğru biçimi \"blend/bg_color/fg_color/alpha\"dır; \"%s\" "
 "bu biçime uymuyor"
 
-#: ../src/ui/theme.c:1372
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Renk karışımındaki \"%s\" alfa değeri ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1382
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Renk karışımının alfa değeri \"%s\", 0.0 ile 1.0 arasında değil"
 
-#: ../src/ui/theme.c:1429
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -884,27 +837,27 @@ msgstr ""
 "Gölgelendirmenin doğru biçimi \"shade/bas_color/factor\"dır; \"%s\" bu "
 "biçime uymuyor"
 
-#: ../src/ui/theme.c:1440
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Gölgeli rengin gölge katsayısı olan \"%s\" ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1450
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Gölgeli rengin gölge katsayısı olan \"%s\", negatif"
 
-#: ../src/ui/theme.c:1479
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "\"%s\" rengi ayrıştırılamadı"
 
-#: ../src/ui/theme.c:1790
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Kordinat ifadesi izin verilmeyen '%s' karakterini içeriyor"
 
-#: ../src/ui/theme.c:1817
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -912,12 +865,12 @@ msgid ""
 msgstr ""
 "Kordinat ifadesi '%s' gerçel sayısını içeriyor ve bu sayı ayrıştırılamıyor"
 
-#: ../src/ui/theme.c:1831
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Kordinat ifadesi ayrıştırılamayan '%s' tamsayısını içeriyor"
 
-#: ../src/ui/theme.c:1953
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -925,17 +878,17 @@ msgid ""
 msgstr ""
 "Kordinat ifadesi bu metnin başında bilinmeyen bir işleç içeriyor: \"%s\""
 
-#: ../src/ui/theme.c:2010
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Kordinat ifadesi boş ya da anlaşılamadı"
 
-#: ../src/ui/theme.c:2121 ../src/ui/theme.c:2131 ../src/ui/theme.c:2165
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Kordinat ifadesi sıfıra bölümle sonuçlanıyor"
 
-#: ../src/ui/theme.c:2173
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -943,23 +896,23 @@ msgstr ""
 "Kordinat ifadesi bir gerçel sayı üzerinde mod (kalan bulma) işlecini "
 "kullanmaya çalıştı"
 
-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Kordinat ifadesi işleneni beklenen \"%s\", işlecini içeriyor"
 
-#: ../src/ui/theme.c:2238
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Kordinat ifadesi işleci beklenen bir işlenen içeriyor"
 
-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Kordinat ifadesi bir işlenen yerine işleçle bitiyor"
 
-#: ../src/ui/theme.c:2256
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -968,38 +921,38 @@ msgstr ""
 "Kordinat ifadesi birbirlerinin izleyen ve aralarında işlenen olmayan \"%2$c"
 "\" ve \"%1$c\" işleçlerini içeriyor"
 
-#: ../src/ui/theme.c:2407 ../src/ui/theme.c:2452
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Kordinat ifadesi bilinmeyen bir değişken ya da sabit olan \"%s\" içeriyor"
 
-#: ../src/ui/theme.c:2506
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Kordinat belirtim ayrıştırıcısı tamponundan taştı."
 
-#: ../src/ui/theme.c:2535
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Kordinat ifadesi sol parantezi olmayan bir sağ parantez içeriyor"
 
-#: ../src/ui/theme.c:2599
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Kordinat ifadesi sağ parantezi olmayan bir sol parantez içeriyor"
 
-#: ../src/ui/theme.c:2610
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Kordinat ifadesi göründüğü kadarıyla ne işleç ne de işlenen içeriyor"
 
-#: ../src/ui/theme.c:2822 ../src/ui/theme.c:2842 ../src/ui/theme.c:2862
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema bir hata ile sonuçlanan ifadeye sahip: %s\n"
 
-#: ../src/ui/theme.c:4533
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1008,25 +961,25 @@ msgstr ""
 "Bu çerçeve biçeminde <button function=\"%s\" state=\"%s\" draw_ops=\"her "
 "neyse\"/> belirtilmek zorunda"
 
-#: ../src/ui/theme.c:5066 ../src/ui/theme.c:5091
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Eksik <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"her neyse\"/>"
 
-#: ../src/ui/theme.c:5139
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "\"%s\" teması yüklenemedi: %s\n"
 
-#: ../src/ui/theme.c:5275 ../src/ui/theme.c:5282 ../src/ui/theme.c:5289
-#: ../src/ui/theme.c:5296 ../src/ui/theme.c:5303
+#: ../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
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "\"%2$s\" temasında hiç <%1$s> atanmamış"
 
-#: ../src/ui/theme.c:5311
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1035,14 +988,14 @@ msgstr ""
 "\"%2$s\" temasında \"%1$s\" pencere türüne çerçeve biçemi atanmamış, bir "
 "<window type=\"%3$s\" style_set=\"her neyse\"/> öğesi ekleyin"
 
-#: ../src/ui/theme.c:5709 ../src/ui/theme.c:5771 ../src/ui/theme.c:5834
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Kullanıcı tanımlı sabitler büyük harfle başlamalıdır; \"%s\" buna uymuyor"
 
-#: ../src/ui/theme.c:5717 ../src/ui/theme.c:5779 ../src/ui/theme.c:5842
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "\"%s\" sabit değeri zaten tanımlanmış"
@@ -1425,7 +1378,7 @@ msgstr "<%s> öğesinin içinde metin bulunmamalıdır"
 msgid "<%s> specified twice for this theme"
 msgstr "Bu tema için <%s> iki kez belirtilmiş"
 
-#: ../src/ui/theme-parser.c:4348
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Tema %s için geçerli bir dosya bulunamadı\n"
@@ -1629,6 +1582,52 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d kordinat ifadesi %g saniye içinde ayrıştırıldı (%g saniye ortalama ile)\n"
 
+#~ msgid "Comma-separated list of compositor plugins"
+#~ msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"
+
+#~ msgid "Live Hidden Windows"
+#~ msgstr "Çalışır Durumdaki Gizli Pencereler"
+
+#~ msgid ""
+#~ "Determines whether hidden windows (i.e., minimized windows and windows on "
+#~ "other workspaces than the current one) should be kept alive."
+#~ msgstr ""
+#~ "Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma "
+#~ "alanındaki pencereler) çalışır bırakılıp bırakılmayacağını belirler."
+
+#~ msgid "Close Window"
+#~ msgstr "Pencereyi Kapat"
+
+#~ msgid "Window Menu"
+#~ msgstr "Pencere Menüsü"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Pencereyi Küçült"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Pencereyi Büyült"
+
+#~ msgid "Restore Window"
+#~ msgstr "Pencere Geri Getir"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Pencereyi Yukarı Sar"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Pencereyi Geri Sar"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Pencereyi Üstte Tut"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Pencereyi Üstten Kaldır"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Her Zaman Görünen Çalışma Alanında"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Çalışma alanı 1'e geç"
 

po/zh_CN.po

@@ -16,26 +16,28 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-19 15:55+0000\n"
+"POT-Creation-Date: 2012-04-14 03:24+0000\n"
 "PO-Revision-Date: 2012-03-20 17:10+0000\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1
+#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
 msgid "Windows"
 msgstr "窗口"
 
 #: ../src/50-mutter-windows.xml.in.h:2
+#, fuzzy
 msgid "View split on left"
-msgstr ""
+msgstr "分割到左侧"
 
 #: ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
 msgid "View split on right"
-msgstr ""
+msgstr "分割到右侧"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
@@ -426,6 +428,8 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
+"如果启用，将窗口拖放到屏幕竖直边缘时会将窗口纵向最大化、横向占据半屏；将窗口"
+"拖放到屏幕上边缘时会将窗口最大化。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces are managed dynamically"
@@ -453,14 +457,16 @@ msgid ""
 msgstr "决定工作区切换对所有显示器上的窗口还是只对主显示器上的有效。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#, fuzzy
 msgid "No tab popup"
-msgstr ""
+msgstr "无切换弹出"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#, fuzzy
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
-msgstr ""
+msgstr "决定窗口轮换时是否禁用缩略图弹出和高亮边框。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -477,11 +483,12 @@ msgstr ""
 #, fuzzy
 #| msgid "Remove Window From Top"
 msgid "Select window from tab popup"
-msgstr "取消窗口常居顶端"
+msgstr "从切换弹出界面选择窗口"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
+#, fuzzy
 msgid "Cancel tab popup"
-msgstr ""
+msgstr "取消切换弹出"
 
 #: ../src/tools/mutter-message.c:123
 #, c-format
@@ -1523,17 +1530,177 @@ msgstr "y 值为 %d，但应该为 %d "
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 
-#~ msgid "Switch to workspace 1"
-#~ msgstr "切换到工作区 1"
+#: ../src/50-mutter-navigation.xml.in.h:18
+msgid "Switch to workspace 1"
+msgstr "切换到工作区 1"
 
-#~ msgid "Switch to workspace 2"
-#~ msgstr "切换到工作区 2"
+#: ../src/50-mutter-navigation.xml.in.h:19
+msgid "Switch to workspace 2"
+msgstr "切换到工作区 2"
 
-#~ msgid "Switch to workspace 3"
-#~ msgstr "切换到工作区 3"
+#: ../src/50-mutter-navigation.xml.in.h:20
+msgid "Switch to workspace 3"
+msgstr "切换到工作区 3"
 
-#~ msgid "Switch to workspace 4"
-#~ msgstr "切换到工作区 4"
+#: ../src/50-mutter-navigation.xml.in.h:21
+msgid "Switch to workspace 4"
+msgstr "切换到工作区 4"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+msgid "Activate the window menu"
+msgstr "激活窗口菜单"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+msgid "Toggle fullscreen mode"
+msgstr "切换全屏模式"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+msgid "Toggle maximization state"
+msgstr "切换最大化状态"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+msgid "Maximize window"
+msgstr "最大化窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+msgid "Restore window"
+msgstr "恢复窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+msgid "Toggle shaded state"
+msgstr "切换卷起状态"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+msgid "Minimize window"
+msgstr "最小化窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:2
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+msgid "Move window"
+msgstr "移动窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "改变窗口大小"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Move window to workspace 1"
+msgstr "将窗口移到工作区 1"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Move window to workspace 2"
+msgstr "将窗口移到工作区 2"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+msgid "Move window to workspace 3"
+msgstr "将窗口移到工作区 3"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+msgid "Move window to workspace 4"
+msgstr "将窗口移到工作区 4"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "将窗口左移一个工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "将窗口右移一个工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace up"
+msgstr "将窗口上移一个工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+msgid "Move window one workspace down"
+msgstr "将窗口下移一个工作区"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+msgid "Raise window above other windows"
+msgstr "将窗口提升到其它窗口之上"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+msgid "Lower window below other windows"
+msgstr "将窗口降低到其它窗口之下"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+msgid "Maximize window vertically"
+msgstr "垂直最大化窗口"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+msgid "Maximize window horizontally"
+msgstr "水平最大化窗口"
+
+#: ../src/50-mutter-navigation.xml.in.h:1
+msgid "Hide all normal windows"
+msgstr "隐藏所有正常窗口"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+msgid "Move to workspace above"
+msgstr "移动到上层工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+msgid "Move to workspace below"
+msgstr "移动到下层工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+msgid "Move to workspace left"
+msgstr "移动到左侧工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+msgid "Move to workspace right"
+msgstr "移动到右侧工作区"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+msgid "Navigation"
+msgstr "导航"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+msgid "Switch applications"
+msgstr "切换应用程序"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+msgid "Switch system controls"
+msgstr "切换系统控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+msgid "Switch system controls directly"
+msgstr "直接切换系统控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+msgid "Switch windows directly"
+msgstr "直接切换窗口"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+msgid "Switch windows of an app directly"
+msgstr "在应用程序窗口间直接移动焦点"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+msgid "Switch windows of an application"
+msgstr "在应用程序的窗口之间切换窗口"
+
+#: ../src/50-mutter-system.xml.in.h:1
+msgid "Show the activities overview"
+msgstr "显示活动大纲"
+
+#: ../src/50-mutter-system.xml.in.h:2
+msgid "Show the run command prompt"
+msgstr "显示运行命令提示符"
+
+#: ../src/50-mutter-system.xml.in.h:3
+msgid "System"
+msgstr "系统"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+msgid "Raise window if covered, otherwise lower it"
+msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+msgid "Toggle window on all workspaces or one"
+msgstr "在位于所有或仅一个工作区的窗口间切换"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "切换到工作区 5"
@@ -1629,54 +1796,12 @@ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 #~ msgid "Run a terminal"
 #~ msgstr "运行终端"
 
-#~ msgid "Activate the window menu"
-#~ msgstr "激活窗口菜单"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "切换全屏模式"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "切换最大化状态"
-
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "在窗口是否永远可见于其它窗口之上间切换"
 
-#~ msgid "Maximize window"
-#~ msgstr "最大化窗口"
-
-#~ msgid "Restore window"
-#~ msgstr "恢复窗口"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "切换卷起状态"
-
-#~ msgid "Minimize window"
-#~ msgstr "最小化窗口"
-
-#~ msgid "Close window"
-#~ msgstr "关闭窗口"
-
-#~ msgid "Move window"
-#~ msgstr "移动窗口"
-
-#~ msgid "Resize window"
-#~ msgstr "改变窗口大小"
-
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "在窗口位于所有或仅一个工作区间切换"
 
-#~ msgid "Move window to workspace 1"
-#~ msgstr "将窗口移到工作区 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "将窗口移到工作区 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "将窗口移到工作区 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "将窗口移到工作区 4"
-
 #~ msgid "Move window to workspace 5"
 #~ msgstr "将窗口移到工作区 5"
 
@@ -1701,33 +1826,9 @@ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "将窗口移到工作区 12"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "将窗口左移一个工作区"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "将窗口右移一个工作区"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "将窗口上移一个工作区"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "将窗口下移一个工作区"
-
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
 
-#~ msgid "Raise window above other windows"
-#~ msgstr "将窗口提升到其它窗口之上"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "将窗口降低到其它窗口之下"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "垂直最大化窗口"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "水平最大化窗口"
-
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "将窗口移到西北(左上)角"
 

po/zh_HK.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-19 23:54+0800\n"
-"PO-Revision-Date: 2012-03-19 23:55+0800\n"
+"POT-Creation-Date: 2012-07-17 15:17+0800\n"
+"PO-Revision-Date: 2012-07-17 15:17+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: \n"
@@ -19,18 +19,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1
+#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+msgid "Windows"
+msgstr "視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "檢視分割於左側"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "檢視分割於右側"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "視窗"
-
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
@@ -41,7 +41,7 @@ msgid ""
 "\"."
 msgstr "在畫面「%2$s」中的第 %1$i 個螢幕中已啟動另一個組合視窗管理員。"
 
-#: ../src/core/bell.c:307
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "響鈴事件"
 
@@ -50,76 +50,76 @@ msgstr "響鈴事件"
 msgid "Unknown window information request: %d"
 msgstr "未知的視窗資訊要求：%d"
 
-#: ../src/core/delete.c:111
-#, c-format
-msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s</tt> 沒有回應。"
-
 #: ../src/core/delete.c:114
+#, c-format
+msgid "%s is not responding."
+msgstr "%s 沒有回應。"
+
+#: ../src/core/delete.c:118
 msgid "Application is not responding."
 msgstr "應用程式沒有回應。"
 
-#: ../src/core/delete.c:119
+#: ../src/core/delete.c:123
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "你可以選擇稍等一下，或者強制程式立即結束。"
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Wait"
 msgstr "等待(_W)"
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Force Quit"
 msgstr "強制結束(_F)"
 
-#: ../src/core/display.c:387
+#: ../src/core/display.c:380
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "遺失複合視窗管理所需的 %s 延伸功能"
 
-#: ../src/core/display.c:453
+#: ../src/core/display.c:446
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "無法開啟 X Window 畫面‘%s’\n"
 
-#: ../src/core/keybindings.c:852
+#: ../src/core/keybindings.c:844
 #, 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/main.c:206
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "停用到作業階段管理程式的連線"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "取代執行中的視窗管理員"
 
-#: ../src/core/main.c:218
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "指定作業階段管理 ID"
 
-#: ../src/core/main.c:223
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "使用的 X 畫面"
 
-#: ../src/core/main.c:229
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "以 savefile 初始化作業階段"
 
-#: ../src/core/main.c:235
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "使用同步方式調用 X 函數"
 
-#: ../src/core/main.c:504
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "找不到佈景主題目錄：%s\n"
 
-#: ../src/core/main.c:520
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -144,28 +144,28 @@ msgid "Print version"
 msgstr "顯示版本"
 
 #: ../src/core/mutter.c:60
-msgid "Comma-separated list of compositor plugins"
-msgstr "以逗號分隔的複合視窗外掛程式清單"
+msgid "Mutter plugin to use"
+msgstr "要使用的 Mutter 外掛程式"
 
-#: ../src/core/prefs.c:1077
+#: ../src/core/prefs.c:1065
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr "關閉了對不合規格的程式的支援。某些程式可能無法正常運作。\n"
 
-#: ../src/core/prefs.c:1152
+#: ../src/core/prefs.c:1140
 #, 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:1218
+#: ../src/core/prefs.c:1206
 #, 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:1739
+#: ../src/core/prefs.c:1724
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -173,17 +173,17 @@ msgid ""
 msgstr "組態資料庫中的“%s”不是按鍵組合“%s”的有效設定值\n"
 
 # (Abel) take care of the same string in libwnck
-#: ../src/core/prefs.c:1836
+#: ../src/core/prefs.c:1821
 #, c-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: ../src/core/screen.c:730
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "畫面‘%2$s’中的第 %1$d 個螢幕無效\n"
 
-#: ../src/core/screen.c:746
+#: ../src/core/screen.c:668
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -191,18 +191,18 @@ msgid ""
 msgstr "畫面‘%2$s’中的第 %1$d 個螢幕已經有了視窗管理員；請嘗試使用 --replace 選項來替換目前的視窗管理員。\n"
 
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
-#: ../src/core/screen.c:773
+#: ../src/core/screen.c:695
 #, 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:828
+#: ../src/core/screen.c:750
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "畫面“%2$s”中的第 %1$d 個螢幕已經有了視窗總管\n"
 
-#: ../src/core/screen.c:1013
+#: ../src/core/screen.c:935
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "無法釋放畫面“%2$s”中的第 %1$d 個螢幕\n"
@@ -260,44 +260,44 @@ msgid ""
 "be restarted manually next time you log in."
 msgstr "這些視窗不支援 &quot;儲存目前的設定&quot; ，必須在下次登入後自行啟動。"
 
-#: ../src/core/util.c:111
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "無法開啟偵錯記錄檔：%s\n"
 
-#: ../src/core/util.c:121
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "無法 fdopen() 記錄檔 %s：%s\n"
 
-#: ../src/core/util.c:127
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "已開啟記錄檔 %s\n"
 
-#: ../src/core/util.c:146 ../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:290
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "視窗管理員："
 
-#: ../src/core/util.c:438
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "視窗總管出現錯誤："
 
-#: ../src/core/util.c:471
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "視窗總管警告："
 
-#: ../src/core/util.c:499
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "視窗總管錯誤："
 
 #. first time through
-#: ../src/core/window.c:7266
+#: ../src/core/window.c:7234
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -311,29 +311,29 @@ msgstr "視窗 %s 將 SM_CLIENT_ID 設定為該視窗本身，而不是 ICCCM
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7931
+#: ../src/core/window.c:7899
 #, 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×%d 及將大小上限定為 %d×%d；這種做法不符合常理。\n"
 
-#: ../src/core/window-props.c:309
+#: ../src/core/window-props.c:310
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "程式設定了多餘的 _NET_WM_PID %lu\n"
 
-#: ../src/core/window-props.c:426
+#: ../src/core/window-props.c:429
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s（在 %s）"
 
-#: ../src/core/window-props.c:1481
+#: ../src/core/window-props.c:1484
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "%2$s 指定了無效的 WM_TRANSIENT_FOR 視窗 0x%1$lx。\n"
 
-#: ../src/core/window-props.c:1492
+#: ../src/core/window-props.c:1495
 #, 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"
@@ -369,68 +369,73 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "用於延伸視窗管理操作程序的特殊按鍵"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr "這個設定鍵會初始化「overlay」，這是一個複合視窗概覽與應用程式執行系統。預設是要成為 PC 硬件上的「Windows key」。預期這個按鍵組含不是預設值就是設定為空字串。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "附加模態對話盒"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "取消分頁彈出項"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr "決定隱藏的視窗（如最小化的視窗和位於目前以外工作區的視窗）是否保持活動。"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr "決定當視窗輪換時是否使用彈出式和強調框架。"
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr "當設為「true」，將不會有獨立的標題列，模態對話盒會附加在上層視窗的標題列並與上層視窗一起移動。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr "決定工作區切換是否使用於所有螢幕的視窗或只用於主要螢幕的視窗。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
-"static number of workspaces (determined by the num-workspaces key in org."
-"gnome.desktop.wm.preferences)."
-msgstr "決定工作區以動態方式管理或是有固定數量的工作區 (以 org.gnome.desktop.wm.preferences 中的 num-workspaces 鍵值來決定)。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
-msgid "Draggable border width"
-msgstr "可拖曳邊框闊度"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "在螢幕邊緣放下視窗時啟用邊緣拼貼"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr "如果啟用，將視窗拖放到螢幕垂直邊緣時會讓它們垂直最大化並調整水平方向大小覆蓋可用區域的一半。拖放視窗到螢幕頂端邊緣則會讓它們完全最大化。"
 
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Workspaces are managed dynamically"
+msgstr "工作區以動態方式管理"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr "決定工作區以動態方式管理或是有固定數量的工作區 (以 org.gnome.desktop.wm.preferences 中的 num-workspaces 鍵值來決定)。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+msgid "Workspaces only on primary"
+msgstr "只有主要螢幕的工作區"
+
 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Live Hidden Windows"
-msgstr "活動中的隱藏 Windows"
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr "決定工作區切換是否使用於所有螢幕的視窗或只用於主要螢幕的視窗。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
-msgid "Modifier to use for extended window management operations"
-msgstr "用於延伸視窗管理操作程序的特殊按鍵"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid "No tab popup"
 msgstr "沒有分頁彈出項"
 
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr "決定當視窗輪換時是否使用彈出式和強調框架。"
+
 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid "Select window from tab popup"
-msgstr "從分頁彈出項選擇視窗"
+msgid "Draggable border width"
+msgstr "可拖曳邊框闊度"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
@@ -439,27 +444,12 @@ msgid ""
 msgstr "所有可拖曳邊框的總數。如果布景的可視邊框不夠，會加入隱形邊框來符合這個數值。"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr "這個設定鍵會初始化「overlay」，這是一個複合視窗概覽與應用程式執行系統。預設是要成為 PC 硬件上的「Windows key」。預期這個按鍵組含不是預設值就是設定為空字串。"
+msgid "Select window from tab popup"
+msgstr "從分頁彈出項選擇視窗"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr "當設為「true」，將不會有獨立的標題列，模態對話盒會附加在上層視窗的標題列並與上層視窗一起移動。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:17
-msgid "Workspaces are managed dynamically"
-msgstr "工作區以動態方式管理"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid "Workspaces only on primary"
-msgstr "只有主要螢幕的工作區"
+msgid "Cancel tab popup"
+msgstr "取消分頁彈出項"
 
 #: ../src/tools/mutter-message.c:123
 #, c-format
@@ -681,261 +671,261 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/ui/theme.c:253
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "頂"
 
-#: ../src/ui/theme.c:255
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "底"
 
-#: ../src/ui/theme.c:257
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "左"
 
-#: ../src/ui/theme.c:259
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "右"
 
-#: ../src/ui/theme.c:286
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "邊框的位置大小中沒有指定“%s”部分的大小"
 
-#: ../src/ui/theme.c:305
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "邊框的位置大小中沒有指定“%2$s”邊框中的“%1$s”部分"
 
-#: ../src/ui/theme.c:342
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "按鈕的長寬比 %g 不合理"
 
-#: ../src/ui/theme.c:354
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "邊框的位置大小規格內未有指定按鈕的大小"
 
-#: ../src/ui/theme.c:1067
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "漸變色至少應該有兩種顏色"
 
-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1201
 #, 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:1235
+#: ../src/ui/theme.c:1217
 #, 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:1249
+#: ../src/ui/theme.c:1231
 #, 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:1294
+#: ../src/ui/theme.c:1276
 #, 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]，這裏 NORMAL 表示狀態；無法分析“%s”"
 
-#: ../src/ui/theme.c:1308
+#: ../src/ui/theme.c:1290
 #, 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:1319
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "無法將“%s”理解為色彩規格中的狀態"
 
-#: ../src/ui/theme.c:1332
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "無法將“%s”理解為色彩規格中的色彩部分"
 
-#: ../src/ui/theme.c:1361
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "指定混色的格式是“blend/背景顏色/前景顏色/透明度”，“%s”不符合規格"
 
-#: ../src/ui/theme.c:1372
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "無法理解“%s”作為混色的透明度數值"
 
-#: ../src/ui/theme.c:1382
+#: ../src/ui/theme.c:1364
 #, 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:1429
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "陰影的格式是“shade/基本顏色/比重”，但“%s”不符合格式"
 
-#: ../src/ui/theme.c:1440
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "在陰影顏色中無法將“%s”理解為陰影比重"
 
-#: ../src/ui/theme.c:1450
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "在陰影顏色中陰影比重“%s”是負數"
 
-#: ../src/ui/theme.c:1479
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "無法分析顏色“%s”"
 
-#: ../src/ui/theme.c:1790
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "座標表達式中出現不可接受的字符‘%s’"
 
-#: ../src/ui/theme.c:1817
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "座標表達式中出現無法分析的浮點小數‘%s’"
 
-#: ../src/ui/theme.c:1831
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "座標表達式中出現無法分析的整數‘%s’"
 
-#: ../src/ui/theme.c:1953
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "在座標表達式中，以下文字的開始部分含有不明的運算符：“%s”"
 
-#: ../src/ui/theme.c:2010
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "座標表達式是空白的或是無法分析"
 
-#: ../src/ui/theme.c:2121 ../src/ui/theme.c:2131 ../src/ui/theme.c:2165
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "座標表達式中出現被 0 整除的錯誤"
 
-#: ../src/ui/theme.c:2173
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "座標表達式中出現將浮點數使用於餘數運算符 (mod) 的錯誤"
 
-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "在座標表達式中，應該有運算子的地方出現了運算符“%s”"
 
-#: ../src/ui/theme.c:2238
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "在座標表達式中，應該有運算符的地方出現了運算子"
 
-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "結束座標表達式的是一個運算符而非運算子"
 
-#: ../src/ui/theme.c:2256
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "在座標表達式中，運算符“%c”緊隨運算符“%c”出現，但中間沒有任何運算子"
 
-#: ../src/ui/theme.c:2407 ../src/ui/theme.c:2452
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "座標表達式中出現不明的變數或常數“%s”"
 
-#: ../src/ui/theme.c:2506
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "座標表達式分析器令緩衝溢位。"
 
-#: ../src/ui/theme.c:2535
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "座標表達式中的閉括號沒有相應的開括號"
 
-#: ../src/ui/theme.c:2599
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "座標表達式中的開括號沒有相應的閉括號"
 
-#: ../src/ui/theme.c:2610
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "座標表達式中似乎沒有任何運算符或運算子"
 
-#: ../src/ui/theme.c:2822 ../src/ui/theme.c:2842 ../src/ui/theme.c:2862
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "佈景主題中含有引致錯誤的表達式：%s\n"
 
-#: ../src/ui/theme.c:4533
+#: ../src/ui/theme.c:4498
 #, 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:5066 ../src/ui/theme.c:5091
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, 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:5139
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "無法載入佈景主題“%s”：%s\n"
 
-#: ../src/ui/theme.c:5275 ../src/ui/theme.c:5282 ../src/ui/theme.c:5289
-#: ../src/ui/theme.c:5296 ../src/ui/theme.c:5303
+#: ../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
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <%s>"
 
-#: ../src/ui/theme.c:5311
+#: ../src/ui/theme.c:5254
 #, 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:5709 ../src/ui/theme.c:5771 ../src/ui/theme.c:5834
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "自行定義的常數必須以大寫字母開始；但“%s”不是"
 
-#: ../src/ui/theme.c:5717 ../src/ui/theme.c:5779 ../src/ui/theme.c:5842
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "已定義了“%s”常數"
@@ -1297,7 +1287,7 @@ msgstr "<%s> 元素內不可出現任何文字"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> 指定了這個佈景主題兩次"
 
-#: ../src/ui/theme-parser.c:4348
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "無法佈景主題的有效檔案 %s\n"
@@ -1500,6 +1490,190 @@ msgstr "y 的數值是 %d，%d是預期中的數值"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "分析 %d 座標表現需時 %g 秒（平均 %g 秒）\n"
 
+#: ../src/50-mutter-navigation.xml.in.h:1
+msgid "Hide all normal windows"
+msgstr "隱藏所有一般視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+msgid "Move to workspace above"
+msgstr "移至上方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+msgid "Move to workspace below"
+msgstr "移至下方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+msgid "Move to workspace left"
+msgstr "移至左方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+msgid "Move to workspace right"
+msgstr "移至右方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+msgid "Move window one workspace down"
+msgstr "將視窗移至下方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "將視窗移至左方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "將視窗移至右方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace up"
+msgstr "將視窗移至上方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Move window to workspace 1"
+msgstr "將視窗移至第 1 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Move window to workspace 2"
+msgstr "將視窗移至第 2 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+msgid "Move window to workspace 3"
+msgstr "將視窗移至第 3 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+msgid "Move window to workspace 4"
+msgstr "將視窗移至第 4 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+msgid "Navigation"
+msgstr "導航"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+msgid "Switch applications"
+msgstr "切換程式"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+msgid "Switch system controls"
+msgstr "切換系統控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+msgid "Switch system controls directly"
+msgstr "直接切換系統控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:18
+msgid "Switch to workspace 1"
+msgstr "切換至第 1 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:19
+msgid "Switch to workspace 2"
+msgstr "切換至第 2 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:20
+msgid "Switch to workspace 3"
+msgstr "切換至第 3 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:21
+msgid "Switch to workspace 4"
+msgstr "切換至第 4 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+msgid "Switch windows directly"
+msgstr "直接切換視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+msgid "Switch windows of an app directly"
+msgstr "直接切換程式的視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+msgid "Switch windows of an application"
+msgstr "切換程式的視窗"
+
+#: ../src/50-mutter-system.xml.in.h:1
+msgid "Show the activities overview"
+msgstr "顯示活動概覽"
+
+#: ../src/50-mutter-system.xml.in.h:2
+msgid "Show the run command prompt"
+msgstr "顯示執行指令提示"
+
+#: ../src/50-mutter-system.xml.in.h:3
+msgid "System"
+msgstr "系統"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+msgid "Activate the window menu"
+msgstr "使用視窗選單"
+
+#: ../src/50-mutter-windows.xml.in.h:2
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+msgid "Lower window below other windows"
+msgstr "遮蔽某個視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+msgid "Maximize window"
+msgstr "視窗最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+msgid "Maximize window horizontally"
+msgstr "將視窗橫向最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+msgid "Maximize window vertically"
+msgstr "將視窗縱向最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+msgid "Minimize window"
+msgstr "視窗最小化"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+msgid "Move window"
+msgstr "移動視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+msgid "Raise window above other windows"
+msgstr "令某個視窗覆蓋其它視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+msgid "Raise window if covered, otherwise lower it"
+msgstr "若被其他視窗遮蔽就抬升它，否則將它降下"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "調整視窗大小"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+msgid "Restore window"
+msgstr "還原視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+msgid "Toggle fullscreen mode"
+msgstr "切換全螢幕模式"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+msgid "Toggle maximization state"
+msgstr "切換最大化狀態"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+msgid "Toggle shaded state"
+msgstr "切換視窗捲起/放下狀態"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+msgid "Toggle window on all workspaces or one"
+msgstr "切換視窗顯示在所有工作區或是只顯示於其中之一"
+
+#~ msgid "Comma-separated list of compositor plugins"
+#~ msgstr "以逗號分隔的複合視窗外掛程式清單"
+
+#~ msgid ""
+#~ "Determines whether hidden windows (i.e., minimized windows and windows on "
+#~ "other workspaces than the current one) should be kept alive."
+#~ msgstr ""
+#~ "決定隱藏的視窗（如最小化的視窗和位於目前以外工作區的視窗）是否保持活動。"
+
+#~ msgid "Live Hidden Windows"
+#~ msgstr "活動中的隱藏 Windows"
+
 #~ msgid "Close Window"
 #~ msgstr "關閉視窗"
 

po/zh_TW.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-19 23:54+0800\n"
-"PO-Revision-Date: 2012-03-19 12:19+0800\n"
+"POT-Creation-Date: 2012-07-17 15:17+0800\n"
+"PO-Revision-Date: 2012-07-16 11:21+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: \n"
@@ -19,18 +19,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1
+#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+msgid "Windows"
+msgstr "視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "檢視分割於左側"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "檢視分割於右側"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "視窗"
-
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
@@ -41,7 +41,7 @@ msgid ""
 "\"."
 msgstr "在畫面「%2$s」中的第 %1$i 個螢幕中已啟動另一個組合視窗管理員。"
 
-#: ../src/core/bell.c:307
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "響鈴事件"
 
@@ -50,76 +50,76 @@ msgstr "響鈴事件"
 msgid "Unknown window information request: %d"
 msgstr "未知的視窗資訊要求：%d"
 
-#: ../src/core/delete.c:111
-#, c-format
-msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s</tt> 沒有回應。"
-
 #: ../src/core/delete.c:114
+#, c-format
+msgid "%s is not responding."
+msgstr "%s 沒有回應。"
+
+#: ../src/core/delete.c:118
 msgid "Application is not responding."
 msgstr "應用程式沒有回應。"
 
-#: ../src/core/delete.c:119
+#: ../src/core/delete.c:123
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "您可以選擇稍等一下，或者強制程式立即結束。"
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Wait"
 msgstr "等待(_W)"
 
-#: ../src/core/delete.c:126
+#: ../src/core/delete.c:130
 msgid "_Force Quit"
 msgstr "強制結束(_F)"
 
-#: ../src/core/display.c:387
+#: ../src/core/display.c:380
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "遺失複合視窗管理所需的 %s 延伸功能"
 
-#: ../src/core/display.c:453
+#: ../src/core/display.c:446
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "無法開啟 X Window 畫面‘%s’\n"
 
-#: ../src/core/keybindings.c:852
+#: ../src/core/keybindings.c:844
 #, 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/main.c:206
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "停用到作業階段管理程式的連線"
 
-#: ../src/core/main.c:212
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "取代執行中的視窗管理員"
 
-#: ../src/core/main.c:218
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "指定作業階段管理 ID"
 
-#: ../src/core/main.c:223
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "使用的 X 畫面"
 
-#: ../src/core/main.c:229
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "以 savefile 初始化作業階段"
 
-#: ../src/core/main.c:235
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "使用同步方式調用 X 函式"
 
-#: ../src/core/main.c:504
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "找不到佈景主題目錄：%s\n"
 
-#: ../src/core/main.c:520
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -144,28 +144,28 @@ msgid "Print version"
 msgstr "顯示版本"
 
 #: ../src/core/mutter.c:60
-msgid "Comma-separated list of compositor plugins"
-msgstr "以逗號分隔的複合視窗外掛程式清單"
+msgid "Mutter plugin to use"
+msgstr "要使用的 Mutter 外掛程式"
 
-#: ../src/core/prefs.c:1077
+#: ../src/core/prefs.c:1065
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr "關閉了對不合規格的程式的支援。某些程式可能無法正常運作。\n"
 
-#: ../src/core/prefs.c:1152
+#: ../src/core/prefs.c:1140
 #, 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:1218
+#: ../src/core/prefs.c:1206
 #, 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:1739
+#: ../src/core/prefs.c:1724
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -173,17 +173,17 @@ msgid ""
 msgstr "組態資料庫中的“%s”不是按鍵組合“%s”的有效設定值\n"
 
 # (Abel) take care of the same string in libwnck
-#: ../src/core/prefs.c:1836
+#: ../src/core/prefs.c:1821
 #, c-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: ../src/core/screen.c:730
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "畫面‘%2$s’中的第 %1$d 個螢幕無效\n"
 
-#: ../src/core/screen.c:746
+#: ../src/core/screen.c:668
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -193,18 +193,18 @@ msgstr ""
 "換目前的視窗管理員。\n"
 
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
-#: ../src/core/screen.c:773
+#: ../src/core/screen.c:695
 #, 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:828
+#: ../src/core/screen.c:750
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "畫面“%2$s”中的第 %1$d 個螢幕已經有了視窗總管\n"
 
-#: ../src/core/screen.c:1013
+#: ../src/core/screen.c:935
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "無法釋放畫面“%2$s”中的第 %1$d 個螢幕\n"
@@ -262,44 +262,44 @@ msgid ""
 "be restarted manually next time you log in."
 msgstr "這些視窗不支援 &quot;儲存目前的設定&quot; ，必須在下次登入後自行啟動。"
 
-#: ../src/core/util.c:111
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "無法開啟偵錯記錄檔：%s\n"
 
-#: ../src/core/util.c:121
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "無法 fdopen() 記錄檔 %s：%s\n"
 
-#: ../src/core/util.c:127
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "已開啟記錄檔 %s\n"
 
-#: ../src/core/util.c:146 ../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:290
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "視窗管理員："
 
-#: ../src/core/util.c:438
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "視窗總管出現錯誤："
 
-#: ../src/core/util.c:471
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "視窗總管警告："
 
-#: ../src/core/util.c:499
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "視窗總管錯誤："
 
 #. first time through
-#: ../src/core/window.c:7266
+#: ../src/core/window.c:7234
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -315,7 +315,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7931
+#: ../src/core/window.c:7899
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -324,22 +324,22 @@ msgstr ""
 "視窗 %s 設定了 MWM 提示，表示它不可以調整大小，但又將大小下限定為 %d×%d 及將"
 "大小上限定為 %d×%d；這種做法不符合常理。\n"
 
-#: ../src/core/window-props.c:309
+#: ../src/core/window-props.c:310
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "程式設定了多餘的 _NET_WM_PID %lu\n"
 
-#: ../src/core/window-props.c:426
+#: ../src/core/window-props.c:429
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s（在 %s）"
 
-#: ../src/core/window-props.c:1481
+#: ../src/core/window-props.c:1484
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "%2$s 指定了無效的 WM_TRANSIENT_FOR 視窗 0x%1$lx。\n"
 
-#: ../src/core/window-props.c:1492
+#: ../src/core/window-props.c:1495
 #, 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"
@@ -375,82 +375,10 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
-msgid "Attach modal dialogs"
-msgstr "附加模態對話盒"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "取消分頁彈出項"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"決定隱藏的視窗（如最小化的視窗和位於目前以外工作區的視窗）是否保持活動。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr "決定當視窗輪換時是否使用彈出式和強調框架。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr "決定工作區切換是否使用於所有螢幕的視窗或只用於主要螢幕的視窗。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
-"static number of workspaces (determined by the num-workspaces key in org."
-"gnome.desktop.wm.preferences)."
-msgstr ""
-"決定工作區以動態方式管理或是有固定數量的工作區 (以 org.gnome.desktop.wm."
-"preferences 中的 num-workspaces 鍵值來決定)。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
-msgid "Draggable border width"
-msgstr "可拖曳邊框寬度"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "在螢幕邊緣放下視窗時啟用邊緣拼貼"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them "
-"vertically and resizes them horizontally to cover half of the available "
-"area. Dropping windows on the top screen edge maximizes them completely."
-msgstr ""
-"如果啟用，將視窗拖放到螢幕垂直邊緣時會讓它們垂直最大化並調整水平方向大小覆蓋"
-"可用區域的一半。拖放視窗到螢幕頂端邊緣則會讓它們完全最大化。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Live Hidden Windows"
-msgstr "活動中的隱藏 Windows"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Modifier to use for extended window management operations"
 msgstr "用於延伸視窗管理操作程序的特殊按鍵"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-msgid "No tab popup"
-msgstr "沒有分頁彈出項"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid "Select window from tab popup"
-msgstr "從分頁彈出項選擇視窗"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
-"not enough, invisible borders will be added to meet this value."
-msgstr ""
-"所有可拖曳邊框的總數。如果布景的可視邊框不夠，會加入隱形邊框來符合這個數值。"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -461,7 +389,11 @@ msgstr ""
 "要成為 PC 硬體上的「Windows key」。預期這個按鍵組含不是預設值就是設定為空字"
 "串。"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr "附加模態對話盒"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -470,14 +402,71 @@ msgstr ""
 "當設為「true」，將不會有獨立的標題列，模態對話盒會附加在上層視窗的標題列並與"
 "上層視窗一起移動。"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "在螢幕邊緣放下視窗時啟用邊緣拼貼"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+"如果啟用，將視窗拖放到螢幕垂直邊緣時會讓它們垂直最大化並調整水平方向大小覆蓋"
+"可用區域的一半。拖放視窗到螢幕頂端邊緣則會讓它們完全最大化。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "工作區以動態方式管理"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"決定工作區以動態方式管理或是有固定數量的工作區 (以 org.gnome.desktop.wm."
+"preferences 中的 num-workspaces 鍵值來決定)。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "只有主要螢幕的工作區"
 
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr "決定工作區切換是否使用於所有螢幕的視窗或只用於主要螢幕的視窗。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "No tab popup"
+msgstr "沒有分頁彈出項"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr "決定當視窗輪換時是否使用彈出式和強調框架。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Draggable border width"
+msgstr "可拖曳邊框寬度"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+"所有可拖曳邊框的總數。如果布景的可視邊框不夠，會加入隱形邊框來符合這個數值。"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Select window from tab popup"
+msgstr "從分頁彈出項選擇視窗"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+msgid "Cancel tab popup"
+msgstr "取消分頁彈出項"
+
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
@@ -698,48 +687,48 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/ui/theme.c:253
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "頂"
 
-#: ../src/ui/theme.c:255
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "底"
 
-#: ../src/ui/theme.c:257
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "左"
 
-#: ../src/ui/theme.c:259
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "右"
 
-#: ../src/ui/theme.c:286
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "邊框的位置大小中沒有指定“%s”部分的大小"
 
-#: ../src/ui/theme.c:305
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "邊框的位置大小中沒有指定“%2$s”邊框中的“%1$s”部分"
 
-#: ../src/ui/theme.c:342
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "按鈕的長寬比 %g 不合理"
 
-#: ../src/ui/theme.c:354
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "邊框的位置大小規格內未有指定按鈕的大小"
 
-#: ../src/ui/theme.c:1067
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "漸層至少應該有兩種顏色"
 
-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -748,14 +737,14 @@ msgstr ""
 "GTK 自訂顏色規格規定必須有顏色名稱並加上封閉括號，例如 gtk:custom(foo,bar)；"
 "無法分析「%s」"
 
-#: ../src/ui/theme.c:1235
+#: ../src/ui/theme.c:1217
 #, 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:1249
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -763,7 +752,7 @@ msgid ""
 msgstr ""
 "Gtk:custom 的格式是「gtk:custom(color_name,fallback)」，但「%s」不符合格式"
 
-#: ../src/ui/theme.c:1294
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -772,7 +761,7 @@ msgstr ""
 "GTK 色彩規格規定必須在狀態外加上方括號，例如 gtk:fg[NORMAL]，這裡 NORMAL 表示"
 "狀態；無法分析“%s”"
 
-#: ../src/ui/theme.c:1308
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -781,148 +770,148 @@ msgstr ""
 "GTK 色彩規格規定必須在狀態後加上閉方括號，例如 gtk:fg[NORMAL]，這裡 NORMAL 表"
 "示狀態；無法分析“%s”"
 
-#: ../src/ui/theme.c:1319
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "無法將“%s”理解為色彩規格中的狀態"
 
-#: ../src/ui/theme.c:1332
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "無法將“%s”理解為色彩規格中的色彩部分"
 
-#: ../src/ui/theme.c:1361
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "指定混色的格式是“blend/背景顏色/前景顏色/透明度”，“%s”不符合規格"
 
-#: ../src/ui/theme.c:1372
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "無法理解“%s”作為混色的透明度數值"
 
-#: ../src/ui/theme.c:1382
+#: ../src/ui/theme.c:1364
 #, 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:1429
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "陰影的格式是“shade/基本顏色/比重”，但“%s”不符合格式"
 
-#: ../src/ui/theme.c:1440
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "在陰影顏色中無法將“%s”理解為陰影比重"
 
-#: ../src/ui/theme.c:1450
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "在陰影顏色中陰影比重“%s”是負數"
 
-#: ../src/ui/theme.c:1479
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "無法分析顏色“%s”"
 
-#: ../src/ui/theme.c:1790
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "座標表達式中出現不可接受的字元‘%s’"
 
-#: ../src/ui/theme.c:1817
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "座標表達式中出現無法分析的浮點小數‘%s’"
 
-#: ../src/ui/theme.c:1831
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "座標表達式中出現無法分析的整數‘%s’"
 
-#: ../src/ui/theme.c:1953
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "在座標表達式中，以下文字的開始部分含有不明的運算符：“%s”"
 
-#: ../src/ui/theme.c:2010
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "座標表達式是空白的或是無法分析"
 
-#: ../src/ui/theme.c:2121 ../src/ui/theme.c:2131 ../src/ui/theme.c:2165
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "座標表達式中出現被 0 整除的錯誤"
 
-#: ../src/ui/theme.c:2173
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "座標表達式中出現將浮點數使用於餘數運算符 (mod) 的錯誤"
 
-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "在座標表達式中，應該有運算子的地方出現了運算符“%s”"
 
-#: ../src/ui/theme.c:2238
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "在座標表達式中，應該有運算符的地方出現了運算子"
 
-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "結束座標表達式的是一個運算符而非運算子"
 
-#: ../src/ui/theme.c:2256
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "在座標表達式中，運算符“%c”緊隨運算符“%c”出現，但中間沒有任何運算子"
 
-#: ../src/ui/theme.c:2407 ../src/ui/theme.c:2452
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "座標表達式中出現不明的變數或常數“%s”"
 
-#: ../src/ui/theme.c:2506
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "座標表達式分析器令緩衝溢位。"
 
-#: ../src/ui/theme.c:2535
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "座標表達式中的閉括號沒有相應的開括號"
 
-#: ../src/ui/theme.c:2599
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "座標表達式中的開括號沒有相應的閉括號"
 
-#: ../src/ui/theme.c:2610
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "座標表達式中似乎沒有任何運算符或運算子"
 
-#: ../src/ui/theme.c:2822 ../src/ui/theme.c:2842 ../src/ui/theme.c:2862
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "佈景主題中含有引致錯誤的表達式：%s\n"
 
-#: ../src/ui/theme.c:4533
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -931,25 +920,25 @@ msgstr ""
 "此邊框款式必須指定 <button function=\"%s\" state=\"%s\" draw_ops=\"whatever"
 "\"/>"
 
-#: ../src/ui/theme.c:5066 ../src/ui/theme.c:5091
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, 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:5139
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "無法載入佈景主題“%s”：%s\n"
 
-#: ../src/ui/theme.c:5275 ../src/ui/theme.c:5282 ../src/ui/theme.c:5289
-#: ../src/ui/theme.c:5296 ../src/ui/theme.c:5303
+#: ../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
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <%s>"
 
-#: ../src/ui/theme.c:5311
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -958,13 +947,13 @@ msgstr ""
 "在佈景主題“%2$s”中，視窗類型“%1$s”沒有指定任何邊框款式。請加上 <window type="
 "\"%3$s\" style_set=\"whatever\"/> 元素"
 
-#: ../src/ui/theme.c:5709 ../src/ui/theme.c:5771 ../src/ui/theme.c:5834
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "自行定義的常數必須以大寫字母開始；但“%s”不是"
 
-#: ../src/ui/theme.c:5717 ../src/ui/theme.c:5779 ../src/ui/theme.c:5842
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "已定義了“%s”常數"
@@ -1334,7 +1323,7 @@ msgstr "<%s> 元素內不可出現任何文字"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> 指定了這個佈景主題兩次"
 
-#: ../src/ui/theme-parser.c:4348
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "無法佈景主題的有效檔案 %s\n"
@@ -1537,6 +1526,190 @@ msgstr "y 的數值是 %d，%d是預期中的數值"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "分析 %d 座標表現需時 %g 秒（平均 %g 秒）\n"
 
+#: ../src/50-mutter-navigation.xml.in.h:1
+msgid "Hide all normal windows"
+msgstr "隱藏所有一般視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+msgid "Move to workspace above"
+msgstr "移至上方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+msgid "Move to workspace below"
+msgstr "移至下方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+msgid "Move to workspace left"
+msgstr "移至左方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+msgid "Move to workspace right"
+msgstr "移至右方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+msgid "Move window one workspace down"
+msgstr "將視窗移至下方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "將視窗移至左方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "將視窗移至右方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace up"
+msgstr "將視窗移至上方的工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Move window to workspace 1"
+msgstr "將視窗移至第 1 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Move window to workspace 2"
+msgstr "將視窗移至第 2 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+msgid "Move window to workspace 3"
+msgstr "將視窗移至第 3 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+msgid "Move window to workspace 4"
+msgstr "將視窗移至第 4 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+msgid "Navigation"
+msgstr "導航"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+msgid "Switch applications"
+msgstr "切換程式"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+msgid "Switch system controls"
+msgstr "切換系統控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+msgid "Switch system controls directly"
+msgstr "直接切換系統控制"
+
+#: ../src/50-mutter-navigation.xml.in.h:18
+msgid "Switch to workspace 1"
+msgstr "切換至第 1 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:19
+msgid "Switch to workspace 2"
+msgstr "切換至第 2 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:20
+msgid "Switch to workspace 3"
+msgstr "切換至第 3 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:21
+msgid "Switch to workspace 4"
+msgstr "切換至第 4 個工作區"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+msgid "Switch windows directly"
+msgstr "直接切換視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+msgid "Switch windows of an app directly"
+msgstr "直接切換程式的視窗"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+msgid "Switch windows of an application"
+msgstr "切換程式的視窗"
+
+#: ../src/50-mutter-system.xml.in.h:1
+msgid "Show the activities overview"
+msgstr "顯示活動概覽"
+
+#: ../src/50-mutter-system.xml.in.h:2
+msgid "Show the run command prompt"
+msgstr "顯示執行指令提示"
+
+#: ../src/50-mutter-system.xml.in.h:3
+msgid "System"
+msgstr "系統"
+
+#: ../src/50-mutter-windows.xml.in.h:1
+msgid "Activate the window menu"
+msgstr "使用視窗選單"
+
+#: ../src/50-mutter-windows.xml.in.h:2
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+msgid "Lower window below other windows"
+msgstr "遮蔽某個視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+msgid "Maximize window"
+msgstr "視窗最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+msgid "Maximize window horizontally"
+msgstr "將視窗橫向最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+msgid "Maximize window vertically"
+msgstr "將視窗縱向最大化"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+msgid "Minimize window"
+msgstr "視窗最小化"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+msgid "Move window"
+msgstr "移動視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+msgid "Raise window above other windows"
+msgstr "令某個視窗覆蓋其它視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+msgid "Raise window if covered, otherwise lower it"
+msgstr "若被其他視窗遮蔽就抬升它，否則將它降下"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "調整視窗大小"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+msgid "Restore window"
+msgstr "還原視窗"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+msgid "Toggle fullscreen mode"
+msgstr "切換全螢幕模式"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+msgid "Toggle maximization state"
+msgstr "切換最大化狀態"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+msgid "Toggle shaded state"
+msgstr "切換視窗捲起/放下狀態"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+msgid "Toggle window on all workspaces or one"
+msgstr "切換視窗顯示在所有工作區或是只顯示於其中之一"
+
+#~ msgid "Comma-separated list of compositor plugins"
+#~ msgstr "以逗號分隔的複合視窗外掛程式清單"
+
+#~ msgid ""
+#~ "Determines whether hidden windows (i.e., minimized windows and windows on "
+#~ "other workspaces than the current one) should be kept alive."
+#~ msgstr ""
+#~ "決定隱藏的視窗（如最小化的視窗和位於目前以外工作區的視窗）是否保持活動。"
+
+#~ msgid "Live Hidden Windows"
+#~ msgstr "活動中的隱藏 Windows"
+
 #~ msgid "Close Window"
 #~ msgstr "關閉視窗"
 

src/50-mutter-navigation.xml.in

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                _name="Navigation"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="move-to-workspace-1"
+	              _description="Move window to workspace 1" />
+
+	<KeyListEntry name="move-to-workspace-2"
+	              _description="Move window to workspace 2" />
+
+	<KeyListEntry name="move-to-workspace-3"
+	              _description="Move window to workspace 3" />
+
+	<KeyListEntry name="move-to-workspace-4"
+	              _description="Move window to workspace 4" />
+
+	<KeyListEntry name="move-to-workspace-left"
+	              _description="Move window one workspace to the left" />
+
+	<KeyListEntry name="move-to-workspace-right"
+	              _description="Move window one workspace to the right" />
+
+	<KeyListEntry name="move-to-workspace-up"
+	              _description="Move window one workspace up" />
+
+	<KeyListEntry name="move-to-workspace-down"
+	              _description="Move window one workspace down" />
+
+	<KeyListEntry name="switch-applications"
+	              _description="Switch applications"/>
+
+	<KeyListEntry name="switch-windows"
+	              _description="Switch windows"/>
+
+	<KeyListEntry name="switch-group"
+	              _description="Switch windows of an application"/>
+
+	<KeyListEntry name="switch-panels"
+	              _description="Switch system controls"/>
+
+	<KeyListEntry name="cycle-windows"
+	              _description="Switch windows directly"/>
+
+	<KeyListEntry name="cycle-group"
+	              _description="Switch windows of an app directly"/>
+
+	<KeyListEntry name="cycle-panels"
+	              _description="Switch system controls directly"/>
+
+	<KeyListEntry name="show-desktop"
+	              _description="Hide all normal windows"/>
+
+	<KeyListEntry name="switch-to-workspace-1"
+	              _description="Switch to workspace 1" />
+
+	<KeyListEntry name="switch-to-workspace-2"
+	              _description="Switch to workspace 2" />
+
+	<KeyListEntry name="switch-to-workspace-3"
+	              _description="Switch to workspace 3" />
+
+	<KeyListEntry name="switch-to-workspace-4"
+	              _description="Switch to workspace 4" />
+
+	<KeyListEntry name="switch-to-workspace-left"
+	              _description="Move to workspace left" />
+
+	<KeyListEntry name="switch-to-workspace-right"
+	              _description="Move to workspace right" />
+
+	<KeyListEntry name="switch-to-workspace-up"
+	              _description="Move to workspace above" />
+
+	<KeyListEntry name="switch-to-workspace-down"
+	              _description="Move to workspace below" />
+
+</KeyListEntries>

src/50-mutter-system.xml.in

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                _name="System"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
+
+	<KeyListEntry name="panel-main-menu" _description="Show the activities overview"/>
+
+</KeyListEntries>
+

src/50-mutter-windows.xml.in

@@ -1,14 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.keybindings"
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
                 group="system"
                 _name="Windows"
                 wm_name="Mutter"
                 package="mutter">
 
+	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
+
+	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
+
+	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
+
+	<KeyListEntry name="maximize" _description="Maximize window"/>
+
+	<KeyListEntry name="unmaximize" _description="Restore window"/>
+
+	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
+
+	<KeyListEntry name="close" _description="Close window"/>
+
+	<KeyListEntry name="minimize" _description="Hide window"/>
+
+	<KeyListEntry name="begin-move" _description="Move window"/>
+
+	<KeyListEntry name="begin-resize" _description="Resize window"/>
+
+	<KeyListEntry name="toggle-on-all-workspaces"
+	              _description="Toggle window on all workspaces or one"/>
+
+	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
+
+	<KeyListEntry name="raise" _description="Raise window above other windows"/>
+
+	<KeyListEntry name="lower" _description="Lower window below other windows"/>
+
+	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
+
+	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
+
 	<KeyListEntry name="toggle-tiled-left"
+                      schema="org.gnome.mutter.keybindings"
                       _description="View split on left"/>
 
 	<KeyListEntry name="toggle-tiled-right"
+                      schema="org.gnome.mutter.keybindings"
                       _description="View split on right"/>
 
 </KeyListEntries>

src/Makefile.am

@@ -6,6 +6,8 @@ lib_LTLIBRARIES = libmutter.la
 SUBDIRS=wm-tester tools compositor/plugins
 
 INCLUDES=								\
+	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
+	-DCOGL_ENABLE_EXPERIMENTAL_API					\
 	$(MUTTER_CFLAGS)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
@@ -221,8 +223,8 @@ typelib_DATA = Meta-$(api_version).typelib
 INTROSPECTION_GIRS = Meta-$(api_version).gir
 
 Meta-$(api_version).gir: libmutter.la
-@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
-@META_GIR@_PACKAGES = clutter-1.0 gtk+-3.0
+@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
+@META_GIR@_EXPORT_PACKAGES = libmutter
 @META_GIR@_CFLAGS = $(INCLUDES)
 @META_GIR@_LIBS = libmutter.la
 @META_GIR@_FILES =				\
@@ -259,6 +261,8 @@ wmproperties_DATA = $(wmproperties_files)
 
 xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
+        50-mutter-navigation.xml.in	\
+        50-mutter-system.xml.in		\
         50-mutter-windows.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)
 

src/compositor/compositor-private.h

@@ -18,7 +18,6 @@ struct _MetaCompositor
   MetaDisplay    *display;
 
   Atom            atom_x_root_pixmap;
-  Atom            atom_x_set_root;
   Atom            atom_net_wm_window_opacity;
   guint           repaint_func_id;
 
@@ -26,9 +25,13 @@ struct _MetaCompositor
 
   MetaPlugin     *modal_plugin;
 
-  gboolean        show_redraw : 1;
-  gboolean        debug       : 1;
-  gboolean        no_mipmaps  : 1;
+  gint64          server_time_query_time;
+  gint64          server_time_offset;
+
+  guint           server_time_is_monotonic_time : 1;
+  guint           show_redraw : 1;
+  guint           debug       : 1;
+  guint           no_mipmaps  : 1;
 };
 
 struct _MetaCompScreen
@@ -42,6 +45,9 @@ struct _MetaCompScreen
   GHashTable            *windows_by_xid;
   Window                 output;
 
+  CoglOnscreen          *onscreen;
+  CoglFrameClosure      *frame_closure;
+
   /* Used for unredirecting fullscreen windows */
   guint                   disable_unredirect_count;
   MetaWindowActor             *unredirected_window;
@@ -54,6 +60,8 @@ struct _MetaCompScreen
   MetaPluginManager *plugin_mgr;
 };
 
+#define META_SYNC_DELAY 2
+
 void meta_switch_workspace_completed (MetaScreen    *screen);
 
 gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
@@ -66,6 +74,9 @@ void     meta_end_modal_for_plugin   (MetaScreen       *screen,
                                       MetaPlugin       *plugin,
                                       guint32           timestamp);
 
+gint64 meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
+                                                      gint64       monotonic_time);
+
 void meta_check_end_modal (MetaScreen *screen);
 
 #endif /* META_COMPOSITOR_PRIVATE_H */

src/compositor/compositor.c

@@ -157,23 +157,26 @@ get_output_window (MetaScreen *screen)
   Window       output, xroot;
   XWindowAttributes attr;
   long         event_mask;
+  unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+  XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
 
   xroot = meta_screen_get_xroot (screen);
-
-  event_mask = FocusChangeMask |
-               ExposureMask |
-               EnterWindowMask | LeaveWindowMask |
-	       PointerMotionMask |
-               PropertyChangeMask |
-               ButtonPressMask | ButtonReleaseMask |
-               KeyPressMask | KeyReleaseMask;
-
   output = XCompositeGetOverlayWindow (xdisplay, xroot);
 
+  XISetMask (mask.mask, XI_KeyPress);
+  XISetMask (mask.mask, XI_KeyRelease);
+  XISetMask (mask.mask, XI_ButtonPress);
+  XISetMask (mask.mask, XI_ButtonRelease);
+  XISetMask (mask.mask, XI_Enter);
+  XISetMask (mask.mask, XI_Leave);
+  XISetMask (mask.mask, XI_FocusIn);
+  XISetMask (mask.mask, XI_FocusOut);
+  XISetMask (mask.mask, XI_Motion);
+  XISelectEvents (xdisplay, output, &mask, 1);
+
+  event_mask = ExposureMask | PropertyChangeMask;
   if (XGetWindowAttributes (xdisplay, output, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
+    event_mask |= attr.your_event_mask;
 
   XSelectInput (xdisplay, output, event_mask);
 
@@ -358,14 +361,23 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
 
   if ((options & META_MODAL_POINTER_ALREADY_GRABBED) == 0)
     {
-      result = XGrabPointer (xdpy, grab_window,
-                             False, /* owner_events */
-                             (ButtonPressMask | ButtonReleaseMask |
-                              EnterWindowMask | LeaveWindowMask | PointerMotionMask),
-                             GrabModeAsync, GrabModeAsync,
-                             None, /* confine to */
+      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+
+      XISetMask (mask.mask, XI_ButtonPress);
+      XISetMask (mask.mask, XI_ButtonRelease);
+      XISetMask (mask.mask, XI_Enter);
+      XISetMask (mask.mask, XI_Leave);
+      XISetMask (mask.mask, XI_Motion);
+
+      result = XIGrabDevice (xdpy,
+                             META_VIRTUAL_CORE_POINTER_ID,
+                             grab_window,
+                             timestamp,
                              cursor,
-                             timestamp);
+                             XIGrabModeAsync, XIGrabModeAsync,
+                             False, /* owner_events */
+                             &mask);
       if (result != Success)
         goto fail;
 
@@ -374,10 +386,20 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
 
   if ((options & META_MODAL_KEYBOARD_ALREADY_GRABBED) == 0)
     {
-      result = XGrabKeyboard (xdpy, grab_window,
-                              False, /* owner_events */
-                              GrabModeAsync, GrabModeAsync,
-                              timestamp);
+      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+
+      XISetMask (mask.mask, XI_KeyPress);
+      XISetMask (mask.mask, XI_KeyRelease);
+
+      result = XIGrabDevice (xdpy,
+                             META_VIRTUAL_CORE_KEYBOARD_ID,
+                             grab_window,
+                             timestamp,
+                             None,
+                             XIGrabModeAsync, XIGrabModeAsync,
+                             False, /* owner_events */
+                             &mask);
 
       if (result != Success)
         goto fail;
@@ -397,9 +419,9 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
 
  fail:
   if (pointer_grabbed)
-    XUngrabPointer (xdpy, timestamp);
+    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
   if (keyboard_grabbed)
-    XUngrabKeyboard (xdpy, timestamp);
+    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
 
   return FALSE;
 }
@@ -415,8 +437,8 @@ meta_end_modal_for_plugin (MetaScreen     *screen,
 
   g_return_if_fail (compositor->modal_plugin == plugin);
 
-  XUngrabPointer (xdpy, timestamp);
-  XUngrabKeyboard (xdpy, timestamp);
+  XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+  XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
 
   display->grab_op = META_GRAB_OP_NONE;
   display->grab_window = NULL;
@@ -445,6 +467,16 @@ meta_check_end_modal (MetaScreen *screen)
     }
 }
 
+static void
+after_stage_paint (ClutterActor   *stage,
+                   MetaCompScreen *info)
+{
+  GList *l;
+
+  for (l = info->windows; l; l = l->next)
+    meta_window_actor_post_paint (l->data);
+}
+
 void
 meta_compositor_manage_screen (MetaCompositor *compositor,
                                MetaScreen     *screen)
@@ -456,8 +488,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   Window          xroot         = meta_screen_get_xroot (screen);
   Window          xwin;
   gint            width, height;
-  XWindowAttributes attr;
-  long            event_mask;
   guint           n_retries;
   guint           max_retries;
 
@@ -516,6 +546,11 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   meta_screen_set_cm_selection (screen);
 
   info->stage = clutter_stage_new ();
+  g_signal_connect_after (info->stage, "paint",
+                          G_CALLBACK (after_stage_paint), info);
+
+  /* Wait 6-ms after vblank before starting to draw next frame */
+  clutter_stage_set_sync_delay (CLUTTER_STAGE (info->stage), META_SYNC_DELAY);
 
   meta_screen_get_size (screen, &width, &height);
   clutter_actor_realize (info->stage);
@@ -524,21 +559,29 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
 
   XResizeWindow (xdisplay, xwin, width, height);
 
-  event_mask = FocusChangeMask |
-               ExposureMask |
-               EnterWindowMask | LeaveWindowMask |
-               PointerMotionMask |
-               PropertyChangeMask |
-               ButtonPressMask | ButtonReleaseMask |
-               KeyPressMask | KeyReleaseMask |
-               StructureNotifyMask;
+  {
+    long event_mask;
+    unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+    XWindowAttributes attr;
 
-  if (XGetWindowAttributes (xdisplay, xwin, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
+    XISetMask (mask.mask, XI_KeyPress);
+    XISetMask (mask.mask, XI_KeyRelease);
+    XISetMask (mask.mask, XI_ButtonPress);
+    XISetMask (mask.mask, XI_ButtonRelease);
+    XISetMask (mask.mask, XI_Enter);
+    XISetMask (mask.mask, XI_Leave);
+    XISetMask (mask.mask, XI_FocusIn);
+    XISetMask (mask.mask, XI_FocusOut);
+    XISetMask (mask.mask, XI_Motion);
+    XISelectEvents (xdisplay, xwin, &mask, 1);
 
-  XSelectInput (xdisplay, xwin, event_mask);
+    event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;
+    if (XGetWindowAttributes (xdisplay, xwin, &attr))
+      event_mask |= attr.your_event_mask;
+
+    XSelectInput (xdisplay, xwin, event_mask);
+  }
 
   info->window_group = meta_window_group_new (screen);
   info->background_actor = meta_background_actor_new_for_screen (screen);
@@ -557,9 +600,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
 
   clutter_actor_hide (info->hidden_group);
 
-  info->plugin_mgr =
-    meta_plugin_manager_get (screen);
-  meta_plugin_manager_initialize (info->plugin_mgr);
+  info->plugin_mgr = meta_plugin_manager_new (screen);
 
   /*
    * Delay the creation of the overlay window as long as we can, to avoid
@@ -690,25 +731,38 @@ meta_compositor_remove_window (MetaCompositor *compositor,
 }
 
 void
-meta_compositor_set_updates (MetaCompositor *compositor,
-                             MetaWindow     *window,
-                             gboolean        updates)
+meta_compositor_set_updates_frozen (MetaCompositor *compositor,
+                                    MetaWindow     *window,
+                                    gboolean        updates_frozen)
 {
+  MetaWindowActor *window_actor;
+
+  DEBUG_TRACE ("meta_compositor_set_updates_frozen\n");
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (!window_actor)
+    return;
+
+  meta_window_actor_set_updates_frozen (window_actor, updates_frozen);
 }
 
 static gboolean
-is_grabbed_event (XEvent *event)
+is_grabbed_event (MetaDisplay *display,
+                  XEvent      *event)
 {
-  switch (event->xany.type)
+  if (event->type == GenericEvent &&
+      event->xcookie.extension == display->xinput_opcode)
     {
-    case ButtonPress:
-    case ButtonRelease:
-    case EnterNotify:
-    case LeaveNotify:
-    case MotionNotify:
-    case KeyPress:
-    case KeyRelease:
-      return TRUE;
+      XIEvent *xev = (XIEvent *) event->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+          return TRUE;
+        }
     }
 
   return FALSE;
@@ -732,7 +786,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
                                MetaWindow     *window)
 {
-  if (compositor->modal_plugin && is_grabbed_event (event))
+  if (compositor->modal_plugin && is_grabbed_event (compositor->display, event))
     {
       MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
 
@@ -817,6 +871,19 @@ meta_compositor_process_event (MetaCompositor *compositor,
   return FALSE;
 }
 
+gboolean
+meta_compositor_filter_keybinding (MetaCompositor *compositor,
+                                   MetaScreen     *screen,
+                                   MetaKeyBinding *binding)
+{
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+
+  if (info->plugin_mgr)
+    return meta_plugin_manager_filter_keybinding (info->plugin_mgr, binding);
+
+  return FALSE;
+}
+
 void
 meta_compositor_show_window (MetaCompositor *compositor,
 			     MetaWindow	    *window,
@@ -871,29 +938,6 @@ meta_compositor_unmaximize_window (MetaCompositor    *compositor,
   meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
 }
 
-void
-meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
-                                           MetaWorkspace  *workspace)
-{
-#if 0
-  /* FIXME -- should do away with this function in favour of MetaWorkspace
-   * signal.
-   */
-  MetaScreen     *screen = meta_workspace_get_screen (workspace);
-  MetaCompScreen *info;
-  MetaPluginManager *mgr;
-
-  DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
-  info = meta_screen_get_compositor_data (screen);
-  mgr  = info->plugin_mgr;
-
-  if (!mgr || !workspace)
-    return;
-
-  meta_plugin_manager_update_workspace (mgr, workspace);
-#endif
-}
-
 void
 meta_compositor_switch_workspace (MetaCompositor     *compositor,
                                   MetaScreen         *screen,
@@ -1161,6 +1205,39 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
 		width, height);
 }
 
+static void
+frame_callback (CoglOnscreen  *onscreen,
+                CoglFrameEvent event,
+                CoglFrameInfo *frame_info,
+                void          *user_data)
+{
+  MetaCompScreen *info = user_data;
+  GList *l;
+
+  if (event == COGL_FRAME_EVENT_COMPLETE)
+    {
+      gint64 presentation_time_cogl = cogl_frame_info_get_presentation_time (frame_info);
+      gint64 presentation_time;
+
+      if (presentation_time_cogl != 0)
+        {
+          CoglContext *context = cogl_framebuffer_get_context (COGL_FRAMEBUFFER (onscreen));
+          gint64 current_time_cogl = cogl_get_clock_time (context);
+          gint64 now = g_get_monotonic_time ();
+
+          presentation_time =
+            now + (presentation_time_cogl - current_time_cogl) / 1000;
+        }
+      else
+        {
+          presentation_time = 0;
+        }
+
+      for (l = info->windows; l; l = l->next)
+        meta_window_actor_frame_complete (l->data, frame_info, presentation_time);
+    }
+}
+
 static void
 pre_paint_windows (MetaCompScreen *info)
 {
@@ -1168,6 +1245,15 @@ pre_paint_windows (MetaCompScreen *info)
   MetaWindowActor *top_window;
   MetaWindowActor *expected_unredirected_window = NULL;
 
+  if (info->onscreen == NULL)
+    {
+      info->onscreen = COGL_ONSCREEN (cogl_get_draw_framebuffer ());
+      info->frame_closure = cogl_onscreen_add_frame_callback (info->onscreen,
+                                                              frame_callback,
+                                                              info,
+                                                              NULL);
+    }
+
   if (info->windows == NULL)
     return;
 
@@ -1249,7 +1335,6 @@ meta_compositor_new (MetaDisplay *display)
 {
   char *atom_names[] = {
     "_XROOTPMAP_ID",
-    "_XSETROOT_ID",
     "_NET_WM_WINDOW_OPACITY",
   };
   Atom                   atoms[G_N_ELEMENTS(atom_names)];
@@ -1276,8 +1361,7 @@ meta_compositor_new (MetaDisplay *display)
                     compositor);
 
   compositor->atom_x_root_pixmap = atoms[0];
-  compositor->atom_x_set_root = atoms[1];
-  compositor->atom_net_wm_window_opacity = atoms[2];
+  compositor->atom_net_wm_window_opacity = atoms[1];
 
   compositor->repaint_func_id = clutter_threads_add_repaint_func (meta_repaint_func,
                                                                   compositor,
@@ -1372,3 +1456,51 @@ meta_compositor_flash_screen (MetaCompositor *compositor,
                          "signal-after::completed", flash_in_completed, flash,
                          NULL);
 }
+
+/**
+ * meta_compositor_monotonic_time_to_server_time:
+ * @display: a #MetaDisplay
+ * @monotonic_time: time in the units of g_get_monotonic_time()
+ *
+ * _NET_WM_FRAME_DRAWN and _NET_WM_FRAME_TIMINGS messages represent time
+ * as a "high resolution server time" - this is the server time interpolated
+ * to microsecond resolution. The advantage of this time representation
+ * is that if  X server is running on the same computer as a client, and
+ * the Xserver uses 'clock_gettime(CLOCK_MONOTONIC, ...)' for the server
+ * time, the client can detect this, and all such clients will share a
+ * a time representation with high accuracy. If there is not a common
+ * time source, then the time synchronization will be less accurate.
+ */
+gint64
+meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
+                                               gint64       monotonic_time)
+{
+  MetaCompositor *compositor = display->compositor;
+
+  if (compositor->server_time_query_time == 0 ||
+      (!compositor->server_time_is_monotonic_time &&
+       monotonic_time > compositor->server_time_query_time + 10000000)) /* 10 seconds */
+    {
+      guint32 server_time = meta_display_get_current_time_roundtrip (display);
+      gint64 server_time_usec = (gint64)server_time * 1000;
+      gint64 current_monotonic_time = g_get_monotonic_time ();
+      compositor->server_time_query_time = current_monotonic_time;
+
+      /* If the server time is within a second of the monotonic time,
+       * we assume that they are identical. This seems like a big margin,
+       * but we want to be as robust as possible even if the system
+       * is under load and our processing of the server response is
+       * delayed.
+       */
+      if (server_time_usec > current_monotonic_time - 1000000 &&
+          server_time_usec < current_monotonic_time + 1000000)
+        compositor->server_time_is_monotonic_time = TRUE;
+
+      compositor->server_time_offset = server_time_usec - current_monotonic_time;
+    }
+
+  if (compositor->server_time_is_monotonic_time)
+    return monotonic_time;
+  else
+    return monotonic_time + compositor->server_time_offset;
+}

src/compositor/meta-background-actor.c

@@ -25,10 +25,8 @@
 
 #include <config.h>
 
-#define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 
 #include <X11/Xatom.h>
@@ -55,7 +53,7 @@ struct _MetaScreenBackground
 
   float texture_width;
   float texture_height;
-  CoglHandle texture;
+  CoglTexture *texture;
   CoglMaterialWrapMode wrap_mode;
   guint have_pixmap : 1;
 };
@@ -63,7 +61,8 @@ struct _MetaScreenBackground
 struct _MetaBackgroundActorPrivate
 {
   MetaScreenBackground *background;
-  CoglHandle material;
+  CoglPipeline *pipeline;
+
   cairo_region_t *visible_region;
   float dim_factor;
 };
@@ -140,7 +139,7 @@ update_wrap_mode_of_actor (MetaBackgroundActor *self)
 {
   MetaBackgroundActorPrivate *priv = self->priv;
 
-  cogl_material_set_layer_wrap_mode (priv->material, 0, priv->background->wrap_mode);
+  cogl_pipeline_set_layer_wrap_mode (priv->pipeline, 0, priv->background->wrap_mode);
 }
 
 static void
@@ -174,7 +173,7 @@ set_texture_on_actor (MetaBackgroundActor *self)
    * the underlying X pixmap is already gone has the tendency to trigger
    * X errors inside DRI. For safety, trap errors */
   meta_error_trap_push (display);
-  cogl_material_set_layer (priv->material, 0, priv->background->texture);
+  cogl_pipeline_set_layer_texture (priv->pipeline, 0, priv->background->texture);
   meta_error_trap_pop (display);
 
   clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
@@ -210,7 +209,7 @@ set_texture (MetaScreenBackground *background,
   update_wrap_mode (background);
 }
 
-/* Sets our material to paint with a 1x1 texture of the stage's background
+/* Sets our pipeline to paint with a 1x1 texture of the stage's background
  * color; doing this when we have no pixmap allows the application to turn
  * off painting the stage. There might be a performance benefit to
  * painting in this case with a solid color, but the normal solid color
@@ -250,11 +249,7 @@ meta_background_actor_dispose (GObject *object)
       priv->background = NULL;
     }
 
-  if (priv->material != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->material);
-      priv->material = COGL_INVALID_HANDLE;
-    }
+  g_clear_pointer(&priv->pipeline, cogl_object_unref);
 
   G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
@@ -309,13 +304,13 @@ meta_background_actor_paint (ClutterActor *actor)
 
   color_component = (int)(0.5 + opacity * priv->dim_factor);
 
-  cogl_material_set_color4ub (priv->material,
+  cogl_pipeline_set_color4ub (priv->pipeline,
                               color_component,
                               color_component,
                               color_component,
                               opacity);
 
-  cogl_set_source (priv->material);
+  cogl_set_source (priv->pipeline);
 
   if (priv->visible_region)
     {
@@ -483,7 +478,8 @@ meta_background_actor_new_for_screen (MetaScreen *screen)
   priv->background = meta_screen_background_get (screen);
   priv->background->actors = g_slist_prepend (priv->background->actors, self);
 
-  priv->material = meta_create_texture_material (NULL);
+  /* A CoglMaterial and a CoglPipeline are the same thing */
+  priv->pipeline = (CoglPipeline*) meta_create_texture_material (NULL);
 
   set_texture_on_actor (self);
   update_wrap_mode_of_actor (self);
@@ -625,3 +621,83 @@ meta_background_actor_screen_size_changed (MetaScreen *screen)
   for (l = background->actors; l; l = l->next)
     clutter_actor_queue_relayout (l->data);
 }
+
+/**
+ * meta_background_actor_add_glsl_snippet:
+ * @actor: a #MetaBackgroundActor
+ * @hook: where to insert the code
+ * @declarations: GLSL declarations
+ * @code: GLSL code
+ * @is_replace: wheter Cogl code should be replaced by the custom shader
+ *
+ * Adds a GLSL snippet to the pipeline used for drawing the background.
+ * See #CoglSnippet for details.
+ */
+void
+meta_background_actor_add_glsl_snippet (MetaBackgroundActor *actor,
+                                        MetaSnippetHook      hook,
+                                        const char          *declarations,
+                                        const char          *code,
+                                        gboolean             is_replace)
+{
+  MetaBackgroundActorPrivate *priv;
+  CoglSnippet *snippet;
+
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
+
+  priv = actor->priv;
+
+  if (is_replace)
+    {
+      snippet = cogl_snippet_new (hook, declarations, NULL);
+      cogl_snippet_set_replace (snippet, code);
+    }
+  else
+    {
+      snippet = cogl_snippet_new (hook, declarations, code);
+    }
+
+  if (hook == META_SNIPPET_HOOK_VERTEX ||
+      hook == META_SNIPPET_HOOK_FRAGMENT)
+    cogl_pipeline_add_snippet (priv->pipeline, snippet);
+  else
+    cogl_pipeline_add_layer_snippet (priv->pipeline, 0, snippet);
+
+  cogl_object_unref (snippet);
+}
+
+/**
+ * meta_background_actor_set_uniform_float:
+ * @actor: a #MetaBackgroundActor
+ * @uniform_name:
+ * @n_components: number of components (for vector uniforms)
+ * @count: number of uniforms (for array uniforms)
+ * @uniform: (array length=uniform_length): the float values to set
+ * @uniform_length: the length of @uniform. Must be exactly @n_components x @count,
+ *                  and is provided mainly for language bindings.
+ *
+ * Sets a new GLSL uniform to the provided value. This is mostly
+ * useful in congiunction with meta_background_actor_add_glsl_snippet().
+ */
+
+void
+meta_background_actor_set_uniform_float (MetaBackgroundActor *actor,
+                                         const char          *uniform_name,
+                                         int                  n_components,
+                                         int                  count,
+                                         const float         *uniform,
+                                         int                  uniform_length)
+{
+  MetaBackgroundActorPrivate *priv;
+
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
+  g_return_if_fail (uniform_length == n_components * count);
+
+  priv = actor->priv;
+
+  cogl_pipeline_set_uniform_float (priv->pipeline,
+                                   cogl_pipeline_get_uniform_location (priv->pipeline,
+                                                                       uniform_name),
+                                   n_components, count, uniform);
+}
+

src/compositor/meta-plugin-manager.c

@@ -35,34 +35,32 @@
 
 #include <clutter/x11/clutter-x11.h>
 
-static GSList *plugin_types;
-
-/*
- * We have one "default plugin manager" that acts for the first screen,
- * but also can be used before we open any screens, and additional
- * plugin managers for each screen. (This is ugly. Probably we should
- * have one plugin manager and only make the plugins per-screen.)
- */
-static MetaPluginManager *default_plugin_manager;
+static GType plugin_type = G_TYPE_NONE;
 
 struct MetaPluginManager
 {
-  MetaScreen   *screen;
-
-  GList /* MetaPlugin */ *plugins;  /* TODO -- maybe use hash table */
+  MetaScreen *screen;
+  MetaPlugin *plugin;
 };
 
+void
+meta_plugin_manager_set_plugin_type (GType gtype)
+{
+  if (plugin_type != G_TYPE_NONE)
+    meta_fatal ("Mutter plugin already set: %s", g_type_name (plugin_type));
+
+  plugin_type = gtype;
+}
+
 /*
  * Loads the given plugin.
  */
 void
-meta_plugin_manager_load (MetaPluginManager *plugin_mgr,
-                          const gchar       *plugin_name)
+meta_plugin_manager_load (const gchar       *plugin_name)
 {
   const gchar *dpath = MUTTER_PLUGIN_DIR "/";
   gchar       *path;
   MetaModule  *module;
-  GType        plugin_type;
 
   if (g_path_is_absolute (plugin_name))
     path = g_strdup (plugin_name);
@@ -81,162 +79,57 @@ meta_plugin_manager_load (MetaPluginManager *plugin_mgr,
       exit (1);
     }
 
-  plugin_type = meta_module_get_plugin_type (module);
-  meta_plugin_manager_register (plugin_mgr, plugin_type);
+  meta_plugin_manager_set_plugin_type (meta_module_get_plugin_type (module));
 
   g_type_module_unuse (G_TYPE_MODULE (module));
   g_free (path);
 }
 
-/*
- * Registers the given plugin type
- */
-void
-meta_plugin_manager_register (MetaPluginManager *plugin_mgr,
-                              GType              plugin_type)
-{
-  MetaPlugin  *plugin;
-
-  plugin_types = g_slist_prepend (plugin_types, GSIZE_TO_POINTER (plugin_type));
-
-  plugin = g_object_new (plugin_type, NULL);
-  plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
-}
-
-void
-meta_plugin_manager_initialize (MetaPluginManager *plugin_mgr)
-{
-  GList *iter;
-
-  if (!plugin_mgr->plugins)
-    {
-      /*
-       * If no plugins are specified, load the default plugin.
-       */
-      meta_plugin_manager_load (plugin_mgr, "default");
-    }
-
-  for (iter = plugin_mgr->plugins; iter; iter = iter->next)
-    {
-      MetaPlugin *plugin = (MetaPlugin*) iter->data;
-      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      g_object_set (plugin,
-                    "screen", plugin_mgr->screen,
-                    NULL);
-
-      if (klass->start)
-        klass->start (plugin);
-    }
-}
-
-static MetaPluginManager *
+MetaPluginManager *
 meta_plugin_manager_new (MetaScreen *screen)
 {
   MetaPluginManager *plugin_mgr;
+  MetaPluginClass *klass;
+  MetaPlugin *plugin;
 
   plugin_mgr = g_new0 (MetaPluginManager, 1);
   plugin_mgr->screen = screen;
+  plugin_mgr->plugin = plugin = g_object_new (plugin_type, "screen", screen, NULL);
 
-  if (screen)
-    g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", plugin_mgr);
+  klass = META_PLUGIN_GET_CLASS (plugin);
+
+  if (klass->start)
+    klass->start (plugin);
 
   return plugin_mgr;
 }
 
-MetaPluginManager *
-meta_plugin_manager_get_default (void)
-{
-  if (!default_plugin_manager)
-    {
-      default_plugin_manager = meta_plugin_manager_new (NULL);
-    }
-
-  return default_plugin_manager;
-}
-
-MetaPluginManager *
-meta_plugin_manager_get (MetaScreen *screen)
-{
-  MetaPluginManager *plugin_mgr;
-
-  plugin_mgr = g_object_get_data (G_OBJECT (screen), "meta-plugin-manager");
-  if (plugin_mgr)
-    return plugin_mgr;
-
-  if (!default_plugin_manager)
-    meta_plugin_manager_get_default ();
-
-  if (!default_plugin_manager->screen)
-    {
-      /* The default plugin manager is so far unused, we can recycle it */
-      default_plugin_manager->screen = screen;
-      g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", default_plugin_manager);
-
-      return default_plugin_manager;
-    }
-  else
-    {
-      GSList *iter;
-      GType plugin_type;
-      MetaPlugin *plugin;
-
-      plugin_mgr = meta_plugin_manager_new (screen);
-
-      for (iter = plugin_types; iter; iter = iter->next)
-        {
-          plugin_type = (GType)GPOINTER_TO_SIZE (iter->data);
-          plugin = g_object_new (plugin_type, "screen", screen,  NULL);
-          plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
-        }
-
-      return plugin_mgr;
-    }
-}
-
 static void
 meta_plugin_manager_kill_window_effects (MetaPluginManager *plugin_mgr,
                                          MetaWindowActor   *actor)
 {
-  GList *l = plugin_mgr->plugins;
+  MetaPlugin        *plugin = plugin_mgr->plugin;
+  MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-  while (l)
-    {
-      MetaPlugin        *plugin = l->data;
-      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      if (!meta_plugin_disabled (plugin)
-	  && klass->kill_window_effects)
-        klass->kill_window_effects (plugin, actor);
-
-      l = l->next;
-    }
+  if (klass->kill_window_effects)
+    klass->kill_window_effects (plugin, actor);
 }
 
 static void
 meta_plugin_manager_kill_switch_workspace (MetaPluginManager *plugin_mgr)
 {
-  GList *l = plugin_mgr->plugins;
+  MetaPlugin        *plugin = plugin_mgr->plugin;
+  MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-  while (l)
-    {
-      MetaPlugin        *plugin = l->data;
-      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      if (!meta_plugin_disabled (plugin)
-          && (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE)
-	  && klass->kill_switch_workspace)
-        klass->kill_switch_workspace (plugin);
-
-      l = l->next;
-    }
+  if (klass->kill_switch_workspace)
+    klass->kill_switch_workspace (plugin);
 }
 
 /*
  * Public method that the compositor hooks into for events that require
  * no additional parameters.
  *
- * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * 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.
@@ -246,60 +139,48 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
                                   MetaWindowActor   *actor,
                                   unsigned long      event)
 {
-  GList *l = plugin_mgr->plugins;
-  gboolean retval = FALSE;
+  MetaPlugin *plugin = plugin_mgr->plugin;
+  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
   MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
+  gboolean retval = FALSE;
 
   if (display->display_opening)
     return FALSE;
 
-  while (l)
+  switch (event)
     {
-      MetaPlugin        *plugin = l->data;
-      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      if (!meta_plugin_disabled (plugin) &&
-          (meta_plugin_features (plugin) & event))
+    case META_PLUGIN_MINIMIZE:
+      if (klass->minimize)
         {
           retval = TRUE;
+          meta_plugin_manager_kill_window_effects (plugin_mgr,
+                                                   actor);
 
-          switch (event)
-            {
-            case META_PLUGIN_MINIMIZE:
-              if (klass->minimize)
-                {
-                  meta_plugin_manager_kill_window_effects (
-		      plugin_mgr,
-		      actor);
-
-                  _meta_plugin_effect_started (plugin);
-                  klass->minimize (plugin, actor);
-                }
-              break;
-            case META_PLUGIN_MAP:
-              if (klass->map)
-                {
-                  meta_plugin_manager_kill_window_effects (
-		      plugin_mgr,
-		      actor);
-
-                  _meta_plugin_effect_started (plugin);
-                  klass->map (plugin, actor);
-                }
-              break;
-            case META_PLUGIN_DESTROY:
-              if (klass->destroy)
-                {
-                  _meta_plugin_effect_started (plugin);
-                  klass->destroy (plugin, actor);
-                }
-              break;
-            default:
-              g_warning ("Incorrect handler called for event %lu", event);
-            }
+          _meta_plugin_effect_started (plugin);
+          klass->minimize (plugin, actor);
         }
+      break;
+    case META_PLUGIN_MAP:
+      if (klass->map)
+        {
+          retval = TRUE;
+          meta_plugin_manager_kill_window_effects (plugin_mgr,
+                                                   actor);
 
-      l = l->next;
+          _meta_plugin_effect_started (plugin);
+          klass->map (plugin, actor);
+        }
+      break;
+    case META_PLUGIN_DESTROY:
+      if (klass->destroy)
+        {
+          retval = TRUE;
+          _meta_plugin_effect_started (plugin);
+          klass->destroy (plugin, actor);
+        }
+      break;
+    default:
+      g_warning ("Incorrect handler called for event %lu", event);
     }
 
   return retval;
@@ -309,7 +190,7 @@ meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
  * The public method that the compositor hooks into for maximize and unmaximize
  * events.
  *
- * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * 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.
@@ -323,57 +204,44 @@ meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
                                     gint               target_width,
                                     gint               target_height)
 {
-  GList *l = plugin_mgr->plugins;
+  MetaPlugin *plugin = plugin_mgr->plugin;
+  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+  MetaDisplay *display = meta_screen_get_display (plugin_mgr->screen);
   gboolean retval = FALSE;
-  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
 
   if (display->display_opening)
     return FALSE;
 
-  while (l)
+  switch (event)
     {
-      MetaPlugin        *plugin = l->data;
-      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      if (!meta_plugin_disabled (plugin) &&
-          (meta_plugin_features (plugin) & event))
+    case META_PLUGIN_MAXIMIZE:
+      if (klass->maximize)
         {
           retval = TRUE;
+          meta_plugin_manager_kill_window_effects (plugin_mgr,
+                                                   actor);
 
-          switch (event)
-            {
-            case META_PLUGIN_MAXIMIZE:
-              if (klass->maximize)
-                {
-                  meta_plugin_manager_kill_window_effects (
-		      plugin_mgr,
-		      actor);
-
-                  _meta_plugin_effect_started (plugin);
-                  klass->maximize (plugin, actor,
-                                   target_x, target_y,
-                                   target_width, target_height);
-                }
-              break;
-            case META_PLUGIN_UNMAXIMIZE:
-              if (klass->unmaximize)
-                {
-                  meta_plugin_manager_kill_window_effects (
-		      plugin_mgr,
-		      actor);
-
-                  _meta_plugin_effect_started (plugin);
-                  klass->unmaximize (plugin, actor,
-                                     target_x, target_y,
-                                     target_width, target_height);
-                }
-              break;
-            default:
-              g_warning ("Incorrect handler called for event %lu", event);
-            }
+          _meta_plugin_effect_started (plugin);
+          klass->maximize (plugin, actor,
+                           target_x, target_y,
+                           target_width, target_height);
         }
+      break;
+    case META_PLUGIN_UNMAXIMIZE:
+      if (klass->unmaximize)
+        {
+          retval = TRUE;
+          meta_plugin_manager_kill_window_effects (plugin_mgr,
+                                                   actor);
 
-      l = l->next;
+          _meta_plugin_effect_started (plugin);
+          klass->unmaximize (plugin, actor,
+                             target_x, target_y,
+                             target_width, target_height);
+        }
+      break;
+    default:
+      g_warning ("Incorrect handler called for event %lu", event);
     }
 
   return retval;
@@ -382,7 +250,7 @@ meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
 /*
  * The public method that the compositor hooks into for desktop switching.
  *
- * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * 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.
@@ -393,41 +261,43 @@ meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
                                       gint                 to,
                                       MetaMotionDirection  direction)
 {
-  GList *l = plugin_mgr->plugins;
+  MetaPlugin *plugin = plugin_mgr->plugin;
+  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+  MetaDisplay *display = meta_screen_get_display (plugin_mgr->screen);
   gboolean retval = FALSE;
-  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
 
   if (display->display_opening)
     return FALSE;
 
-  while (l)
+  if (klass->switch_workspace)
     {
-      MetaPlugin        *plugin = l->data;
-      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+      retval = TRUE;
+      meta_plugin_manager_kill_switch_workspace (plugin_mgr);
 
-      if (!meta_plugin_disabled (plugin) &&
-          (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE))
-        {
-          if (klass->switch_workspace)
-            {
-              retval = TRUE;
-              meta_plugin_manager_kill_switch_workspace (plugin_mgr);
-
-              _meta_plugin_effect_started (plugin);
-              klass->switch_workspace (plugin, from, to, direction);
-            }
-        }
-
-      l = l->next;
+      _meta_plugin_effect_started (plugin);
+      klass->switch_workspace (plugin, from, to, direction);
     }
 
   return retval;
 }
 
+gboolean
+meta_plugin_manager_filter_keybinding (MetaPluginManager *plugin_mgr,
+                                       MetaKeyBinding    *binding)
+{
+  MetaPlugin *plugin = plugin_mgr->plugin;
+  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+
+  if (klass->keybinding_filter)
+    return klass->keybinding_filter (plugin, binding);
+
+  return FALSE;
+}
+
 /*
  * The public method that the compositor hooks into for desktop switching.
  *
- * Returns TRUE if at least one of the plugins handled the event type (i.e.,
+ * 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.
@@ -436,49 +306,17 @@ gboolean
 meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
                                    XEvent            *xev)
 {
-  GList *l;
-  gboolean have_plugin_xevent_func;
-
-  if (!plugin_mgr)
-    return FALSE;
-
-  l = plugin_mgr->plugins;
+  MetaPlugin *plugin = plugin_mgr->plugin;
+  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (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.
-   *
-   * What happens if there are two plugins with xevent_filter functions
-   * is undefined; in general, multiple competing plugins are something
-   * we don't support well or care much about.
-   *
-   * FIXME: Really, we should just always handle sending the event to
-   *  clutter if a plugin doesn't report the event as handled by
-   *  returning TRUE, but it doesn't seem worth breaking compatibility
-   *  of the plugin interface right now to achieve this; the way it is
-   *  now works fine in practice.
    */
-  have_plugin_xevent_func = FALSE;
-
-  while (l)
-    {
-      MetaPlugin      *plugin = l->data;
-      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-
-      if (klass->xevent_filter)
-        {
-          have_plugin_xevent_func = TRUE;
-          if (klass->xevent_filter (plugin, xev) == TRUE)
-            return TRUE;
-        }
-
-      l = l->next;
-    }
-
-  if (!have_plugin_xevent_func)
+  if (klass->xevent_filter)
+    return klass->xevent_filter (plugin, xev);
+  else
     return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
-
-  return FALSE;
 }

src/compositor/meta-plugin-manager.h

@@ -46,14 +46,9 @@
  */
 typedef struct MetaPluginManager MetaPluginManager;
 
-MetaPluginManager * meta_plugin_manager_get         (MetaScreen *screen);
-MetaPluginManager * meta_plugin_manager_get_default (void);
+MetaPluginManager * meta_plugin_manager_new (MetaScreen *screen);
 
-void     meta_plugin_manager_load         (MetaPluginManager *mgr,
-                                           const gchar       *plugin_name);
-void     meta_plugin_manager_register     (MetaPluginManager *mgr,
-                                           GType              plugin_type);
-void     meta_plugin_manager_initialize   (MetaPluginManager *mgr);
+void     meta_plugin_manager_load         (const gchar       *plugin_name);
 
 gboolean meta_plugin_manager_event_simple (MetaPluginManager *mgr,
                                            MetaWindowActor   *actor,
@@ -66,16 +61,15 @@ gboolean meta_plugin_manager_event_maximize    (MetaPluginManager *mgr,
                                                 gint               target_y,
                                                 gint               target_width,
                                                 gint               target_height);
-void     meta_plugin_manager_update_workspaces (MetaPluginManager *mgr);
-
-void meta_plugin_manager_update_workspace (MetaPluginManager *mgr,
-                                           MetaWorkspace     *w);
 
 gboolean meta_plugin_manager_switch_workspace (MetaPluginManager   *mgr,
                                                gint                 from,
                                                gint                 to,
                                                MetaMotionDirection  direction);
 
+gboolean meta_plugin_manager_filter_keybinding (MetaPluginManager  *mgr,
+                                                MetaKeyBinding     *binding);
+
 gboolean meta_plugin_manager_xevent_filter (MetaPluginManager *mgr,
                                             XEvent            *xev);
 

src/compositor/meta-plugin.c

@@ -44,74 +44,17 @@ enum
 {
   PROP_0,
   PROP_SCREEN,
-  PROP_FEATURES,
-  PROP_DISABLED,
   PROP_DEBUG_MODE,
 };
 
 struct _MetaPluginPrivate
 {
   MetaScreen   *screen;
-  gulong        features;
 
   gint          running;
-
-  gboolean      disabled : 1;
   gboolean      debug    : 1;
 };
 
-static void
-meta_plugin_set_features (MetaPlugin *plugin)
-{
-  MetaPluginPrivate  *priv     = plugin->priv;
-  MetaPluginClass    *klass    = META_PLUGIN_GET_CLASS (plugin);
-
-  priv->features = 0;
-
-  /*
-   * Feature flags: identify events that the plugin can handle; a plugin can
-   * handle one or more events.
-   */
-  if (klass->minimize)
-    priv->features |= META_PLUGIN_MINIMIZE;
-
-  if (klass->maximize)
-    priv->features |= META_PLUGIN_MAXIMIZE;
-
-  if (klass->unmaximize)
-    priv->features |= META_PLUGIN_UNMAXIMIZE;
-
-  if (klass->map)
-    priv->features |= META_PLUGIN_MAP;
-
-  if (klass->destroy)
-    priv->features |= META_PLUGIN_DESTROY;
-
-  if (klass->switch_workspace)
-    priv->features |= META_PLUGIN_SWITCH_WORKSPACE;
-}
-
-static void
-meta_plugin_constructed (GObject *object)
-{
-  meta_plugin_set_features (META_PLUGIN (object));
-
-  if (G_OBJECT_CLASS (meta_plugin_parent_class)->constructed)
-      G_OBJECT_CLASS (meta_plugin_parent_class)->constructed (object);
-}
-
-static void
-meta_plugin_dispose (GObject *object)
-{
-  G_OBJECT_CLASS (meta_plugin_parent_class)->dispose (object);
-}
-
-static void
-meta_plugin_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (meta_plugin_parent_class)->finalize (object);
-}
-
 static void
 meta_plugin_set_property (GObject      *object,
                           guint         prop_id,
@@ -125,9 +68,6 @@ meta_plugin_set_property (GObject      *object,
     case PROP_SCREEN:
       priv->screen = g_value_get_object (value);
       break;
-    case PROP_DISABLED:
-      priv->disabled = g_value_get_boolean (value);
-      break;
     case PROP_DEBUG_MODE:
       priv->debug = g_value_get_boolean (value);
       break;
@@ -150,15 +90,9 @@ meta_plugin_get_property (GObject    *object,
     case PROP_SCREEN:
       g_value_set_object (value, priv->screen);
       break;
-    case PROP_DISABLED:
-      g_value_set_boolean (value, priv->disabled);
-      break;
     case PROP_DEBUG_MODE:
       g_value_set_boolean (value, priv->debug);
       break;
-    case PROP_FEATURES:
-      g_value_set_ulong (value, priv->features);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -171,9 +105,6 @@ meta_plugin_class_init (MetaPluginClass *klass)
 {
   GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 
-  gobject_class->constructed     = meta_plugin_constructed;
-  gobject_class->finalize        = meta_plugin_finalize;
-  gobject_class->dispose         = meta_plugin_dispose;
   gobject_class->set_property    = meta_plugin_set_property;
   gobject_class->get_property    = meta_plugin_get_property;
 
@@ -185,22 +116,6 @@ meta_plugin_class_init (MetaPluginClass *klass)
                                                         META_TYPE_SCREEN,
                                                         G_PARAM_READWRITE));
 
-  g_object_class_install_property (gobject_class,
-				   PROP_FEATURES,
-				   g_param_spec_ulong ("features",
-                                                       "Features",
-                                                       "Plugin Features",
-                                                       0 , G_MAXULONG, 0,
-                                                       G_PARAM_READABLE));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_DISABLED,
-				   g_param_spec_boolean ("disabled",
-                                                      "Plugin disabled",
-                                                      "Plugin disabled",
-                                                      FALSE,
-                                                      G_PARAM_READWRITE));
-
   g_object_class_install_property (gobject_class,
 				   PROP_DEBUG_MODE,
 				   g_param_spec_boolean ("debug-mode",
@@ -220,22 +135,6 @@ meta_plugin_init (MetaPlugin *self)
   self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
 }
 
-gulong
-meta_plugin_features (MetaPlugin *plugin)
-{
-  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
-
-  return priv->features;
-}
-
-gboolean
-meta_plugin_disabled (MetaPlugin *plugin)
-{
-  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
-
-  return priv->disabled;
-}
-
 gboolean
 meta_plugin_running  (MetaPlugin *plugin)
 {
@@ -396,7 +295,7 @@ meta_plugin_begin_modal (MetaPlugin       *plugin,
 }
 
 /**
- * meta_plugin_end_modal
+ * meta_plugin_end_modal:
  * @plugin: a #MetaPlugin
  * @timestamp: the time used for releasing grabs
  *
@@ -432,19 +331,3 @@ meta_plugin_get_screen (MetaPlugin *plugin)
 
   return priv->screen;
 }
-
-/**
- * meta_plugin_type_register:
- * @plugin_type: a #MetaPlugin type
- *
- * Register @plugin_type as a compositor plugin type to be used.
- * You must call this before calling meta_init().
- */
-void
-meta_plugin_type_register (GType plugin_type)
-{
-  MetaPluginManager *plugin_manager;
-
-  plugin_manager = meta_plugin_manager_get_default ();
-  meta_plugin_manager_register (plugin_manager, plugin_type);
-}

src/compositor/meta-shadow-factory.c

@@ -130,7 +130,7 @@ MetaShadowClassInfo default_shadow_classes[] = {
   { "popup-menu",    { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } },
 
   { "dropdown-menu", { 1, 10, 0, 1, 128 }, { 1, 10, 0, 1, 128 } },
-  { "attached",      { 2, 50, 0, 1, 255 }, { 1, 50, 0, 1, 128 } }
+  { "attached",      { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } }
 };
 
 G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);

src/compositor/meta-shaped-texture.c

@@ -1,11 +1,13 @@
 /*
  * shaped texture
  *
- * An actor to draw a texture clipped to a list of rectangles
+ * An actor to draw a masked texture.
  *
  * Authored By Neil Roberts  <neil@linux.intel.com>
+ * and Jasper St. Pierre <jstpierre@mecheye.net>
  *
  * Copyright (C) 2008 Intel Corporation
+ * Copyright (C) 2012 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -25,18 +27,13 @@
 
 #include <config.h>
 
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#define COGL_ENABLE_EXPERIMENTAL_API
-
 #include <meta/meta-shaped-texture.h>
 #include "meta-texture-tower.h"
-#include "meta-texture-rectangle.h"
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 #include <cogl/cogl-texture-pixmap-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
-#include <string.h>
 
 static void meta_shaped_texture_dispose  (GObject    *object);
 
@@ -54,8 +51,6 @@ static void meta_shaped_texture_get_preferred_height (ClutterActor *self,
                                                       gfloat       *min_height_p,
                                                       gfloat       *natural_height_p);
 
-static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
-
 static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, ClutterPaintVolume *volume);
 
 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
@@ -75,13 +70,8 @@ struct _MetaShapedTexturePrivate
   CoglHandle material_unshaped;
 
   cairo_region_t *clip_region;
-  cairo_region_t *shape_region;
-
-  cairo_region_t *overlay_region;
-  cairo_path_t *overlay_path;
 
   guint tex_width, tex_height;
-  guint mask_width, mask_height;
 
   guint create_mipmaps : 1;
 };
@@ -110,9 +100,6 @@ meta_shaped_texture_init (MetaShapedTexture *self)
 
   priv = self->priv = META_SHAPED_TEXTURE_GET_PRIVATE (self);
 
-  priv->shape_region = NULL;
-  priv->overlay_path = NULL;
-  priv->overlay_region = NULL;
   priv->paint_tower = meta_texture_tower_new ();
   priv->texture = COGL_INVALID_HANDLE;
   priv->mask_texture = COGL_INVALID_HANDLE;
@@ -129,8 +116,6 @@ meta_shaped_texture_dispose (GObject *object)
     meta_texture_tower_free (priv->paint_tower);
   priv->paint_tower = NULL;
 
-  meta_shaped_texture_dirty_mask (self);
-
   if (priv->material != COGL_INVALID_HANDLE)
     {
       cogl_handle_unref (priv->material);
@@ -147,186 +132,12 @@ meta_shaped_texture_dispose (GObject *object)
       priv->texture = COGL_INVALID_HANDLE;
     }
 
-  meta_shaped_texture_set_shape_region (self, NULL);
+  meta_shaped_texture_set_mask_texture (self, COGL_INVALID_HANDLE);
   meta_shaped_texture_set_clip_region (self, NULL);
-  meta_shaped_texture_set_overlay_path (self, NULL, NULL);
 
   G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }
 
-static void
-meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-
-  if (priv->mask_texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->mask_texture);
-      priv->mask_texture = COGL_INVALID_HANDLE;
-    }
-
-  if (priv->material != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
-}
-
-static void
-install_overlay_path (MetaShapedTexture *stex,
-                      guchar            *mask_data,
-                      int                tex_width,
-                      int                tex_height,
-                      int                stride)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  int i, n_rects;
-  cairo_t *cr;
-  cairo_rectangle_int_t rect;
-  cairo_surface_t *surface;
-
-  if (priv->overlay_region == NULL)
-    return;
-
-  surface = cairo_image_surface_create_for_data (mask_data,
-                                                 CAIRO_FORMAT_A8,
-                                                 tex_width,
-                                                 tex_height,
-                                                 stride);
-
-  cr = cairo_create (surface);
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-
-  n_rects = cairo_region_num_rectangles (priv->overlay_region);
-  for (i = 0; i < n_rects; i++)
-    {
-      cairo_region_get_rectangle (priv->overlay_region, i, &rect);
-      cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
-    }
-
-  cairo_fill_preserve (cr);
-  if (priv->overlay_path == NULL)
-    {
-      /* If we have an overlay region but not an overlay path, then we
-       * just need to clear the rectangles in the overlay region. */
-      goto out;
-    }
-
-  cairo_clip (cr);
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba (cr, 1, 1, 1, 1);
-
-  cairo_append_path (cr, priv->overlay_path);
-  cairo_fill (cr);
-
- out:
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-}
-
-static void
-meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  CoglHandle paint_tex;
-  guint tex_width, tex_height;
-
-  paint_tex = priv->texture;
-
-  if (paint_tex == COGL_INVALID_HANDLE)
-    return;
-
-  tex_width = cogl_texture_get_width (paint_tex);
-  tex_height = cogl_texture_get_height (paint_tex);
-
-  /* If the mask texture we have was created for a different size then
-     recreate it */
-  if (priv->mask_texture != COGL_INVALID_HANDLE
-      && (priv->mask_width != tex_width || priv->mask_height != tex_height))
-    meta_shaped_texture_dirty_mask (stex);
-
-  /* If we don't have a mask texture yet then create one */
-  if (priv->mask_texture == COGL_INVALID_HANDLE)
-    {
-      guchar *mask_data;
-      int i;
-      int n_rects;
-      int stride;
-      GLenum paint_gl_target;
-
-      /* If we have no shape region and no (or an empty) overlay region, we
-       * don't need to create a full mask texture, so quit early. */
-      if (priv->shape_region == NULL &&
-          (priv->overlay_region == NULL ||
-           cairo_region_num_rectangles (priv->overlay_region) == 0))
-        {
-          return;
-        }
-
-      stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);
-
-      /* Create data for an empty image */
-      mask_data = g_malloc0 (stride * tex_height);
-
-      n_rects = cairo_region_num_rectangles (priv->shape_region);
-
-      /* Fill in each rectangle. */
-      for (i = 0; i < n_rects; i ++)
-        {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (priv->shape_region, i, &rect);
-
-          gint x1 = rect.x, x2 = x1 + rect.width;
-          gint y1 = rect.y, y2 = y1 + rect.height;
-          guchar *p;
-
-          /* Clip the rectangle to the size of the texture */
-          x1 = CLAMP (x1, 0, (gint) tex_width - 1);
-          x2 = CLAMP (x2, x1, (gint) tex_width);
-          y1 = CLAMP (y1, 0, (gint) tex_height - 1);
-          y2 = CLAMP (y2, y1, (gint) tex_height);
-
-          /* Fill the rectangle */
-          for (p = mask_data + y1 * stride + x1;
-               y1 < y2;
-               y1++, p += stride)
-            memset (p, 255, x2 - x1);
-        }
-
-      install_overlay_path (stex, mask_data, tex_width, tex_height, stride);
-
-      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
-
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-      if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
-        {
-          priv->mask_texture
-            = meta_texture_rectangle_new (tex_width, tex_height,
-                                          0, /* flags */
-                                          /* data format */
-                                          COGL_PIXEL_FORMAT_A_8,
-                                          /* internal GL format */
-                                          GL_ALPHA,
-                                          /* internal cogl format */
-                                          COGL_PIXEL_FORMAT_A_8,
-                                          /* rowstride */
-                                          stride,
-                                          mask_data);
-        }
-      else
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-        priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
-                                                         COGL_TEXTURE_NONE,
-                                                         COGL_PIXEL_FORMAT_A_8,
-                                                         COGL_PIXEL_FORMAT_ANY,
-                                                         stride,
-                                                         mask_data);
-
-      g_free (mask_data);
-
-      priv->mask_width = tex_width;
-      priv->mask_height = tex_height;
-    }
-}
-
 static void
 meta_shaped_texture_paint (ClutterActor *actor)
 {
@@ -376,9 +187,9 @@ meta_shaped_texture_paint (ClutterActor *actor)
   if (tex_width == 0 || tex_height == 0) /* no contents yet */
     return;
 
-  if (priv->shape_region == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
     {
-      /* No region means an unclipped shape. Use a single-layer texture. */
+      /* Use a single-layer texture if we don't have a mask. */
 
       if (priv->material_unshaped == COGL_INVALID_HANDLE) 
         {
@@ -391,8 +202,6 @@ meta_shaped_texture_paint (ClutterActor *actor)
     }
   else
     {
-      meta_shaped_texture_ensure_mask (stex);
-
       if (priv->material == COGL_INVALID_HANDLE)
 	{
 	   if (G_UNLIKELY (material_template == COGL_INVALID_HANDLE))
@@ -483,7 +292,7 @@ meta_shaped_texture_pick (ClutterActor       *actor,
   MetaShapedTexturePrivate *priv = stex->priv;
 
   /* If there is no region then use the regular pick */
-  if (priv->shape_region == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
     CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
       ->pick (actor, color);
   else if (clutter_actor_should_pick_paint (actor))
@@ -503,8 +312,6 @@ meta_shaped_texture_pick (ClutterActor       *actor,
       if (tex_width == 0 || tex_height == 0) /* no contents yet */
         return;
 
-      meta_shaped_texture_ensure_mask (stex);
-
       cogl_set_source_color4ub (color->red, color->green, color->blue,
                                  color->alpha);
 
@@ -595,8 +402,8 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 }
 
 void
-meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
-                                      cairo_region_t    *region)
+meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
+                                      CoglHandle         mask_texture)
 {
   MetaShapedTexturePrivate *priv;
 
@@ -604,19 +411,18 @@ meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
 
   priv = stex->priv;
 
-  if (priv->shape_region != NULL)
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
     {
-      cairo_region_destroy (priv->shape_region);
-      priv->shape_region = NULL;
+      cogl_handle_unref (priv->mask_texture);
+      priv->mask_texture = COGL_INVALID_HANDLE;
     }
 
-  if (region != NULL)
+  if (mask_texture != COGL_INVALID_HANDLE)
     {
-      cairo_region_reference (region);
-      priv->shape_region = region;
+      priv->mask_texture = mask_texture;
+      cogl_handle_ref (priv->mask_texture);
     }
 
-  meta_shaped_texture_dirty_mask (stex);
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }
 
@@ -735,48 +541,6 @@ meta_shaped_texture_get_texture (MetaShapedTexture *stex)
   return stex->priv->texture;
 }
 
-/**
- * meta_shaped_texture_set_overlay_path:
- * @stex: a #MetaShapedTexture
- * @overlay_region: A region containing the parts of the mask to overlay.
- *   All rectangles in this region are wiped clear to full transparency,
- *   and the overlay path is clipped to this region.
- * @overlay_path: (transfer full): This path will be painted onto the mask
- *   texture with a fully opaque source. Due to the lack of refcounting
- *   in #cairo_path_t, ownership of the path is assumed.
- */
-void
-meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
-                                      cairo_region_t    *overlay_region,
-                                      cairo_path_t      *overlay_path)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  if (priv->overlay_region != NULL)
-    {
-      cairo_region_destroy (priv->overlay_region);
-      priv->overlay_region = NULL;
-    }
-
-  if (priv->overlay_path != NULL)
-    {
-      cairo_path_destroy (priv->overlay_path);
-      priv->overlay_path = NULL;
-    }
-
-  cairo_region_reference (overlay_region);
-  priv->overlay_region = overlay_region;
-
-  /* cairo_path_t does not have refcounting. */
-  priv->overlay_path = overlay_path;
-
-  meta_shaped_texture_dirty_mask (stex);
-}
-
 /**
  * meta_shaped_texture_set_clip_region:
  * @stex: a #MetaShapedTexture

src/compositor/meta-texture-rectangle.c

@@ -5,7 +5,7 @@
  *
  * Authored By Neil Roberts  <neil@linux.intel.com>
  *
- * Copyright (C) 2011 Intel Corporation
+ * Copyright (C) 2011, 2012 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -25,94 +25,74 @@
 
 #include <config.h>
 
+#include <clutter/clutter.h>
 #include "meta-texture-rectangle.h"
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-
-static void (* pf_glGetIntegerv) (GLenum pname, GLint *params);
-static void (* pf_glTexImage2D) (GLenum target, GLint level,
-                                 GLint internalFormat,
-                                 GLsizei width, GLsizei height,
-                                 GLint border, GLenum format, GLenum type,
-                                 const GLvoid *pixels);
-static void (* pf_glGenTextures) (GLsizei n, GLuint *textures);
-static void (* pf_glDeleteTextures) (GLsizei n, const GLuint *texture);
-static void (* pf_glBindTexture) (GLenum target, GLuint texture);
-
-static void
-rectangle_texture_destroy_cb (void *user_data)
-{
-  GLuint tex = GPOINTER_TO_UINT (user_data);
-
-  pf_glDeleteTextures (1, &tex);
-}
-
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
-CoglHandle
+CoglTexture *
 meta_texture_rectangle_new (unsigned int width,
                             unsigned int height,
-                            CoglTextureFlags flags,
                             CoglPixelFormat format,
-                            GLenum internal_gl_format,
-                            GLenum internal_format,
+                            CoglPixelFormat internal_format,
                             unsigned int rowstride,
-                            const guint8 *data)
+                            const guint8 *data,
+                            GError **error)
 {
-  CoglHandle cogl_tex = COGL_INVALID_HANDLE;
+  ClutterBackend *backend =
+    clutter_get_default_backend ();
+  CoglContext *context =
+    clutter_backend_get_cogl_context (backend);
+  CoglTextureRectangle *tex_rect;
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
+  tex_rect = cogl_texture_rectangle_new_with_size (context,
+                                                   width, height,
+                                                   internal_format,
+                                                   error);
+  if (tex_rect == NULL)
+    return NULL;
 
-  static CoglUserDataKey user_data_key;
-  GLint old_binding;
-  GLuint tex;
-
-  if (pf_glGenTextures == NULL)
-    {
-      pf_glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv");
-      pf_glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D");
-      pf_glGenTextures = (void *) cogl_get_proc_address ("glGenTextures");
-      pf_glDeleteTextures = (void *) cogl_get_proc_address ("glDeleteTextures");
-      pf_glBindTexture = (void *) cogl_get_proc_address ("glBindTexture");
-    }
-
-  pf_glGenTextures (1, &tex);
-  pf_glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding);
-  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
-  pf_glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
-                   internal_gl_format, width, height,
-                   0, internal_gl_format,
-                   GL_UNSIGNED_BYTE, NULL);
-  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, old_binding);
-
-  cogl_tex = cogl_texture_new_from_foreign (tex,
-                                            GL_TEXTURE_RECTANGLE_ARB,
-                                            width, height,
-                                            0, 0, /* no waste */
-                                            internal_format);
-
-  /* Cogl won't destroy the GL texture when a foreign texture is used
-     so we need to destroy it manually. We can set a destroy
-     notification callback to do this transparently */
-  cogl_object_set_user_data (cogl_tex,
-                             &user_data_key,
-                             GUINT_TO_POINTER (tex),
-                             rectangle_texture_destroy_cb);
-
-  /* Use cogl_texture_set_region instead of uploading the data
-     directly with GL calls so that we can let Cogl deal with setting
-     the pixel store parameters and handling format conversion */
   if (data)
-    cogl_texture_set_region (cogl_tex,
-                             0, 0, /* src x/y */
-                             0, 0, /* dst x/y */
-                             width, height, /* dst width/height */
-                             width, height, /* src width/height */
+    cogl_texture_set_region (COGL_TEXTURE (tex_rect),
+                             0, 0, /* src_x/y */
+                             0, 0, /* dst_x/y */
+                             width, height, /* dst_width/height */
+                             width, height, /* width/height */
                              format,
                              rowstride,
                              data);
 
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
-  return cogl_tex;
+  return COGL_TEXTURE (tex_rect);
+}
+
+static void
+texture_rectangle_check_cb (CoglTexture *sub_texture,
+                            const float *sub_texture_coords,
+                            const float *meta_coords,
+                            void *user_data)
+{
+  gboolean *result = user_data;
+
+  if (cogl_is_texture_rectangle (sub_texture))
+    *result = TRUE;
+}
+
+/* Determines if the given texture is using a rectangle texture as its
+ * primitive texture type. Eventually this function could be replaced
+ * with cogl_texture_get_type if Cogl makes that public.
+ *
+ * http://git.gnome.org/browse/cogl/commit/?h=8012eee31
+ */
+gboolean
+meta_texture_rectangle_check (CoglTexture *texture)
+{
+  gboolean result = FALSE;
+
+  cogl_meta_texture_foreach_in_region (COGL_META_TEXTURE (texture),
+                                       0.0f, 0.0f, /* tx_1 / ty_1 */
+                                       1.0f, 1.0f, /* tx_2 / ty_2 */
+                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
+                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
+                                       texture_rectangle_check_cb,
+                                       &result);
+
+  return result;
 }

src/compositor/meta-texture-rectangle.h

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

src/compositor/meta-texture-tower.c

@@ -98,18 +98,6 @@ meta_texture_tower_free (MetaTextureTower *tower)
   g_slice_free (MetaTextureTower, tower);
 }
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-static gboolean
-texture_is_rectangle (CoglHandle texture)
-{
-  GLuint gl_tex;
-  GLenum gl_target;
-
-  cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
-  return gl_target == GL_TEXTURE_RECTANGLE_ARB;
-}
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
 /**
  * meta_texture_tower_set_base_texture:
  * @tower: a #MetaTextureTower
@@ -354,13 +342,11 @@ get_paint_level (int width, int height)
     return (int)(0.5 + lambda);
 }
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
 static gboolean
 is_power_of_two (int x)
 {
   return (x & (x - 1)) == 0;
 }
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
 
 static void
 texture_tower_create_texture (MetaTextureTower *tower,
@@ -368,25 +354,23 @@ texture_tower_create_texture (MetaTextureTower *tower,
                               int               width,
                               int               height)
 {
-#ifdef GL_TEXTURE_RECTANGLE_ARB
   if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
-      texture_is_rectangle (tower->textures[level - 1]))
+      meta_texture_rectangle_check (tower->textures[level - 1]))
     {
       tower->textures[level] =
         meta_texture_rectangle_new (width, height,
-                                    0, /* flags */
                                     /* data format */
                                     TEXTURE_FORMAT,
-                                    /* internal GL format */
-                                    GL_RGBA,
                                     /* internal cogl format */
                                     TEXTURE_FORMAT,
                                     /* rowstride */
                                     width * 4,
+                                    /* data */
+                                    NULL,
+                                    /* error */
                                     NULL);
     }
   else
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
     {
       tower->textures[level] = cogl_texture_new_with_size (width, height,
                                                            COGL_TEXTURE_NO_AUTO_MIPMAP,
@@ -562,7 +546,7 @@ texture_tower_revalidate_client (MetaTextureTower *tower,
                            4 * dest_width,
                            dest_data);
 
-  if (dest_height < source_texture_height)
+  if (dest_texture_height < source_texture_height)
     {
       g_free (source_tmp1);
       g_free (source_tmp2);

src/compositor/meta-window-actor-private.h

@@ -28,6 +28,10 @@ void meta_window_actor_process_damage (MetaWindowActor    *self,
                                        XDamageNotifyEvent *event);
 
 void meta_window_actor_pre_paint      (MetaWindowActor    *self);
+void meta_window_actor_post_paint     (MetaWindowActor    *self);
+void meta_window_actor_frame_complete (MetaWindowActor    *self,
+                                       CoglFrameInfo      *frame_info,
+                                       gint64              presentation_time);
 
 void meta_window_actor_invalidate_shadow (MetaWindowActor *self);
 
@@ -45,6 +49,8 @@ void     meta_window_actor_update_shape        (MetaWindowActor *self);
 void     meta_window_actor_update_opacity      (MetaWindowActor *self);
 void     meta_window_actor_mapped              (MetaWindowActor *self);
 void     meta_window_actor_unmapped            (MetaWindowActor *self);
+void     meta_window_actor_set_updates_frozen  (MetaWindowActor *self,
+                                                gboolean         updates_frozen);
 
 cairo_region_t *meta_window_actor_get_obscured_region (MetaWindowActor *self);
 

src/compositor/meta-window-group.c

@@ -26,9 +26,28 @@ struct _MetaWindowGroup
 
 G_DEFINE_TYPE (MetaWindowGroup, meta_window_group, CLUTTER_TYPE_GROUP);
 
-/* We want to find out if the window is "close enough" to
- * 1:1 transform. We do that by converting the transformed coordinates
- * to 24.8 fixed-point before checking if they look right.
+/* This file uses pixel-aligned region computation to determine what
+ * can be clipped out. This only really works if everything is aligned
+ * to the pixel grid - not scaled or rotated and at integer offsets.
+ *
+ * (This could be relaxed - if we turned off filtering for unscaled
+ * windows then windows would be, by definition aligned to the pixel
+ * grid. And for rectangular windows without a shape, the outline that
+ * we draw for an unrotated window is always a rectangle because we
+ * don't use antialasing for the window boundary - with or without
+ * filtering, with or without a scale. But figuring out exactly
+ * what pixels will be drawn by the graphics system in these cases
+ * gets tricky, so we just go for the easiest part - no scale,
+ * and at integer offsets.)
+ *
+ * The way we check for pixel-aligned is by looking at the
+ * transformation into screen space of the allocation box of an actor
+ * and and checking if the corners are "close enough" to integral
+ * pixel values.
+ */
+
+/* The definition of "close enough" to integral pixel values is
+ * equality when we convert to 24.8 fixed-point.
  */
 static inline int
 round_to_fixed (float x)
@@ -36,41 +55,24 @@ round_to_fixed (float x)
   return roundf (x * 256);
 }
 
-/* We can only (easily) apply our logic for figuring out what a window
- * obscures if is not transformed. This function does that check and
- * as a side effect gets the position of the upper-left corner of the
- * actors.
- *
- * (We actually could handle scaled and non-integrally positioned actors
- * too as long as they weren't shaped - no filtering is done at the
- * edges so a rectangle stays a rectangle. But the gain from that is
- * small, especally since most of our windows are shaped. The simple
- * case we handle here is the case that matters when the user is just
- * using the desktop normally.)
- *
- * If we assume that the window group is untransformed (it better not
- * be!) then we could also make this determination by checking directly
- * if the actor itself is rotated, scaled, or at a non-integral position.
- * However, the criterion for "close enough" in that case get trickier,
- * since, for example, the allowed rotation depends on the size of
- * actor. The approach we take here is to just require everything
- * to be within 1/256th of a pixel.
+/* This helper function checks if (according to our fixed point precision)
+ * the vertices @verts form a box of width @widthf and height @heightf
+ * located at integral coordinates. These coordinates are returned
+ * in @x_origin and @y_origin.
  */
 static gboolean
-actor_is_untransformed (ClutterActor *actor,
-                        int          *x_origin,
-                        int          *y_origin)
+vertices_are_untransformed (ClutterVertex *verts,
+                            float          widthf,
+                            float          heightf,
+                            int           *x_origin,
+                            int           *y_origin)
 {
-  gfloat widthf, heightf;
   int width, height;
-  ClutterVertex verts[4];
   int v0x, v0y, v1x, v1y, v2x, v2y, v3x, v3y;
   int x, y;
 
-  clutter_actor_get_size (actor, &widthf, &heightf);
   width = round_to_fixed (widthf); height = round_to_fixed (heightf);
 
-  clutter_actor_get_abs_allocation_vertices (actor, verts);
   v0x = round_to_fixed (verts[0].x); v0y = round_to_fixed (verts[0].y);
   v1x = round_to_fixed (verts[1].x); v1y = round_to_fixed (verts[1].y);
   v2x = round_to_fixed (verts[2].x); v2y = round_to_fixed (verts[2].y);
@@ -101,23 +103,118 @@ actor_is_untransformed (ClutterActor *actor,
   return TRUE;
 }
 
+/* Check if an actor is "untransformed" - which actually means transformed by
+ * at most a integer-translation. The integer translation, if any, is returned.
+ */
+static gboolean
+actor_is_untransformed (ClutterActor *actor,
+                        int          *x_origin,
+                        int          *y_origin)
+{
+  gfloat widthf, heightf;
+  ClutterVertex verts[4];
+
+  clutter_actor_get_size (actor, &widthf, &heightf);
+  clutter_actor_get_abs_allocation_vertices (actor, verts);
+
+  return vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
+}
+
+/* Help macros to scale from OpenGL <-1,1> coordinates system to
+ * window coordinates ranging [0,window-size]. Borrowed from clutter-utils.c
+ */
+#define MTX_GL_SCALE_X(x,w,v1,v2) ((((((x) / (w)) + 1.0f) / 2.0f) * (v1)) + (v2))
+#define MTX_GL_SCALE_Y(y,w,v1,v2) ((v1) - (((((y) / (w)) + 1.0f) / 2.0f) * (v1)) + (v2))
+
+/* Check if we're painting the MetaWindowGroup "untransformed". This can
+ * differ from the result of actor_is_untransformed(window_group) if we're
+ * inside a clone paint. The integer translation, if any, is returned.
+ */
+static gboolean
+painting_untransformed (MetaWindowGroup *window_group,
+                        int             *x_origin,
+                        int             *y_origin)
+{
+  CoglMatrix modelview, projection, modelview_projection;
+  ClutterVertex vertices[4];
+  int width, height;
+  float viewport[4];
+  int i;
+
+  cogl_get_modelview_matrix (&modelview);
+  cogl_get_projection_matrix (&projection);
+
+  cogl_matrix_multiply (&modelview_projection,
+                        &projection,
+                        &modelview);
+
+  meta_screen_get_size (window_group->screen, &width, &height);
+
+  vertices[0].x = 0;
+  vertices[0].y = 0;
+  vertices[0].z = 0;
+  vertices[1].x = width;
+  vertices[1].y = 0;
+  vertices[1].z = 0;
+  vertices[2].x = 0;
+  vertices[2].y = height;
+  vertices[2].z = 0;
+  vertices[3].x = width;
+  vertices[3].y = height;
+  vertices[3].z = 0;
+
+  cogl_get_viewport (viewport);
+
+  for (i = 0; i < 4; i++)
+    {
+      float w = 1;
+      cogl_matrix_transform_point (&modelview_projection, &vertices[i].x, &vertices[i].y, &vertices[i].z, &w);
+      vertices[i].x = MTX_GL_SCALE_X (vertices[i].x, w,
+                                      viewport[2], viewport[0]);
+      vertices[i].y = MTX_GL_SCALE_Y (vertices[i].y, w,
+                                      viewport[3], viewport[1]);
+    }
+
+  return vertices_are_untransformed (vertices, width, height, x_origin, y_origin);
+}
+
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
   cairo_region_t *visible_region;
-  cairo_region_t *unredirected_window_region = NULL;
   ClutterActor *stage;
-  cairo_rectangle_int_t visible_rect, unredirected_rect;
+  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);
-  if (info->unredirected_window != 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
+   * case and we need to compensate. We look at the position of the window
+   * group under the current model-view matrix and the position of the actor.
+   * If they are both simply integer translations, then we can compensate
+   * easily, otherwise we give up.
+   *
+   * Possible cleanup: work entirely in paint space - we can compute the
+   * combination of the model-view matrix with the local matrix for each child
+   * actor and get a total transformation for that actor for how we are
+   * painting currently, and never worry about how actors are positioned
+   * on the stage.
+   */
+  if (!painting_untransformed (window_group, &paint_x_origin, &paint_y_origin) ||
+      !actor_is_untransformed (actor, &actor_x_origin, &actor_y_origin))
     {
-      meta_window_actor_get_shape_bounds (META_WINDOW_ACTOR (info->unredirected_window), &unredirected_rect);
-      unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
+      CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);
+      return;
     }
 
+  paint_x_offset = paint_x_origin - actor_x_origin;
+  paint_y_offset = paint_y_origin - actor_y_origin;
+
   /* 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.
@@ -137,14 +234,23 @@ meta_window_group_paint (ClutterActor *actor)
 
   visible_region = cairo_region_create_rectangle (&visible_rect);
 
-  if (unredirected_window_region)
-    cairo_region_subtract (visible_region, unredirected_window_region);
+  if (info->unredirected_window != NULL)
+    {
+      cairo_rectangle_int_t unredirected_rect;
+      MetaWindow *window = meta_window_actor_get_meta_window (info->unredirected_window);
+
+      meta_window_get_outer_rect (window, (MetaRectangle *)&unredirected_rect);
+      cairo_region_subtract_rectangle (visible_region, &unredirected_rect);
+    }
 
   for (l = children; l; l = l->next)
     {
       if (!CLUTTER_ACTOR_IS_VISIBLE (l->data))
         continue;
 
+      if (l->data == info->unredirected_window)
+        continue;
+
       /* If an actor has effects applied, then that can change the area
        * it paints and the opacity, so we no longer can figure out what
        * portion of the actor is obscured and what portion of the screen
@@ -172,6 +278,9 @@ meta_window_group_paint (ClutterActor *actor)
           if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
             continue;
 
+          x += paint_x_offset;
+          y += paint_y_offset;
+
           /* Temporarily move to the coordinate system of the actor */
           cairo_region_translate (visible_region, - x, - y);
 
@@ -190,15 +299,22 @@ meta_window_group_paint (ClutterActor *actor)
       else if (META_IS_BACKGROUND_ACTOR (l->data))
         {
           MetaBackgroundActor *background_actor = l->data;
+          int x, y;
+
+          if (!actor_is_untransformed (CLUTTER_ACTOR (background_actor), &x, &y))
+            continue;
+
+          x += paint_x_offset;
+          y += paint_y_offset;
+
+          cairo_region_translate (visible_region, - x, - y);
           meta_background_actor_set_visible_region (background_actor, visible_region);
+          cairo_region_translate (visible_region, x, y);
         }
     }
 
   cairo_region_destroy (visible_region);
 
-  if (unredirected_window_region)
-    cairo_region_destroy (unredirected_window_region);
-
   CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);
 
   /* Now that we are done painting, unset the visible regions (they will
@@ -209,7 +325,6 @@ meta_window_group_paint (ClutterActor *actor)
       if (META_IS_WINDOW_ACTOR (l->data))
         {
           MetaWindowActor *window_actor = l->data;
-          window_actor = l->data;
           meta_window_actor_reset_visible_regions (window_actor);
         }
       else if (META_IS_BACKGROUND_ACTOR (l->data))

src/compositor/plugins/Makefile.am

@@ -16,3 +16,9 @@ pkglib_LTLIBRARIES = default.la
 install-exec-hook:
 	-rm $(DESTDIR)$(pkglibdir)/*.a
 	-rm $(DESTDIR)$(pkglibdir)/*.la
+
+# Since we removed the .la file, 'make uninstall' doesn't work properly,
+# since it counts on libtool to remove the .la files, so just kill the
+# .so file manually.
+uninstall-local:
+	-rm -f $(DESTDIR)$(pkglibdir)/default.so

src/compositor/plugins/default.c

@@ -112,8 +112,6 @@ struct _MetaDefaultPluginPrivate
   ClutterActor          *desktop2;
 
   MetaPluginInfo         info;
-
-  gboolean               debug_mode : 1;
 };
 
 /*
@@ -182,34 +180,6 @@ meta_default_plugin_get_property (GObject    *object,
     }
 }
 
-static void
-start (MetaPlugin *plugin)
-{
-  MetaDefaultPluginPrivate *priv   = META_DEFAULT_PLUGIN (plugin)->priv;
-
-  guint destroy_timeout  = DESTROY_TIMEOUT;
-  guint minimize_timeout = MINIMIZE_TIMEOUT;
-  guint maximize_timeout = MAXIMIZE_TIMEOUT;
-  guint map_timeout      = MAP_TIMEOUT;
-  guint switch_timeout   = SWITCH_TIMEOUT;
-
-  if (meta_plugin_debug_mode (plugin))
-    {
-      g_debug ("Plugin %s: Entering debug mode.", priv->info.name);
-
-      priv->debug_mode = TRUE;
-
-      /*
-       * Double the effect duration to make them easier to observe.
-       */
-      destroy_timeout  *= 2;
-      minimize_timeout *= 2;
-      maximize_timeout *= 2;
-      map_timeout      *= 2;
-      switch_timeout   *= 2;
-    }
-}
-
 static void
 meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
 {
@@ -221,7 +191,6 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
   gobject_class->set_property    = meta_default_plugin_set_property;
   gobject_class->get_property    = meta_default_plugin_get_property;
 
-  plugin_class->start            = start;
   plugin_class->map              = map;
   plugin_class->minimize         = minimize;
   plugin_class->maximize         = maximize;
@@ -479,8 +448,8 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
                                          MINIMIZE_TIMEOUT,
                                          "scale-x", 0.0,
                                          "scale-y", 0.0,
-                                         "x", icon_geometry.x,
-                                         "y", icon_geometry.y,
+                                         "x", (double)icon_geometry.x,
+                                         "y", (double)icon_geometry.y,
                                          NULL);
       apriv->tml_minimize = clutter_animation_get_timeline (animation);
       data->plugin = plugin;

src/compositor/region-utils.c

@@ -43,34 +43,17 @@
 /* Optimium performance seems to be with MAX_CHUNK_RECTANGLES=4; 8 is about 10% slower.
  * But using 8 may be more robust to systems with slow malloc(). */
 #define MAX_CHUNK_RECTANGLES 8
-#define MAX_LEVELS 16
 
-typedef struct
-{
-  /* To merge regions in binary tree order, we need to keep track of
-   * the regions that we've already merged together at different
-   * levels of the tree. We fill in an array in the pattern:
-   *
-   * |a  |
-   * |b  |a  |
-   * |c  |   |ab |
-   * |d  |c  |ab |
-   * |e  |   |   |abcd|
-   */
-  cairo_region_t *levels[MAX_LEVELS];
-  int n_levels;
-} MetaRegionBuilder;
-
-static void
+void
 meta_region_builder_init (MetaRegionBuilder *builder)
 {
   int i;
-  for (i = 0; i < MAX_LEVELS; i++)
+  for (i = 0; i < META_REGION_BUILDER_MAX_LEVELS; i++)
     builder->levels[i] = NULL;
   builder->n_levels = 1;
 }
 
-static void
+void
 meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
                                    int                x,
                                    int                y,
@@ -95,7 +78,7 @@ meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
         {
           if (builder->levels[i] == NULL)
             {
-              if (i < MAX_LEVELS)
+              if (i < META_REGION_BUILDER_MAX_LEVELS)
                 {
                   builder->levels[i] = builder->levels[i - 1];
                   builder->levels[i - 1] = NULL;
@@ -115,7 +98,7 @@ meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
     }
 }
 
-static cairo_region_t *
+cairo_region_t *
 meta_region_builder_finish (MetaRegionBuilder *builder)
 {
   cairo_region_t *result = NULL;

src/compositor/region-utils.h

@@ -63,6 +63,32 @@ struct _MetaRegionIterator {
   cairo_rectangle_int_t next_rectangle;
 };
 
+typedef struct _MetaRegionBuilder MetaRegionBuilder;
+
+#define META_REGION_BUILDER_MAX_LEVELS 16
+struct _MetaRegionBuilder {
+  /* To merge regions in binary tree order, we need to keep track of
+   * the regions that we've already merged together at different
+   * levels of the tree. We fill in an array in the pattern:
+   *
+   * |a  |
+   * |b  |a  |
+   * |c  |   |ab |
+   * |d  |c  |ab |
+   * |e  |   |   |abcd|
+   */
+  cairo_region_t *levels[META_REGION_BUILDER_MAX_LEVELS];
+  int n_levels;
+};
+
+void     meta_region_builder_init       (MetaRegionBuilder *builder);
+void     meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
+                                            int                x,
+                                            int                y,
+                                            int                width,
+                                            int                height);
+cairo_region_t * meta_region_builder_finish (MetaRegionBuilder *builder);
+
 void     meta_region_iterator_init      (MetaRegionIterator *iter,
                                          cairo_region_t     *region);
 gboolean meta_region_iterator_at_end    (MetaRegionIterator *iter);

src/core/bell.c

@@ -23,7 +23,8 @@
  */
 
 /**
- * \file bell.c Ring the bell or flash the screen
+ * SECTION:Bell
+ * @short_description: Ring the bell or flash the screen
  *
  * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
  * the user configure the bell to be audible or visible (aka visual), and
@@ -57,6 +58,10 @@
 #endif
 
 /**
+ * bell_flash_screen:
+ * @display:  The display which owns the screen (rather redundant)
+ * @screen:   The screen to flash
+ *
  * Flashes one entire screen.  This is done by making a window the size of the
  * whole screen (or reusing the old one, if it's still around), mapping it,
  * painting it white and then black, and then unmapping it. We set saveunder so
@@ -65,14 +70,12 @@
  * Unlike frame flashes, we don't do fullscreen flashes with a timeout; rather,
  * we do them in one go, because we don't have to rely on the theme code
  * redrawing the frame for us in order to do the flash.
- *
- * \param display  The display which owns the screen (rather redundant)
- * \param screen   The screen to flash
- *
- * \bug The way I read it, this appears not to do the flash
+ */
+/*
+ * Bug: The way I read it, this appears not to do the flash
  * the first time we flash a particular display. Am I wrong?
  *
- * \bug This appears to destroy our current XSync status.
+ * Bug: This appears to destroy our current XSync status.
  */
 static void
 bell_flash_screen (MetaDisplay *display, 
@@ -137,14 +140,15 @@ bell_flash_screen (MetaDisplay *display,
 }
 
 /**
+ * bell_flash_fullscreen:
+ * @display: The display the event came in on
+ * @xkb_ev: The bell event
+ *
  * Flashes one screen, or all screens, in response to a bell event.
  * If the event is on a particular window, flash the screen that
  * window is on. Otherwise, flash every screen on this display.
  *
  * If the configure script found we had no XKB, this does not exist.
- *
- * \param display  The display the event came in on
- * \param xkb_ev   The bell event
  */
 #ifdef HAVE_XKB
 static void
@@ -182,17 +186,21 @@ bell_flash_fullscreen (MetaDisplay *display,
 }
 
 /**
+ * bell_unflash_frame:
+ * @data: The frame to unflash, cast to a gpointer so it can go into
+ *        a callback function.
+ *
  * Makes a frame be not flashed; this is the timeout half of
  * bell_flash_window_frame(). This is done simply by clearing the
  * flash flag and queuing a redraw of the frame.
  *
  * If the configure script found we had no XKB, this does not exist.
  *
- * \param data  The frame to unflash, cast to a gpointer so it can go into
- *              a callback function.
- * \return Always FALSE, so we don't get called again.
- *
- * \bug This is the parallel to bell_flash_window_frame(), so it should
+ * Returns: Always FALSE, so we don't get called again.
+ */
+
+/*
+ * Bug: This is the parallel to bell_flash_window_frame(), so it should
  * really be called meta_bell_unflash_window_frame().
  */
 static gboolean 
@@ -205,6 +213,9 @@ bell_unflash_frame (gpointer data)
 }
 
 /**
+ * bell_flash_window_frame:
+ * @window: The window to flash
+ *
  * Makes a frame flash and then return to normal shortly afterwards.
  * This is done by setting a flag so that the theme
  * code will temporarily draw the frame as focussed if it's unfocussed and
@@ -212,8 +223,6 @@ bell_unflash_frame (gpointer data)
  * that the flag can be unset and the frame re-redrawn.
  *
  * If the configure script found we had no XKB, this does not exist.
- *
- * \param window  The window to flash
  */
 static void
 bell_flash_window_frame (MetaWindow *window)
@@ -231,11 +240,12 @@ bell_flash_window_frame (MetaWindow *window)
 }
 
 /**
+ * bell_flash_frame:
+ * @display:  The display the bell event came in on
+ * @xkb_ev:   The bell event we just received
+ *
  * Flashes the frame of the focussed window. If there is no focussed window,
  * flashes the screen.
- *
- * \param display  The display the bell event came in on
- * \param xkb_ev   The bell event we just received
  */
 static void
 bell_flash_frame (MetaDisplay *display, 
@@ -261,15 +271,18 @@ bell_flash_frame (MetaDisplay *display,
 }
 
 /**
+ * bell_visual_notify:
+ * @display: The display the bell event came in on
+ * @xkb_ev: The bell event we just received
+ *
  * Gives the user some kind of visual bell substitute, in response to a
  * bell event. What this is depends on the "visual bell type" pref.
  *
  * If the configure script found we had no XKB, this does not exist.
- *
- * \param display  The display the bell event came in on
- * \param xkb_ev   The bell event we just received
- *
- * \bug This should be merged with meta_bell_notify().
+ */
+
+/*
+ * Bug: This should be merged with meta_bell_notify().
  */
 static void
 bell_visual_notify (MetaDisplay *display, 
@@ -407,12 +420,13 @@ meta_bell_shutdown (MetaDisplay *display)
 }
 
 /**
+ * meta_bell_notify_frame_destroy:
+ * @frame: The frame which is being destroyed
+ *
  * Deals with a frame being destroyed. This is important because if we're
  * using a visual bell, we might be flashing the edges of the frame, and
  * so we'd have a timeout function waiting ready to un-flash them. If the
  * frame's going away, we can tell the timeout not to bother.
- *
- * \param frame  The frame which is being destroyed
  */
 void
 meta_bell_notify_frame_destroy (MetaFrame *frame)

src/core/bell.h

@@ -1,17 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-/**
- * \file bell.h Ring the bell or flash the screen
- *
- * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
- * the user configure the bell to be audible or visible (aka visual), and
- * if it's visual it can be configured to be frame-flash or fullscreen-flash.
- * We never get told about audible bells; X handles them just fine by itself.
- *
- * The visual bell was the result of a discussion in Bugzilla here:
- * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
- */
-
 /* 
  * Copyright (C) 2002 Sun Microsystems Inc.
  * 

src/core/boxes.c

@@ -625,7 +625,6 @@ meta_rectangle_get_minimal_spanning_set_for_region (
   *temp_rect = *basic_rect;
   ret = g_list_prepend (NULL, temp_rect);
 
-  strut_iter = all_struts;
   for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next)
     {
       GList *rect_iter; 

src/core/constraints.c

@@ -119,6 +119,7 @@ typedef struct
   MetaRectangle        orig;
   MetaRectangle        current;
   MetaFrameBorders    *borders;
+  gboolean             must_free_borders;
   ActionType           action_type;
   gboolean             is_user_action;
 
@@ -337,7 +338,7 @@ meta_window_constrain (MetaWindow          *window,
    * not gobject-style--gobject would be more pain than it's worth) or
    * smart pointers would be so much nicer here.  *shrug*
    */
-  if (!orig_borders)
+  if (info.must_free_borders)
     g_free (info.borders);
 }
 
@@ -358,9 +359,15 @@ setup_constraint_info (ConstraintInfo      *info,
 
   /* Create a fake frame geometry if none really exists */
   if (orig_borders && !window->fullscreen)
-    info->borders = orig_borders;
+    {
+      info->borders = orig_borders;
+      info->must_free_borders = FALSE;
+    }
   else
-    info->borders = g_new0 (MetaFrameBorders, 1);
+    {
+      info->borders = g_new0 (MetaFrameBorders, 1);
+      info->must_free_borders = TRUE;
+    }
 
   if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
     info->action_type = ACTION_MOVE_AND_RESIZE;
@@ -564,6 +571,11 @@ place_window_if_needed(MetaWindow     *window,
                        .083 * info->work_area_monitor.height;
             }
 
+          /* idle_move_resize() uses the user_rect, so make sure it uses the
+           * placed coordinates (bug #556696).
+           */
+          window->user_rect = info->current;
+
           if (window->maximize_horizontally_after_placement ||
               window->maximize_vertically_after_placement)
             meta_window_maximize_internal (window,   
@@ -757,21 +769,12 @@ constrain_modal_dialog (MetaWindow         *window,
     return TRUE;
 
   x = parent->rect.x + (parent->rect.width / 2  - info->current.width / 2);
-  y = 0;
+  y = parent->rect.y + (parent->rect.height / 2 - info->current.height / 2);
   if (parent->frame)
     {
-      MetaFrameBorders borders;
-
       x += parent->frame->rect.x;
       y += parent->frame->rect.y;
-
-      meta_frame_calc_borders (parent->frame, &borders);
-      y += borders.total.top;
-
-      y += info->borders->visible.top;
     }
-  else
-    y = parent->rect.y + info->borders->visible.top;
 
   constraint_already_satisfied = (x == info->current.x) && (y == info->current.y);
 

src/core/delete.c

@@ -108,13 +108,12 @@ delete_ping_timeout_func (MetaDisplay *display,
 
   /* Translators: %s is a window title */
   if (window_title)
-    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
-                                   window_title);
+    tmp = g_strdup_printf (_("“%s” is not responding."), window_title);
   else
     tmp = g_strdup (_("Application is not responding."));
 
   window_content = g_strdup_printf (
-      "<big><b>%s</b></big>\n\n<i>%s</i>",
+      "<big><b>%s</b></big>\n\n%s",
       tmp,
       _("You may choose to wait a short while for it to "
         "continue or force the application to quit entirely."));
@@ -123,7 +122,8 @@ delete_ping_timeout_func (MetaDisplay *display,
     meta_show_dialog ("--question",
                       window_content, NULL,
                       window->screen->screen_name,
-                      _("_Wait"), _("_Force Quit"), window->xwindow,
+                      _("_Wait"), _("_Force Quit"),
+                      "face-sad-symbolic", window->xwindow,
                       NULL, NULL);
 
   g_free (window_content);
@@ -133,6 +133,18 @@ delete_ping_timeout_func (MetaDisplay *display,
   g_child_watch_add (dialog_pid, dialog_exited, window);
 }
 
+void
+meta_window_check_alive (MetaWindow *window,
+                         guint32     timestamp)
+{
+  meta_display_ping_window (window->display,
+                            window,
+                            timestamp,
+                            delete_ping_reply_func,
+                            delete_ping_timeout_func,
+                            window);
+}
+
 void
 meta_window_delete (MetaWindow  *window,
                     guint32      timestamp)
@@ -156,13 +168,8 @@ meta_window_delete (MetaWindow  *window,
     }
   meta_error_trap_pop (window->display);
 
-  meta_display_ping_window (window->display,
-                            window,
-                            timestamp,
-                            delete_ping_reply_func,
-                            delete_ping_timeout_func,
-                            window);
-  
+  meta_window_check_alive (window, timestamp);
+
   if (window->has_focus)
     {
       /* FIXME Clean this up someday 

src/core/display-private.h

@@ -172,6 +172,9 @@ struct _MetaDisplay
   /* Pings which we're waiting for a reply from */
   GSList     *pending_pings;
 
+  /* Pending focus change */
+  guint       focus_timeout_id;
+
   /* Pending autoraise */
   guint       autoraise_timeout_id;
   MetaWindow* autoraise_window;
@@ -208,6 +211,7 @@ struct _MetaDisplay
   GList*      grab_old_window_stacking;
   MetaEdgeResistanceData *grab_edge_resistance_data;
   unsigned int grab_last_user_action_was_snap;
+  guint32     grab_timestamp;
 
   /* we use property updates as sentinels for certain window focus events
    * to avoid some race conditions on EnterNotify events
@@ -219,8 +223,7 @@ struct _MetaDisplay
   guint32     last_bell_time;
 #endif
 #ifdef HAVE_XSYNC
-  /* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */
-  XSyncAlarm  grab_sync_request_alarm;
+  gint64      grab_sync_counter_wait_serial;
 #endif
   int	      grab_resize_timeout_id;
 
@@ -280,7 +283,10 @@ struct _MetaDisplay
   int damage_error_base;
   int xfixes_event_base;
   int xfixes_error_base;
-  
+  int xinput_error_base;
+  int xinput_event_base;
+  int xinput_opcode;
+
 #ifdef HAVE_STARTUP_NOTIFICATION
   SnDisplay *sn_display;
 #endif
@@ -363,6 +369,16 @@ void        meta_display_register_x_window   (MetaDisplay *display,
 void        meta_display_unregister_x_window (MetaDisplay *display,
                                               Window       xwindow);
 
+#ifdef HAVE_XSYNC
+MetaWindow* meta_display_lookup_sync_alarm     (MetaDisplay *display,
+                                                XSyncAlarm   alarm);
+void        meta_display_register_sync_alarm   (MetaDisplay *display,
+                                                XSyncAlarm  *alarmp,
+                                                MetaWindow  *window);
+void        meta_display_unregister_sync_alarm (MetaDisplay *display,
+                                                XSyncAlarm   alarm);
+#endif /* HAVE_XSYNC */
+
 void        meta_display_notify_window_created (MetaDisplay  *display,
                                                 MetaWindow   *window);
 
@@ -378,7 +394,6 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
                                           MetaScreen  *screen,
                                           MetaGrabOp   op,
-                                          gboolean     change_pointer,
                                           Window       grab_xwindow,
                                           guint32      timestamp);
 
@@ -426,6 +441,7 @@ int meta_resize_gravity_from_grab_op (MetaGrabOp op);
 
 gboolean meta_grab_op_is_moving   (MetaGrabOp op);
 gboolean meta_grab_op_is_resizing (MetaGrabOp op);
+gboolean meta_grab_op_is_mouse    (MetaGrabOp op);
 
 void meta_display_devirtualize_modifiers (MetaDisplay        *display,
                                           MetaVirtualModifier modifiers,

src/core/keybindings-private.h

@@ -29,6 +29,7 @@
 #ifndef META_KEYBINDINGS_PRIVATE_H
 #define META_KEYBINDINGS_PRIVATE_H
 
+#include <gio/gio.h>
 #include <meta/keybindings.h>
 
 struct _MetaKeyHandler
@@ -65,15 +66,15 @@ gboolean meta_window_grab_all_keys          (MetaWindow  *window,
                                              guint32      timestamp);
 void     meta_window_ungrab_all_keys        (MetaWindow  *window,
                                              guint32      timestamp);
-gboolean meta_display_process_key_event     (MetaDisplay *display,
-                                             MetaWindow  *window,
-                                             XEvent      *event);
+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);
 
 gboolean meta_prefs_add_keybinding          (const char           *name,
-                                             const char           *schema,
+                                             GSettings            *settings,
                                              MetaKeyBindingAction  action,
                                              MetaKeyBindingFlags   flags);
 

src/core/main.c

@@ -23,18 +23,19 @@
  */
 
 /**
- * \file 
- * Program startup.
+ * SECTION:main
+ * @short_description: Program startup.
+ *
  * Functions which parse the command-line arguments, create the display,
  * kick everything off and then close down Mutter when it's time to go.
- */
-
-/**
- * \mainpage
+ *
+ *
+ *
  * Mutter - a boring window manager for the adult in you
  *
  * Many window managers are like Marshmallow Froot Loops; Mutter
- * is like Cheerios.
+ * is like Frosted Flakes: it's still plain old corn, but dusted
+ * with some sugar.
  *
  * The best way to get a handle on how the whole system fits together
  * is discussed in doc/code-overview.txt; if you're looking for functions
@@ -59,7 +60,7 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
@@ -77,12 +78,12 @@
 #include <girepository.h>
 #endif
 
-/**
+/*
  * The exit code we'll return to our parent process when we eventually die.
  */
 static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;
 
-/**
+/*
  * Handle on the main loop, so that we have an easy way of shutting Mutter
  * down.
  */
@@ -92,14 +93,15 @@ static void prefs_changed_callback (MetaPreference pref,
                                     gpointer       data);
 
 /**
+ * log_handler:
+ * @log_domain: the domain the error occurred in (we ignore this)
+ * @log_level: the log level so that we can filter out less
+ *             important messages
+ * @message: the message to log
+ * @user_data: arbitrary data (we ignore this)
+ *
  * Prints log messages. If Mutter was compiled with backtrace support,
  * also prints a backtrace (see meta_print_backtrace()).
- *
- * \param log_domain  the domain the error occurred in (we ignore this)
- * \param log_level   the log level so that we can filter out less
- *                    important messages
- * \param message     the message to log
- * \param user_data   arbitrary data (we ignore this)
  */
 static void
 log_handler (const gchar   *log_domain,
@@ -108,14 +110,15 @@ log_handler (const gchar   *log_domain,
              gpointer       user_data)
 {
   meta_warning ("Log level %d: %s\n", log_level, message);
-  meta_print_backtrace ();
 }
 
 /**
+ * meta_print_compilation_info:
+ *
  * Prints a list of which configure script options were used to
  * build this copy of Mutter. This is actually always called
  * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose).
+ * (see meta_set_verbose()).
  */
 static void
 meta_print_compilation_info (void)
@@ -125,21 +128,6 @@ meta_print_compilation_info (void)
 #else
   meta_verbose ("Compiled without shape extension\n");
 #endif
-#ifdef HAVE_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, "Compiled with Xinerama extension\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, "Compiled without Xinerama extension\n");
-#endif
-#ifdef HAVE_XFREE_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, " (using XFree86 Xinerama)\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, " (not using XFree86 Xinerama)\n");
-#endif
-#ifdef HAVE_SOLARIS_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, " (using Solaris Xinerama)\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, " (not using Solaris Xinerama)\n");
-#endif
 #ifdef HAVE_XSYNC
   meta_verbose ("Compiled with sync extension\n");
 #else
@@ -158,12 +146,14 @@ meta_print_compilation_info (void)
 }
 
 /**
+ * meta_print_self_identity:
+ *
  * Prints the version number, the current timestamp (not the
  * build date), the locale, the character encoding, and a list
  * of configure script options that were used to build this
  * copy of Mutter. This is actually always called
  * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose).
+ * (see meta_set_verbose()).
  */
 static void
 meta_print_self_identity (void)
@@ -188,7 +178,7 @@ meta_print_self_identity (void)
   meta_print_compilation_info ();
 }
 
-/**
+/*
  * The set of possible options that can be set on Mutter's
  * command line.
  */
@@ -207,7 +197,7 @@ static GOptionEntry meta_options[] = {
     NULL
   },
   {
-    "replace", 0, 0, G_OPTION_ARG_NONE,
+    "replace", 'r', 0, G_OPTION_ARG_NONE,
     &opt_replace_wm,
     N_("Replace the running window manager"),
     NULL
@@ -313,7 +303,7 @@ meta_clutter_init (void)
 {
   clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
   clutter_x11_disable_event_retrieval ();
-  
+
   if (CLUTTER_INIT_SUCCESS == clutter_init (NULL, NULL))
     {
       GSource *source = g_source_new (&event_funcs, sizeof (GSource));
@@ -327,10 +317,12 @@ meta_clutter_init (void)
 }
 
 /**
+ * meta_select_display:
+ *
  * Selects which display Mutter should use. It first tries to use
- * display_name as the display. If display_name is NULL then
+ * @display_name as the display. If @display_name is %NULL then
  * try to use the environment variable MUTTER_DISPLAY. If that
- * also is NULL, use the default - :0.0
+ * also is %NULL, use the default - :0.0
  */
 static void
 meta_select_display (gchar *display_name)
@@ -381,7 +373,7 @@ on_sigterm (void)
  * meta_init: (skip)
  *
  * Initialize mutter. Call this after meta_get_option_context() and
- * meta_plugin_type_register(), and before meta_run().
+ * meta_plugin_manager_set_plugin_type(), and before meta_run().
  */
 void
 meta_init (void)
@@ -389,8 +381,6 @@ meta_init (void)
   struct sigaction act;
   sigset_t empty_mask;
   GIOChannel *channel;
-
-  g_type_init ();
   
   sigemptyset (&empty_mask);
   act.sa_handler = SIG_IGN;
@@ -560,13 +550,14 @@ meta_run (void)
 }
 
 /**
+ * meta_quit:
+ * @code: The success or failure code to return to the calling process.
+ *
  * Stops Mutter. This tells the event loop to stop processing; it is
  * rather dangerous to use this because this will leave the user with
  * no window manager. We generally do this only if, for example, the
  * session manager asks us to; we assume the session manager knows
  * what it's talking about.
- *
- * \param code The success or failure code to return to the calling process.
  */
 void
 meta_quit (MetaExitCode code)
@@ -579,13 +570,14 @@ meta_quit (MetaExitCode code)
 }
 
 /**
+ * prefs_changed_callback:
+ * @pref  Which preference has changed
+ * @data  Arbitrary data (which we ignore)
+ *
  * Called on pref changes. (One of several functions of its kind and purpose.)
  *
- * \bug Why are these particular prefs handled in main.c and not others?
- * Should they be?
- *
- * \param pref  Which preference has changed
- * \param data  Arbitrary data (which we ignore)
+ * FIXME: Why are these particular prefs handled in main.c and not others?
+ *        Should they be?
  */
 static void
 prefs_changed_callback (MetaPreference pref,

src/core/mutter.c

@@ -45,7 +45,7 @@ print_version (const gchar    *option_name,
   exit (0);
 }
 
-static gchar *mutter_plugins;
+static gchar *plugin = "default";
 
 GOptionEntry mutter_options[] = {
   {
@@ -55,10 +55,10 @@ GOptionEntry mutter_options[] = {
     NULL
   },
   {
-    "mutter-plugins", 0, 0, G_OPTION_ARG_STRING,
-    &mutter_plugins,
-    N_("Comma-separated list of compositor plugins"),
-    "PLUGINS"
+    "mutter-plugin", 0, 0, G_OPTION_ARG_STRING,
+    &plugin,
+    N_("Mutter plugin to use"),
+    "PLUGIN",
   },
   { NULL }
 };
@@ -77,20 +77,8 @@ main (int argc, char **argv)
       exit (1);
     }
 
-  if (mutter_plugins)
-    {
-      MetaPluginManager *mgr;
-      char **plugins = g_strsplit (mutter_plugins, ",", -1); 
-      char **plugin;
-
-      mgr = meta_plugin_manager_get_default ();
-      for (plugin = plugins; *plugin; plugin++)
-        {
-          g_strstrip (*plugin);
-          meta_plugin_manager_load (mgr, *plugin);
-        }
-      g_strfreev (plugins);
-    }
+  if (plugin)
+    meta_plugin_manager_load (plugin);
 
   meta_init ();
   return meta_run ();

src/core/place.c

@@ -105,7 +105,7 @@ find_next_cascade (MetaWindow *window,
   int window_width, window_height;
   int cascade_stage;
   MetaRectangle work_area;
-  const MetaMonitorInfo* current;
+  int current;
   
   sorted = g_list_copy (windows);
   sorted = g_list_sort (sorted, northwestcmp);
@@ -137,7 +137,7 @@ find_next_cascade (MetaWindow *window,
    */
 
   current = meta_screen_get_current_monitor (window->screen);
-  meta_window_get_work_area_for_monitor (window, current->number, &work_area);
+  meta_window_get_work_area_for_monitor (window, current, &work_area);
 
   cascade_x = MAX (0, work_area.x);
   cascade_y = MAX (0, work_area.y);
@@ -815,7 +815,7 @@ meta_window_place (MetaWindow        *window,
       int w, h;
 
       /* Warning, this function is a round trip! */
-      xi = meta_screen_get_current_monitor (window->screen);
+      xi = meta_screen_get_current_monitor_info (window->screen);
 
       w = xi->rect.width;
       h = xi->rect.height;
@@ -847,10 +847,9 @@ meta_window_place (MetaWindow        *window,
       {
         MetaWindow *w = tmp->data;
 
-        if (meta_window_showing_on_its_workspace (w) &&
-            w != window && 
-            (window->workspace == w->workspace ||
-             window->on_all_workspaces || w->on_all_workspaces))
+        if (w != window &&
+            meta_window_showing_on_its_workspace (w) &&
+            meta_window_located_on_workspace (w, window->workspace))
           windows = g_list_prepend (windows, w);
 
         tmp = tmp->next;
@@ -860,7 +859,7 @@ meta_window_place (MetaWindow        *window,
   }
 
   /* Warning, this is a round trip! */
-  xi = meta_screen_get_current_monitor (window->screen);
+  xi = meta_screen_get_current_monitor_info (window->screen);
   
   /* "Origin" placement algorithm */
   x = xi->rect.x;

src/core/prefs.c

@@ -53,7 +53,6 @@
 #define KEY_GNOME_CURSOR_SIZE "cursor-size"
 
 #define KEY_OVERLAY_KEY "overlay-key"
-#define KEY_LIVE_HIDDEN_WINDOWS "live-hidden-windows"
 #define KEY_WORKSPACES_ONLY_ON_PRIMARY "workspaces-only-on-primary"
 #define KEY_NO_TAB_POPUP "no-tab-popup"
 
@@ -73,6 +72,7 @@ static GHashTable *settings_schemas;
 static gboolean use_system_font = FALSE;
 static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
+static MetaKeyCombo overlay_key_combo = { 0, 0, 0 };
 static GDesktopFocusMode focus_mode = G_DESKTOP_FOCUS_MODE_CLICK;
 static GDesktopFocusNewWindows focus_new_windows = G_DESKTOP_FOCUS_NEW_WINDOWS_SMART;
 static gboolean raise_on_click = TRUE;
@@ -87,6 +87,7 @@ static gboolean application_based = FALSE;
 static gboolean disable_workarounds = FALSE;
 static gboolean auto_raise = FALSE;
 static gboolean auto_raise_delay = 500;
+static gboolean focus_change_on_pointer_rest = FALSE;
 static gboolean bell_is_visible = FALSE;
 static gboolean bell_is_audible = TRUE;
 static gboolean gnome_accessibility = FALSE;
@@ -97,6 +98,8 @@ static int   draggable_border_width = 10;
 static gboolean resize_with_right_button = FALSE;
 static gboolean edge_tiling = FALSE;
 static gboolean force_fullscreen = TRUE;
+static gboolean ignore_request_hide_titlebar = FALSE;
+static gboolean auto_maximize = TRUE;
 
 static GDesktopVisualBellType visual_bell_type = G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH;
 static MetaButtonLayout button_layout;
@@ -104,7 +107,6 @@ static MetaButtonLayout button_layout;
 /* NULL-terminated array */
 static char **workspace_names = NULL;
 
-static gboolean live_hidden_windows = FALSE;
 static gboolean workspaces_only_on_primary = FALSE;
 
 static gboolean no_tab_popup = FALSE;
@@ -133,6 +135,7 @@ static gboolean titlebar_handler (GVariant*, gpointer*, gpointer);
 static gboolean theme_name_handler (GVariant*, gpointer*, gpointer);
 static gboolean mouse_button_mods_handler (GVariant*, gpointer*, gpointer);
 static gboolean button_layout_handler (GVariant*, gpointer*, gpointer);
+static gboolean overlay_key_handler (GVariant*, gpointer*, gpointer);
 
 static void     do_override               (char *key, char *schema);
 
@@ -165,36 +168,30 @@ typedef struct
   gboolean *target;
 } MetaBoolPreference;
 
+
+/**
+ * MetaStringPreference:
+ * @handler: (allow-none): A handler. Many of the string preferences
+ * aren't stored as strings and need parsing; others of them have
+ * default values which can't be solved in the general case.  If you
+ * include a function pointer here, it will be called instead of writing
+ * the string value out to the target variable.
+ * The function will be passed to g_settings_get_mapped() and should
+ * return %TRUE if the mapping was successful and %FALSE otherwise.
+ * In the former case the function is expected to handle the result
+ * of the conversion itself and call queue_changed() appropriately;
+ * in particular the @result (out) parameter as returned by
+ * g_settings_get_mapped() will be ignored in all cases.
+ * This may be %NULL.  If it is, see "target", below.
+ * @target: (allow-none): Where to write the incoming string.
+ * This must be %NULL if the handler is non-%NULL.
+ * If the incoming string is %NULL, no change will be made.
+ */
 typedef struct
 {
   MetaBasePreference base;
-
-  /**
-   * A handler.  Many of the string preferences aren't stored as
-   * strings and need parsing; others of them have default values
-   * which can't be solved in the general case.  If you include a
-   * function pointer here, it will be called instead of writing
-   * the string value out to the target variable.
-   *
-   * The function will be passed to g_settings_get_mapped() and should
-   * return %TRUE if the mapping was successful and %FALSE otherwise.
-   * In the former case the function is expected to handle the result
-   * of the conversion itself and call queue_changed() appropriately;
-   * in particular the @result (out) parameter as returned by
-   * g_settings_get_mapped() will be ignored in all cases.
-   *
-   * This may be NULL.  If it is, see "target", below.
-   */
   GSettingsGetMapping handler;
-
-  /**
-   * Where to write the incoming string.
-   *
-   * This must be NULL if the handler is non-NULL.
-   * If the incoming string is NULL, no change will be made.
-   */
   gchar **target;
-
 } MetaStringPreference;
 
 typedef struct
@@ -309,6 +306,13 @@ static MetaBoolPreference preferences_bool[] =
       },
       &auto_raise,
     },
+    {
+      { "focus-change-on-pointer-rest",
+        SCHEMA_MUTTER,
+        META_PREF_FOCUS_CHANGE_ON_POINTER_REST,
+      },
+      &focus_change_on_pointer_rest
+    },
     {
       { "visual-bell",
         SCHEMA_GENERAL,
@@ -351,13 +355,6 @@ static MetaBoolPreference preferences_bool[] =
       },
       &edge_tiling,
     },
-    {
-      { KEY_LIVE_HIDDEN_WINDOWS,
-        SCHEMA_MUTTER,
-        META_PREF_LIVE_HIDDEN_WINDOWS,
-      },
-      &live_hidden_windows,
-    },
     {
       { "workspaces-only-on-primary",
         SCHEMA_MUTTER,
@@ -372,6 +369,13 @@ static MetaBoolPreference preferences_bool[] =
       },
       &no_tab_popup,
     },
+    {
+      { "auto-maximize",
+        SCHEMA_MUTTER,
+        META_PREF_AUTO_MAXIMIZE,
+      },
+      &auto_maximize,
+    },
     { { NULL, 0, 0 }, NULL },
   };
 
@@ -417,6 +421,14 @@ static MetaStringPreference preferences_string[] =
       NULL,
       &cursor_theme,
     },
+    {
+      { "overlay-key",
+        SCHEMA_MUTTER,
+        META_PREF_KEYBINDINGS,
+      },
+      overlay_key_handler,
+      NULL,
+    },
     { { NULL, 0, 0 }, NULL },
   };
 
@@ -692,13 +704,13 @@ handle_preference_update_int (GSettings *settings,
  */
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
-                         gpointer             data)
+                         gpointer             user_data)
 {
   MetaPrefsListener *l;
 
   l = g_new (MetaPrefsListener, 1);
   l->func = func;
-  l->data = data;
+  l->data = user_data;
 
   listeners = g_list_prepend (listeners, l);
 }
@@ -709,7 +721,7 @@ meta_prefs_add_listener (MetaPrefsChangedFunc func,
  */
 void
 meta_prefs_remove_listener (MetaPrefsChangedFunc func,
-                            gpointer             data)
+                            gpointer             user_data)
 {
   GList *tmp;
 
@@ -719,7 +731,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
       MetaPrefsListener *l = tmp->data;
 
       if (l->func == func &&
-          l->data == data)
+          l->data == user_data)
         {
           g_free (l);
           listeners = g_list_delete_link (listeners, tmp);
@@ -931,9 +943,9 @@ do_override (char *key,
 
 
 /**
- * meta_prefs_override_preference_schema
+ * meta_prefs_override_preference_schema:
  * @key: the preference name
- * @schema: new schema for preference %key
+ * @schema: new schema for preference @key
  *
  * Specify a schema whose keys are used to override the standard Metacity
  * keys. This might be used if a plugin expected a different value for
@@ -1003,7 +1015,7 @@ settings_changed (GSettings *settings,
   /* String array, handled separately */
   if (strcmp (key, KEY_WORKSPACE_NAMES) == 0)
     {
-      if (update_workspace_names ());
+      if (update_workspace_names ())
         queue_changed (META_PREF_WORKSPACE_NAMES);
       return;
     }
@@ -1034,10 +1046,6 @@ settings_changed (GSettings *settings,
       else
         handle_preference_update_string (settings, key);
     }
-  else if (g_str_equal (key, KEY_OVERLAY_KEY))
-    {
-      queue_changed (META_PREF_KEYBINDINGS);
-    }
   else
     {
       /* Someone added a preference of an unhandled type */
@@ -1062,6 +1070,8 @@ bindings_changed (GSettings *settings,
 }
 
 /**
+ * maybe_give_disable_workaround_warning:
+ *
  * Special case: give a warning the first time disable_workarounds
  * is turned on.
  */
@@ -1385,8 +1395,11 @@ button_layout_handler (GVariant *value,
       g_strfreev (buttons);
     }
 
-  new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
-  new_layout.left_buttons_has_spacer[i] = FALSE;
+  for (; i < MAX_BUTTONS_PER_CORNER; i++)
+    {
+      new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
+      new_layout.left_buttons_has_spacer[i] = FALSE;
+    }
 
   i = 0;
   if (sides != NULL && sides[0] != NULL && sides[1] != NULL)
@@ -1444,8 +1457,11 @@ button_layout_handler (GVariant *value,
       g_strfreev (buttons);
     }
 
-  new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-  new_layout.right_buttons_has_spacer[i] = FALSE;
+  for (; i < MAX_BUTTONS_PER_CORNER; i++)
+    {
+      new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
+      new_layout.right_buttons_has_spacer[i] = FALSE;
+    }
 
   g_strfreev (sides);
   
@@ -1464,8 +1480,11 @@ button_layout_handler (GVariant *value,
         else
           rtl_layout.right_buttons_has_spacer[j - 1] = new_layout.left_buttons_has_spacer[i - j - 1];
       }
-    rtl_layout.right_buttons[j] = META_BUTTON_FUNCTION_LAST;
-    rtl_layout.right_buttons_has_spacer[j] = FALSE;
+    for (; j < MAX_BUTTONS_PER_CORNER; j++)
+      {
+        rtl_layout.right_buttons[j] = META_BUTTON_FUNCTION_LAST;
+        rtl_layout.right_buttons_has_spacer[j] = FALSE;
+      }
       
     for (i = 0; new_layout.right_buttons[i] != META_BUTTON_FUNCTION_LAST; i++);
     for (j = 0; j < i; j++)
@@ -1476,8 +1495,11 @@ button_layout_handler (GVariant *value,
         else
           rtl_layout.left_buttons_has_spacer[j - 1] = new_layout.right_buttons_has_spacer[i - j - 1];
       }
-    rtl_layout.left_buttons[j] = META_BUTTON_FUNCTION_LAST;
-    rtl_layout.left_buttons_has_spacer[j] = FALSE;
+    for (; j < MAX_BUTTONS_PER_CORNER; j++)
+      {
+        rtl_layout.left_buttons[j] = META_BUTTON_FUNCTION_LAST;
+        rtl_layout.left_buttons_has_spacer[j] = FALSE;
+      }
 
     new_layout = rtl_layout;
   }
@@ -1491,6 +1513,39 @@ button_layout_handler (GVariant *value,
   return TRUE;
 }
 
+static gboolean
+overlay_key_handler (GVariant *value,
+                     gpointer *result,
+                     gpointer  data)
+{
+  MetaKeyCombo combo;
+  const gchar *string_value;
+
+  *result = NULL; /* ignored */
+  string_value = g_variant_get_string (value, NULL);
+
+  if (string_value && meta_ui_parse_accelerator (string_value, &combo.keysym,
+                                                 &combo.keycode,
+                                                 &combo.modifiers))
+    ;
+  else
+    {
+      meta_topic (META_DEBUG_KEYBINDINGS,
+                  "Failed to parse value for overlay-key\n");
+      return FALSE;
+    }
+
+  if (overlay_key_combo.keysym != combo.keysym ||
+      overlay_key_combo.keycode != combo.keycode ||
+      overlay_key_combo.modifiers != combo.modifiers)
+    {
+      overlay_key_combo = combo;
+      queue_changed (META_PREF_KEYBINDINGS);
+    }
+
+  return TRUE;
+}
+
 const PangoFontDescription*
 meta_prefs_get_titlebar_font (void)
 {
@@ -1581,6 +1636,9 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_AUTO_RAISE_DELAY:
       return "AUTO_RAISE_DELAY";
 
+    case META_PREF_FOCUS_CHANGE_ON_POINTER_REST:
+      return "FOCUS_CHANGE_ON_POINTER_REST";
+
     case META_PREF_BUTTON_LAYOUT:
       return "BUTTON_LAYOUT";
 
@@ -1617,9 +1675,6 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_FORCE_FULLSCREEN:
       return "FORCE_FULLSCREEN";
 
-    case META_PREF_LIVE_HIDDEN_WINDOWS:
-      return "LIVE_HIDDEN_WINDOWS";
-
     case META_PREF_WORKSPACES_ONLY_ON_PRIMARY:
       return "WORKSPACES_ONLY_ON_PRIMARY";
 
@@ -1631,6 +1686,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_DYNAMIC_WORKSPACES:
       return "DYNAMIC_WORKSPACES";
+
+    case META_PREF_AUTO_MAXIMIZE:
+      return "AUTO_MAXIMIZE";
     }
 
   return "(unknown)";
@@ -1652,50 +1710,33 @@ meta_prefs_set_num_workspaces (int n_workspaces)
 
 static GHashTable *key_bindings;
 
-static MetaKeyCombo overlay_key_combo = { 0, 0, 0 };
-
 static void
 meta_key_pref_free (MetaKeyPref *pref)
 {
   update_binding (pref, NULL);
 
   g_free (pref->name);
-  g_free (pref->schema);
+  g_object_unref (pref->settings);
 
   g_free (pref);
 }
 
-/* These bindings are for modifiers alone, so they need special handling */
-static void
-init_special_bindings (void)
-{
-  char *val;
-  
-  /* Default values for bindings which are global, but take special handling */
-  meta_ui_parse_accelerator ("Super_L", &overlay_key_combo.keysym, 
-                             &overlay_key_combo.keycode, 
-                             &overlay_key_combo.modifiers);
-
-  val = g_settings_get_string (SETTINGS (SCHEMA_MUTTER), KEY_OVERLAY_KEY);
-    
-  if (val && meta_ui_parse_accelerator (val, &overlay_key_combo.keysym, 
-                                        &overlay_key_combo.keycode, 
-                                        &overlay_key_combo.modifiers))
-    ;
-  else
-    {
-      meta_topic (META_DEBUG_KEYBINDINGS,
-                  "Failed to parse value for overlay_key\n");
-    }
-  g_free (val);
-}
 
 static void
 init_bindings (void)
 {
+  MetaKeyPref *pref;
+
   key_bindings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
                                         (GDestroyNotify)meta_key_pref_free);
-  init_special_bindings ();  
+
+  pref = g_new0 (MetaKeyPref, 1);
+  pref->name = g_strdup ("overlay-key");
+  pref->action = META_KEYBINDING_ACTION_OVERLAY_KEY;
+  pref->bindings = g_slist_prepend (pref->bindings, &overlay_key_combo);
+  pref->builtin = 1;
+
+  g_hash_table_insert (key_bindings, g_strdup ("overlay-key"), pref);
 }
 
 static void
@@ -1894,6 +1935,10 @@ meta_prefs_change_workspace_name (int         num,
                         g_variant_builder_end (&builder));
 }
 
+/**
+ * meta_prefs_get_button_layout:
+ * @button_layout: (out):
+ */
 void
 meta_prefs_get_button_layout (MetaButtonLayout *button_layout_p)
 {
@@ -1920,13 +1965,13 @@ meta_prefs_get_visual_bell_type (void)
 
 gboolean
 meta_prefs_add_keybinding (const char           *name,
-                           const char           *schema,
+                           GSettings            *settings,
                            MetaKeyBindingAction  action,
                            MetaKeyBindingFlags   flags)
 {
   MetaKeyPref  *pref;
-  GSettings    *settings;
   char        **strokes;
+  guint         id;
 
   if (g_hash_table_lookup (key_bindings, name))
     {
@@ -1934,19 +1979,9 @@ meta_prefs_add_keybinding (const char           *name,
       return FALSE;
     }
 
-  settings = SETTINGS (schema);
-  if (settings == NULL)
-    {
-      settings = g_settings_new (schema);
-      if ((flags & META_KEY_BINDING_BUILTIN) != 0)
-        g_signal_connect (settings, "changed",
-                          G_CALLBACK (bindings_changed), NULL);
-      g_hash_table_insert (settings_schemas, g_strdup (schema), settings);
-    }
-
   pref = g_new0 (MetaKeyPref, 1);
   pref->name = g_strdup (name);
-  pref->schema = g_strdup (schema);
+  pref->settings = g_object_ref (settings);
   pref->action = action;
   pref->bindings = NULL;
   pref->add_shift = (flags & META_KEY_BINDING_REVERSES) != 0;
@@ -1959,9 +1994,17 @@ meta_prefs_add_keybinding (const char           *name,
 
   g_hash_table_insert (key_bindings, g_strdup (name), pref);
 
-  if (!pref->builtin)
+  if (pref->builtin)
+    {
+      if (g_object_get_data (G_OBJECT (settings), "changed-signal") == NULL)
+        {
+          id = g_signal_connect (settings, "changed",
+                                 G_CALLBACK (bindings_changed), NULL);
+          g_object_set_data (G_OBJECT (settings), "changed-signal", GUINT_TO_POINTER (id));
+        }
+    }
+  else
     {
-      guint id;
       char *changed_signal = g_strdup_printf ("changed::%s", name);
       id = g_signal_connect (settings, changed_signal,
                              G_CALLBACK (bindings_changed), NULL);
@@ -1979,7 +2022,6 @@ gboolean
 meta_prefs_remove_keybinding (const char *name)
 {
   MetaKeyPref *pref;
-  GSettings   *settings;
   guint        id;
 
   pref = g_hash_table_lookup (key_bindings, name);
@@ -1995,9 +2037,8 @@ meta_prefs_remove_keybinding (const char *name)
       return FALSE;
     }
 
-  settings = SETTINGS (pref->schema);
-  id = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (settings), name));
-  g_signal_handler_disconnect (settings, id);
+  id = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (pref->settings), name));
+  g_signal_handler_disconnect (pref->settings, id);
 
   g_hash_table_remove (key_bindings, name);
 
@@ -2008,7 +2049,8 @@ meta_prefs_remove_keybinding (const char *name)
 
 /**
  * meta_prefs_get_keybindings:
- * Return: (element-type MetaKeyPref) (transfer container):
+ *
+ * Returns: (element-type MetaKeyPref) (transfer container):
  */
 GList *
 meta_prefs_get_keybindings ()
@@ -2052,6 +2094,12 @@ meta_prefs_get_auto_raise_delay (void)
   return auto_raise_delay;
 }
 
+gboolean
+meta_prefs_get_focus_change_on_pointer_rest ()
+{
+  return focus_change_on_pointer_rest;
+}
+
 gboolean
 meta_prefs_get_gnome_accessibility ()
 {
@@ -2070,6 +2118,12 @@ meta_prefs_get_edge_tiling ()
   return edge_tiling;
 }
 
+gboolean
+meta_prefs_get_auto_maximize (void)
+{
+  return auto_maximize;
+}
+
 MetaKeyBindingAction
 meta_prefs_get_keybinding_action (const char *name)
 {
@@ -2116,13 +2170,13 @@ meta_prefs_get_window_binding (const char          *name,
   g_assert_not_reached ();
 }
 
-guint
+gint
 meta_prefs_get_mouse_button_resize (void)
 {
   return resize_with_right_button ? 3: 2;
 }
 
-guint
+gint
 meta_prefs_get_mouse_button_menu (void)
 {
   return resize_with_right_button ? 2: 3;
@@ -2134,27 +2188,6 @@ meta_prefs_get_force_fullscreen (void)
   return force_fullscreen;
 }
 
-gboolean
-meta_prefs_get_live_hidden_windows (void)
-{
-#if 0
-  return live_hidden_windows;
-#else
-  return TRUE;
-#endif
-}
-
-void
-meta_prefs_set_live_hidden_windows (gboolean whether)
-{
-  MetaBasePreference *pref;
-
-  find_pref (preferences_bool, sizeof(MetaBoolPreference),
-             KEY_LIVE_HIDDEN_WINDOWS, &pref);
-  g_settings_set_boolean (SETTINGS (pref->schema), KEY_LIVE_HIDDEN_WINDOWS,
-                          whether);
-}
-
 gboolean
 meta_prefs_get_workspaces_only_on_primary (void)
 {
@@ -2189,3 +2222,15 @@ meta_prefs_set_force_fullscreen (gboolean whether)
 {
   force_fullscreen = whether;
 }
+
+gboolean
+meta_prefs_get_ignore_request_hide_titlebar (void)
+{
+  return ignore_request_hide_titlebar;
+}
+
+void
+meta_prefs_set_ignore_request_hide_titlebar (gboolean whether)
+{
+  ignore_request_hide_titlebar = whether;
+}

src/core/screen-private.h

@@ -156,8 +156,6 @@ void          meta_screen_manage_all_windows  (MetaScreen                 *scree
 void          meta_screen_foreach_window      (MetaScreen                 *screen,
                                                MetaScreenWindowFunc        func,
                                                gpointer                    data);
-void          meta_screen_queue_frame_redraws (MetaScreen                 *screen);
-void          meta_screen_queue_window_resizes (MetaScreen                 *screen);
 
 void          meta_screen_set_cursor          (MetaScreen                 *screen,
                                                MetaCursor                  cursor);
@@ -186,7 +184,7 @@ void          meta_screen_tile_preview_hide            (MetaScreen    *screen);
 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
                                                 MetaWindow                 *not_this_one);
 
-const MetaMonitorInfo* meta_screen_get_current_monitor    (MetaScreen    *screen);
+const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen);
 const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen,
                                                            MetaRectangle *rect);
 const MetaMonitorInfo* meta_screen_get_monitor_for_window (MetaScreen    *screen,