define DEBUG, NDEBUG, and G_DISABLE_ASSERTS

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 9d2554f5a1cdcb584a6f3fa6d07213bae3edf48b..5f60019ecca45d2989fb07e16907170ef545212f 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -114,48 +114,56 @@ void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_east(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_EAST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_south(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_west(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_WEST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact)
 {
     (*a)->data.interdiraction.inter.any.interactive = TRUE;
     (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
+    (*a)->data.interdiraction.dialog = TRUE;
 }
 
 void setup_action_send_to_desktop(ObAction **a, ObUserAction uact)
@@ -226,7 +234,7 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
 
 void setup_action_desktop(ObAction **a, ObUserAction uact)
 {
-    (*a)->data.desktop.inter.any.interactive = TRUE;
+    (*a)->data.desktop.inter.any.interactive = FALSE;
 }
 
 void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
@@ -282,6 +290,7 @@ void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
     (*a)->data.cycle.inter.any.interactive = TRUE;
     (*a)->data.cycle.linear = FALSE;
     (*a)->data.cycle.forward = TRUE;
+    (*a)->data.cycle.dialog = TRUE;
 }
 
 void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
@@ -289,6 +298,7 @@ void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
     (*a)->data.cycle.inter.any.interactive = TRUE;
     (*a)->data.cycle.linear = FALSE;
     (*a)->data.cycle.forward = FALSE;
+    (*a)->data.cycle.dialog = TRUE;
 }
 
 void setup_action_movetoedge_north(ObAction **a, ObUserAction uact)
@@ -788,6 +798,13 @@ ActionString actionstrings[] =
     }
 };
 
+/* only key bindings can be interactive. thus saith the xor.
+   because of how the mouse is grabbed, mouse events dont even get
+   read during interactive events, so no dice! >:) */
+#define INTERACTIVE_LIMIT(a, uact) \
+    if (uact != OB_USER_ACTION_KEYBOARD_KEY) \
+        a->data.any.interactive = FALSE;
+
 ObAction *action_from_string(const gchar *name, ObUserAction uact)
 {
     ObAction *a = NULL;
@@ -800,11 +817,7 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact)
             a = action_new(actionstrings[i].func);
             if (actionstrings[i].setup)
                 actionstrings[i].setup(&a, uact);
-            /* only key bindings can be interactive. thus saith the xor.
-             because of how the mouse is grabbed, mouse events dont even get
-             read during interactive events, so no dice! >:) */
-            if (uact != OB_USER_ACTION_KEYBOARD_KEY)
-                a->data.any.interactive = FALSE;
+            INTERACTIVE_LIMIT(a, uact);
             break;
         }
     if (!exist)
@@ -843,6 +856,9 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                 if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
                     act->data.desktop.desk = parse_int(doc, n);
                 if (act->data.desktop.desk > 0) act->data.desktop.desk--;
+                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+                    act->data.desktop.inter.any.interactive =
+                        parse_bool(doc, n);
            } else if (act->func == action_send_to_desktop) {
                 if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
                     act->data.sendto.desk = parse_int(doc, n);
@@ -852,19 +868,31 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             } else if (act->func == action_desktop_dir) {
                 if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
                     act->data.desktopdir.wrap = parse_bool(doc, n); 
+                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+                    act->data.desktopdir.inter.any.interactive =
+                        parse_bool(doc, n);
             } else if (act->func == action_send_to_desktop_dir) {
                 if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
                     act->data.sendtodir.wrap = parse_bool(doc, n);
                 if ((n = parse_find_node("follow", node->xmlChildrenNode)))
                     act->data.sendtodir.follow = parse_bool(doc, n);
+                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+                    act->data.sendtodir.inter.any.interactive =
+                        parse_bool(doc, n);
             } else if (act->func == action_activate) {
                 if ((n = parse_find_node("here", node->xmlChildrenNode)))
                     act->data.activate.here = parse_bool(doc, n);
             } else if (act->func == action_cycle_windows) {
                 if ((n = parse_find_node("linear", node->xmlChildrenNode)))
                     act->data.cycle.linear = parse_bool(doc, n);
+                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+                    act->data.cycle.dialog = parse_bool(doc, n);
+            } else if (act->func == action_directional_focus) {
+                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+                    act->data.cycle.dialog = parse_bool(doc, n);
             }
         }
+        INTERACTIVE_LIMIT(act, uact);
         g_free(actname);
     }
     return act;
@@ -1030,6 +1058,8 @@ void action_lower(union ActionData *data)
     client_action_start(data);
     stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
     client_action_end(data);
+
+    focus_order_to_bottom(data->client.any.c);
 }
 
 void action_close(union ActionData *data)
@@ -1210,7 +1240,7 @@ void action_desktop(union ActionData *data)
         screen_set_desktop(first);
     }
 
-    if (data->inter.any.interactive && data->inter.final) {
+    if (!data->inter.any.interactive || data->inter.final) {
         screen_desktop_popup(0, FALSE);
         first = (unsigned) -1;
     }
@@ -1222,12 +1252,13 @@ void action_desktop_dir(union ActionData *data)
 
     d = screen_cycle_desktop(data->desktopdir.dir,
                              data->desktopdir.wrap,
-                             data->sendtodir.linear,
+                             data->desktopdir.linear,
                              data->desktopdir.inter.any.interactive,
                              data->desktopdir.inter.final,
                              data->desktopdir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         screen_set_desktop(d);
     }
@@ -1246,7 +1277,8 @@ void action_send_to_desktop_dir(union ActionData *data)
                              data->sendtodir.inter.final,
                              data->sendtodir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow)
@@ -1338,14 +1370,14 @@ void action_showmenu(union ActionData *data)
 void action_cycle_windows(union ActionData *data)
 {
     focus_cycle(data->cycle.forward, data->cycle.linear,
-                data->cycle.inter.any.interactive,
+                data->cycle.dialog,
                 data->cycle.inter.final, data->cycle.inter.cancel);
 }
 
 void action_directional_focus(union ActionData *data)
 {
     focus_directional_cycle(data->interdiraction.direction,
-                            data->interdiraction.inter.any.interactive,
+                            data->interdiraction.dialog,
                             data->interdiraction.inter.final,
                             data->interdiraction.inter.cancel);
 }