X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=e166dd8bdfff95bc37cbe266d07b38007c3619d5;hb=f0b09e265a9b5c333ae27d57db6be79a3da6312f;hp=eb19426b7eee06eeee61a73a913763e757e94c15;hpb=e48325700788622cc82b34f1ede5f02f74911d41;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index eb19426b..e166dd8b 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -246,11 +246,6 @@ ActionString actionstrings[] =
         action_lower,
         NULL
     },
-    {
-        "focusraise",
-        action_focusraise,
-        NULL
-    },
     {
         "close",
         action_close,
@@ -431,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,
@@ -533,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)
@@ -561,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)
@@ -1059,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;
 }
 
@@ -1144,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);
+}