]> Dogcows Code - chaz/openbox/blobdiff - openbox/action.c
Add MoveFromEdge* actions, shorten client_directional_edge_search with some handy...
[chaz/openbox] / openbox / action.c
index cb3233252a4232f86a13934a800583ffe16dbbf3..24a0c6346396d39c45de365b372b106e008af1c6 100644 (file)
@@ -1,35 +1,93 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   action.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "debug.h"
 #include "client.h"
 #include "focus.h"
 #include "moveresize.h"
 #include "menu.h"
 #include "prop.h"
 #include "stacking.h"
-#include "frame.h"
 #include "screen.h"
 #include "action.h"
-#include "dispatch.h"
 #include "openbox.h"
+#include "grab.h"
+#include "keyboard.h"
+#include "event.h"
+#include "dock.h"
+#include "config.h"
+#include "mainloop.h"
 
 #include <glib.h>
 
-typedef struct ActionString {
-    char *name;
+inline void client_action_start(union ActionData *data)
+{
+    if (config_focus_follow)
+        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
+            grab_pointer(TRUE, OB_CURSOR_NONE);
+}
+
+inline void client_action_end(union ActionData *data)
+{
+    if (config_focus_follow)
+        if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
+            if (!data->any.button) {
+                grab_pointer(FALSE, OB_CURSOR_NONE);
+            } else {
+                ObClient *c;
+
+                /* usually this is sorta redundant, but with a press action
+                   the enter event will come as a GrabNotify which is
+                   ignored, so this will handle that case */
+                if ((c = client_under_pointer()))
+                    event_enter_client(c);
+            }
+        }
+}
+
+typedef struct
+{
+    const gchar *name;
     void (*func)(union ActionData *);
-    void (*setup)(Action *);
+    void (*setup)(ObAction **, ObUserAction uact);
 } ActionString;
 
-Action *action_new(void (*func)(union ActionData *data))
+static ObAction *action_new(void (*func)(union ActionData *data))
 {
-    Action *a = g_new0(Action, 1);
+    ObAction *a = g_new0(ObAction, 1);
+    a->ref = 1;
     a->func = func;
 
     return a;
 }
 
-void action_free(Action *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);
@@ -39,139 +97,345 @@ void action_free(Action *a)
     g_free(a);
 }
 
-void setup_action_directional_focus_north(Action *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_showmenu)
+        a->data.showmenu.name = g_strdup(a->data.showmenu.name);
+
+    return a;
+}
+
+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)
+{
+    (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.sendto.follow = TRUE;
+}
+
+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(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTH;
+    (*a)->data.desktop.inter.any.interactive = FALSE;
 }
 
-void setup_action_directional_focus_east(Action *a)
+void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_EAST;
+    (*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_directional_focus_south(Action *a)
+void setup_action_desktop_next(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTH;
+    (*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_directional_focus_west(Action *a)
+void setup_action_desktop_left(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_WEST;
+    (*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_directional_focus_northeast(Action *a)
+void setup_action_desktop_right(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
+    (*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_directional_focus_southeast(Action *a)
+void setup_action_desktop_up(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
+    (*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_directional_focus_southwest(Action *a)
+void setup_action_desktop_down(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
+    (*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_directional_focus_northwest(Action *a)
+void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTHWEST;
+    (*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_send_to_desktop(Action *a)
+void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
 {
-    a->data.sendto.follow = TRUE;
+    (*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_send_to_desktop_direction(Action *a)
+void setup_action_movefromedge_north(ObAction **a, ObUserAction uact)
 {
-    a->data.sendtodir.wrap = TRUE;
-    a->data.sendtodir.follow = TRUE;
+    (*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_desktop_direction(Action *a)
+void setup_action_movefromedge_south(ObAction **a, ObUserAction uact)
 {
-    a->data.desktopdir.wrap = TRUE;
+    (*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_move_keyboard(Action *a)
+void setup_action_movefromedge_east(ObAction **a, ObUserAction uact)
 {
-    a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard;
+    (*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_move(Action *a)
+void setup_action_movefromedge_west(ObAction **a, ObUserAction uact)
 {
-    a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move;
+    (*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_resize(Action *a)
+void setup_action_movetoedge_north(ObAction **a, ObUserAction uact)
 {
-    a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft;
+    (*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_resize_keyboard(Action *a)
+void setup_action_movetoedge_south(ObAction **a, ObUserAction uact)
 {
-    a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard;
+    (*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_cycle_windows_linear_next(Action *a)
+void setup_action_movetoedge_east(ObAction **a, ObUserAction uact)
 {
-    a->data.cycle.linear = TRUE;
-    a->data.cycle.forward = TRUE;
+    (*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_cycle_windows_linear_previous(Action *a)
+void setup_action_movetoedge_west(ObAction **a, ObUserAction uact)
 {
-    a->data.cycle.linear = TRUE;
-    a->data.cycle.forward = FALSE;
+    (*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_cycle_windows_next(Action *a)
+void setup_action_growtoedge_north(ObAction **a, ObUserAction uact)
 {
-    a->data.cycle.linear = FALSE;
-    a->data.cycle.forward = TRUE;
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
 }
 
-void setup_action_cycle_windows_previous(Action *a)
+void setup_action_growtoedge_south(ObAction **a, ObUserAction uact)
 {
-    a->data.cycle.linear = FALSE;
-    a->data.cycle.forward = FALSE;
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
 }
 
-void setup_action_movetoedge_north(Action *a)
+void setup_action_growtoedge_east(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTH;
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_EAST;
 }
 
-void setup_action_movetoedge_south(Action *a)
+void setup_action_growtoedge_west(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTH;
+    (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.diraction.direction = OB_DIRECTION_WEST;
 }
 
-void setup_action_movetoedge_east(Action *a)
+void setup_action_top_layer(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_EAST;
+    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.layer.layer = 1;
 }
 
-void setup_action_movetoedge_west(Action *a)
+void setup_action_normal_layer(ObAction **a, ObUserAction uact)
 {
-    a->data.diraction.direction = OB_DIRECTION_WEST;
+    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.layer.layer = 0;
 }
 
-void setup_action_top_layer(Action *a)
+void setup_action_bottom_layer(ObAction **a, ObUserAction uact)
 {
-    a->data.layer.layer = 1;
+    (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.layer.layer = -1;
 }
 
-void setup_action_normal_layer(Action *a)
+void setup_action_move(ObAction **a, ObUserAction uact)
 {
-    a->data.layer.layer = 0;
+    (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.moveresize.move = TRUE;
+    (*a)->data.moveresize.keyboard =
+        (uact == OB_USER_ACTION_NONE ||
+         uact == OB_USER_ACTION_KEYBOARD_KEY ||
+         uact == OB_USER_ACTION_MENU_SELECTION);
 }
 
-void setup_action_bottom_layer(Action *a)
+void setup_action_resize(ObAction **a, ObUserAction uact)
 {
-    a->data.layer.layer = -1;
+    (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+    (*a)->data.moveresize.move = FALSE;
+    (*a)->data.moveresize.keyboard =
+        (uact == OB_USER_ACTION_NONE ||
+         uact == OB_USER_ACTION_KEYBOARD_KEY ||
+         uact == OB_USER_ACTION_MENU_SELECTION);
+}
+
+void setup_action_showmenu(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.showmenu.any.client_action = OB_CLIENT_ACTION_OPTIONAL;
+    /* you cannot call ShowMenu from inside a menu, cuz the menu code makes
+       assumptions that there is only one menu (and submenus) open at
+       a time! */
+    if (uact == OB_USER_ACTION_MENU_SELECTION) {
+        action_unref(*a);
+        *a = NULL;
+    }
+}
+
+void setup_client_action(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS;
 }
 
 ActionString actionstrings[] =
@@ -221,195 +485,245 @@ ActionString actionstrings[] =
         action_directional_focus,
         setup_action_directional_focus_northwest
     },
+    {
+        "activate",
+        action_activate,
+        setup_client_action
+    },
     {
         "focus",
         action_focus,
-        NULL,
+        setup_client_action
     },
     {
         "unfocus",
         action_unfocus,
-        NULL
+        setup_client_action
     },
     {
         "iconify",
         action_iconify,
-        NULL
+        setup_client_action
+    },
+    {
+        "focustobottom",
+        action_focus_order_to_bottom,
+        setup_client_action
+    },
+    {
+        "raiselower",
+        action_raiselower,
+        setup_client_action
     },
     {
         "raise",
         action_raise,
-        NULL
+        setup_client_action
     },
     {
         "lower",
         action_lower,
-        NULL
+        setup_client_action
     },
     {
         "close",
         action_close,
-        NULL
+        setup_client_action
     },
     {
         "kill",
         action_kill,
-        NULL
+        setup_client_action
     },
     {
         "shadelower",
         action_shadelower,
-        NULL
+        setup_client_action
     },
     {
         "unshaderaise",
         action_unshaderaise,
-        NULL
+        setup_client_action
     },
     {
         "shade",
         action_shade,
-        NULL
+        setup_client_action
     },
     {
         "unshade",
         action_unshade,
-        NULL
+        setup_client_action
     },
     {
         "toggleshade",
         action_toggle_shade,
-        NULL
+        setup_client_action
     },
     {
         "toggleomnipresent",
         action_toggle_omnipresent,
-        NULL
+        setup_client_action
     },
     {
         "moverelativehorz",
         action_move_relative_horz,
-        NULL
+        setup_client_action
     },
     {
         "moverelativevert",
         action_move_relative_vert,
-        NULL
+        setup_client_action
+    },
+    {
+        "movetocenter",
+        action_move_to_center,
+        setup_client_action
     },
     {
         "resizerelativehorz",
         action_resize_relative_horz,
-        NULL
+        setup_client_action
     },
     {
         "resizerelativevert",
         action_resize_relative_vert,
-        NULL
+        setup_client_action
+    },
+    {
+        "moverelative",
+        action_move_relative,
+        setup_client_action
+    },
+    {
+        "resizerelative",
+        action_resize_relative,
+        setup_client_action
     },
     {
         "maximizefull",
         action_maximize_full,
-        NULL
+        setup_client_action
     },
     {
         "unmaximizefull",
         action_unmaximize_full,
-        NULL
+        setup_client_action
     },
     {
         "togglemaximizefull",
         action_toggle_maximize_full,
-        NULL
+        setup_client_action
     },
     {
         "maximizehorz",
         action_maximize_horz,
-        NULL
+        setup_client_action
     },
     {
         "unmaximizehorz",
         action_unmaximize_horz,
-        NULL
+        setup_client_action
     },
     {
         "togglemaximizehorz",
         action_toggle_maximize_horz,
-        NULL
+        setup_client_action
     },
     {
         "maximizevert",
         action_maximize_vert,
-        NULL
+        setup_client_action
     },
     {
         "unmaximizevert",
         action_unmaximize_vert,
-        NULL
+        setup_client_action
     },
     {
         "togglemaximizevert",
         action_toggle_maximize_vert,
-        NULL
+        setup_client_action
+    },
+    {
+        "togglefullscreen",
+        action_toggle_fullscreen,
+        setup_client_action
     },
     {
         "sendtodesktop",
         action_send_to_desktop,
         setup_action_send_to_desktop
     },
+    {
+        "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_right,
-        setup_action_send_to_desktop_direction
+        action_send_to_desktop_dir,
+        setup_action_send_to_desktop_right
     },
     {
         "sendtodesktopleft",
-        action_send_to_desktop_left,
-        setup_action_send_to_desktop_direction
+        action_send_to_desktop_dir,
+        setup_action_send_to_desktop_left
     },
     {
         "sendtodesktopup",
-        action_send_to_desktop_up,
-        setup_action_send_to_desktop_direction
+        action_send_to_desktop_dir,
+        setup_action_send_to_desktop_up
     },
     {
         "sendtodesktopdown",
-        action_send_to_desktop_down,
-        setup_action_send_to_desktop_direction
+        action_send_to_desktop_dir,
+        setup_action_send_to_desktop_down
     },
     {
         "desktop",
         action_desktop,
-        NULL
+        setup_action_desktop
+    },
+    {
+        "desktopnext",
+        action_desktop_dir,
+        setup_action_desktop_next
+    },
+    {
+        "desktopprevious",
+        action_desktop_dir,
+        setup_action_desktop_prev
     },
     {
         "desktopright",
-        action_desktop_right,
-        setup_action_desktop_direction
+        action_desktop_dir,
+        setup_action_desktop_right
     },
     {
         "desktopleft",
-        action_desktop_left,
-        setup_action_desktop_direction
+        action_desktop_dir,
+        setup_action_desktop_left
     },
     {
         "desktopup",
-        action_desktop_up,
-        setup_action_desktop_direction
+        action_desktop_dir,
+        setup_action_desktop_up
     },
     {
         "desktopdown",
-        action_desktop_down,
-        setup_action_desktop_direction
+        action_desktop_dir,
+        setup_action_desktop_down
     },
     {
         "toggledecorations",
         action_toggle_decorations,
-        NULL
-    },
-    {
-        "keyboardmove", 
-        action_moveresize,
-        setup_action_move_keyboard
+        setup_client_action
     },
     {
         "move",
@@ -422,9 +736,9 @@ ActionString actionstrings[] =
         setup_action_resize
     },
     {
-        "keyboardresize",
-        action_moveresize,
-        setup_action_resize_keyboard
+        "toggledockautohide",
+        action_toggle_dockautohide,
+        NULL
     },
     {
         "toggleshowdesktop",
@@ -441,6 +755,16 @@ ActionString actionstrings[] =
         action_unshow_desktop,
         NULL
     },
+    {
+        "desktoplast",
+        action_desktop_last,
+        NULL
+    },
+    {
+        "reconfigure",
+        action_reconfigure,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -454,7 +778,7 @@ ActionString actionstrings[] =
     {
         "showmenu",
         action_showmenu,
-        NULL
+        setup_action_showmenu
     },
     {
         "sendtotoplayer",
@@ -481,16 +805,6 @@ ActionString actionstrings[] =
         action_toggle_layer,
         setup_action_bottom_layer
     },
-    {
-        "nextwindowlinear",
-        action_cycle_windows,
-        setup_action_cycle_windows_linear_next
-    },
-    {
-        "previouswindowlinear",
-        action_cycle_windows,
-        setup_action_cycle_windows_linear_previous
-    },
     {
         "nextwindow",
         action_cycle_windows,
@@ -501,6 +815,26 @@ ActionString actionstrings[] =
         action_cycle_windows,
         setup_action_cycle_windows_previous
     },
+    {
+        "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,
@@ -521,6 +855,26 @@ ActionString actionstrings[] =
         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
+    },
     {
         NULL,
         NULL,
@@ -528,682 +882,841 @@ ActionString actionstrings[] =
     }
 };
 
-Action *action_from_string(char *name)
+/* 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)
 {
-    Action *a = NULL;
-    int i;
+    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);
+                actionstrings[i].setup(&a, uact);
+            if (a)
+                INTERACTIVE_LIMIT(a, uact);
             break;
         }
+    if (!exist)
+        g_warning("Invalid action '%s' requested. No such action exists.",
+                  name);
+    if (!a)
+        g_warning("Invalid use of action '%s'. Action will be ignored.", name);
     return a;
 }
 
-Action *action_parse(xmlDocPtr doc, xmlNodePtr node)
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       ObUserAction uact)
 {
-    char *actname;
-    Action *act = NULL;
+    gchar *actname;
+    ObAction *act = NULL;
     xmlNodePtr n;
 
     if (parse_attr_string("name", node, &actname)) {
-        if ((act = action_from_string(actname))) {
+        if ((act = action_from_string(actname, uact))) {
             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);
+                if ((n = parse_find_node("execute", node->xmlChildrenNode))) {
+                    gchar *s = parse_string(doc, n);
+                    act->data.execute.path = parse_expand_tilde(s);
+                    g_free(s);
+                }
             } 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_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.deltax = parse_int(doc, n);
+            } else if (act->func == action_move_relative) {
+                if ((n = parse_find_node("x", node->xmlChildrenNode)))
+                    act->data.relative.deltax = parse_int(doc, n);
+                if ((n = parse_find_node("y", node->xmlChildrenNode)))
+                    act->data.relative.deltay = parse_int(doc, n);
+            } else if (act->func == action_resize_relative) {
+                if ((n = parse_find_node("left", node->xmlChildrenNode)))
+                    act->data.relative.deltaxl = parse_int(doc, n);
+                if ((n = parse_find_node("up", node->xmlChildrenNode)))
+                    act->data.relative.deltayu = parse_int(doc, n);
+                if ((n = parse_find_node("right", node->xmlChildrenNode)))
+                    act->data.relative.deltax = parse_int(doc, n);
+                if ((n = parse_find_node("down", node->xmlChildrenNode)))
+                    act->data.relative.deltay = parse_int(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("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);
                 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("follow", node->xmlChildrenNode)))
+                    act->data.sendto.follow = parse_bool(doc, n);
+            } 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);
+            } else if (act->func == action_raise ||
+                       act->func == action_lower ||
+                       act->func == action_raiselower ||
+                       act->func == action_shadelower ||
+                       act->func == action_unshaderaise) {
+                if ((n = parse_find_node("group", node->xmlChildrenNode)))
+                    act->data.stacking.group = parse_bool(doc, n);
             }
+            INTERACTIVE_LIMIT(act, uact);
         }
+        g_free(actname);
     }
     return act;
 }
 
+void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
+                     guint state, guint button, gint x, gint y,
+                     gboolean cancel, gboolean done)
+{
+    GSList *it;
+    ObAction *a;
+    gboolean inter = FALSE;
+
+    if (!acts)
+        return;
+
+    if (x < 0 && y < 0)
+        screen_pointer_pos(&x, &y);
+
+    if (grab_on_keyboard())
+        inter = TRUE;
+    else
+        for (it = acts; it; it = g_slist_next(it)) {
+            a = it->data;
+            if (a->data.any.interactive) {
+                inter = TRUE;
+                break;
+            }
+        }
+
+    if (!inter) {
+        /* sometimes when we execute another app as an action,
+           it won't work right unless we XUngrabKeyboard first,
+           even though we grabbed the key/button Asychronously.
+           e.g. "gnome-panel-control --main-menu" */
+        XUngrabKeyboard(ob_display, event_lasttime);
+    }
+
+    for (it = acts; it; it = g_slist_next(it)) {
+        a = it->data;
+
+        if (!(a->data.any.client_action == OB_CLIENT_ACTION_ALWAYS && !c)) {
+            a->data.any.c = a->data.any.client_action ? c : NULL;
+            a->data.any.context = context;
+            a->data.any.x = x;
+            a->data.any.y = y;
+
+            a->data.any.button = button;
+
+            if (a->data.any.interactive) {
+                a->data.inter.cancel = cancel;
+                a->data.inter.final = done;
+                if (!(cancel || done))
+                    if (!keyboard_interactive_grab(state, a->data.any.c, a))
+                        continue;
+            }
+
+            /* XXX UGLY HACK race with motion event starting a move and the
+               button release gettnig processed first. answer: don't queue
+               moveresize starts. UGLY HACK XXX */
+            if (a->data.any.interactive || a->func == action_moveresize) {
+                /* interactive actions are not queued */
+                a->func(&a->data);
+            } else
+                ob_main_loop_queue_action(ob_main_loop, a);
+        }
+    }
+}
+
+void action_run_string(const gchar *name, struct _ObClient *c)
+{
+    ObAction *a;
+    GSList *l;
+
+    a = action_from_string(name, OB_USER_ACTION_NONE);
+    g_assert(a);
+
+    l = g_slist_append(NULL, a);
+
+    action_run(l, c, 0);
+}
+
 void action_execute(union ActionData *data)
 {
     GError *e = NULL;
-    char *cmd;
+    gchar *cmd, **argv = 0;
     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)) {
+            if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) {
                 g_warning("failed to execute '%s': %s",
                           cmd, e->message);
+                g_error_free(e);
+            } else {
+                if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH |
+                                   G_SPAWN_DO_NOT_REAP_CHILD,
+                                   NULL, NULL, NULL, &e)) {
+                    g_warning("failed to execute '%s': %s",
+                              cmd, e->message);
+                    g_error_free(e);
+                }
+                g_strfreev(argv);
             }
+            g_free(cmd);
         } else {
             g_warning("failed to convert '%s' from utf8", data->execute.path);
         }
     }
 }
 
+void action_activate(union ActionData *data)
+{
+    client_activate(data->activate.any.c, data->activate.here);
+}
+
 void action_focus(union ActionData *data)
 {
-    if (data->client.c)
-        client_focus(data->client.c);
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+
+    client_focus(data->client.any.c);
 }
 
 void action_unfocus (union ActionData *data)
 {
-    if (data->client.c)
-        client_unfocus(data->client.c);
+    if (data->client.any.c == focus_client)
+        focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
 
 void action_iconify(union ActionData *data)
 {
-    if (data->client.c)
-        client_iconify(data->client.c, TRUE, TRUE);
+    client_action_start(data);
+    client_iconify(data->client.any.c, TRUE, TRUE);
+    client_action_end(data);
+}
+
+void action_focus_order_to_bottom(union ActionData *data)
+{
+    focus_order_to_bottom(data->client.any.c);
+}
+
+void action_raiselower(union ActionData *data)
+{
+    ObClient *c = data->client.any.c;
+    GList *it;
+    gboolean raise = FALSE;
+
+    for (it = stacking_list; it; it = g_list_next(it)) {
+        if (WINDOW_IS_CLIENT(it->data)) {
+            ObClient *cit = it->data;
+
+            if (cit == c) break;
+            if (client_normal(cit) == client_normal(c) &&
+                    cit->layer == c->layer &&
+                    cit->frame->visible &&
+                    !client_search_transient(c, cit))
+            {
+                if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
+                    raise = TRUE;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (raise)
+        action_raise(data);
+    else
+        action_lower(data);
 }
 
 void action_raise(union ActionData *data)
 {
-    if (data->client.c)
-        stacking_raise(CLIENT_AS_WINDOW(data->client.c));
+    client_action_start(data);
+    stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+    client_action_end(data);
 }
 
 void action_unshaderaise(union ActionData *data)
 {
-    if (data->client.c) {
-        if (data->client.c->shaded)
-            client_shade(data->client.c, FALSE);
-        else
-            stacking_raise(CLIENT_AS_WINDOW(data->client.c));
-    }
+    if (data->client.any.c->shaded)
+        action_unshade(data);
+    else
+        action_raise(data);
 }
 
 void action_shadelower(union ActionData *data)
 {
-    if (data->client.c) {
-        if (data->client.c->shaded)
-            stacking_lower(CLIENT_AS_WINDOW(data->client.c));
-        else
-            client_shade(data->client.c, TRUE);
-    }
+    if (data->client.any.c->shaded)
+        action_lower(data);
+    else
+        action_shade(data);
 }
 
 void action_lower(union ActionData *data)
 {
-    if (data->client.c)
-        stacking_lower(CLIENT_AS_WINDOW(data->client.c));
+    client_action_start(data);
+    stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+    client_action_end(data);
 }
 
 void action_close(union ActionData *data)
 {
-    if (data->client.c)
-        client_close(data->client.c);
+    client_close(data->client.any.c);
 }
 
 void action_kill(union ActionData *data)
 {
-    if (data->client.c)
-        client_kill(data->client.c);
+    client_kill(data->client.any.c);
 }
 
 void action_shade(union ActionData *data)
 {
-    if (data->client.c)
-        client_shade(data->client.c, TRUE);
+    client_action_start(data);
+    client_shade(data->client.any.c, TRUE);
+    client_action_end(data);
 }
 
 void action_unshade(union ActionData *data)
 {
-    if (data->client.c)
-        client_shade(data->client.c, FALSE);
+    client_action_start(data);
+    client_shade(data->client.any.c, FALSE);
+    client_action_end(data);
 }
 
 void action_toggle_shade(union ActionData *data)
 {
-    if (data->client.c)
-        client_shade(data->client.c, !data->client.c->shaded);
+    client_action_start(data);
+    client_shade(data->client.any.c, !data->client.any.c->shaded);
+    client_action_end(data);
 }
 
 void action_toggle_omnipresent(union ActionData *data)
 { 
-    if (data->client.c)
-        client_set_desktop(data->client.c,
-                           data->client.c->desktop == DESKTOP_ALL ?
-                           screen_desktop : DESKTOP_ALL, FALSE);
+    client_set_desktop(data->client.any.c,
+                       data->client.any.c->desktop == DESKTOP_ALL ?
+                       screen_desktop : DESKTOP_ALL, FALSE);
 }
 
 void action_move_relative_horz(union ActionData *data)
 {
-    ObClient *c = data->relative.c;
-    if (c)
-        client_configure(c, OB_CORNER_TOPLEFT,
-                         c->area.x + data->relative.delta, c->area.y,
-                         c->area.width, c->area.height, TRUE, TRUE);
+    ObClient *c = data->relative.any.c;
+    client_action_start(data);
+    client_move(c, c->area.x + data->relative.deltax, c->area.y);
+    client_action_end(data);
 }
 
 void action_move_relative_vert(union ActionData *data)
 {
-    ObClient *c = data->relative.c;
-    if (c)
-        client_configure(c, OB_CORNER_TOPLEFT,
-                         c->area.x, c->area.y + data->relative.delta,
-                         c->area.width, c->area.height, TRUE, TRUE);
+    ObClient *c = data->relative.any.c;
+    client_action_start(data);
+    client_move(c, c->area.x, c->area.y + data->relative.deltax);
+    client_action_end(data);
+}
+
+void action_move_to_center(union ActionData *data)
+{
+    ObClient *c = data->client.any.c;
+    Rect *area;
+    area = screen_area_monitor(c->desktop, 0);
+    client_action_start(data);
+    client_move(c, area->width / 2 - c->area.width / 2,
+                area->height / 2 - c->area.height / 2);
+    client_action_end(data);
 }
 
 void action_resize_relative_horz(union ActionData *data)
 {
-    ObClient *c = data->relative.c;
-    if (c)
-        client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
-                         c->area.width +
-                         data->relative.delta * c->size_inc.width,
-                         c->area.height, TRUE, TRUE);
+    ObClient *c = data->relative.any.c;
+    client_action_start(data);
+    client_resize(c,
+                  c->area.width + data->relative.deltax * c->size_inc.width,
+                  c->area.height);
+    client_action_end(data);
 }
 
 void action_resize_relative_vert(union ActionData *data)
 {
-    ObClient *c = data->relative.c;
-    if (c && !c->shaded)
-        client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
-                         c->area.width, c->area.height +
-                         data->relative.delta * c->size_inc.height,
-                         TRUE, TRUE);
+    ObClient *c = data->relative.any.c;
+    if (!c->shaded) {
+        client_action_start(data);
+        client_resize(c, c->area.width, c->area.height +
+                      data->relative.deltax * c->size_inc.height);
+        client_action_end(data);
+    }
+}
+
+void action_move_relative(union ActionData *data)
+{
+    ObClient *c = data->relative.any.c;
+    client_action_start(data);
+    client_move(c, c->area.x + data->relative.deltax, c->area.y +
+                data->relative.deltay);
+    client_action_end(data);
+}
+
+void action_resize_relative(union ActionData *data)
+{
+    ObClient *c = data->relative.any.c;
+    client_action_start(data);
+    client_move_resize(c,
+                  c->area.x - data->relative.deltaxl * c->size_inc.width,
+                  c->area.y - data->relative.deltayu * c->size_inc.height,
+                  c->area.width + data->relative.deltax  * c->size_inc.width
+                                + data->relative.deltaxl * c->size_inc.width,
+                  c->area.height + data->relative.deltay  * c->size_inc.height
+                                 + data->relative.deltayu * c->size_inc.height);
+    client_action_end(data);
 }
 
 void action_maximize_full(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, TRUE, 0, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, TRUE, 0, TRUE);
+    client_action_end(data);
 }
 
 void action_unmaximize_full(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, FALSE, 0, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, FALSE, 0, TRUE);
+    client_action_end(data);
 }
 
 void action_toggle_maximize_full(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c,
-                        !(data->client.c->max_horz ||
-                          data->client.c->max_vert),
-                        0, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c,
+                    !(data->client.any.c->max_horz ||
+                      data->client.any.c->max_vert),
+                    0, TRUE);
+    client_action_end(data);
 }
 
 void action_maximize_horz(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, TRUE, 1, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, TRUE, 1, TRUE);
+    client_action_end(data);
 }
 
 void action_unmaximize_horz(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, FALSE, 1, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, FALSE, 1, TRUE);
+    client_action_end(data);
 }
 
 void action_toggle_maximize_horz(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c,
+                    !data->client.any.c->max_horz, 1, TRUE);
+    client_action_end(data);
 }
 
 void action_maximize_vert(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, TRUE, 2, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, TRUE, 2, TRUE);
+    client_action_end(data);
 }
 
 void action_unmaximize_vert(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, FALSE, 2, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c, FALSE, 2, TRUE);
+    client_action_end(data);
 }
 
 void action_toggle_maximize_vert(union ActionData *data)
 {
-    if (data->client.c)
-        client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE);
+    client_action_start(data);
+    client_maximize(data->client.any.c,
+                    !data->client.any.c->max_vert, 2, TRUE);
+    client_action_end(data);
 }
 
-void action_send_to_desktop(union ActionData *data)
+void action_toggle_fullscreen(union ActionData *data)
 {
-    if (data->sendto.c) {
-        if (data->sendto.desk < screen_num_desktops ||
-            data->sendto.desk == DESKTOP_ALL) {
-            client_set_desktop(data->desktop.c,
-                               data->sendto.desk, data->sendto.follow);
-            if (data->sendto.follow) screen_set_desktop(data->sendto.desk);
-        }
-    }
+    client_action_start(data);
+    client_fullscreen(data->client.any.c,
+                      !(data->client.any.c->fullscreen), TRUE);
+    client_action_end(data);
 }
 
-void action_desktop(union ActionData *data)
+void action_send_to_desktop(union ActionData *data)
 {
-    if (data->desktop.desk < screen_num_desktops ||
-        data->desktop.desk == DESKTOP_ALL)
-        screen_set_desktop(data->desktop.desk);
-}
+    ObClient *c = data->sendto.any.c;
 
-static void cur_row_col(guint *r, guint *c)
-{
-    switch (screen_desktop_layout.orientation) {
-    case OB_ORIENTATION_HORZ:
-        switch (screen_desktop_layout.start_corner) {
-        case OB_CORNER_TOPLEFT:
-            *r = screen_desktop / screen_desktop_layout.columns;
-            *c = screen_desktop % screen_desktop_layout.columns;
-            break;
-        case OB_CORNER_BOTTOMLEFT:
-            *r = screen_desktop_layout.rows - 1 -
-                screen_desktop / screen_desktop_layout.columns;
-            *c = screen_desktop % screen_desktop_layout.columns;
-            break;
-        case OB_CORNER_TOPRIGHT:
-            *r = screen_desktop / screen_desktop_layout.columns;
-            *c = screen_desktop_layout.columns - 1 -
-                screen_desktop % screen_desktop_layout.columns;
-            break;
-        case OB_CORNER_BOTTOMRIGHT:
-            *r = screen_desktop_layout.rows - 1 -
-                screen_desktop / screen_desktop_layout.columns;
-            *c = screen_desktop_layout.columns - 1 -
-                screen_desktop % screen_desktop_layout.columns;
-            break;
-        }
-        break;
-    case OB_ORIENTATION_VERT:
-        switch (screen_desktop_layout.start_corner) {
-        case OB_CORNER_TOPLEFT:
-            *r = screen_desktop % screen_desktop_layout.rows;
-            *c = screen_desktop / screen_desktop_layout.rows;
-            break;
-        case OB_CORNER_BOTTOMLEFT:
-            *r = screen_desktop_layout.rows - 1 -
-                screen_desktop % screen_desktop_layout.rows;
-            *c = screen_desktop / screen_desktop_layout.rows;
-            break;
-        case OB_CORNER_TOPRIGHT:
-            *r = screen_desktop % screen_desktop_layout.rows;
-            *c = screen_desktop_layout.columns - 1 -
-                screen_desktop / screen_desktop_layout.rows;
-            break;
-        case OB_CORNER_BOTTOMRIGHT:
-            *r = screen_desktop_layout.rows - 1 -
-                screen_desktop % screen_desktop_layout.rows;
-            *c = screen_desktop_layout.columns - 1 -
-                screen_desktop / screen_desktop_layout.rows;
-            break;
-        }
-        break;
-    }
-}
+    if (!client_normal(c)) return;
 
-static guint translate_row_col(guint r, guint c)
-{
-    switch (screen_desktop_layout.orientation) {
-    case OB_ORIENTATION_HORZ:
-        switch (screen_desktop_layout.start_corner) {
-        case OB_CORNER_TOPLEFT:
-            return r % screen_desktop_layout.rows *
-                screen_desktop_layout.columns +
-                c % screen_desktop_layout.columns;
-        case OB_CORNER_BOTTOMLEFT:
-            return (screen_desktop_layout.rows - 1 -
-                    r % screen_desktop_layout.rows) *
-                screen_desktop_layout.columns +
-                c % screen_desktop_layout.columns;
-        case OB_CORNER_TOPRIGHT:
-            return r % screen_desktop_layout.rows *
-                screen_desktop_layout.columns +
-                (screen_desktop_layout.columns - 1 -
-                 c % screen_desktop_layout.columns);
-        case OB_CORNER_BOTTOMRIGHT:
-            return (screen_desktop_layout.rows - 1 -
-                    r % screen_desktop_layout.rows) *
-                screen_desktop_layout.columns +
-                (screen_desktop_layout.columns - 1 -
-                 c % screen_desktop_layout.columns);
-        }
-    case OB_ORIENTATION_VERT:
-        switch (screen_desktop_layout.start_corner) {
-        case OB_CORNER_TOPLEFT:
-            return c % screen_desktop_layout.columns *
-                screen_desktop_layout.rows +
-                r % screen_desktop_layout.rows;
-        case OB_CORNER_BOTTOMLEFT:
-            return c % screen_desktop_layout.columns *
-                screen_desktop_layout.rows +
-                (screen_desktop_layout.rows - 1 -
-                 r % screen_desktop_layout.rows);
-        case OB_CORNER_TOPRIGHT:
-            return (screen_desktop_layout.columns - 1 -
-                    c % screen_desktop_layout.columns) *
-                screen_desktop_layout.rows +
-                r % screen_desktop_layout.rows;
-        case OB_CORNER_BOTTOMRIGHT:
-            return (screen_desktop_layout.columns - 1 -
-                    c % screen_desktop_layout.columns) *
-                screen_desktop_layout.rows +
-                (screen_desktop_layout.rows - 1 -
-                 r % screen_desktop_layout.rows);
-        }
+    if (data->sendto.desk < screen_num_desktops ||
+        data->sendto.desk == DESKTOP_ALL) {
+        client_set_desktop(c, data->sendto.desk, data->sendto.follow);
+        if (data->sendto.follow)
+            screen_set_desktop(data->sendto.desk);
     }
-    g_assert_not_reached();
-    return 0;
 }
 
-void action_desktop_right(union ActionData *data)
+void action_desktop(union ActionData *data)
 {
-    guint r, c, d;
+    static guint first = (unsigned) -1;
 
-    cur_row_col(&r, &c);
-    ++c;
-    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->desktopdir.wrap) return;
-        ++c;
-    }
-    d = translate_row_col(r, c);
-    if (d < screen_num_desktops)
-        screen_set_desktop(d);
-}
-
-void action_send_to_desktop_right(union ActionData *data)
-{
-    guint r, c, d;
+    if (data->inter.any.interactive && first == (unsigned) -1)
+        first = screen_desktop;
 
-    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);
+    if (!data->inter.any.interactive ||
+        (!data->inter.cancel && !data->inter.final))
+    {
+        if (data->desktop.desk < screen_num_desktops ||
+            data->desktop.desk == DESKTOP_ALL)
+        {
+            screen_set_desktop(data->desktop.desk);
+            if (data->inter.any.interactive)
+                screen_desktop_popup(data->desktop.desk, TRUE);
         }
+    } else if (data->inter.cancel) {
+        screen_set_desktop(first);
     }
-}
-
-void action_desktop_left(union ActionData *data)
-{
-    guint r, c, d;
 
-    cur_row_col(&r, &c);
-    --c;
-    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->desktopdir.wrap) return;
-        --c;
+    if (!data->inter.any.interactive || data->inter.final) {
+        screen_desktop_popup(0, FALSE);
+        first = (unsigned) -1;
     }
-    d = translate_row_col(r, c);
-    if (d < screen_num_desktops)
-        screen_set_desktop(d);
 }
 
-void action_send_to_desktop_left(union ActionData *data)
+void action_desktop_dir(union ActionData *data)
 {
-    guint r, c, d;
+    guint 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);
-        }
+    d = screen_cycle_desktop(data->desktopdir.dir,
+                             data->desktopdir.wrap,
+                             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.cancel)
+    {
+        screen_set_desktop(d);
     }
 }
 
-void action_desktop_down(union ActionData *data)
+void action_send_to_desktop_dir(union ActionData *data)
 {
-    guint r, c, d;
+    ObClient *c = data->sendtodir.inter.any.c;
+    guint d;
 
-    cur_row_col(&r, &c);
-    ++r;
-    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->desktopdir.wrap) return;
-        ++r;
+    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);
+    if (!data->sendtodir.inter.any.interactive ||
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
+    {
+        client_set_desktop(c, d, data->sendtodir.follow);
+        if (data->sendtodir.follow)
+            screen_set_desktop(d);
     }
-    d = translate_row_col(r, c);
-    if (d < screen_num_desktops)
-        screen_set_desktop(d);
 }
 
-void action_send_to_desktop_down(union ActionData *data)
+void action_desktop_last(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);
-        }
-    }
+    screen_set_desktop(screen_last_desktop);
 }
 
-void action_desktop_up(union ActionData *data)
+void action_toggle_decorations(union ActionData *data)
 {
-    guint r, c, d;
+    ObClient *c = data->client.any.c;
 
-    cur_row_col(&r, &c);
-    --r;
-    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->desktopdir.wrap) return;
-        --r;
-    }
-    d = translate_row_col(r, c);
-    if (d < screen_num_desktops)
-        screen_set_desktop(d);
+    client_action_start(data);
+    client_set_undecorated(c, !c->undecorated);
+    client_action_end(data);
 }
 
-void action_send_to_desktop_up(union ActionData *data)
+static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch)
 {
-    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);
+    if (config_resize_four_corners) {
+        if (x - cx > cw / 2) {
+            if (y - cy > ch / 2)
+                return prop_atoms.net_wm_moveresize_size_bottomright;
+            else
+                return prop_atoms.net_wm_moveresize_size_topright;
+        } else {
+            if (y - cy > ch / 2)
+                return prop_atoms.net_wm_moveresize_size_bottomleft;
+            else
+                return prop_atoms.net_wm_moveresize_size_topleft;
         }
+    } else {
+        if (x - cx > cw * 2 / 3) {
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottomright;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_topright;
+            else
+                return prop_atoms.net_wm_moveresize_size_right;
+        } else if (x - cx < cw / 3) {
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottomleft;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_topleft;
+            else
+                return prop_atoms.net_wm_moveresize_size_left;
+        } else
+            if (y - cy > ch * 2 / 3)
+                return prop_atoms.net_wm_moveresize_size_bottom;
+            else if (y - cy < ch / 3)
+                return prop_atoms.net_wm_moveresize_size_top;
+            else
+                return prop_atoms.net_wm_moveresize_move;
     }
 }
 
-void action_toggle_decorations(union ActionData *data)
+void action_moveresize(union ActionData *data)
 {
-    ObClient *c = data->client.c;;
-
-    if (!c) return;
+    ObClient *c = data->moveresize.any.c;
+    guint32 corner;
+
+    if (!client_normal(c)) return;
+
+    if (data->moveresize.keyboard) {
+        corner = (data->moveresize.move ?
+                  prop_atoms.net_wm_moveresize_move_keyboard :
+                  prop_atoms.net_wm_moveresize_size_keyboard);
+    } else {
+        corner = (data->moveresize.move ?
+                  prop_atoms.net_wm_moveresize_move :
+                  pick_corner(data->any.x, data->any.y,
+                              c->frame->area.x, c->frame->area.y,
+                              /* use the client size because the frame
+                                 can be differently sized (shaded
+                                 windows) and we want this based on the
+                                 clients size */
+                              c->area.width + c->frame->size.left +
+                              c->frame->size.right,
+                              c->area.height + c->frame->size.top +
+                              c->frame->size.bottom));
+    }
 
-    c->disabled_decorations = c->disabled_decorations ? 0 : ~0;
-    client_setup_decor_and_functions(c);
+    moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
 }
 
-void action_moveresize(union ActionData *data)
+void action_reconfigure(union ActionData *data)
 {
-    ObClient *c = data->moveresize.c;
-
-    if (!c || !client_normal(c)) return;
-
-    moveresize_start(c, data->moveresize.x, data->moveresize.y,
-                     data->moveresize.button, data->moveresize.corner);
+    ob_reconfigure();
 }
 
 void action_restart(union ActionData *data)
 {
-    ob_restart_path = g_strdup(data->execute.path);
-    ob_shutdown = ob_restart = TRUE;
+    ob_restart_other(data->execute.path);
 }
 
 void action_exit(union ActionData *data)
 {
-    ob_shutdown = TRUE;
+    ob_exit(0);
 }
 
 void action_showmenu(union ActionData *data)
 {
     if (data->showmenu.name) {
-        menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y,
-                  data->showmenu.c);
+        menu_show(data->showmenu.name, data->any.x, data->any.y,
+                  data->showmenu.any.c);
     }
 }
 
 void action_cycle_windows(union ActionData *data)
 {
-    ObClient *c;
-    
-    c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
-                    data->cycle.cancel);
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+
+    focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive,
+                data->cycle.dialog,
+                data->cycle.inter.final, data->cycle.inter.cancel);
 }
 
 void action_directional_focus(union ActionData *data)
 {
-    ObClient *nf;
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
 
-    if (!data->diraction.c)
-        return;
-    if ((nf = client_find_directional(data->diraction.c,
-                                      data->diraction.direction)))
-        client_activate(nf);
+    focus_directional_cycle(data->interdiraction.direction,
+                            data->any.interactive,
+                            data->interdiraction.dialog,
+                            data->interdiraction.inter.final,
+                            data->interdiraction.inter.cancel);
 }
 
 void action_movetoedge(union ActionData *data)
 {
-    int x, y, h, w;
-    ObClient *c = data->diraction.c;
+    gint x, y;
+    ObClient *c = data->diraction.any.c;
 
-    if (!c)
-        return;
     x = c->frame->area.x;
     y = c->frame->area.y;
     
-    h = screen_area(c->desktop)->height;
-    w = screen_area(c->desktop)->width;
     switch(data->diraction.direction) {
     case OB_DIRECTION_NORTH:
-        y = 0;
+        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 = 0;
+        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 = h - c->frame->area.height;
+        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 = w - c->frame->area.width;
+        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);
-    client_configure(c, OB_CORNER_TOPLEFT,
-                     x, y, c->area.width, c->area.height, TRUE, TRUE);
+    client_action_start(data);
+    client_move(c, x, y);
+    client_action_end(data);
+}
+
+void action_growtoedge(union ActionData *data)
+{
+    gint x, y, width, height, dest;
+    ObClient *c = data->diraction.any.c;
+    Rect *a;
+
+    //FIXME growtoedge resizes shaded windows to 0 height
+    if (c->shaded)
+        return;
+
+    a = screen_area(c->desktop);
+    x = c->frame->area.x;
+    y = c->frame->area.y;
+    width = c->frame->area.width;
+    height = c->frame->area.height;
 
+    switch(data->diraction.direction) {
+    case OB_DIRECTION_NORTH:
+        dest = client_directional_edge_search(c, OB_DIRECTION_NORTH, FALSE);
+        if (a->y == y)
+            height = c->frame->area.height / 2;
+        else {
+            height = c->frame->area.y + c->frame->area.height - dest;
+            y = dest;
+        }
+        break;
+    case OB_DIRECTION_WEST:
+        dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE);
+        if (a->x == x)
+            width = c->frame->area.width / 2;
+        else {
+            width = c->frame->area.x + c->frame->area.width - dest;
+            x = dest;
+        }
+        break;
+    case OB_DIRECTION_SOUTH:
+        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();
+    }
+    frame_frame_gravity(c->frame, &x, &y);
+    width -= c->frame->size.left + c->frame->size.right;
+    height -= c->frame->size.top + c->frame->size.bottom;
+    client_action_start(data);
+    client_move_resize(c, x, y, width, height);
+    client_action_end(data);
 }
 
 void action_send_to_layer(union ActionData *data)
 {
-    if (data->layer.c)
-        client_set_layer(data->layer.c, data->layer.layer);
+    client_set_layer(data->layer.any.c, data->layer.layer);
 }
 
 void action_toggle_layer(union ActionData *data)
 {
-    ObClient *c = data->layer.c;
+    ObClient *c = data->layer.any.c;
 
-    if (c) {
-        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_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);
+}
+
+void action_toggle_dockautohide(union ActionData *data)
+{
+    config_dock_hide = !config_dock_hide;
+    dock_configure();
 }
 
 void action_toggle_show_desktop(union ActionData *data)
This page took 0.081034 seconds and 4 git commands to generate.