Updated ordering and simplified description (this type of behaviour is

generally referred to as "wrap around" in PaperWM).

Author: jtaala

keybindings.js

@@ -162,22 +162,23 @@ export function setupActions(settings) {
     registerNavigatorAction('take-window', Tiling.takeWindow);
 
     registerMinimapAction("switch-next", (mw, space) => space.switchLinear(1, false));
-    registerMinimapAction("switch-next-loop", (mw, space) => space.switchLinear(1, true));
     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-first", Tiling.activateFirstWindow);
-    registerMinimapAction("switch-last", Tiling.activateLastWindow);
-
     registerMinimapAction("switch-right", (mw, space) => space.switchRight(false));
-    registerMinimapAction("switch-right-loop", (mw, space) => space.switchRight(true));
     registerMinimapAction("switch-left", (mw, space) => space.switchLeft(false));
-    registerMinimapAction("switch-left-loop", (mw, space) => space.switchLeft(true));
     registerMinimapAction("switch-up", (mw, space) => space.switchUp(false));
-    registerMinimapAction("switch-up-loop", (mw, space) => space.switchUp(true));
     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-global-right", (mw, space) => space.switchGlobalRight());
     registerMinimapAction("switch-global-left", (mw, space) => space.switchGlobalLeft());
     registerMinimapAction("switch-global-up", (mw, space) => space.switchGlobalUp());

prefsKeybinding.js

@@ -22,16 +22,16 @@ const actions = {
         'new-window',
         'close-window',
         'switch-next',
-        'switch-next-loop',
         'switch-previous',
-        'switch-previous-loop',
         'switch-left',
-        'switch-left-loop',
         'switch-right',
-        'switch-right-loop',
         'switch-up',
-        'switch-up-loop',
         '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',

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

@@ -154,51 +154,50 @@
       <default><![CDATA[['<Super>period']]]></default>
       <summary>Switch to the next window</summary>
     </key>
-    <key type="as" name="switch-next-loop">
-      <default><![CDATA[['']]]></default>
-      <summary>Switch to the next window and loop around to the first window</summary>
-    </key>
     <key type="as" name="switch-previous">
       <default><![CDATA[['<Super>comma']]]></default>
       <summary>Switch to the previous window</summary>
     </key>
-    <key type="as" name="switch-previous-loop">
-      <default><![CDATA[['']]]></default>
-      <summary>Switch to the previous window and loop around to the last window</summary>
-    </key>
-
     <key type="as" name="switch-right">
         <default><![CDATA[['<Super>Right']]]></default>
         <summary>Switch to the right window</summary>
     </key>
-    <key type="as" name="switch-right-loop">
-        <default><![CDATA[['']]]></default>
-        <summary>Switch to the right window and loop around to the left-most window</summary>
-    </key>
     <key type="as" name="switch-left">
         <default><![CDATA[['<Super>Left']]]></default>
         <summary>Switch to the left window</summary>
     </key>
-    <key type="as" name="switch-left-loop">
-        <default><![CDATA[['']]]></default>
-        <summary>Switch to the left window and loop around to the right-most window</summary>
-    </key>
-
     <key type="as" name="switch-up">
         <default><![CDATA[['<Super>Up']]]></default>
         <summary>Switch to the window above</summary>
     </key>
-    <key type="as" name="switch-up-loop">
-        <default><![CDATA[['']]]></default>
-        <summary>Switch to the window above and loop around to the bottom-most window</summary>
-    </key>
     <key type="as" name="switch-down">
         <default><![CDATA[['<Super>Down']]]></default>
         <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 and loop back to the top-most window</summary>
+        <summary>Switch to the window below (with wrap-around)</summary>
     </key>
 
     <key type="as" name="switch-global-right">