cs_keyboard.py, main.js, and KeybindingTable.py: Separate the key bindings and keyboard menu options for switching workspace up/down and toggling window/workspace selection

Author: rcalixte

files/usr/share/cinnamon/cinnamon-settings/bin/KeybindingTable.py

@@ -172,7 +172,9 @@
     ],
     [
       [_("Switch to left workspace"), MUFFIN_KEYBINDINGS_SCHEMA, "switch-to-workspace-left"],
-      [_("Switch to right workspace"), MUFFIN_KEYBINDINGS_SCHEMA, "switch-to-workspace-right"]
+      [_("Switch to right workspace"), MUFFIN_KEYBINDINGS_SCHEMA, "switch-to-workspace-right"],
+      [_("Switch to up workspace"), MUFFIN_KEYBINDINGS_SCHEMA, "switch-to-workspace-up"],
+      [_("Switch to down workspace"), MUFFIN_KEYBINDINGS_SCHEMA, "switch-to-workspace-down"]
     ]
   ],
   [_("System"), "system", None, "xsi-emblem-system-symbolic",
@@ -976,4 +978,4 @@ def get_default():
     global instance
     if instance is None:
         instance = KeybindingTable()
-    return instance
+    return instance

files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py

@@ -25,6 +25,7 @@
 MASKS = [Gdk.ModifierType.CONTROL_MASK, Gdk.ModifierType.MOD1_MASK,
          Gdk.ModifierType.SHIFT_MASK, Gdk.ModifierType.SUPER_MASK]
 
+
 class Module:
     comment = _("Manage keyboard settings and shortcuts")
     name = "keyboard"

js/ui/windowManager.js

@@ -366,7 +366,10 @@ var WindowManager = class WindowManager {
             (d, w, b) => this._moveWindowToWorkspaceLeft(d, w, b), Cinnamon.ActionMode.NORMAL);
         kbm.setBuiltinHandler('move-to-workspace-right', Meta.KeyBindingAction.MOVE_TO_WORKSPACE_RIGHT,
             (d, w, b) => this._moveWindowToWorkspaceRight(d, w, b), Cinnamon.ActionMode.NORMAL);
-
+        kbm.setBuiltinHandler('toggle-window-selection', Meta.KeyBindingAction.TOGGLE_WINDOW_SELECTION,
+            (d, w, b) => this._showWorkspaceSwitcher(d, w, b), WORKSPACE_MODES);
+        kbm.setBuiltinHandler('toggle-workspace-selection', Meta.KeyBindingAction.TOGGLE_WORKSPACE_SELECTION,
+            (d, w, b) => this._showWorkspaceSwitcher(d, w, b), WORKSPACE_MODES);
         kbm.setBuiltinHandler('switch-to-workspace-left', Meta.KeyBindingAction.WORKSPACE_LEFT,
             (d, w, b) => this._showWorkspaceSwitcher(d, w, b), WORKSPACE_MODES);
         kbm.setBuiltinHandler('switch-to-workspace-right', Meta.KeyBindingAction.WORKSPACE_RIGHT,
@@ -1394,7 +1397,7 @@ var WindowManager = class WindowManager {
     _showWorkspaceSwitcher(display, window, binding) {
         let bindingName = binding.get_name();
 
-        if (bindingName === 'switch-to-workspace-up') {
+        if (bindingName === 'toggle-workspace-selection') {
             if (Main.overview.visible || Main.expo.visible) {
                 Main.overview.hide();
                 Main.expo.hide();
@@ -1403,7 +1406,7 @@ var WindowManager = class WindowManager {
             }
             return;
         }
-        if (bindingName === 'switch-to-workspace-down') {
+        if (bindingName === 'toggle-window-selection') {
             if (Main.overview.visible || Main.expo.visible) {
                 Main.overview.hide();
                 Main.expo.hide();
@@ -1420,6 +1423,10 @@ var WindowManager = class WindowManager {
             this.actionMoveWorkspaceLeft();
         } else if (bindingName === 'switch-to-workspace-right') {
             this.actionMoveWorkspaceRight();
+        } else if (bindingName === 'switch-to-workspace-up') {
+            this.actionMoveWorkspaceUp();
+        } else if (bindingName === 'switch-to-workspace-down') {
+            this.actionMoveWorkspaceDown();
         }
     }