add the decorations action

diff --git a/Makefile.am b/Makefile.am
index 4d2b78a8b6bebe091696d3c40c1e3d1f86c543d0..b067543c4249b902a9b00bc6f03c7e33288a47cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,6 +160,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/close.c \
        openbox/actions/cyclewindows.c \
        openbox/actions/debug.c \
+       openbox/actions/decorations.c \
        openbox/actions/directionalcyclewindows.c \
        openbox/actions/directionaltargetwindow.c \
        openbox/actions/execute.c \

diff --git a/openbox/action.c b/openbox/action.c
index 61c29721d72f0e2eb6c1f8dbce1b4b0047c6196a..2dca0dd5eeea079ae8d72b1429b63d5c023bd01d 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -432,11 +432,6 @@ ActionString actionstrings[] =
         action_desktop_dir,
         setup_action_desktop_down
     },
-    {
-        "toggledecorations",
-        action_toggle_decorations,
-        setup_client_action
-    },
     {
         "toggledockautohide",
         action_toggle_dockautohide,
@@ -890,16 +885,6 @@ void action_desktop_last(union ActionData *data)
         screen_set_desktop(screen_last_desktop, TRUE);
 }
 
-void action_toggle_decorations(union ActionData *data)
-{
-    ObClient *c = data->client.any.c;
-
-    client_action_start(data);
-    client_set_undecorated(c, !c->undecorated);
-    client_action_end(data, FALSE);
-}
-
-
 void action_directional_focus(union ActionData *data)
 {
     /* if using focus_delay, stop the timer now so that focus doesn't go moving

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index c41c5f857e9ce06c3502b929e009eb6ee08b0be0..7297d2352ab0a8cf5327436fc4a9dee51187c8ca 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -31,4 +31,5 @@ void action_all_startup()
     action_directionalcyclewindows_startup();
     action_directionaltargetwindow_startup();
     action_resize_startup();
+    action_decorations_startup();
 }

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index cae5031887312b8253b89efcee24feb7384be6ae..477b5fe9ae975fba9a9aa9a381b05521f20a7f7c 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -32,5 +32,6 @@ void action_omnipresent_startup();
 void action_directionalcyclewindows_startup();
 void action_directionaltargetwindow_startup();
 void action_resize_startup();
+void action_decorations_startup();
 
 #endif

diff --git a/openbox/actions/decorations.c b/openbox/actions/decorations.c
new file mode 100644 (file)
index 0000000..8a816ae
--- /dev/null
+++ b/openbox/actions/decorations.c
@@ -0,0 +1,62 @@
+#include "openbox/actions.h"
+#include "openbox/client.h"
+
+typedef struct {
+    gboolean toggle;
+    gboolean on;
+} Options;
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static void     free_func(gpointer options);
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_decorations_startup()
+{
+    actions_register("Decorations",
+                     setup_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+}
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->toggle = TRUE;
+
+    if ((n = parse_find_node("decorations", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "toggle")) {
+            o->toggle = FALSE;
+            o->on = parse_bool(doc, n);
+        }
+        g_free(s);
+    }
+
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (data->client) {
+        actions_client_move(data, TRUE);
+        if (o->toggle || o->on != !data->client->undecorated)
+            client_set_undecorated(data->client, !data->client->undecorated);
+        actions_client_move(data, FALSE);
+    }
+
+    return FALSE;
+}