M menu.c → menu.c

@@ -155,16 +155,29 @@ return;
     case Button3:
       break;
     case Button4:
-      /* scroll up changes to previous virtual screen */
+      /* scroll up changes to previous virtual screen, wraps around */
       if (!c && e->type == ButtonPress)
-        if (numvirtuals > 1 && virt > 0)
-          switch_to(virt - 1);
+      {
+        if (numvirtuals > 1) {
+          if (virt > 0) {
+            switch_to(virt - 1);
+          } else {
+            switch_to(numvirtuals - 1);
+          }
+        }
+      }
       return;
     case Button5:
-      /* scroll down changes to next virtual screen */
-      if (!c && e->type == ButtonPress)
-        if (numvirtuals > 1 && virt < numvirtuals - 1)
-          switch_to(virt + 1);
+      /* scroll down changes to next virtual screen, wraps around */
+      if (!c && e->type == ButtonPress) {
+        if (numvirtuals > 1) {
+          if (virt < numvirtuals - 1) {
+            switch_to(virt + 1);
+          } else {
+            switch_to(0);
+          }
+        }
+      }
       return;
     default:
       return;