actions: add "loop" variants of "switch-{next,previous,left,right,up,down}" (#787)

The "switch-next",  "switch-prev" and related actions currently do
nothing once they reach the last window in the action's direction.
Add "loop" variants of these actions that loop around when the last
window is reached.
    
The new actions are "switch-previous-loop", "switch-next-loop",
"switch-left-loop", "switch-right-loop", "switch-up-loop" and
"switch-down-loop".

Author: jtaala

keybindings.js

@@ -161,17 +161,24 @@ export function setupActions(settings) {
 
     registerNavigatorAction('take-window', Tiling.takeWindow);
 
-    registerMinimapAction("switch-next", (mw, space) => space.switchLinear(1));
-    registerMinimapAction("switch-previous", (mw, space) => space.switchLinear(-1));
+    registerMinimapAction("switch-next", (mw, space) => space.switchLinear(1, false));
+    registerMinimapAction("switch-previous", (mw, space) => space.switchLinear(-1, false));
+    registerMinimapAction("switch-next-loop", (mw, space) => space.switchLinear(1, true));
+    registerMinimapAction("switch-previous-loop", (mw, space) => space.switchLinear(-1, true));
+
+    registerMinimapAction("switch-right", (mw, space) => space.switchRight(false));
+    registerMinimapAction("switch-left", (mw, space) => space.switchLeft(false));
+    registerMinimapAction("switch-up", (mw, space) => space.switchUp(false));
+    registerMinimapAction("switch-down", (mw, space) => space.switchDown(false));
+
+    registerMinimapAction("switch-right-loop", (mw, space) => space.switchRight(true));
+    registerMinimapAction("switch-left-loop", (mw, space) => space.switchLeft(true));
+    registerMinimapAction("switch-up-loop", (mw, space) => space.switchUp(true));
+    registerMinimapAction("switch-down-loop", (mw, space) => space.switchDown(true));
 
     registerMinimapAction("switch-first", Tiling.activateFirstWindow);
     registerMinimapAction("switch-last", Tiling.activateLastWindow);
 
-    registerMinimapAction("switch-right", (mw, space) => space.switchRight());
-    registerMinimapAction("switch-left", (mw, space) => space.switchLeft());
-    registerMinimapAction("switch-up", (mw, space) => space.switchUp());
-    registerMinimapAction("switch-down", (mw, space) => space.switchDown());
-
     registerMinimapAction("switch-global-right", (mw, space) => space.switchGlobalRight());
     registerMinimapAction("switch-global-left", (mw, space) => space.switchGlobalLeft());
     registerMinimapAction("switch-global-up", (mw, space) => space.switchGlobalUp());

prefsKeybinding.js

@@ -27,6 +27,12 @@ const actions = {
         'switch-right',
         'switch-up',
         'switch-down',
+        'switch-next-loop',
+        'switch-previous-loop',
+        'switch-left-loop',
+        'switch-right-loop',
+        'switch-up-loop',
+        'switch-down-loop',
         'switch-global-left',
         'switch-global-right',
         'switch-global-up',

schemas/gschemas.compiled

@@ -158,7 +158,6 @@
       <default><![CDATA[['<Super>comma']]]></default>
       <summary>Switch to the previous window</summary>
     </key>
-
     <key type="as" name="switch-right">
         <default><![CDATA[['<Super>Right']]]></default>
         <summary>Switch to the right window</summary>
@@ -169,11 +168,36 @@
     </key>
     <key type="as" name="switch-up">
         <default><![CDATA[['<Super>Up']]]></default>
-        <summary>Switch to the above window</summary>
+        <summary>Switch to the window above</summary>
     </key>
     <key type="as" name="switch-down">
         <default><![CDATA[['<Super>Down']]]></default>
-        <summary>Switch to the below window</summary>
+        <summary>Switch to the window below</summary>
+    </key>
+
+    <key type="as" name="switch-next-loop">
+      <default><![CDATA[['']]]></default>
+      <summary>Switch to the next window (with wrap-around)</summary>
+    </key>
+    <key type="as" name="switch-previous-loop">
+      <default><![CDATA[['']]]></default>
+      <summary>Switch to the previous window (with wrap-around)</summary>
+    </key>
+    <key type="as" name="switch-right-loop">
+        <default><![CDATA[['']]]></default>
+        <summary>Switch to the right window (with wrap-around)</summary>
+    </key>
+    <key type="as" name="switch-left-loop">
+        <default><![CDATA[['']]]></default>
+        <summary>Switch to the left window (with wrap-around)</summary>
+    </key>
+    <key type="as" name="switch-up-loop">
+        <default><![CDATA[['']]]></default>
+        <summary>Switch to the window above (with wrap-around)</summary>
+    </key>
+    <key type="as" name="switch-down-loop">
+        <default><![CDATA[['']]]></default>
+        <summary>Switch to the window below (with wrap-around)</summary>
     </key>
 
     <key type="as" name="switch-global-right">

schemas/org.gnome.shell.extensions.paperwm.gschema.xml

@@ -1004,14 +1004,21 @@ export class Space extends Array {
         ensureViewport(this.selectedWindow, this, { force: true });
     }
 
-    switchLinear(dir) {
+    switchLinear(dir, loop) {
         let index = this.selectedIndex();
         let column = this[index];
         if (!column)
             return false;
         let row = column.indexOf(this.selectedWindow);
         if (Lib.in_bounds(column, row + dir) === false) {
             index += dir;
+            if (loop) {
+                if (index >= this.length) {
+                    index = 0;
+                } else if (index < 0) {
+                    index = this.length - 1;
+                }
+            }
             if (dir === 1) {
                 if (index < this.length)
                     row = 0;
@@ -1026,11 +1033,11 @@ export class Space extends Array {
         return true;
     }
 
-    switchLeft() { this.switch(Meta.MotionDirection.LEFT); }
-    switchRight() { this.switch(Meta.MotionDirection.RIGHT); }
-    switchUp() { this.switch(Meta.MotionDirection.UP); }
-    switchDown() { this.switch(Meta.MotionDirection.DOWN); }
-    switch(direction) {
+    switchLeft(loop) { this.switch(Meta.MotionDirection.LEFT, loop); }
+    switchRight(loop) { this.switch(Meta.MotionDirection.RIGHT, loop); }
+    switchUp(loop) { this.switch(Meta.MotionDirection.UP, loop); }
+    switchDown(loop) { this.switch(Meta.MotionDirection.DOWN, loop); }
+    switch(direction, loop) {
         let space = this;
         let index = space.selectedIndex();
         if (index === -1) {
@@ -1046,8 +1053,15 @@ export class Space extends Array {
             index--;
             row = -1;
         }
-        if (index < 0 || index >= space.length)
+        if (loop) {
+            if (index < 0) {
+                index = space.length - 1;
+            } else if (index >= space.length) {
+                index = 0;
+            }
+        } else if (index < 0 || index >= space.length) {
             return;
+        }
 
         let column = space[index];
 
@@ -1064,8 +1078,15 @@ export class Space extends Array {
         case Meta.MotionDirection.DOWN:
             row++;
         }
-        if (row < 0 || row >= column.length)
+        if (loop) {
+            if (row < 0) {
+                row = column.length - 1;
+            } else if (row >= column.length) {
+                row = 0;
+            }
+        } else if (row < 0 || row >= column.length) {
             return;
+        }
 
         let metaWindow = space.getWindow(index, row);
         ensureViewport(metaWindow, space);
@@ -1766,11 +1787,11 @@ border-radius: ${borderWidth}px;
                 switch (dir) {
                 case Clutter.ScrollDirection.LEFT:
                 case Clutter.ScrollDirection.UP:
-                    this.switchLeft();
+                    this.switchLeft(false);
                     break;
                 case Clutter.ScrollDirection.RIGHT:
                 case Clutter.ScrollDirection.DOWN:
-                    this.switchRight();
+                    this.switchRight(false);
                     break;
                 }
             });