X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=3786feb363cdb0b649b188c9d9370ccbda426f35;hb=8228e90450c147c647465d281fa16caeca07fd10;hp=8e717e65f18104b8e8d8738f5419623c868217e5;hpb=74aa6fe7cce662817ea4bca516d24d6d8d1e9a9b;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 8e717e65..3786feb3 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -17,306 +17,6 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#include "debug.h"
-#include "client.h"
-#include "focus.h"
-#include "focus_cycle.h"
-#include "moveresize.h"
-#include "menu.h"
-#include "prop.h"
-#include "stacking.h"
-#include "screen.h"
-#include "action.h"
-#include "openbox.h"
-#include "grab.h"
-#include "keyboard.h"
-#include "event.h"
-#include "dock.h"
-#include "config.h"
-#include "mainloop.h"
-#include "startupnotify.h"
-#include "gettext.h"
-
-#include <glib.h>
-
-
-
-typedef struct
-{
-    const gchar *name;
-    void (*func)(union ActionData *);
-    void (*setup)(ObAction **, ObUserAction uact);
-} ActionString;
-
-static ObAction *action_new(void (*func)(union ActionData *data))
-{
-    ObAction *a = g_new0(ObAction, 1);
-    a->ref = 1;
-    a->func = func;
-
-    return a;
-}
-
-void action_ref(ObAction *a)
-{
-    ++a->ref;
-}
-
-void action_unref(ObAction *a)
-{
-    if (a == NULL) return;
-
-    if (--a->ref > 0) return;
-
-    /* deal with pointers */
-    if (a->func == action_execute || a->func == action_restart)
-        g_free(a->data.execute.path);
-    else if (a->func == action_debug)
-        g_free(a->data.debug.string);
-    else if (a->func == action_showmenu)
-        g_free(a->data.showmenu.name);
-
-    g_free(a);
-}
-
-ObAction* action_copy(const ObAction *src)
-{
-    ObAction *a = action_new(src->func);
-
-    a->data = src->data;
-
-    /* deal with pointers */
-    if (a->func == action_execute || a->func == action_restart)
-        a->data.execute.path = g_strdup(a->data.execute.path);
-    else if (a->func == action_debug)
-        a->data.debug.string = g_strdup(a->data.debug.string);
-    else if (a->func == action_showmenu)
-        a->data.showmenu.name = g_strdup(a->data.showmenu.name);
-
-    return a;
-}
-
-void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
-    (*a)->data.sendtodir.linear = TRUE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
-    (*a)->data.sendtodir.linear = TRUE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
-    (*a)->data.sendtodir.linear = FALSE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
-    (*a)->data.sendtodir.linear = FALSE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_NORTH;
-    (*a)->data.sendtodir.linear = FALSE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.sendtodir.inter.any.interactive = TRUE;
-    (*a)->data.sendtodir.dir = OB_DIRECTION_SOUTH;
-    (*a)->data.sendtodir.linear = FALSE;
-    (*a)->data.sendtodir.wrap = TRUE;
-    (*a)->data.sendtodir.follow = TRUE;
-}
-
-void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_WEST;
-    (*a)->data.desktopdir.linear = TRUE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_desktop_next(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_EAST;
-    (*a)->data.desktopdir.linear = TRUE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_desktop_left(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_WEST;
-    (*a)->data.desktopdir.linear = FALSE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_desktop_right(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_EAST;
-    (*a)->data.desktopdir.linear = FALSE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_desktop_up(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_NORTH;
-    (*a)->data.desktopdir.linear = FALSE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_desktop_down(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.desktopdir.inter.any.interactive = TRUE;
-    (*a)->data.desktopdir.dir = OB_DIRECTION_SOUTH;
-    (*a)->data.desktopdir.linear = FALSE;
-    (*a)->data.desktopdir.wrap = TRUE;
-}
-
-void setup_action_movefromedge_north(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
-    (*a)->data.diraction.hang = TRUE;
-}
-
-void setup_action_movefromedge_south(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
-    (*a)->data.diraction.hang = TRUE;
-}
-
-void setup_action_movefromedge_east(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_EAST;
-    (*a)->data.diraction.hang = TRUE;
-}
-
-void setup_action_movefromedge_west(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_WEST;
-    (*a)->data.diraction.hang = TRUE;
-}
-
-void setup_action_movetoedge_north(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
-    (*a)->data.diraction.hang = FALSE;
-}
-
-void setup_action_movetoedge_south(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
-    (*a)->data.diraction.hang = FALSE;
-}
-
-void setup_action_movetoedge_east(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_EAST;
-    (*a)->data.diraction.hang = FALSE;
-}
-
-void setup_action_movetoedge_west(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_WEST;
-    (*a)->data.diraction.hang = FALSE;
-}
-
-void setup_action_growtoedge_north(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
-}
-
-void setup_action_growtoedge_south(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
-}
-
-void setup_action_growtoedge_east(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_EAST;
-}
-
-void setup_action_growtoedge_west(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.diraction.direction = OB_DIRECTION_WEST;
-}
-
-void setup_action_top_layer(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.layer.layer = 1;
-}
-
-void setup_action_normal_layer(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.layer.layer = 0;
-}
-
-void setup_action_bottom_layer(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-    (*a)->data.layer.layer = -1;
-}
-
-void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.addremovedesktop.current = TRUE;
-}
-
-void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.addremovedesktop.current = FALSE;
-}
-
-void setup_client_action(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS;
-}
-
 ActionString actionstrings[] =
 {
     {
@@ -329,146 +29,6 @@ ActionString actionstrings[] =
         action_unshaderaise,
         setup_client_action
     },
-    {
-        "sendtodesktopnext",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_next
-    },
-    {
-        "sendtodesktopprevious",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_prev
-    },
-    {
-        "sendtodesktopright",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_right
-    },
-    {
-        "sendtodesktopleft",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_left
-    },
-    {
-        "sendtodesktopup",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_up
-    },
-    {
-        "sendtodesktopdown",
-        action_send_to_desktop_dir,
-        setup_action_send_to_desktop_down
-    },
-    {
-        "toggledockautohide",
-        action_toggle_dockautohide,
-        NULL
-    },
-    {
-        "sendtotoplayer",
-        action_send_to_layer,
-        setup_action_top_layer
-    },
-    {
-        "togglealwaysontop",
-        action_toggle_layer,
-        setup_action_top_layer
-    },
-    {
-        "sendtonormallayer",
-        action_send_to_layer,
-        setup_action_normal_layer
-    },
-    {
-        "sendtobottomlayer",
-        action_send_to_layer,
-        setup_action_bottom_layer
-    },
-    {
-        "togglealwaysonbottom",
-        action_toggle_layer,
-        setup_action_bottom_layer
-    },
-    {
-        "movefromedgenorth",
-        action_movetoedge,
-        setup_action_movefromedge_north
-    },
-    {
-        "movefromedgesouth",
-        action_movetoedge,
-        setup_action_movefromedge_south
-    },
-    {
-        "movefromedgewest",
-        action_movetoedge,
-        setup_action_movefromedge_west
-    },
-    {
-        "movefromedgeeast",
-        action_movetoedge,
-        setup_action_movefromedge_east
-    },
-    {
-        "movetoedgenorth",
-        action_movetoedge,
-        setup_action_movetoedge_north
-    },
-    {
-        "movetoedgesouth",
-        action_movetoedge,
-        setup_action_movetoedge_south
-    },
-    {
-        "movetoedgewest",
-        action_movetoedge,
-        setup_action_movetoedge_west
-    },
-    {
-        "movetoedgeeast",
-        action_movetoedge,
-        setup_action_movetoedge_east
-    },
-    {
-        "growtoedgenorth",
-        action_growtoedge,
-        setup_action_growtoedge_north
-    },
-    {
-        "growtoedgesouth",
-        action_growtoedge,
-        setup_action_growtoedge_south
-    },
-    {
-        "growtoedgewest",
-        action_growtoedge,
-        setup_action_growtoedge_west
-    },
-    {
-        "growtoedgeeast",
-        action_growtoedge,
-        setup_action_growtoedge_east
-    },
-    {
-        "adddesktoplast",
-        action_add_desktop,
-        setup_action_addremove_desktop_last
-    },
-    {
-        "removedesktoplast",
-        action_remove_desktop,
-        setup_action_addremove_desktop_last
-    },
-    {
-        "adddesktopcurrent",
-        action_add_desktop,
-        setup_action_addremove_desktop_current
-    },
-    {
-        "removedesktopcurrent",
-        action_remove_desktop,
-        setup_action_addremove_desktop_current
-    },
     {
         NULL,
         NULL,
@@ -476,64 +36,6 @@ 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;
-    gboolean exist = FALSE;
-    gint i;
-
-    for (i = 0; actionstrings[i].name; i++)
-        if (!g_ascii_strcasecmp(name, actionstrings[i].name)) {
-            exist = TRUE;
-            a = action_new(actionstrings[i].func);
-            if (actionstrings[i].setup)
-                actionstrings[i].setup(&a, uact);
-            if (a)
-                INTERACTIVE_LIMIT(a, uact);
-            break;
-        }
-    if (!exist)
-        g_message(_("Invalid action '%s' requested. No such action exists."),
-                  name);
-    if (!a)
-        g_message(_("Invalid use of action '%s'. Action will be ignored."),
-                  name);
-    return a;
-}
-
-ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                       ObUserAction uact)
-{
-    gchar *actname;
-    ObAction *act = NULL;
-    xmlNodePtr n;
-
-    if (parse_attr_string("name", node, &actname)) {
-        if ((act = action_from_string(actname, uact))) {
-            } else if (act->func == action_desktop) {
-            } 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);
-            INTERACTIVE_LIMIT(act, uact);
-        }
-        g_free(actname);
-    }
-    return act;
-}
-
-
 void action_unshaderaise(union ActionData *data)
 {
     if (data->client.any.c->shaded)
@@ -549,244 +51,3 @@ void action_shadelower(union ActionData *data)
     else
         action_shade(data);
 }
-
-void action_send_to_desktop_dir(union ActionData *data)
-{
-    ObClient *c = data->sendtodir.inter.any.c;
-    guint d;
-
-    if (!client_normal(c)) return;
-
-    d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
-                             data->sendtodir.linear,
-                             data->sendtodir.inter.any.interactive,
-                             data->sendtodir.inter.final,
-                             data->sendtodir.inter.cancel);
-    /* only move the desktop when the action is complete. if we switch
-       desktops during the interactive action, focus will move but with
-       NotifyWhileGrabbed and applications don't like that. */
-    if (!data->sendtodir.inter.any.interactive ||
-        (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
-    {
-        client_set_desktop(c, d, data->sendtodir.follow, FALSE);
-        if (data->sendtodir.follow && d != screen_desktop)
-            screen_set_desktop(d, TRUE);
-    }
-}
-
-void action_directional_focus(union ActionData *data)
-{
-    /* if using focus_delay, stop the timer now so that focus doesn't go moving
-       on us */
-    event_halt_focus_delay();
-
-    focus_directional_cycle(data->interdiraction.direction,
-                            data->interdiraction.dock_windows,
-                            data->interdiraction.desktop_windows,
-                            data->any.interactive,
-                            data->interdiraction.dialog,
-                            data->interdiraction.inter.final,
-                            data->interdiraction.inter.cancel);
-}
-
-void action_movetoedge(union ActionData *data)
-{
-    gint x, y;
-    ObClient *c = data->diraction.any.c;
-
-    x = c->frame->area.x;
-    y = c->frame->area.y;
-    
-    switch(data->diraction.direction) {
-    case OB_DIRECTION_NORTH:
-        y = client_directional_edge_search(c, OB_DIRECTION_NORTH,
-                                           data->diraction.hang)
-            - (data->diraction.hang ? c->frame->area.height : 0);
-        break;
-    case OB_DIRECTION_WEST:
-        x = client_directional_edge_search(c, OB_DIRECTION_WEST,
-                                           data->diraction.hang)
-            - (data->diraction.hang ? c->frame->area.width : 0);
-        break;
-    case OB_DIRECTION_SOUTH:
-        y = client_directional_edge_search(c, OB_DIRECTION_SOUTH,
-                                           data->diraction.hang)
-            - (data->diraction.hang ? 0 : c->frame->area.height);
-        break;
-    case OB_DIRECTION_EAST:
-        x = client_directional_edge_search(c, OB_DIRECTION_EAST,
-                                           data->diraction.hang)
-            - (data->diraction.hang ? 0 : c->frame->area.width);
-        break;
-    default:
-        g_assert_not_reached();
-    }
-    frame_frame_gravity(c->frame, &x, &y, c->area.width, c->area.height);
-    client_action_start(data);
-    client_move(c, x, y);
-    client_action_end(data, FALSE);
-}
-
-void action_growtoedge(union ActionData *data)
-{
-    gint x, y, width, height, dest;
-    ObClient *c = data->diraction.any.c;
-    Rect *a;
-
-    a = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, &c->frame->area);
-    x = c->frame->area.x;
-    y = c->frame->area.y;
-    /* get the unshaded frame's dimensions..if it is shaded */
-    width = c->area.width + c->frame->size.left + c->frame->size.right;
-    height = c->area.height + c->frame->size.top + c->frame->size.bottom;
-
-    switch(data->diraction.direction) {
-    case OB_DIRECTION_NORTH:
-        if (c->shaded) break; /* don't allow vertical resize if shaded */
-
-        dest = client_directional_edge_search(c, OB_DIRECTION_NORTH, FALSE);
-        if (a->y == y)
-            height = height / 2;
-        else {
-            height = c->frame->area.y + height - dest;
-            y = dest;
-        }
-        break;
-    case OB_DIRECTION_WEST:
-        dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE);
-        if (a->x == x)
-            width = width / 2;
-        else {
-            width = c->frame->area.x + width - dest;
-            x = dest;
-        }
-        break;
-    case OB_DIRECTION_SOUTH:
-        if (c->shaded) break; /* don't allow vertical resize if shaded */
-
-        dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH, FALSE);
-        if (a->y + a->height == y + c->frame->area.height) {
-            height = c->frame->area.height / 2;
-            y = a->y + a->height - height;
-        } else
-            height = dest - c->frame->area.y;
-        y += (height - c->frame->area.height) % c->size_inc.height;
-        height -= (height - c->frame->area.height) % c->size_inc.height;
-        break;
-    case OB_DIRECTION_EAST:
-        dest = client_directional_edge_search(c, OB_DIRECTION_EAST, FALSE);
-        if (a->x + a->width == x + c->frame->area.width) {
-            width = c->frame->area.width / 2;
-            x = a->x + a->width - width;
-        } else
-            width = dest - c->frame->area.x;
-        x += (width - c->frame->area.width) % c->size_inc.width;
-        width -= (width - c->frame->area.width) % c->size_inc.width;
-        break;
-    default:
-        g_assert_not_reached();
-    }
-    width -= c->frame->size.left + c->frame->size.right;
-    height -= c->frame->size.top + c->frame->size.bottom;
-    frame_frame_gravity(c->frame, &x, &y, width, height);
-    client_action_start(data);
-    client_move_resize(c, x, y, width, height);
-    client_action_end(data, FALSE);
-    g_free(a);
-}
-
-void action_send_to_layer(union ActionData *data)
-{
-    client_set_layer(data->layer.any.c, data->layer.layer);
-}
-
-void action_toggle_layer(union ActionData *data)
-{
-    ObClient *c = data->layer.any.c;
-
-    client_action_start(data);
-    if (data->layer.layer < 0)
-        client_set_layer(c, c->below ? 0 : -1);
-    else if (data->layer.layer > 0)
-        client_set_layer(c, c->above ? 0 : 1);
-    client_action_end(data, config_focus_under_mouse);
-}
-
-void action_toggle_dockautohide(union ActionData *data)
-{
-    config_dock_hide = !config_dock_hide;
-    dock_configure();
-}
-
-void action_add_desktop(union ActionData *data)
-{
-    client_action_start(data);
-    screen_set_num_desktops(screen_num_desktops+1);
-
-    /* move all the clients over */
-    if (data->addremovedesktop.current) {
-        GList *it;
-
-        for (it = client_list; it; it = g_list_next(it)) {
-            ObClient *c = it->data;
-            if (c->desktop != DESKTOP_ALL && c->desktop >= screen_desktop)
-                client_set_desktop(c, c->desktop+1, FALSE, TRUE);
-        }
-    }
-
-    client_action_end(data, config_focus_under_mouse);
-}
-
-void action_remove_desktop(union ActionData *data)
-{
-    guint rmdesktop, movedesktop;
-    GList *it, *stacking_copy;
-
-    if (screen_num_desktops < 2) return;
-
-    client_action_start(data);
-
-    /* what desktop are we removing and moving to? */
-    if (data->addremovedesktop.current)
-        rmdesktop = screen_desktop;
-    else
-        rmdesktop = screen_num_desktops - 1;
-    if (rmdesktop < screen_num_desktops - 1)
-        movedesktop = rmdesktop + 1;
-    else
-        movedesktop = rmdesktop;
-
-    /* make a copy of the list cuz we're changing it */
-    stacking_copy = g_list_copy(stacking_list);
-    for (it = g_list_last(stacking_copy); it; it = g_list_previous(it)) {
-        if (WINDOW_IS_CLIENT(it->data)) {
-            ObClient *c = it->data;
-            guint d = c->desktop;
-            if (d != DESKTOP_ALL && d >= movedesktop) {
-                client_set_desktop(c, c->desktop - 1, TRUE, TRUE);
-                ob_debug("moving window %s\n", c->title);
-            }
-            /* raise all the windows that are on the current desktop which
-               is being merged */
-            if ((screen_desktop == rmdesktop - 1 ||
-                 screen_desktop == rmdesktop) &&
-                (d == DESKTOP_ALL || d == screen_desktop))
-            {
-                stacking_raise(CLIENT_AS_WINDOW(c));
-                ob_debug("raising window %s\n", c->title);
-            }
-        }
-    }
-
-    /* act like we're changing desktops */
-    if (screen_desktop < screen_num_desktops - 1) {
-        gint d = screen_desktop;
-        screen_desktop = screen_last_desktop;
-        screen_set_desktop(d, TRUE);
-        ob_debug("fake desktop change\n");
-    }
-
-    screen_set_num_desktops(screen_num_desktops-1);
-
-    client_action_end(data, config_focus_under_mouse);
-}