[mutter] keybindings: Import keybinding files from Metacity

[Florian MÃllner <fmuellner src gnome org>]

commit bdf47aeac4c94e35b2c753666063f8a2057a769d
Author: Florian MÃllner <fmuellner gnome org>
Date:   Mon Nov 5 14:55:15 2012 +0100

    keybindings: Import keybinding files from Metacity
    
    Fallback mode is going away, so we should stop depending on Metacity
    for keybinding files for common bindings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687672

 .gitignore                      |    2 +
 po/POTFILES.in                  |    2 +
 src/50-mutter-navigation.xml.in |   77 +++++++++++++++++++++++++++++++++++++++
 src/50-mutter-system.xml.in     |   13 +++++++
 src/50-mutter-windows.xml.in    |   37 ++++++++++++++++++-
 src/Makefile.am                 |    2 +
 src/core/display.c              |    4 +--
 7 files changed, 133 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 671b4b5..fb8872c 100644
--- a/.gitignore
+++ b/.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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5845fd4..c448f63 100644
--- a/po/POTFILES.in
+++ b/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
diff --git a/src/50-mutter-navigation.xml.in b/src/50-mutter-navigation.xml.in
new file mode 100644
index 0000000..bf56d08
--- /dev/null
+++ b/src/50-mutter-navigation.xml.in
@@ -0,0 +1,77 @@
+<?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-windows"
+	              _description="Switch applications"/>
+
+	<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>
diff --git a/src/50-mutter-system.xml.in b/src/50-mutter-system.xml.in
new file mode 100644
index 0000000..b8f4e6b
--- /dev/null
+++ b/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>
+
diff --git a/src/50-mutter-windows.xml.in b/src/50-mutter-windows.xml.in
index 4e0ab9d..e590e5d 100644
--- a/src/50-mutter-windows.xml.in
+++ b/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="Minimize 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>
diff --git a/src/Makefile.am b/src/Makefile.am
index e9038a6..9071d1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,6 +259,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)
 
diff --git a/src/core/display.c b/src/core/display.c
index d6ee04a..42cf7b4 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -167,9 +167,7 @@ static guint display_signals [LAST_SIGNAL] = { 0 };
 static MetaDisplay *the_display = NULL;
 
 
-/* By default, the GNOME keybindings capplet should include both the Mutter
- * and Metacity keybindings */
-static const char *gnome_wm_keybindings = "Mutter,Metacity";
+static const char *gnome_wm_keybindings = "Mutter";
 static const char *net_wm_name = "Mutter";
 
 #ifdef WITH_VERBOSE_MODE