all repos — openbox @ 1923939bba3c1b2590d14adf01b667eee40fa8cf

openbox fork - make it a bit more like ryudo 

02:33 (@xor) omg yes
02:33 (@xor) grid workspace cycling of d3th
Dana Jansens danakj@orodu.net
commit

1923939bba3c1b2590d14adf01b667eee40fa8cf

parent

827e7baf20c3d0bb8251f5d024d304d0f9bebbe6

1 files changed, 12 insertions(+), 12 deletions(-)

jump to
M openbox/action.c → openbox/action.c 
@@ -578,13 +578,13 @@ guint r, c, d;
 
     cur_row_col(&r, &c);
     ++c;
+    if (c >= screen_desktop_layout.columns)
+        c = 0;
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
         if (!data->nextprevdesktop.wrap) return;
-        c = 0;
+        ++c;
     }
-    if (d >= screen_num_desktops)
-        ++c;
     d = translate_row_col(r, c);
     if (d < screen_num_desktops)
         screen_set_desktop(d);

@@ -596,13 +596,13 @@ guint r, c, d;
 
     cur_row_col(&r, &c);
     --c;
+    if (c >= screen_desktop_layout.columns)
+        c = screen_desktop_layout.columns - 1;
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
         if (!data->nextprevdesktop.wrap) return;
-        c = screen_desktop_layout.columns - 1;
+        --c;
     }
-    if (d >= screen_num_desktops)
-        --c;
     d = translate_row_col(r, c);
     if (d < screen_num_desktops)
         screen_set_desktop(d);

@@ -614,13 +614,13 @@ guint r, c, d;
 
     cur_row_col(&r, &c);
     ++r;
+    if (r >= screen_desktop_layout.rows)
+        r = 0;
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
         if (!data->nextprevdesktop.wrap) return;
-        r = 0;
+        ++r;
     }
-    if (d >= screen_num_desktops)
-        ++r;
     d = translate_row_col(r, c);
     if (d < screen_num_desktops)
         screen_set_desktop(d);

@@ -632,13 +632,13 @@ guint r, c, d;
 
     cur_row_col(&r, &c);
     --r;
+    if (r >= screen_desktop_layout.rows)
+        r = screen_desktop_layout.rows - 1;
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
         if (!data->nextprevdesktop.wrap) return;
-        c = screen_desktop_layout.rows - 1;
+        --r;
     }
-    if (d >= screen_num_desktops)
-        --r;
     d = translate_row_col(r, c);
     if (d < screen_num_desktops)
         screen_set_desktop(d);