X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=e166dd8bdfff95bc37cbe266d07b38007c3619d5;hb=069e9607fa433190307bb8242294a109e88165de;hp=b514916f31f43d28a9d27228653eda6925808112;hpb=4d814a383b099c48ad9b61cb94d25ef16b1a698a;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index b514916f..e166dd8b 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -84,26 +84,15 @@ void setup_action_send_to_desktop(Action *a)
     a->data.sendto.follow = TRUE;
 }
 
-void setup_action_send_to_np_desktop(Action *a)
+void setup_action_send_to_desktop_direction(Action *a)
 {
-    a->data.sendtonextprev.wrap = FALSE;
-    a->data.sendtonextprev.follow = TRUE;
+    a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
-void setup_action_send_to_np_desktop_wrap(Action *a)
+void setup_action_desktop_direction(Action *a)
 {
-    a->data.sendtonextprev.wrap = TRUE;
-    a->data.sendtonextprev.follow = TRUE;
-}
-
-void setup_action_np_desktop(Action *a)
-{
-    a->data.nextprevdesktop.wrap = FALSE;
-}
-
-void setup_action_np_desktop_wrap(Action *a)
-{
-    a->data.nextprevdesktop.wrap = TRUE;
+    a->data.desktopdir.wrap = TRUE;
 }
 
 void setup_action_move_keyboard(Action *a)
@@ -257,11 +246,6 @@ ActionString actionstrings[] =
         action_lower,
         NULL
     },
-    {
-        "focusraise",
-        action_focusraise,
-        NULL
-    },
     {
         "close",
         action_close,
@@ -373,24 +357,24 @@ ActionString actionstrings[] =
         setup_action_send_to_desktop
     },
     {
-        "sendtonextdesktop",
-        action_send_to_next_desktop,
-        setup_action_send_to_np_desktop
+        "sendtodesktopright",
+        action_send_to_desktop_right,
+        setup_action_send_to_desktop_direction
     },
     {
-        "sendtonextdesktopwrap",
-        action_send_to_next_desktop,
-        setup_action_send_to_np_desktop_wrap
+        "sendtodesktopleft",
+        action_send_to_desktop_left,
+        setup_action_send_to_desktop_direction
     },
     {
-        "sendtopreviousdesktop",
-        action_send_to_previous_desktop,
-        setup_action_send_to_np_desktop
+        "sendtodesktopup",
+        action_send_to_desktop_up,
+        setup_action_send_to_desktop_direction
     },
     {
-        "sendtopreviousdesktopwrap",
-        action_send_to_previous_desktop,
-        setup_action_send_to_np_desktop_wrap
+        "sendtodesktopdown",
+        action_send_to_desktop_down,
+        setup_action_send_to_desktop_direction
     },
     {
         "desktop",
@@ -398,64 +382,24 @@ ActionString actionstrings[] =
         NULL
     },
     {
-        "nextdesktop",
-        action_next_desktop,
-        setup_action_np_desktop
-    },
-    {
-        "nextdesktopwrap",
-        action_next_desktop,
-        setup_action_np_desktop_wrap
-    },
-    {
-        "previousdesktop",
-        action_previous_desktop,
-        setup_action_np_desktop
-    },
-    {
-        "previousdesktopwrap",
-        action_previous_desktop,
-        setup_action_np_desktop_wrap
-    },
-    {
-        "nextdesktopcolumn",
-        action_next_desktop_column,
-        setup_action_np_desktop
-    },
-    {
-        "nextdesktopcolumnwrap",
-        action_next_desktop_column,
-        setup_action_np_desktop_wrap
-    },
-    {
-        "previousdesktopcolumn",
-        action_previous_desktop_column,
-        setup_action_np_desktop
-    },
-    {
-        "previousdesktopcolumnwrap",
-        action_previous_desktop_column,
-        setup_action_np_desktop_wrap
-    },
-    {
-        "nextdesktoprow",
-        action_next_desktop_row,
-        setup_action_np_desktop
+        "desktopright",
+        action_desktop_right,
+        setup_action_desktop_direction
     },
     {
-        "nextdesktoprowwrap",
-        action_next_desktop_row,
-        setup_action_np_desktop_wrap
+        "desktopleft",
+        action_desktop_left,
+        setup_action_desktop_direction
     },
     {
-        "previousdesktoprow",
-        action_previous_desktop_row,
-        setup_action_np_desktop
+        "desktopup",
+        action_desktop_up,
+        setup_action_desktop_direction
     },
     {
-        "previousdesktoprowwrap",
-        action_previous_desktop_row,
-        setup_action_np_desktop_wrap
+        "desktopdown",
+        action_desktop_down,
+        setup_action_desktop_direction
     },
     {
         "toggledecorations",
@@ -482,6 +426,21 @@ ActionString actionstrings[] =
         action_moveresize,
         setup_action_resize_keyboard
     },
+    {
+        "toggleshowdesktop",
+        action_toggle_show_desktop,
+        NULL
+    },
+    {
+        "showdesktop",
+        action_show_desktop,
+        NULL
+    },
+    {
+        "unshowdesktop",
+        action_unshow_desktop,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -584,14 +543,71 @@ Action *action_from_string(char *name)
     return a;
 }
 
+Action *action_parse(xmlDocPtr doc, xmlNodePtr node)
+{
+    char *actname;
+    Action *act = NULL;
+    xmlNodePtr n;
+
+    if (parse_attr_string("name", node, &actname)) {
+        if ((act = action_from_string(actname))) {
+            if (act->func == action_execute || act->func == action_restart) {
+                if ((n = parse_find_node("execute", node->xmlChildrenNode)))
+                    act->data.execute.path = parse_string(doc, n);
+            } else if (act->func == action_showmenu) {
+                if ((n = parse_find_node("menu", node->xmlChildrenNode)))
+                    act->data.showmenu.name = parse_string(doc, n);
+            } else if (act->func == action_desktop) {
+                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--;
+            } else if (act->func == action_send_to_desktop) {
+                if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
+                    act->data.sendto.desk = parse_int(doc, n);
+                if (act->data.sendto.desk > 0) act->data.sendto.desk--;
+            } else if (act->func == action_move_relative_horz ||
+                       act->func == action_move_relative_vert ||
+                       act->func == action_resize_relative_horz ||
+                       act->func == action_resize_relative_vert) {
+                if ((n = parse_find_node("delta", node->xmlChildrenNode)))
+                    act->data.relative.delta = parse_int(doc, n);
+            } else if (act->func == action_desktop_right ||
+                       act->func == action_desktop_left ||
+                       act->func == action_desktop_up ||
+                       act->func == action_desktop_down) {
+                if ((n = parse_find_node("wrap", node->xmlChildrenNode))) {
+                    g_message("WRAP %d", parse_bool(doc, n));
+                    act->data.desktopdir.wrap = parse_bool(doc, n);
+                }
+            } else if (act->func == action_send_to_desktop_right ||
+                       act->func == action_send_to_desktop_left ||
+                       act->func == action_send_to_desktop_up ||
+                       act->func == action_send_to_desktop_down) {
+                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);
+            }
+        }
+    }
+    return act;
+}
+
 void action_execute(union ActionData *data)
 {
     GError *e = NULL;
-    if (data->execute.path)
-        if (!g_spawn_command_line_async(data->execute.path, &e)) {
-            g_warning("failed to execute '%s': %s",
-                      data->execute.path, e->message);
+    char *cmd;
+    if (data->execute.path) {
+        cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
+        if (cmd) {
+            if (!g_spawn_command_line_async(cmd, &e)) {
+                g_warning("failed to execute '%s': %s",
+                          cmd, e->message);
+            }
+        } else {
+            g_warning("failed to convert '%s' from utf8", data->execute.path);
         }
+    }
 }
 
 void action_focus(union ActionData *data)
@@ -612,14 +628,6 @@ void action_iconify(union ActionData *data)
         client_iconify(data->client.c, TRUE, TRUE);
 }
 
-void action_focusraise(union ActionData *data)
-{
-    if (data->client.c) {
-        client_focus(data->client.c);
-        stacking_raise(CLIENT_AS_WINDOW(data->client.c));
-    }
-}
-
 void action_raise(union ActionData *data)
 {
     if (data->client.c)
@@ -797,36 +805,6 @@ void action_send_to_desktop(union ActionData *data)
     }
 }
 
-void action_send_to_next_desktop(union ActionData *data)
-{
-    guint d;
-
-    if (!data->sendtonextprev.c) return;
-
-    d = screen_desktop + 1;
-    if (d >= screen_num_desktops) {
-        if (!data->sendtonextprev.wrap) return;
-        d = 0;
-    }
-    client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
-    if (data->sendtonextprev.follow) screen_set_desktop(d);
-}
-
-void action_send_to_previous_desktop(union ActionData *data)
-{
-    guint d;
-
-    if (!data->sendtonextprev.c) return;
-
-    d = screen_desktop - 1;
-    if (d >= screen_num_desktops) {
-        if (!data->sendtonextprev.wrap) return;
-        d = screen_num_desktops - 1;
-    }
-    client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
-    if (data->sendtonextprev.follow) screen_set_desktop(d);
-}
-
 void action_desktop(union ActionData *data)
 {
     if (data->desktop.desk < screen_num_desktops ||
@@ -834,30 +812,6 @@ void action_desktop(union ActionData *data)
         screen_set_desktop(data->desktop.desk);
 }
 
-void action_next_desktop(union ActionData *data)
-{
-    guint d;
-
-    d = screen_desktop + 1;
-    if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
-        d = 0;
-    }
-    screen_set_desktop(d);
-}
-
-void action_previous_desktop(union ActionData *data)
-{
-    guint d;
-
-    d = screen_desktop - 1;
-    if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
-        d = screen_num_desktops - 1;
-    }
-    screen_set_desktop(d);
-}
-
 static void cur_row_col(guint *r, guint *c)
 {
     switch (screen_desktop_layout.orientation) {
@@ -966,17 +920,19 @@ static guint translate_row_col(guint r, guint c)
     return 0;
 }
 
-void action_next_desktop_column(union ActionData *data)
+void action_desktop_right(union ActionData *data)
 {
     guint r, c, d;
 
     cur_row_col(&r, &c);
     ++c;
-    if (c >= screen_desktop_layout.columns)
+    if (c >= screen_desktop_layout.columns) {
+        if (!data->desktopdir.wrap) return;
         c = 0;
+    }
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
+        if (!data->desktopdir.wrap) return;
         ++c;
     }
     d = translate_row_col(r, c);
@@ -984,17 +940,43 @@ void action_next_desktop_column(union ActionData *data)
         screen_set_desktop(d);
 }
 
-void action_previous_desktop_column(union ActionData *data)
+void action_send_to_desktop_right(union ActionData *data)
+{
+    guint r, c, d;
+
+    if (data->sendtodir.c) {
+        cur_row_col(&r, &c);
+        ++c;
+        if (c >= screen_desktop_layout.columns) {
+            if (!data->sendtodir.wrap) return;
+            c = 0;
+        }
+        d = translate_row_col(r, c);
+        if (d >= screen_num_desktops) {
+            if (!data->sendtodir.wrap) return;
+            ++c;
+        }
+        d = translate_row_col(r, c);
+        if (d < screen_num_desktops) {
+            client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
+            if (data->sendtodir.follow) screen_set_desktop(d);
+        }
+    }
+}
+
+void action_desktop_left(union ActionData *data)
 {
     guint r, c, d;
 
     cur_row_col(&r, &c);
     --c;
-    if (c >= screen_desktop_layout.columns)
+    if (c >= screen_desktop_layout.columns) {
+        if (!data->desktopdir.wrap) return;
         c = screen_desktop_layout.columns - 1;
+    }
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
+        if (!data->desktopdir.wrap) return;
         --c;
     }
     d = translate_row_col(r, c);
@@ -1002,17 +984,43 @@ void action_previous_desktop_column(union ActionData *data)
         screen_set_desktop(d);
 }
 
-void action_next_desktop_row(union ActionData *data)
+void action_send_to_desktop_left(union ActionData *data)
+{
+    guint r, c, d;
+
+    if (data->sendtodir.c) {
+        cur_row_col(&r, &c);
+        --c;
+        if (c >= screen_desktop_layout.columns) {
+            if (!data->sendtodir.wrap) return;
+            c = screen_desktop_layout.columns - 1;
+        }
+        d = translate_row_col(r, c);
+        if (d >= screen_num_desktops) {
+            if (!data->sendtodir.wrap) return;
+            --c;
+        }
+        d = translate_row_col(r, c);
+        if (d < screen_num_desktops) {
+            client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
+            if (data->sendtodir.follow) screen_set_desktop(d);
+        }
+    }
+}
+
+void action_desktop_down(union ActionData *data)
 {
     guint r, c, d;
 
     cur_row_col(&r, &c);
     ++r;
-    if (r >= screen_desktop_layout.rows)
+    if (r >= screen_desktop_layout.rows) {
+        if (!data->desktopdir.wrap) return;
         r = 0;
+    }
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
+        if (!data->desktopdir.wrap) return;
         ++r;
     }
     d = translate_row_col(r, c);
@@ -1020,17 +1028,43 @@ void action_next_desktop_row(union ActionData *data)
         screen_set_desktop(d);
 }
 
-void action_previous_desktop_row(union ActionData *data)
+void action_send_to_desktop_down(union ActionData *data)
+{
+    guint r, c, d;
+
+    if (data->sendtodir.c) {
+        cur_row_col(&r, &c);
+        ++r;
+        if (r >= screen_desktop_layout.rows) {
+            if (!data->sendtodir.wrap) return;
+            r = 0;
+        }
+        d = translate_row_col(r, c);
+        if (d >= screen_num_desktops) {
+            if (!data->sendtodir.wrap) return;
+            ++r;
+        }
+        d = translate_row_col(r, c);
+        if (d < screen_num_desktops) {
+            client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
+            if (data->sendtodir.follow) screen_set_desktop(d);
+        }
+    }
+}
+
+void action_desktop_up(union ActionData *data)
 {
     guint r, c, d;
 
     cur_row_col(&r, &c);
     --r;
-    if (r >= screen_desktop_layout.rows)
+    if (r >= screen_desktop_layout.rows) {
+        if (!data->desktopdir.wrap) return;
         r = screen_desktop_layout.rows - 1;
+    }
     d = translate_row_col(r, c);
     if (d >= screen_num_desktops) {
-        if (!data->nextprevdesktop.wrap) return;
+        if (!data->desktopdir.wrap) return;
         --r;
     }
     d = translate_row_col(r, c);
@@ -1038,6 +1072,30 @@ void action_previous_desktop_row(union ActionData *data)
         screen_set_desktop(d);
 }
 
+void action_send_to_desktop_up(union ActionData *data)
+{
+    guint r, c, d;
+
+    if (data->sendtodir.c) {
+        cur_row_col(&r, &c);
+        --r;
+        if (r >= screen_desktop_layout.rows) {
+            if (!data->sendtodir.wrap) return;
+            r = screen_desktop_layout.rows - 1;
+        }
+        d = translate_row_col(r, c);
+        if (d >= screen_num_desktops) {
+            if (!data->sendtodir.wrap) return;
+            --r;
+        }
+        d = translate_row_col(r, c);
+        if (d < screen_num_desktops) {
+            client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
+            if (data->sendtodir.follow) screen_set_desktop(d);
+        }
+    }
+}
+
 void action_toggle_decorations(union ActionData *data)
 {
     Client *c = data->client.c;;
@@ -1060,7 +1118,7 @@ void action_moveresize(union ActionData *data)
 
 void action_restart(union ActionData *data)
 {
-    ob_restart_path = data->execute.path;
+    ob_restart_path = g_strdup(data->execute.path);
     ob_shutdown = ob_restart = TRUE;
 }
 
@@ -1145,3 +1203,18 @@ void action_toggle_layer(union ActionData *data)
             client_set_layer(c, c->above ? 0 : 1);
     }
 }
+
+void action_toggle_show_desktop(union ActionData *data)
+{
+    screen_show_desktop(!screen_showing_desktop);
+}
+
+void action_show_desktop(union ActionData *data)
+{
+    screen_show_desktop(TRUE);
+}
+
+void action_unshow_desktop(union ActionData *data)
+{
+    screen_show_desktop(FALSE);
+}