Merge lp:~townsend/ubuntu/saucy/gsettings-desktop-schemas/revert-workspace-keybindings into lp:ubuntu/saucy/gsettings-desktop-schemas

[Christopher Townsend]

The last revision added a new keybindings for workspace switching up and down by using <Super>Page_Up/<Super>Page_Down while also allowing the old Ctrl-Alt-Up/Ctrl-Alt-Down as secondary keybindings. However, Compiz can only handle one keybinding and so for new installations or upgrades after this was introduced, it only uses the <Super> combination.

We need to revert the <Super> combinations from Ubuntu to allow Compiz workspace switching to use the correct keybindings.

[Sebastien Bacher (seb128)]

@Christopher: thanks for the work, I don't think that's right though since that would change the GNOME remix keybindings.

Could we rather just overwrite those for Ubuntu Desktop? by adding them to the ubuntu-settings gsettings' override:
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/saucy/ubuntu-settings/saucy/view/head:/debian/ubuntu-settings.gsettings-override

Note that I couldn't confirm the bug, either in a guest session, nor on a current daily iso ... do you know why, your description suggests that should happen to everyone since compiz reads only the first key? or is the order of the key not constant?

review: Needs Fixing

[Christopher Townsend (townsend)]

@Sebastien,

Thanks for the feedback. I wasn't aware of the ubuntu-settings.gsettings-override, but that is definitely a better place to put this. I'll propose a new fix for that branch and reject this one.

I'm not really sure what the trigger is for which shortcut is picked, but I do know that Compiz can only handle one and something is overriding Compiz's default to use Ctrl-Alt-Up/Down.

Doug McMahon put in the bug some conditions that seem to trigger this. I was able to reproduce by creating a brand new user on my machine. I have a feeling that once 13.10 is released, this will affect many more users.

[Christopher Townsend (townsend)]

I made a new MP (https://code.launchpad.net/~townsend/ubuntu/saucy/ubuntu-settings/fix-wall-switch-keybinding/+merge/189652). I tried to reject this MP, but I don't have permission to do this, so someone else will the authority will have to do that.

[Sebastien Bacher (seb128)]

done, set to rejected. I'm going to review the other one in a bit

Unmerged revisions

47. By Christopher Townsend on 2013-10-02

* debian/patches/ubuntu_remove-workspace-bindings.patch: new patch
  - Revert the <Super>Page_Up and <Super>Page_Down keybindings for
    workspace switching as this is not consistent with Compiz's
    keybindings. (LP: #1201405)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-05-31 17:18:29 +0000
+++ .pc/applied-patches	2013-10-02 13:34:41 +0000
@@ -3,3 +3,4 @@
 ubuntu_overlay-scrollbars.patch
 git_revert_background_key_removal.patch
 git_revert_notifications_key_removal.patch
+ubuntu_remove-workspace-bindings.patch

=== added directory '.pc/ubuntu_remove-workspace-bindings.patch'
=== added file '.pc/ubuntu_remove-workspace-bindings.patch/.timestamp'
=== added directory '.pc/ubuntu_remove-workspace-bindings.patch/schemas'
=== added file '.pc/ubuntu_remove-workspace-bindings.patch/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in'
--- .pc/ubuntu_remove-workspace-bindings.patch/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ .pc/ubuntu_remove-workspace-bindings.patch/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in	2013-10-02 13:34:41 +0000
@@ -0,0 +1,322 @@
+<schemalist>
+
+  <schema id="org.gnome.desktop.wm.keybindings"
+          path="/org/gnome/desktop/wm/keybindings/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="switch-to-workspace-1" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 1</_summary>
+    </key>
+    <key name="switch-to-workspace-2" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 2</_summary>
+    </key>
+    <key name="switch-to-workspace-3" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 3</_summary>
+    </key>
+    <key name="switch-to-workspace-4" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 4</_summary>
+    </key>
+    <key name="switch-to-workspace-5" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 5</_summary>
+    </key>
+    <key name="switch-to-workspace-6" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 6</_summary>
+    </key>
+    <key name="switch-to-workspace-7" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 7</_summary>
+    </key>
+    <key name="switch-to-workspace-8" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 8</_summary>
+    </key>
+    <key name="switch-to-workspace-9" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 9</_summary>
+    </key>
+    <key name="switch-to-workspace-10" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 10</_summary>
+    </key>
+    <key name="switch-to-workspace-11" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 11</_summary>
+    </key>
+    <key name="switch-to-workspace-12" type="as">
+      <default>[]</default>
+      <_summary>Switch to workspace 12</_summary>
+    </key>
+    <key name="switch-to-workspace-left" type="as">
+      <default><![CDATA[['<Control><Alt>Left']]]></default>
+      <_summary>Switch to workspace left</_summary>
+    </key>
+    <key name="switch-to-workspace-right" type="as">
+      <default><![CDATA[['<Control><Alt>Right']]]></default>
+      <_summary>Switch to workspace right</_summary>
+    </key>
+    <key name="switch-to-workspace-up" type="as">
+      <default><![CDATA[['<Super>Page_Up','<Control><Alt>Up']]]></default>
+      <_summary>Switch to workspace above</_summary>
+    </key>
+    <key name="switch-to-workspace-down" type="as">
+      <default><![CDATA[['<Super>Page_Down','<Control><Alt>Down']]]></default>
+      <_summary>Switch to workspace below</_summary>
+    </key>
+    <key name="switch-group" type="as">
+      <default><![CDATA[['<Super>Above_Tab','<Alt>Above_Tab']]]></default>
+      <_summary>Switch windows of an application</_summary>
+    </key>
+    <key name="switch-group-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch windows of an application</_summary>
+    </key>
+    <key name="switch-applications" type="as">
+      <default><![CDATA[['<Super>Tab','<Alt>Tab']]]></default>
+      <_summary>Switch applications</_summary>
+    </key>
+    <key name="switch-applications-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch applications</_summary>
+    </key>
+    <key name="switch-windows" type="as">
+      <default>[]</default>
+      <_summary>Switch windows</_summary>
+    </key>
+    <key name="switch-windows-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch windows</_summary>
+    </key>
+    <key name="switch-panels" type="as">
+      <default><![CDATA[['<Control><Alt>Tab']]]></default>
+      <_summary>Switch system controls</_summary>
+    </key>
+    <key name="switch-panels-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch system controls</_summary>
+    </key>
+    <key name="cycle-group" type="as">
+      <default><![CDATA[['<Alt>F6']]]></default>
+      <_summary>Switch windows of an app directly</_summary>
+    </key>
+    <key name="cycle-group-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch windows of an app directly</_summary>
+    </key>
+    <key name="cycle-windows" type="as">
+      <default><![CDATA[['<Alt>Escape']]]></default>
+      <_summary>Switch windows directly</_summary>
+    </key>
+    <key name="cycle-windows-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch windows directly</_summary>
+    </key>
+    <key name="cycle-panels" type="as">
+      <default><![CDATA[['<Control><Alt>Escape']]]></default>
+      <_summary>Switch system controls directly</_summary>
+    </key>
+    <key name="cycle-panels-backward" type="as">
+      <default>[]</default>
+      <_summary>Reverse switch system controls directly</_summary>
+    </key>
+    <key name="show-desktop" type="as">
+      <default>[]</default>
+      <_summary>Hide all normal windows</_summary>
+    </key>
+    <key name="panel-main-menu" type="as">
+      <default><![CDATA[['<Alt>F1']]]></default>
+      <_summary>Show the activities overview</_summary>
+    </key>
+    <key name="panel-run-dialog" type="as">
+      <default><![CDATA[['<Alt>F2']]]></default>
+      <_summary>Show the run command prompt</_summary>
+    </key>
+    <key name="set-spew-mark" type="as">
+      <default>[]</default>
+      <_summary>Don't use</_summary>
+    </key>
+    <key name="activate-window-menu" type="as">
+      <default><![CDATA[['<Alt>space']]]></default>
+      <_summary>Activate the window menu</_summary>
+    </key>
+    <key name="toggle-fullscreen" type="as">
+      <default>[]</default>
+      <_summary>Toggle fullscreen mode</_summary>
+    </key>
+    <key name="toggle-maximized" type="as">
+      <default><![CDATA[['<Alt>F10']]]></default>
+      <_summary>Toggle maximization state</_summary>
+    </key>
+    <key name="toggle-above" type="as">
+      <default>[]</default>
+      <_summary>Toggle window always appearing on top</_summary>
+    </key>
+    <key name="maximize" type="as">
+      <default><![CDATA[['<Super>Up']]]></default>
+      <_summary>Maximize window</_summary>
+    </key>
+    <key name="unmaximize" type="as">
+      <default><![CDATA[['<Super>Down','<Alt>F5']]]></default>
+      <_summary>Restore window</_summary>
+    </key>
+    <key name="toggle-shaded" type="as">
+      <default>[]</default>
+      <_summary>Toggle shaded state</_summary>
+    </key>
+    <key name="minimize" type="as">
+      <default><![CDATA[['<Super>h']]]></default>
+      <_summary>Minimize window</_summary>
+    </key>
+    <key name="close" type="as">
+      <default><![CDATA[['<Alt>F4']]]></default>
+      <_summary>Close window</_summary>
+    </key>
+    <key name="begin-move" type="as">
+      <default><![CDATA[['<Alt>F7']]]></default>
+      <_summary>Move window</_summary>
+    </key>
+    <key name="begin-resize" type="as">
+      <default><![CDATA[['<Alt>F8']]]></default>
+      <_summary>Resize window</_summary>
+    </key>
+    <key name="toggle-on-all-workspaces" type="as">
+      <default>[]</default>
+      <_summary>Toggle window on all workspaces or one</_summary>
+    </key>
+    <key name="move-to-workspace-1" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 1</_summary>
+    </key>
+    <key name="move-to-workspace-2" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 2</_summary>
+    </key>
+    <key name="move-to-workspace-3" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 3</_summary>
+    </key>
+    <key name="move-to-workspace-4" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 4</_summary>
+    </key>
+    <key name="move-to-workspace-5" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 5</_summary>
+    </key>
+    <key name="move-to-workspace-6" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 6</_summary>
+    </key>
+    <key name="move-to-workspace-7" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 7</_summary>
+    </key>
+    <key name="move-to-workspace-8" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 8</_summary>
+    </key>
+    <key name="move-to-workspace-9" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 9</_summary>
+    </key>
+    <key name="move-to-workspace-10" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 10</_summary>
+    </key>
+    <key name="move-to-workspace-11" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 11</_summary>
+    </key>
+    <key name="move-to-workspace-12" type="as">
+      <default>[]</default>
+      <_summary>Move window to workspace 12</_summary>
+    </key>
+    <key name="move-to-workspace-left" type="as">
+      <default><![CDATA[['<Control><Shift><Alt>Left']]]></default>
+      <_summary>Move window one workspace to the left</_summary>
+    </key>
+    <key name="move-to-workspace-right" type="as">
+      <default><![CDATA[['<Control><Shift><Alt>Right']]]></default>
+      <_summary>Move window one workspace to the right</_summary>
+    </key>
+    <key name="move-to-workspace-up" type="as">
+      <default><![CDATA[['<Super><Shift>Page_Up','<Control><Shift><Alt>Up']]]></default>
+      <_summary>Move window one workspace up</_summary>
+    </key>
+    <key name="move-to-workspace-down" type="as">
+      <default><![CDATA[['<Super><Shift>Page_Down','<Control><Shift><Alt>Down']]]></default>
+      <_summary>Move window one workspace down</_summary>
+    </key>
+    <key name="raise-or-lower" type="as">
+      <default>[]</default>
+      <_summary>Raise window if covered, otherwise lower it</_summary>
+    </key>
+    <key name="raise" type="as">
+      <default>[]</default>
+      <_summary>Raise window above other windows</_summary>
+    </key>
+    <key name="lower" type="as">
+      <default>[]</default>
+      <_summary>Lower window below other windows</_summary>
+    </key>
+    <key name="maximize-vertically" type="as">
+      <default>[]</default>
+      <_summary>Maximize window vertically</_summary>
+    </key>
+    <key name="maximize-horizontally" type="as">
+      <default>[]</default>
+      <_summary>Maximize window horizontally</_summary>
+    </key>
+    <key name="move-to-corner-nw" type="as">
+      <default>[]</default>
+      <_summary>Move window to top left corner</_summary>
+    </key>
+    <key name="move-to-corner-ne" type="as">
+      <default>[]</default>
+      <_summary>Move window to top right corner</_summary>
+    </key>
+    <key name="move-to-corner-sw" type="as">
+      <default>[]</default>
+      <_summary>Move window to bottom left corner</_summary>
+    </key>
+    <key name="move-to-corner-se" type="as">
+      <default>[]</default>
+      <_summary>Move window to bottom right corner</_summary>
+    </key>
+    <key name="move-to-side-n" type="as">
+      <default>[]</default>
+      <_summary>Move window to top edge of screen</_summary>
+    </key>
+    <key name="move-to-side-s" type="as">
+      <default>[]</default>
+      <_summary>Move window to bottom edge of screen</_summary>
+    </key>
+    <key name="move-to-side-e" type="as">
+      <default>[]</default>
+      <_summary>Move window to right side of screen</_summary>
+    </key>
+    <key name="move-to-side-w" type="as">
+      <default>[]</default>
+      <_summary>Move window to left side of screen</_summary>
+    </key>
+    <key name="move-to-center" type="as">
+      <default>[]</default>
+      <_summary>Move window to center of screen</_summary>
+    </key>
+    <key name="switch-input-source" type="as">
+      <default>["&lt;Super&gt;space"]</default>
+      <_summary>Switch input source</_summary>
+      <_description>Binding to select the next input source</_description>
+    </key>
+    <key name="switch-input-source-backward" type="as">
+      <default>[]</default>
+      <_summary>Switch input source backward</_summary>
+      <_description>Binding to select the previous input source</_description>
+    </key>
+  </schema>
+
+</schemalist>

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 17:18:29 +0000
+++ debian/changelog	2013-10-02 13:34:41 +0000
@@ -1,3 +1,12 @@
+gsettings-desktop-schemas (3.8.0-1ubuntu2) unstable; urgency=low
+
+  * debian/patches/ubuntu_remove-workspace-bindings.patch: new patch
+    - Revert the <Super>Page_Up and <Super>Page_Down keybindings for
+      workspace switching as this is not consistent with Compiz's
+      keybindings. (LP: #1201405)
+
+ -- Chris Townsend <[e-mail]>  Wed, 02 Oct 2013 08:55:52 -0400
+
 gsettings-desktop-schemas (3.8.0-1ubuntu1) saucy; urgency=low
 
   [ Jeremy Bicha ]

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-31 17:18:29 +0000
+++ debian/patches/series	2013-10-02 13:34:41 +0000
@@ -3,3 +3,4 @@
 ubuntu_overlay-scrollbars.patch
 git_revert_background_key_removal.patch
 git_revert_notifications_key_removal.patch
+ubuntu_remove-workspace-bindings.patch

=== added file 'debian/patches/ubuntu_remove-workspace-bindings.patch'
--- debian/patches/ubuntu_remove-workspace-bindings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_remove-workspace-bindings.patch	2013-10-02 13:34:41 +0000
@@ -0,0 +1,20 @@
+## Description: Remove the new default <Super>Page_Up/<Super>Page_Down keybindings
+##              since it conflicts with Compiz.
+## Author: Chris Townsend <[e-mail]>
+## Bug: https://bugs.launchpad.net/bugs/1201405
+--- a/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in
++++ b/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in
+@@ -60,11 +60,11 @@
+       <_summary>Switch to workspace right</_summary>
+     </key>
+     <key name="switch-to-workspace-up" type="as">
+-      <default><![CDATA[['<Super>Page_Up','<Control><Alt>Up']]]></default>
++      <default><![CDATA[[''<Control><Alt>Up']]]></default>
+       <_summary>Switch to workspace above</_summary>
+     </key>
+     <key name="switch-to-workspace-down" type="as">
+-      <default><![CDATA[['<Super>Page_Down','<Control><Alt>Down']]]></default>
++      <default><![CDATA[[''<Control><Alt>Down']]]></default>
+       <_summary>Switch to workspace below</_summary>
+     </key>
+     <key name="switch-group" type="as">

=== modified file 'schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in'
--- schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in	2013-05-31 17:18:29 +0000
+++ schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in	2013-10-02 13:34:41 +0000
@@ -60,11 +60,11 @@
       <_summary>Switch to workspace right</_summary>
     </key>
     <key name="switch-to-workspace-up" type="as">
-      <default><![CDATA[['<Super>Page_Up','<Control><Alt>Up']]]></default>
+      <default><![CDATA[[''<Control><Alt>Up']]]></default>
       <_summary>Switch to workspace above</_summary>
     </key>
     <key name="switch-to-workspace-down" type="as">
-      <default><![CDATA[['<Super>Page_Down','<Control><Alt>Down']]]></default>
+      <default><![CDATA[[''<Control><Alt>Down']]]></default>
       <_summary>Switch to workspace below</_summary>
     </key>
     <key name="switch-group" type="as">