Keybindings: uniquify the name for non-builtin keybindings

Multiple settings objects could have the same key, so that alone is not enough to identify the binding. Add also the pointer value of the GSettings object. https://bugzilla.gnome.org/show_bug.cgi?id=613543
Allow a keybinding handler to ignore a keybinding
2012-11-10 17:06:29 +01:00 · 2012-11-10 17:06:29 +01:00 · 2012-11-10 17:06:29 +01:00 · 2012-11-10 17:06:29 +01:00 · 2012-11-07 18:40:37 +02:00 · 2012-11-05 19:44:03 +01:00
15 changed files with 536 additions and 238 deletions
--- a/po/de.po
+++ b/po/de.po
@@ -13,8 +13,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-09-06 16:35+0000\n"
-"PO-Revision-Date: 2012-09-06 21:22+0200\n"
+"POT-Creation-Date: 2012-10-22 19:35+0000\n"
+"PO-Revision-Date: 2012-10-26 08:14+0200\n"
 "Last-Translator: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -56,16 +56,16 @@ msgstr "Klangereignis"
 msgid "Unknown window information request: %d"
 msgstr "Unbekannte Fensterinformation angefordert: %d"

-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:113
 #, c-format
 msgid "%s is not responding."
 msgstr "%s antwortet nicht."

-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:117
 msgid "Application is not responding."
 msgstr "Die Anwendung antwortet nicht."

-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:122
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -73,20 +73,20 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:129
 msgid "_Wait"
 msgstr "_Warten"

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:129
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"

-#: ../src/core/display.c:380
+#: ../src/core/display.c:396
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Die für Compositing benötigte %s-Erweiterung wurde nicht gefunden"

-#: ../src/core/display.c:446
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
@@ -163,7 +163,7 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"

-#: ../src/core/prefs.c:1071
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -171,14 +171,14 @@ msgstr ""
 "Provisorien (Workarounds) für defekte Anwendungen abgeschaltet. "
 "Möglicherweise funktionieren manche Anwendungen nicht richtig.\n"

-#: ../src/core/prefs.c:1146
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Schriftbeschreibung »%s« aus GConf-Schlüssel %s konnte nicht verarbeitet "
 "werden\n"

-#: ../src/core/prefs.c:1212
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -187,7 +187,7 @@ msgstr ""
 "In der Konfigurationsdatenbank gefundenes »%s« ist kein zulässiger Wert für "
 "den Maustastenumschalter\n"

-#: ../src/core/prefs.c:1736
+#: ../src/core/prefs.c:1747
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -196,7 +196,7 @@ msgstr ""
 "In der Konfigurationsdatenbank gefundenes »%s« ist kein zulässiger Wert für "
 "die Tastenkombination »%s«\n"

-#: ../src/core/prefs.c:1833
+#: ../src/core/prefs.c:1844
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
@@ -328,7 +328,7 @@ msgid "Window manager error: "
 msgstr "Fensterverwalter-Fehler:"

 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7237
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -350,7 +350,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7902
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -360,22 +360,22 @@ msgstr ""
 "veränderbar ist, setzt jedoch die minimale Größe auf %d x %d und die "
 "maximale Größe auf %d x %d; dies ergibt keinen Sinn.\n"

-#: ../src/core/window-props.c:310
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Anwendung hat eine unsinnige _NET_WM_PID %lu angegeben\n"

-#: ../src/core/window-props.c:429
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"

-#: ../src/core/window-props.c:1484
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Ungültiges WM_TRANSIENT_FOR-Fenster 0x%lx festgelegt für %s.\n"

-#: ../src/core/window-props.c:1495
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr ""
@@ -501,11 +501,25 @@ msgstr ""
 "Hervorhebung des Rahmens deaktiviert werden soll."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Delay focus changes until the pointer stops moving"
+msgstr "Fokus-Änderungen verzögern, bis der Zeiger aufhört sich zu bewegen"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+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 ""
+"Falls dieser Schlüssel gesetzt ist und der Fokusmodus entweder »sloppy« oder "
+"»mouse« ist, wird der Fokus nicht sofort beim Erreichen eines Fensters "
+"geändert, sondern erst, wenn der Zeiger aufhört sich zu bewegen."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Breite der ziehbaren Ränder"

 # Lange Beschreibung von »Draggable border width«
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 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."
@@ -514,11 +528,11 @@ msgstr ""
 "nicht ausreichen, werden unsichtbare Ränder hinzugefügt, um diesen Wert zu "
 "erreichen."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Select window from tab popup"
 msgstr "Fenster aus Tab-Anzeige auswählen"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "Tab-Anzeige abbrechen"

--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-24 22:26+0300\n"
-"PO-Revision-Date: 2012-07-24 22:26+0200\n"
+"POT-Creation-Date: 2012-11-07 18:40+0200\n"
+"PO-Revision-Date: 2012-11-07 18:40+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -47,38 +47,38 @@ msgstr "אירוע פעמון"
 msgid "Unknown window information request: %d"
 msgstr "Unknown window information request: %d"

-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "%s אינו מגיב"
+msgid "“%s” is not responding."
+msgstr "„%s“ אינו מגיב."

-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:113
 msgid "Application is not responding."
 msgstr "היישום אינו מגיב."

-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:118
 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:130
+#: ../src/core/delete.c:125
 msgid "_Wait"
 msgstr "ה_מתנה"

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:125
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:380
+#: ../src/core/display.c:399
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"

-#: ../src/core/display.c:446
+#: ../src/core/display.c:496
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"

-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:853
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "תוכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"
@@ -138,26 +138,26 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"

-#: ../src/core/prefs.c:1065
+#: ../src/core/prefs.c:1079
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"

-#: ../src/core/prefs.c:1140
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"

-#: ../src/core/prefs.c:1206
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"

-#: ../src/core/prefs.c:1724
+#: ../src/core/prefs.c:1747
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"

-#: ../src/core/prefs.c:1821
+#: ../src/core/prefs.c:1844
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"
@@ -279,7 +279,7 @@ msgid "Window manager error: "
 msgstr "Window manager error: "

 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7240
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@@ -291,27 +291,27 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7905
 #, 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 "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"

-#: ../src/core/window-props.c:310
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Application set a bogus _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:429
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (מעל %s)"

-#: ../src/core/window-props.c:1484
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"

-#: ../src/core/window-props.c:1495
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
@@ -395,18 +395,26 @@ msgid "Determines whether the use of popup and highlight frame should be disable
 msgstr "Determines whether the use of popup and highlight frame should be disabled for window cycling."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Delay focus changes until the pointer stops moving"
+msgstr "Delay focus changes until the pointer stops moving"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+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 "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."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Draggable border width"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 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 "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "Cancel tab popup"

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,16 +10,17 @@
 # Rodrigo Flores <rodrigomarquesflores@gmail.com>, 2007.
 # Djavan Fagundes <djavanf@gnome.org>, 2008, 2009, 2011.
 # Vladimir Melo <vmelo@gnome.org>, 2009.
-# Antonio Fernandes C. Neto <fernandes@pelivre.org>, 2010.
+# Antonio Fernandes C. Neto <fernandesn@gnome.org>, 2010.
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Enrico Nicoletto <liverig@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-17 16:25-0400\n"
-"PO-Revision-Date: 2012-09-12 09:45-0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-10-26 13:53+0000\n"
+"PO-Revision-Date: 2012-10-12 23:18-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -60,16 +61,16 @@ msgstr "Evento de som"
 msgid "Unknown window information request: %d"
 msgstr "Informação solicitada de janela desconhecida: %d"

-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "%s não está respondendo."
+msgid "“%s” is not responding."
+msgstr "\"%s\" não está respondendo."

-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:113
 msgid "Application is not responding."
 msgstr "O aplicativo não está respondendo."

-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:118
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -77,20 +78,20 @@ msgstr ""
 "Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
 "sair completamente."

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:125
 msgid "_Wait"
 msgstr "_Esperar"

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:125
 msgid "_Force Quit"
 msgstr "_Forçar sair"

-#: ../src/core/display.c:380
+#: ../src/core/display.c:396
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Faltando extensão %s necessária para composição"

-#: ../src/core/display.c:446
+#: ../src/core/display.c:493
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir a exibição \"%s\" do X Window System\n"
@@ -165,7 +166,7 @@ msgstr "Versão impressa"
 msgid "Mutter plugin to use"
 msgstr "Plug-in do Mutter para usar"

-#: ../src/core/prefs.c:1071
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -173,14 +174,14 @@ msgstr ""
 "As alternativas para aplicativos quebrados estão desabilitadas. É possível "
 "que alguns aplicativos não funcionem de maneira adequada.\n"

-#: ../src/core/prefs.c:1146
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Não foi possível analisar a descrição da fonte \"%s\" a partir da chave "
 "GSettings %s\n"

-#: ../src/core/prefs.c:1212
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -189,7 +190,7 @@ msgstr ""
 "\"%s\" localizado no banco de dados de configurações não é um valor válido "
 "para o modificador de botão do mouse\n"

-#: ../src/core/prefs.c:1736
+#: ../src/core/prefs.c:1747
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -198,7 +199,7 @@ msgstr ""
 "\"%s\" localizado no banco de dados de configurações não é um valor válido "
 "para a tecla de atalho \"%s\"\n"

-#: ../src/core/prefs.c:1833
+#: ../src/core/prefs.c:1844
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"
@@ -328,7 +329,7 @@ msgid "Window manager error: "
 msgstr "Erro do gerenciador de janelas: "

 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7240
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -344,7 +345,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7905
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -354,22 +355,22 @@ msgstr ""
 "define o tamanho mínimo %d x %d e máximo %d x %d; isso não faz muito "
 "sentido.\n"

-#: ../src/core/window-props.c:310
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "O aplicativo definiu um _NET_WM_PID %lu inválido\n"

-#: ../src/core/window-props.c:429
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (em %s)"

-#: ../src/core/window-props.c:1484
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Janela WM_TRANSIENT_FOR inválida 0x%lx especificada para %s.\n"

-#: ../src/core/window-props.c:1495
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "Janela WM_TRANSIENT_FOR 0x%lx especificada para %s iriar criar loop.\n"
@@ -493,10 +494,24 @@ msgstr ""
 "desabilitados na alternância de janelas."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Delay focus changes until the pointer stops moving"
+msgstr "Atrasar a alteração do foco até o ponteiro parar de mover"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+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 ""
+"Se verdadeiro, e o modo de foco for \"sloppy\" ou \"mouse\", o foco não será "
+"alterado imediatamente ao entrar em uma janela, e sim somente após o "
+"ponteiro parar de mover."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Largura da borda arrastável"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 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."
@@ -505,11 +520,11 @@ msgstr ""
 "não são suficientes, as bordas invisíveis serão adicionadas para encontrar "
 "este valor."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Select window from tab popup"
 msgstr "Selecione a janela a partir da aba instantânea"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "Cancelar aba instantânea"

@@ -2172,18 +2187,6 @@ msgstr ""
 #~ msgid "Enable Visual Bell"
 #~ msgstr "Habilitar campainha visual"

-#~ msgid ""
-#~ "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-#~ "the focused window will be automatically raised after a delay specified "
-#~ "by the auto_raise_delay key. This is not related to clicking on a window "
-#~ "to raise it, nor to entering a window during drag-and-drop."
-#~ msgstr ""
-#~ "Se verdadeiro, e o modo de foco for \"sloppy\" ou \"mouse\", a janela "
-#~ "focada será automaticamente elevada após um atraso especificado pela "
-#~ "chave auto_raise_delay. Isso não tem relação alguma com clicar em uma "
-#~ "janela para elevá-la, ou alcançar uma janela durante uma ação de arrastar-"
-#~ "e-soltar."
-
 #~ msgid ""
 #~ "If true, ignore the titlebar_font option, and use the standard "
 #~ "application font for window titles."
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -221,7 +221,7 @@ 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@_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
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -55,7 +55,7 @@ struct _MetaScreenBackground

  float texture_width;
  float texture_height;
-  CoglHandle texture;
+  CoglTexture *texture;
  CoglMaterialWrapMode wrap_mode;
  guint have_pixmap : 1;
 };
@@ -63,7 +63,8 @@ struct _MetaScreenBackground
 struct _MetaBackgroundActorPrivate
 {
  MetaScreenBackground *background;
-  CoglHandle material;
+  CoglPipeline *pipeline;
+
  cairo_region_t *visible_region;
  float dim_factor;
 };
@@ -140,7 +141,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 +175,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 +211,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 +251,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 +306,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 +480,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 +623,48 @@ 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);
+}
+
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -305,8 +305,8 @@ meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
   * of that plugin to pass events to Clutter. Otherwise, we send the
   * event directly to Clutter ourselves.
   */
-  if (klass->xevent_filter && klass->xevent_filter (plugin, xev))
-    return TRUE;
+  if (klass->xevent_filter)
+    return klass->xevent_filter (plugin, xev);
  else
    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -74,6 +74,9 @@
 #include <string.h>
 #include <unistd.h>

+/* This is set in stone and also hard-coded in GDK. */
+#define VIRTUAL_CORE_KEYBOARD_ID 3
+
 #define GRAB_OP_IS_WINDOW_SWITCH(g)                     \
        (g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL  ||  \
         g == META_GRAB_OP_KEYBOARD_TABBING_DOCK    ||  \
@@ -1958,9 +1961,6 @@ event_callback (XEvent   *event,
    {
    case KeyPress:
    case KeyRelease:
-      if (display->grab_op == META_GRAB_OP_COMPOSITOR)
-        break;
-
      /* For key events, it's important to enforce single-handling, or
       * we can get into a confused state. So if a keybinding is
       * handled (because it's one of our hot-keys, or because we are
@@ -2813,7 +2813,8 @@ event_callback (XEvent   *event,
 	      break;
            case XkbNewKeyboardNotify:
            case XkbMapNotify:
-              meta_display_process_mapping_event (display, event);
+              if (xkb_ev->device == VIRTUAL_CORE_KEYBOARD_ID)
+                meta_display_process_mapping_event (display, event);
              break;
 	    }
 	}
@@ -3131,7 +3132,10 @@ meta_spew_event (MetaDisplay *display,
  if (event->type == Expose || event->type == MotionNotify ||
      event->type == NoExpose)
    return;
-      
+
+  if (event->type == (display->damage_event_base + XDamageNotify))
+    return;
+
  switch (event->type)
    {
    case KeyPress:
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -75,6 +75,8 @@ void     meta_display_process_mapping_event (MetaDisplay *display,

 gboolean meta_prefs_add_keybinding          (const char           *name,
                                             GSettings            *settings,
+                                             const char           *setting_key,
+                                             const char           *hardcoded_key,
                                             MetaKeyBindingAction  action,
                                             MetaKeyBindingFlags   flags);

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -99,12 +99,12 @@ meta_key_binding_get_mask (MetaKeyBinding *binding)
 * handler functions and have some kind of flag to say they're unbindable.
 */

-static void handle_workspace_switch  (MetaDisplay    *display,
-                                      MetaScreen     *screen,
-                                      MetaWindow     *window,
-                                      XEvent         *event,
-                                      MetaKeyBinding *binding,
-                                      gpointer        dummy);
+static gboolean handle_workspace_switch  (MetaDisplay    *display,
+                                          MetaScreen     *screen,
+                                          MetaWindow     *window,
+                                          XEvent         *event,
+                                          MetaKeyBinding *binding,
+                                          gpointer        dummy);

 static gboolean process_mouse_move_resize_grab (MetaDisplay *display,
                                                MetaScreen  *screen,
@@ -539,6 +539,8 @@ static gboolean
 add_keybinding_internal (MetaDisplay          *display,
                         const char           *name,
                         GSettings            *settings,
+                         const char           *setting_key,
+                         const char           *hardcoded_key,
                         MetaKeyBindingFlags   flags,
                         MetaKeyBindingAction  action,
                         MetaKeyHandlerFunc    func,
@@ -548,7 +550,7 @@ add_keybinding_internal (MetaDisplay          *display,
 {
  MetaKeyHandler *handler;

-  if (!meta_prefs_add_keybinding (name, settings, action, flags))
+  if (!meta_prefs_add_keybinding (name, settings, setting_key, hardcoded_key, action, flags))
    return FALSE;

  handler = g_new0 (MetaKeyHandler, 1);
@@ -567,16 +569,20 @@ add_keybinding_internal (MetaDisplay          *display,

 static gboolean
 add_builtin_keybinding (MetaDisplay          *display,
-                        const char           *name,
+                        const char           *key,
                        GSettings            *settings,
                        MetaKeyBindingFlags   flags,
                        MetaKeyBindingAction  action,
                        MetaKeyHandlerFunc    handler,
                        int                   handler_arg)
 {
-  return add_keybinding_internal (display, name, settings,
+  char *name = g_strdup_printf ("internal-keybinding-%s", key);
+
+  return add_keybinding_internal (display, name, settings, key, NULL,
                                  flags | META_KEY_BINDING_BUILTIN,
                                  action, handler, handler_arg, NULL, NULL);
+
+  g_free (name);
 }

 /**
@@ -608,22 +614,74 @@ add_builtin_keybinding (MetaDisplay          *display,
 */
 gboolean
 meta_display_add_keybinding (MetaDisplay         *display,
-                             const char          *name,
+                             const char          *key,
                             GSettings           *settings,
                             MetaKeyBindingFlags  flags,
                             MetaKeyHandlerFunc   handler,
                             gpointer             user_data,
                             GDestroyNotify       free_data)
 {
-  return add_keybinding_internal (display, name, settings, flags,
-                                  META_KEYBINDING_ACTION_NONE,
+  char *name = g_strdup_printf("custom-keybinding-%p-%s", settings, key);
+
+  return add_keybinding_internal (display, name, settings, key, NULL,
+                                  flags, META_KEYBINDING_ACTION_NONE,
                                  handler, 0, user_data, free_data);
+
+  g_free (name);
+}
+
+/**
+ * meta_display_add_grabbed_key:
+ * @display: a #MetaDisplay
+ * @name: the binding's name
+ * @keyval: the key combination that should trigger this keybinding
+ * @flags: flags to specify binding details
+ * @handler: function to run when the keybinding is invoked
+ * @user_data: the data to pass to @handler
+ * @free_data: function to free @user_data
+ *
+ * This function is similar to meta_display_add_keybinding(), except
+ * that the keybinding is hardcoded to @keyval, which should be a GTK
+ * key string combination.
+ */
+gboolean
+meta_display_add_grabbed_key (MetaDisplay         *display,
+                              const char          *name,
+                              const char          *keyval,
+                              MetaKeyBindingFlags  flags,
+                              MetaKeyHandlerFunc   handler,
+                              gpointer             user_data,
+                              GDestroyNotify       free_data)
+{
+  return add_keybinding_internal (display, name, NULL, NULL, keyval,
+                                  flags, META_KEYBINDING_ACTION_NONE,
+                                  handler, 0, user_data, free_data);
+}
+
+/**
+ * meta_display_remove_grabbed_key:
+ * @display: the #MetaDisplay
+ * @name: the name that was passed to meta_display_add_grabbed_key()
+ *
+ * Undoes the effect of meta_display_add_grabbed_key()
+ */
+gboolean
+meta_display_remove_grabbed_key (MetaDisplay *display,
+                                 const char  *name)
+{
+  if (!meta_prefs_remove_keybinding (name))
+    return FALSE;
+
+  g_hash_table_remove (key_handlers, name);
+
+  return TRUE;
 }

 /**
 * meta_display_remove_keybinding:
 * @display: the #MetaDisplay
 * @name: name of the keybinding to remove
+ * @settings: (allow-none): the #GSettings object on which the keybinding is registered
 *
 * Remove keybinding @name; the function will fail if @name is not a known
 * keybinding or has not been added with meta_display_add_keybinding().
@@ -633,14 +691,28 @@ meta_display_add_keybinding (MetaDisplay         *display,
 */
 gboolean
 meta_display_remove_keybinding (MetaDisplay *display,
-                                const char  *name)
+                                const char  *key,
+                                GSettings   *settings)
 {
+  gboolean retval;
+  char *name;
+
+  if (settings)
+    name = g_strdup_printf ("custom-keybinding-%p-%s", settings, key);
+  else
+    name = g_strdup (key);
+
+  retval = FALSE;
  if (!meta_prefs_remove_keybinding (name))
-    return FALSE;
+    goto out;

  g_hash_table_remove (key_handlers, name);

-  return TRUE;
+  retval = TRUE;
+
+ out:
+  g_free (name);
+  return retval;
 }

 /**
@@ -1344,7 +1416,7 @@ primary_modifier_still_pressed (MetaDisplay *display,
    return TRUE;
 }

-static void
+static gboolean
 invoke_handler (MetaDisplay    *display,
                MetaScreen     *screen,
                MetaKeyHandler *handler,
@@ -1354,22 +1426,22 @@ invoke_handler (MetaDisplay    *display,

 {
  if (handler->func)
-    (* handler->func) (display, screen,
-                       handler->flags & META_KEY_BINDING_PER_WINDOW ?
-                           window : NULL,
-                       event,
-                       binding,
-                       handler->user_data);
+    return (* handler->func) (display, screen,
+                              handler->flags & META_KEY_BINDING_PER_WINDOW ?
+                              window : NULL,
+                              event,
+                              binding,
+                              handler->user_data);
  else
-    (* handler->default_func) (display, screen,
-                               handler->flags & META_KEY_BINDING_PER_WINDOW ?
-                                   window: NULL,
-                               event,
-                               binding,
-                               NULL);
+    return (* handler->default_func) (display, screen,
+                                      handler->flags & META_KEY_BINDING_PER_WINDOW ?
+                                      window: NULL,
+                                      event,
+                                      binding,
+                                      NULL);
 }

-static void
+static gboolean
 invoke_handler_by_name (MetaDisplay    *display,
                        MetaScreen     *screen,
                        const char     *handler_name,
@@ -1380,7 +1452,8 @@ invoke_handler_by_name (MetaDisplay    *display,

  handler = HANDLER (handler_name);
  if (handler)
-    invoke_handler (display, screen, handler, window, event, NULL);
+    return invoke_handler (display, screen, handler, window, event, NULL);
+  return FALSE;
 }

 /* now called from only one place, may be worth merging */
@@ -1415,6 +1488,10 @@ process_event (MetaKeyBinding       *bindings,
           bindings[i].mask))
        continue;

+      if (display->grab_op != META_GRAB_OP_NONE &&
+          (handler->flags & META_KEY_BINDING_HANDLE_WHEN_GRABBED) == 0)
+        continue;
+
      /*
       * window must be non-NULL for on_window to be true,
       * and so also window must be non-NULL if we get here and
@@ -1439,9 +1516,7 @@ process_event (MetaKeyBinding       *bindings,
       */
      display->allow_terminal_deactivation = TRUE;

-      invoke_handler (display, screen, handler, window, event, &bindings[i]);
-
-      return TRUE;
+      return invoke_handler (display, screen, handler, window, event, &bindings[i]);
    }

  meta_topic (META_DEBUG_KEYBINDINGS,
@@ -1664,6 +1739,11 @@ meta_display_process_key_event (MetaDisplay *display,
                          "Processing event for keyboard workspace switching\n");
              keep_grab = process_workspace_switch_grab (display, screen, event, keysym);
              break;
+
+            case META_GRAB_OP_COMPOSITOR:
+              /* Compositor grabs don't go through meta_display_begin_grab_op(),
+                 so all_keys_grabbed is always false for them */
+              g_assert_not_reached ();
 
            default:
              break;
@@ -2550,7 +2630,7 @@ process_tab_grab (MetaDisplay *display,
  return key_used;
 }

-static void
+static gboolean
 handle_switch_to_workspace (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *event_window,
@@ -2575,7 +2655,7 @@ handle_switch_to_workspace (MetaDisplay    *display,
       */
      handle_workspace_switch (display, screen, event_window, event, binding,
                               dummy);
-      return;
+      return TRUE;
    }

  workspace = meta_screen_get_workspace_by_index (screen, which);
@@ -2588,10 +2668,12 @@ handle_switch_to_workspace (MetaDisplay    *display,
    {
      /* We could offer to create it I suppose */
    }
+
+  return TRUE;
 }


-static void
+static gboolean
 handle_maximize_vertically (MetaDisplay    *display,
                      MetaScreen     *screen,
                      MetaWindow     *window,
@@ -2606,9 +2688,11 @@ handle_maximize_vertically (MetaDisplay    *display,
      else
        meta_window_maximize (window, META_MAXIMIZE_VERTICAL);
    }
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_maximize_horizontally (MetaDisplay    *display,
                       MetaScreen     *screen,
                       MetaWindow     *window,
@@ -2623,6 +2707,8 @@ handle_maximize_horizontally (MetaDisplay    *display,
      else
        meta_window_maximize (window, META_MAXIMIZE_HORIZONTAL);
    }
+
+  return TRUE;
 }

 /* Move a window to a corner; to_bottom/to_right are FALSE for the
@@ -2672,7 +2758,7 @@ handle_move_to_corner_backend (MetaDisplay    *display,
                          new_y);
 }

-static void
+static gboolean
 handle_move_to_corner_nw  (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2681,9 +2767,10 @@ handle_move_to_corner_nw  (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, FALSE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_corner_ne  (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2692,9 +2779,10 @@ handle_move_to_corner_ne  (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, FALSE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_corner_sw  (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2703,9 +2791,10 @@ handle_move_to_corner_sw  (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, TRUE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_corner_se  (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2714,9 +2803,10 @@ handle_move_to_corner_se  (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, TRUE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_side_n     (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2725,9 +2815,10 @@ handle_move_to_side_n     (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, FALSE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_side_s     (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2736,9 +2827,10 @@ handle_move_to_side_s     (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, TRUE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_side_e     (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2747,9 +2839,10 @@ handle_move_to_side_e     (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, TRUE, FALSE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_side_w     (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -2758,9 +2851,10 @@ handle_move_to_side_w     (MetaDisplay    *display,
                           gpointer        dummy)
 {
  handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, FALSE, FALSE, dummy);
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_center  (MetaDisplay    *display,
                        MetaScreen     *screen,
                        MetaWindow     *window,
@@ -2786,6 +2880,8 @@ handle_move_to_center  (MetaDisplay    *display,
          work_area.y + (work_area.height+frame_height-outer.height)/2,
          window->rect.width,
          window->rect.height);
+
+  return FALSE;
 }

 static gboolean
@@ -2902,7 +2998,7 @@ process_workspace_switch_grab (MetaDisplay *display,
  return FALSE;
 }

-static void
+static gboolean
 handle_show_desktop (MetaDisplay    *display,
                       MetaScreen     *screen,
                       MetaWindow     *window,
@@ -2919,9 +3015,11 @@ handle_show_desktop (MetaDisplay    *display,
    }
  else
    meta_screen_show_desktop (screen, event->xkey.time);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_panel (MetaDisplay    *display,
                         MetaScreen     *screen,
                         MetaWindow     *window,
@@ -2944,7 +3042,7 @@ handle_panel (MetaDisplay    *display,
      action_atom = display->atom__GNOME_PANEL_ACTION_RUN_DIALOG;
      break;
    default:
-      return;
+      return FALSE;
    }
   
  ev.type = ClientMessage;
@@ -2971,9 +3069,11 @@ handle_panel (MetaDisplay    *display,
 	      (XEvent*) &ev);

  meta_error_trap_pop (display);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_activate_window_menu (MetaDisplay    *display,
                      MetaScreen     *screen,
                      MetaWindow     *event_window,
@@ -2996,6 +3096,8 @@ handle_activate_window_menu (MetaDisplay    *display,
                             0,
                             event->xkey.time);
    }
+
+  return TRUE;
 }

 static MetaGrabOp
@@ -3142,7 +3244,7 @@ do_choose_window (MetaDisplay    *display,
    }
 }

-static void
+static gboolean
 handle_switch (MetaDisplay    *display,
                    MetaScreen     *screen,
                    MetaWindow     *event_window,
@@ -3154,9 +3256,10 @@ handle_switch (MetaDisplay    *display,

  do_choose_window (display, screen, event_window, event, binding,
                    backwards, TRUE);
+  return TRUE;
 }

-static void
+static gboolean
 handle_cycle (MetaDisplay    *display,
                    MetaScreen     *screen,
                    MetaWindow     *event_window,
@@ -3168,9 +3271,10 @@ handle_cycle (MetaDisplay    *display,

  do_choose_window (display, screen, event_window, event, binding,
                    backwards, FALSE);
+  return TRUE;
 }

-static void
+static gboolean
 handle_tab_popup_select (MetaDisplay    *display,
                         MetaScreen     *screen,
                         MetaWindow     *window,
@@ -3179,9 +3283,10 @@ handle_tab_popup_select (MetaDisplay    *display,
                         gpointer        dummy)
 {
  /* Stub for custom handlers; no default implementation */
+  return FALSE;
 }

-static void
+static gboolean
 handle_tab_popup_cancel (MetaDisplay    *display,
                         MetaScreen     *screen,
                         MetaWindow     *window,
@@ -3190,9 +3295,10 @@ handle_tab_popup_cancel (MetaDisplay    *display,
                         gpointer        dummy)
 {
  /* Stub for custom handlers; no default implementation */
+  return FALSE;
 }

-static void
+static gboolean
 handle_toggle_fullscreen  (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3204,9 +3310,11 @@ handle_toggle_fullscreen  (MetaDisplay    *display,
    meta_window_unmake_fullscreen (window);
  else if (window->has_fullscreen_func)
    meta_window_make_fullscreen (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_toggle_above       (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3218,9 +3326,11 @@ handle_toggle_above       (MetaDisplay    *display,
    meta_window_unmake_above (window);
  else
    meta_window_make_above (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_toggle_tiled (MetaDisplay    *display,
                     MetaScreen     *screen,
                     MetaWindow     *window,
@@ -3258,9 +3368,11 @@ handle_toggle_tiled (MetaDisplay    *display,
      window->maximized_horizontally = FALSE;
      meta_window_tile (window);
    }
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_toggle_maximized    (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3276,9 +3388,11 @@ handle_toggle_maximized    (MetaDisplay    *display,
    meta_window_maximize (window,
                          META_MAXIMIZE_HORIZONTAL |
                          META_MAXIMIZE_VERTICAL);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_maximize           (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3290,9 +3404,11 @@ handle_maximize           (MetaDisplay    *display,
    meta_window_maximize (window,
                          META_MAXIMIZE_HORIZONTAL |
                          META_MAXIMIZE_VERTICAL);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_unmaximize         (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3304,9 +3420,11 @@ handle_unmaximize         (MetaDisplay    *display,
    meta_window_unmaximize (window,
                            META_MAXIMIZE_HORIZONTAL |
                            META_MAXIMIZE_VERTICAL);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_toggle_shaded      (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3318,9 +3436,11 @@ handle_toggle_shaded      (MetaDisplay    *display,
    meta_window_unshade (window, event->xkey.time);
  else if (window->has_shade_func)
    meta_window_shade (window, event->xkey.time);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_close              (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3330,9 +3450,11 @@ handle_close              (MetaDisplay    *display,
 {
  if (window->has_close_func)
    meta_window_delete (window, event->xkey.time);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_minimize        (MetaDisplay    *display,
                        MetaScreen     *screen,
                        MetaWindow     *window,
@@ -3342,9 +3464,11 @@ handle_minimize        (MetaDisplay    *display,
 {
  if (window->has_minimize_func)
    meta_window_minimize (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_begin_move         (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3359,9 +3483,11 @@ handle_begin_move         (MetaDisplay    *display,
                                 FALSE,
                                 event->xkey.time);
    }
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_begin_resize       (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3376,9 +3502,11 @@ handle_begin_resize       (MetaDisplay    *display,
                                 FALSE,
                                 event->xkey.time);
    }
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_toggle_on_all_workspaces (MetaDisplay    *display,
                           MetaScreen     *screen,
                           MetaWindow     *window,
@@ -3390,13 +3518,15 @@ handle_toggle_on_all_workspaces (MetaDisplay    *display,
    meta_window_unstick (window);
  else
    meta_window_stick (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_move_to_workspace  (MetaDisplay    *display,
-                              MetaScreen     *screen,
-                              MetaWindow     *window,
-                              XEvent         *event,
+                           MetaScreen     *screen,
+                           MetaWindow     *window,
+                           XEvent         *event,
                           MetaKeyBinding *binding,
                           gpointer        dummy)
 {
@@ -3413,11 +3543,11 @@ handle_move_to_workspace  (MetaDisplay    *display,
   */

  if (window->always_sticky)
-    return;
-  
+    return FALSE;
+
  workspace = NULL;
  if (flip)
-    {      
+    {
      workspace = meta_workspace_get_neighbor (screen->active_workspace,
                                               which);
    }
@@ -3425,7 +3555,7 @@ handle_move_to_workspace  (MetaDisplay    *display,
    {
      workspace = meta_screen_get_workspace_by_index (screen, which);
    }
-  
+
  if (workspace)
    {
      /* Activate second, so the window is never unmapped */
@@ -3444,10 +3574,12 @@ handle_move_to_workspace  (MetaDisplay    *display,
  else
    {
      /* We could offer to create it I suppose */
-    }  
+    }
+
+  return TRUE;
 }

-static void 
+static gboolean
 handle_raise_or_lower (MetaDisplay    *display,
                       MetaScreen     *screen,
 		       MetaWindow     *window,
@@ -3463,7 +3595,7 @@ handle_raise_or_lower (MetaDisplay    *display,
  if (meta_stack_get_top (window->screen->stack) == window)
    {
      meta_window_lower (window);
-      return;
+      return TRUE;
    }
      
  /* else check if windows in same layer are intersecting it */
@@ -3483,7 +3615,7 @@ handle_raise_or_lower (MetaDisplay    *display,
          if (meta_rectangle_intersect (&win_rect, &above_rect, &tmp))
            {
              meta_window_raise (window);
-              return;
+              return TRUE;
            }
        }
 	  
@@ -3492,9 +3624,10 @@ handle_raise_or_lower (MetaDisplay    *display,

  /* window is not obscured */
  meta_window_lower (window);
+  return TRUE;
 }

-static void
+static gboolean
 handle_raise (MetaDisplay    *display,
              MetaScreen     *screen,
              MetaWindow     *window,
@@ -3503,9 +3636,11 @@ handle_raise (MetaDisplay    *display,
              gpointer        dummy)
 {
  meta_window_raise (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_lower (MetaDisplay    *display,
              MetaScreen     *screen,
              MetaWindow     *window,
@@ -3514,9 +3649,11 @@ handle_lower (MetaDisplay    *display,
              gpointer        dummy)
 {
  meta_window_lower (window);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_workspace_switch  (MetaDisplay    *display,
                          MetaScreen     *screen,
                          MetaWindow     *window,
@@ -3547,7 +3684,7 @@ handle_workspace_switch  (MetaDisplay    *display,
                                   grab_mask,
                                   event->xkey.time,
                                   0, 0))
-    return;
+    return FALSE;

  next = meta_workspace_get_neighbor (screen->active_workspace, motion);
  g_assert (next); 
@@ -3570,17 +3707,21 @@ handle_workspace_switch  (MetaDisplay    *display,

  if (grabbed_before_release && !meta_prefs_get_no_tab_popup ())
    meta_screen_workspace_popup_create (screen, next);
+
+  return TRUE;
 }

-static void
+static gboolean
 handle_set_spew_mark (MetaDisplay    *display,
-                  MetaScreen     *screen,
-                  MetaWindow     *window,
-                  XEvent         *event,
+                      MetaScreen     *screen,
+                      MetaWindow     *window,
+                      XEvent         *event,
                      MetaKeyBinding *binding,
                      gpointer        dummy)
 {
  meta_verbose ("-- MARK MARK MARK MARK --\n");
+
+  return TRUE;
 }

 void
@@ -3726,28 +3867,28 @@ init_builtin_key_bindings (MetaDisplay *display)
  add_builtin_keybinding (display,
                          "switch-to-workspace-left",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_WORKSPACE_LEFT,
                          handle_switch_to_workspace, META_MOTION_LEFT);

  add_builtin_keybinding (display,
                          "switch-to-workspace-right",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
                          handle_switch_to_workspace, META_MOTION_RIGHT);

  add_builtin_keybinding (display,
                          "switch-to-workspace-up",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_WORKSPACE_UP,
                          handle_switch_to_workspace, META_MOTION_UP);

  add_builtin_keybinding (display,
                          "switch-to-workspace-down",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_WORKSPACE_DOWN,
                          handle_switch_to_workspace, META_MOTION_DOWN);

@@ -3793,14 +3934,14 @@ init_builtin_key_bindings (MetaDisplay *display)
  add_builtin_keybinding (display,
                          "switch-panels",
                          common_keybindings,
-                          META_KEY_BINDING_REVERSES,
+                          META_KEY_BINDING_REVERSES | META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_SWITCH_PANELS,
                          handle_switch, META_TAB_LIST_DOCKS);

  add_builtin_keybinding (display,
                          "switch-panels-backward",
                          common_keybindings,
-                          REVERSES_AND_REVERSED,
+                          REVERSES_AND_REVERSED | META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD,
                          handle_switch, META_TAB_LIST_DOCKS);

@@ -3878,14 +4019,14 @@ init_builtin_key_bindings (MetaDisplay *display)
  add_builtin_keybinding (display,
                          "panel-main-menu",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
                          handle_panel, META_KEYBINDING_ACTION_PANEL_MAIN_MENU);

  add_builtin_keybinding (display,
                          "panel-run-dialog",
                          common_keybindings,
-                          META_KEY_BINDING_NONE,
+                          META_KEY_BINDING_HANDLE_WHEN_GRABBED,
                          META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
                          handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG);

--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@@ -69,8 +69,6 @@ main (int argc, char **argv)
  GOptionContext *ctx;
  GError *error = NULL;

-  g_type_init ();
-
  ctx = meta_get_option_context ();
  g_option_context_add_main_entries (ctx, mutter_options, GETTEXT_PACKAGE);
  if (!g_option_context_parse (ctx, &argc, &argv, &error))
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -110,13 +110,12 @@ static gboolean workspaces_only_on_primary = FALSE;

 static gboolean no_tab_popup = FALSE;

+static GHashTable *key_bindings;

 static void handle_preference_update_enum (GSettings *settings,
                                           gchar     *key);
 static gboolean update_binding         (MetaKeyPref *binding,
                                        gchar      **strokes);
-static gboolean update_key_binding     (const char  *key,
-                                        gchar      **strokes);
 static gboolean update_workspace_names (void);

 static void settings_changed (GSettings      *settings,
@@ -1052,13 +1051,30 @@ bindings_changed (GSettings *settings,
                  gchar *key,
                  gpointer data)
 {
+  gchar  *static_strokes[2];
  gchar **strokes;
-  strokes = g_settings_get_strv (settings, key);
+  MetaKeyPref *pref;

-  if (update_key_binding (key, strokes))
-    queue_changed (META_PREF_KEYBINDINGS);
+  pref = g_hash_table_lookup (key_bindings, key);
+  if (!pref)
+    return;

-  g_strfreev (strokes);
+  if (pref->is_single)
+    {
+      static_strokes[0] = g_settings_get_string (settings, key);
+      static_strokes[1] = NULL;
+      strokes = static_strokes;
+    }
+  else
+    strokes = g_settings_get_strv (settings, key);
+
+  update_binding (pref, strokes);
+  queue_changed (META_PREF_KEYBINDINGS);
+
+  if (strokes != static_strokes)
+    g_strfreev(strokes);
+  else
+    g_free(static_strokes[0]);
 }

 /**
@@ -1693,7 +1709,10 @@ meta_key_pref_free (MetaKeyPref *pref)
  update_binding (pref, NULL);

  g_free (pref->name);
-  g_object_unref (pref->settings);
+  if (pref->settings)
+    g_object_unref (pref->settings);
+  g_free (pref->setting_key);
+  g_free (pref->hardcoded_key);

  g_free (pref);
 }
@@ -1785,18 +1804,6 @@ update_binding (MetaKeyPref *binding,
  return changed;
 }

-static gboolean
-update_key_binding (const char *key,
-                    gchar     **strokes)
-{
-  MetaKeyPref *pref = g_hash_table_lookup (key_bindings, key);
-
-  if (pref)
-    return update_binding (pref, strokes);
-  else
-    return FALSE;
-}
-
 static gboolean
 update_workspace_names (void)
 {
@@ -1929,11 +1936,14 @@ meta_prefs_get_visual_bell_type (void)
 gboolean
 meta_prefs_add_keybinding (const char           *name,
                           GSettings            *settings,
+                           const char           *setting_key,
+                           const char           *hardcoded_key,
                           MetaKeyBindingAction  action,
                           MetaKeyBindingFlags   flags)
 {
  MetaKeyPref  *pref;
  char        **strokes;
+  char         *static_strokes[2];
  guint         id;

  if (g_hash_table_lookup (key_bindings, name))
@@ -1944,19 +1954,45 @@ meta_prefs_add_keybinding (const char           *name,

  pref = g_new0 (MetaKeyPref, 1);
  pref->name = g_strdup (name);
-  pref->settings = g_object_ref (settings);
+  pref->settings = settings ? g_object_ref (settings) : NULL;
+  pref->setting_key = g_strdup (setting_key);
+  pref->hardcoded_key = g_strdup (hardcoded_key);
  pref->action = action;
  pref->bindings = NULL;
  pref->add_shift = (flags & META_KEY_BINDING_REVERSES) != 0;
  pref->per_window = (flags & META_KEY_BINDING_PER_WINDOW) != 0;
  pref->builtin = (flags & META_KEY_BINDING_BUILTIN) != 0;
+  pref->is_single = (flags & META_KEY_BINDING_IS_SINGLE) != 0;
+
+  if (settings)
+    {
+      if (pref->is_single)
+        {
+          static_strokes[0] = g_settings_get_string (settings, setting_key);
+          static_strokes[1] = NULL;
+          strokes = static_strokes;
+        }
+      else
+        strokes = g_settings_get_strv (settings, setting_key);
+    }
+  else
+    {
+      static_strokes[0] = (char*)hardcoded_key;
+      static_strokes[1] = NULL;
+      strokes = static_strokes;
+    }

-  strokes = g_settings_get_strv (settings, name);
  update_binding (pref, strokes);
-  g_strfreev (strokes);
-
  g_hash_table_insert (key_bindings, g_strdup (name), pref);

+  if (strokes != static_strokes)
+    g_strfreev (strokes);
+  else if (static_strokes[0] != hardcoded_key)
+    g_free (static_strokes[0]);
+
+  if (!settings)
+    return TRUE;
+
  if (pref->builtin)
    {
      if (g_object_get_data (G_OBJECT (settings), "changed-signal") == NULL)
@@ -1968,7 +2004,7 @@ meta_prefs_add_keybinding (const char           *name,
    }
  else
    {
-      char *changed_signal = g_strdup_printf ("changed::%s", name);
+      char *changed_signal = g_strdup_printf ("changed::%s", setting_key);
      id = g_signal_connect (settings, changed_signal,
                             G_CALLBACK (bindings_changed), NULL);
      g_free (changed_signal);
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3304,8 +3304,11 @@ meta_window_hide (MetaWindow *window)
       * active workspace; when it is not, we need to pass in NULL, so as to
       * focus the default window for the active workspace (this scenario
       * arises when we are switching workspaces).
+       * We also pass in NULL if we are in the process of hiding all non-desktop
+       * windows to avoid unexpected changes to the stacking order.
       */
-      if (my_workspace == window->screen->active_workspace)
+      if (my_workspace == window->screen->active_workspace &&
+          !my_workspace->showing_desktop)
        not_this_one = window;

      meta_workspace_focus_default_window (window->screen->active_workspace,
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -134,8 +134,18 @@ gboolean meta_display_add_keybinding    (MetaDisplay         *display,
                                         MetaKeyHandlerFunc   handler,
                                         gpointer             user_data,
                                         GDestroyNotify       free_data);
-gboolean meta_display_remove_keybinding (MetaDisplay         *display,
+gboolean meta_display_add_grabbed_key   (MetaDisplay         *display,
+                                         const char          *name,
+                                         const char          *keyval,
+                                         MetaKeyBindingFlags  flags,
+                                         MetaKeyHandlerFunc   handler,
+                                         gpointer             user_data,
+                                         GDestroyNotify       free_data);
+gboolean meta_display_remove_grabbed_key(MetaDisplay         *display,
                                         const char          *name);
+gboolean meta_display_remove_keybinding (MetaDisplay         *display,
+                                         const char          *name,
+                                         GSettings           *settings);

 MetaKeyBindingAction meta_display_get_keybinding_action (MetaDisplay  *display,
                                                         unsigned int  keycode,
--- a/src/meta/meta-background-actor.h
+++ b/src/meta/meta-background-actor.h
@@ -62,4 +62,32 @@ GType meta_background_actor_get_type (void);

 ClutterActor *meta_background_actor_new_for_screen (MetaScreen *screen);

+/**
+ * MetaSnippetHook:
+ * Temporary hack to work around Cogl not exporting CoglSnippetHook in
+ * the 1.0 API. Don't use.
+ */
+typedef enum {
+  /* Per pipeline vertex hooks */
+  META_SNIPPET_HOOK_VERTEX = 0,
+  META_SNIPPET_HOOK_VERTEX_TRANSFORM,
+
+  /* Per pipeline fragment hooks */
+  META_SNIPPET_HOOK_FRAGMENT = 2048,
+
+  /* Per layer vertex hooks */
+  META_SNIPPET_HOOK_TEXTURE_COORD_TRANSFORM = 4096,
+
+  /* Per layer fragment hooks */
+  META_SNIPPET_HOOK_LAYER_FRAGMENT = 6144,
+  META_SNIPPET_HOOK_TEXTURE_LOOKUP
+} MetaSnippetHook;
+
+
+void meta_background_actor_add_glsl_snippet (MetaBackgroundActor *actor,
+                                             MetaSnippetHook      hook,
+                                             const char          *declarations,
+                                             const char          *code,
+                                             gboolean             is_replace);
+
 #endif /* META_BACKGROUND_ACTOR_H */
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -234,7 +234,9 @@ typedef enum
  META_KEY_BINDING_PER_WINDOW  = 1 << 0,
  META_KEY_BINDING_BUILTIN     = 1 << 1,
  META_KEY_BINDING_REVERSES    = 1 << 2,
-  META_KEY_BINDING_IS_REVERSED = 1 << 3
+  META_KEY_BINDING_IS_REVERSED = 1 << 3,
+  META_KEY_BINDING_IS_SINGLE   = 1 << 4,
+  META_KEY_BINDING_HANDLE_WHEN_GRABBED = 1 << 5,
 } MetaKeyBindingFlags;

 typedef struct
@@ -249,12 +251,12 @@ typedef struct
 * @event: (type gpointer):
 *
 */
-typedef void (* MetaKeyHandlerFunc) (MetaDisplay    *display,
-                                     MetaScreen     *screen,
-                                     MetaWindow     *window,
-                                     XEvent         *event,
-                                     MetaKeyBinding *binding,
-                                     gpointer        user_data);
+typedef gboolean (* MetaKeyHandlerFunc) (MetaDisplay    *display,
+                                         MetaScreen     *screen,
+                                         MetaWindow     *window,
+                                         XEvent         *event,
+                                         MetaKeyBinding *binding,
+                                         gpointer        user_data);

 typedef struct _MetaKeyHandler MetaKeyHandler;

@@ -262,6 +264,8 @@ typedef struct
 {
  char *name;
  GSettings *settings;
+  char *setting_key;
+  char *hardcoded_key;

  MetaKeyBindingAction action;

@@ -280,6 +284,10 @@ typedef struct

  /** for keybindings not added with meta_display_add_keybinding() */
  gboolean      builtin:1;
+
+  /** for keybindings that are stored as a single value, not
+      as a list */
+  gboolean      is_single:1;
 } MetaKeyPref;

 GType meta_key_binding_get_type    (void);
Author	SHA1	Message	Date
Giovanni Campagna	9e2fc32395	Keybindings: uniquify the name for non-builtin keybindings Multiple settings objects could have the same key, so that alone is not enough to identify the binding. Add also the pointer value of the GSettings object. https://bugzilla.gnome.org/show_bug.cgi?id=613543	2012-11-10 17:06:29 +01:00
Giovanni Campagna	53a17185a0	Allow a keybinding handler to ignore a keybinding Previous commit moved policy for keybindings when grabbed down to the handler, but did not replay the event if it is was not handled. This commit adds the missing bit. https://bugzilla.gnome.org/show_bug.cgi?id=613543	2012-11-10 17:06:29 +01:00
Giovanni Campagna	fa679976e3	Handle some keybindings even when a compositor grab is active Do not ignore all key events automatically when a compositor grab is active, and introduce a flag for masking which keybindings should be active. This does not mean that automatically all keybindings are active when the compositor is modal, it merely moves the policy down to the handler. https://bugzilla.gnome.org/show_bug.cgi?id=613543	2012-11-10 17:06:29 +01:00
Giovanni Campagna	f505c59a9f	Keybindings: add a mechanism to grab a specific key combination Instead of requiring a GSettings object, allow to hardcode a specific combination for a keybinding. This will be used by the Shell to replace the media keys plugin in gnome-settings-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=613543	2012-11-10 17:06:29 +01:00
Yaron Shahrabani	e46cf80fdd	Updated Hebrew translation.	2012-11-07 18:40:37 +02:00
Rui Matos	c37c741592	meta-background-actor: Fix compilation error	2012-11-05 19:44:03 +01:00
Rui Matos	4cf461fffa	display: Only process keyboard mapping events for the core X keyboard The X server sends a XkbNewKeyboardNotify event for each keyboard device when a new keyboard description is loaded. These days a typical computer has several keyboard devices, e.g. xinput on this laptop lists 8. Since the work we do on these events is relatively expensive and we are only really interested in changes to the virtual core keyboard we can skip other devices' events to cut on needless work. https://bugzilla.gnome.org/show_bug.cgi?id=674859	2012-11-05 19:40:14 +01:00
Giovanni Campagna	859ea1457d	Add the ability to add shader hooks to MetaBackgroundActor Using ClutterEffect is not pratical on MetaBackgroundActor, as the FBO redirection has a noticeable performance impact. Instead, allow adding GLSL code directly to the pipeline used to draw the background texture. At the same time, port MetaBackgroundActor to modern Cogl API. https://bugzilla.gnome.org/show_bug.cgi?id=669798	2012-11-05 19:12:37 +01:00
Jasper St. Pierre	188d532438	display: Ignore DamageNotify in spew	2012-11-03 19:37:51 -04:00
Owen W. Taylor	f258556cec	MetaPluginManager: don't send events to Clutter twice When support for multiple plugins was removed, the logic that was supposed to send events to Clutter directly only if there is no filter function from a plugin was broken, so events were being sent to Clutter twice if Clutter didn't consume them the first time. https://bugzilla.gnome.org/show_bug.cgi?id=686406	2012-11-03 19:36:41 -04:00
Jasper St. Pierre	62dbaa89ca	mutter: Don't call g_type_init It has been deprecated upstream.	2012-11-02 11:45:11 -04:00
Tobias Endrigkeit	b56396eca5	Updated German translation	2012-10-30 18:59:33 +01:00
Rafael Ferreira	0fdc36cac4	Updated Brazilian Portuguese Translation	2012-10-29 16:29:49 -02:00
Florian Müllner	2cc0d31b17	window: Avoid spurious focus-window changes when showing desktop When using the show-desktop shortcut with no desktop window, unshowing will focus the second-most-recently-used window. If we find a desktop window, it will be focused explicitly and everything works as expected; however without a desktop window, we end up hiding the focus window, which will use focus_default_window() with the not_this_one parameter to move focus away. We used to get away with this, as the not_this_one parameter was ignored until commit `e257580b94`, now with bug 675982 fixed, we need to explicitly handle the show-desktop case. https://bugzilla.gnome.org/show_bug.cgi?id=686928	2012-10-26 15:52:32 +02:00