X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=f8b2b7b3845175971043169876bd2b57fbcf7f63;hb=e180bb036da9d9557e819cdbc67b7a8720731834;hp=797552f69abd2c649704f496fcf29c5798ef2795;hpb=378adaa94f0fac07dc65f0531e950c7ec8944cdf;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 797552f6..f8b2b7b3 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -293,6 +293,7 @@ void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
     (*a)->data.cycle.forward = TRUE;
     (*a)->data.cycle.dialog = TRUE;
     (*a)->data.cycle.dock_windows = FALSE;
+    (*a)->data.cycle.all_desktops = FALSE;
 }
 
 void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
@@ -302,6 +303,7 @@ void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
     (*a)->data.cycle.forward = FALSE;
     (*a)->data.cycle.dialog = TRUE;
     (*a)->data.cycle.dock_windows = FALSE;
+    (*a)->data.cycle.all_desktops = FALSE;
 }
 
 void setup_action_movefromedge_north(ObAction **a, ObUserAction uact)
@@ -1009,6 +1011,9 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                     act->data.cycle.dialog = parse_bool(doc, n);
                 if ((n = parse_find_node("panels", node->xmlChildrenNode)))
                     act->data.cycle.dock_windows = parse_bool(doc, n);
+                if ((n = parse_find_node("allDesktops",
+                                         node->xmlChildrenNode)))
+                    act->data.cycle.all_desktops = parse_bool(doc, n);
             } else if (act->func == action_directional_focus) {
                 if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
                     act->data.interdiraction.dialog = parse_bool(doc, n);
@@ -1512,7 +1517,7 @@ void action_send_to_desktop(union ActionData *data)
         data->sendto.desk == DESKTOP_ALL) {
         client_set_desktop(c, data->sendto.desk, data->sendto.follow);
         if (data->sendto.follow)
-            screen_set_desktop(data->sendto.desk);
+            screen_set_desktop(data->sendto.desk, TRUE);
     }
 }
 
@@ -1529,12 +1534,12 @@ void action_desktop(union ActionData *data)
         if (data->desktop.desk < screen_num_desktops ||
             data->desktop.desk == DESKTOP_ALL)
         {
-            screen_set_desktop(data->desktop.desk);
+            screen_set_desktop(data->desktop.desk, TRUE);
             if (data->inter.any.interactive)
                 screen_desktop_popup(data->desktop.desk, TRUE);
         }
     } else if (data->inter.cancel) {
-        screen_set_desktop(first);
+        screen_set_desktop(first, TRUE);
     }
 
     if (!data->inter.any.interactive || data->inter.final) {
@@ -1557,7 +1562,7 @@ void action_desktop_dir(union ActionData *data)
         !data->sendtodir.inter.final ||
         data->sendtodir.inter.cancel)
     {
-        screen_set_desktop(d);
+        screen_set_desktop(d, TRUE);
     }
 }
 
@@ -1579,13 +1584,13 @@ void action_send_to_desktop_dir(union ActionData *data)
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow)
-            screen_set_desktop(d);
+            screen_set_desktop(d, TRUE);
     }
 }
 
 void action_desktop_last(union ActionData *data)
 {
-    screen_set_desktop(screen_last_desktop);
+    screen_set_desktop(screen_last_desktop, TRUE);
 }
 
 void action_toggle_decorations(union ActionData *data)
@@ -1716,26 +1721,6 @@ void action_moveresize(union ActionData *data)
                               c->frame->size.right,
                               c->area.height + c->frame->size.top +
                               c->frame->size.bottom));
-        const gchar *c;
-        if (corner == prop_atoms.net_wm_moveresize_size_topright)
-            c = "topright";
-        else if (corner == prop_atoms.net_wm_moveresize_size_top)
-            c = "top";
-        else if (corner == prop_atoms.net_wm_moveresize_size_topleft)
-            c = "topleft";
-        else if (corner == prop_atoms.net_wm_moveresize_size_right)
-            c = "right";
-        else if (corner == prop_atoms.net_wm_moveresize_move)
-            c = "middle";
-        else if (corner == prop_atoms.net_wm_moveresize_size_left)
-            c = "left";
-        else if (corner == prop_atoms.net_wm_moveresize_size_bottomright)
-            c = "bottomright";
-        else if (corner == prop_atoms.net_wm_moveresize_size_bottom)
-            c = "bottom";
-        else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft)
-            c = "bottomleft";
-        ob_debug("corner: %s\n", c);
     }
 
     moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
@@ -1771,6 +1756,7 @@ void action_cycle_windows(union ActionData *data)
     event_halt_focus_delay();
 
     focus_cycle(data->cycle.forward,
+                data->cycle.all_desktops,
                 data->cycle.dock_windows,
                 data->cycle.linear, data->any.interactive,
                 data->cycle.dialog,