]> Dogcows Code - chaz/openbox/blobdiff - openbox/action.c
add resizerelative action
[chaz/openbox] / openbox / action.c
index fa6e3cc203bf6e48623c7acfab75b6f71a735e9d..24f4b36f7d91e6e6113234e149f8d9d710d99346 100644 (file)
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    action.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana 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
@@ -19,6 +20,7 @@
 #include "debug.h"
 #include "client.h"
 #include "focus.h"
+#include "focus_cycle.h"
 #include "moveresize.h"
 #include "menu.h"
 #include "prop.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 ActionString {
-    char *name;
+
+
+typedef struct
+{
+    const gchar *name;
     void (*func)(union ActionData *);
     void (*setup)(ObAction **, ObUserAction uact);
 } ActionString;
 
-static ObAction *action_new(void (*func)(union ActionData *data),
-                            ObUserAction uact)
+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_free(ObAction *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);
 }
 
-void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
-{ 
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH;
-}
-
-void setup_action_directional_focus_east(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_EAST;
-}
-
-void setup_action_directional_focus_south(ObAction **a, ObUserAction uact)
+ObAction* action_copy(const ObAction *src)
 {
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH;
-}
-
-void setup_action_directional_focus_west(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_WEST;
-}
-
-void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
-}
+    ObAction *a = action_new(src->func);
 
-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 = src->data;
 
-void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
-}
+    /* 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);
 
-void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
+    return a;
 }
 
 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;
@@ -123,6 +114,7 @@ void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact)
 
 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;
@@ -132,6 +124,7 @@ void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact)
 
 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;
@@ -141,6 +134,7 @@ void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact)
 
 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;
@@ -150,6 +144,7 @@ void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact)
 
 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;
@@ -159,6 +154,7 @@ void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact)
 
 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;
@@ -214,288 +210,140 @@ void setup_action_desktop_down(ObAction **a, ObUserAction uact)
     (*a)->data.desktopdir.wrap = TRUE;
 }
 
-void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
+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.cycle.inter.any.interactive = TRUE;
-    (*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_SOUTH;
+    (*a)->data.diraction.hang = TRUE;
 }
 
-void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
+void setup_action_movefromedge_east(ObAction **a, ObUserAction uact)
 {
-    (*a)->data.cycle.inter.any.interactive = TRUE;
-    (*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_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_move(ObAction **a, ObUserAction uact)
+void setup_action_resize(ObAction **a, ObUserAction uact)
 {
-    (*a)->data.moveresize.move = TRUE;
+    (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
     (*a)->data.moveresize.keyboard =
-        (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+        (uact == OB_USER_ACTION_NONE ||
+         uact == OB_USER_ACTION_KEYBOARD_KEY ||
          uact == OB_USER_ACTION_MENU_SELECTION);
+    (*a)->data.moveresize.corner = 0;
 }
 
-void setup_action_resize(ObAction **a, ObUserAction uact)
+void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact)
 {
-    (*a)->data.moveresize.move = FALSE;
-    (*a)->data.moveresize.keyboard =
-        (uact == OB_USER_ACTION_KEYBOARD_KEY ||
-         uact == OB_USER_ACTION_MENU_SELECTION);
+    (*a)->data.addremovedesktop.current = TRUE;
 }
 
-void setup_action_showmenu(ObAction **a, ObUserAction uact)
+void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact)
 {
-    /* 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_free(*a);
-        a = NULL;
-    }
+    (*a)->data.addremovedesktop.current = FALSE;
+}
+
+void setup_client_action(ObAction **a, ObUserAction uact)
+{
+    (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS;
 }
 
 ActionString actionstrings[] =
 {
-    {
-        "execute", 
-        action_execute, 
-        NULL
-    },
-    {
-        "directionalfocusnorth", 
-        action_directional_focus, 
-        setup_action_directional_focus_north
-    },
-    {
-        "directionalfocuseast", 
-        action_directional_focus, 
-        setup_action_directional_focus_east
-    },
-    {
-        "directionalfocussouth", 
-        action_directional_focus, 
-        setup_action_directional_focus_south
-    },
-    {
-        "directionalfocuswest",
-        action_directional_focus,
-        setup_action_directional_focus_west
-    },
-    {
-        "directionalfocusnortheast",
-        action_directional_focus,
-        setup_action_directional_focus_northeast
-    },
-    {
-        "directionalfocussoutheast",
-        action_directional_focus,
-        setup_action_directional_focus_southeast
-    },
-    {
-        "directionalfocussouthwest",
-        action_directional_focus,
-        setup_action_directional_focus_southwest
-    },
-    {
-        "directionalfocusnorthwest",
-        action_directional_focus,
-        setup_action_directional_focus_northwest
-    },
-    {
-        "activate",
-        action_activate,
-        NULL
-    },
-    {
-        "focus",
-        action_focus,
-        NULL
-    },
-    {
-        "unfocus",
-        action_unfocus,
-        NULL
-    },
-    {
-        "iconify",
-        action_iconify,
-        NULL
-    },
-    {
-        "raiselower",
-        action_raiselower,
-        NULL
-    },
-    {
-        "raise",
-        action_raise,
-        NULL
-    },
-    {
-        "lower",
-        action_lower,
-        NULL
-    },
-    {
-        "close",
-        action_close,
-        NULL
-    },
-    {
-        "kill",
-        action_kill,
-        NULL
-    },
     {
         "shadelower",
         action_shadelower,
-        NULL
+        setup_client_action
     },
     {
         "unshaderaise",
         action_unshaderaise,
-        NULL
-    },
-    {
-        "shade",
-        action_shade,
-        NULL
-    },
-    {
-        "unshade",
-        action_unshade,
-        NULL
-    },
-    {
-        "toggleshade",
-        action_toggle_shade,
-        NULL
-    },
-    {
-        "toggleomnipresent",
-        action_toggle_omnipresent,
-        NULL
-    },
-    {
-        "moverelativehorz",
-        action_move_relative_horz,
-        NULL
-    },
-    {
-        "moverelativevert",
-        action_move_relative_vert,
-        NULL
-    },
-    {
-        "resizerelativehorz",
-        action_resize_relative_horz,
-        NULL
-    },
-    {
-        "resizerelativevert",
-        action_resize_relative_vert,
-        NULL
-    },
-    {
-        "maximizefull",
-        action_maximize_full,
-        NULL
-    },
-    {
-        "unmaximizefull",
-        action_unmaximize_full,
-        NULL
-    },
-    {
-        "togglemaximizefull",
-        action_toggle_maximize_full,
-        NULL
-    },
-    {
-        "maximizehorz",
-        action_maximize_horz,
-        NULL
-    },
-    {
-        "unmaximizehorz",
-        action_unmaximize_horz,
-        NULL
-    },
-    {
-        "togglemaximizehorz",
-        action_toggle_maximize_horz,
-        NULL
-    },
-    {
-        "maximizevert",
-        action_maximize_vert,
-        NULL
-    },
-    {
-        "unmaximizevert",
-        action_unmaximize_vert,
-        NULL
-    },
-    {
-        "togglemaximizevert",
-        action_toggle_maximize_vert,
-        NULL
+        setup_client_action
     },
     {
         "sendtodesktop",
@@ -533,95 +381,10 @@ ActionString actionstrings[] =
         setup_action_send_to_desktop_down
     },
     {
-        "desktop",
-        action_desktop,
-        NULL
-    },
-    {
-        "desktopnext",
-        action_desktop_dir,
-        setup_action_desktop_next
-    },
-    {
-        "desktopprevious",
-        action_desktop_dir,
-        setup_action_desktop_prev
-    },
-    {
-        "desktopright",
-        action_desktop_dir,
-        setup_action_desktop_right
-    },
-    {
-        "desktopleft",
-        action_desktop_dir,
-        setup_action_desktop_left
-    },
-    {
-        "desktopup",
-        action_desktop_dir,
-        setup_action_desktop_up
-    },
-    {
-        "desktopdown",
-        action_desktop_dir,
-        setup_action_desktop_down
-    },
-    {
-        "toggledecorations",
-        action_toggle_decorations,
-        NULL
-    },
-    {
-        "move",
-        action_moveresize,
-        setup_action_move
-    },
-    {
-        "resize",
-        action_moveresize,
-        setup_action_resize
-    },
-    {
-        "toggleshowdesktop",
-        action_toggle_show_desktop,
-        NULL
-    },
-    {
-        "showdesktop",
-        action_show_desktop,
-        NULL
-    },
-    {
-        "unshowdesktop",
-        action_unshow_desktop,
+        "toggledockautohide",
+        action_toggle_dockautohide,
         NULL
     },
-    {
-        "desktoplast",
-        action_desktop_last,
-        NULL
-    },
-    {
-        "reconfigure",
-        action_reconfigure,
-        NULL
-    },
-    {
-        "restart",
-        action_restart,
-        NULL
-    },
-    {
-        "exit",
-        action_exit,
-        NULL
-    },
-    {
-        "showmenu",
-        action_showmenu,
-        setup_action_showmenu
-    },
     {
         "sendtotoplayer",
         action_send_to_layer,
@@ -648,14 +411,24 @@ ActionString actionstrings[] =
         setup_action_bottom_layer
     },
     {
-        "nextwindow",
-        action_cycle_windows,
-        setup_action_cycle_windows_next
+        "movefromedgenorth",
+        action_movetoedge,
+        setup_action_movefromedge_north
+    },
+    {
+        "movefromedgesouth",
+        action_movetoedge,
+        setup_action_movefromedge_south
+    },
+    {
+        "movefromedgewest",
+        action_movetoedge,
+        setup_action_movefromedge_west
     },
     {
-        "previouswindow",
-        action_cycle_windows,
-        setup_action_cycle_windows_previous
+        "movefromedgeeast",
+        action_movetoedge,
+        setup_action_movefromedge_east
     },
     {
         "movetoedgenorth",
@@ -697,6 +470,26 @@ ActionString actionstrings[] =
         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,
@@ -704,584 +497,318 @@ ActionString actionstrings[] =
     }
 };
 
-ObAction *action_from_string(char *name, ObUserAction uact)
+/* 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;
-    int i;
+    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, uact);
+            a = action_new(actionstrings[i].func);
             if (actionstrings[i].setup)
                 actionstrings[i].setup(&a, uact);
-            /* only key bindings can be interactive. thus saith the xor. */
-            if (uact != OB_USER_ACTION_KEYBOARD_KEY)
-                a->data.any.interactive = FALSE;
+            if (a)
+                INTERACTIVE_LIMIT(a, uact);
             break;
         }
     if (!exist)
-        g_warning("Invalid action '%s' requested. No such action exists.",
+        g_message(_("Invalid action '%s' requested. No such action exists."),
                   name);
     if (!a)
-        g_warning("Invalid use of action '%s'. Action will be ignored.", name);
+        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)
 {
-    char *actname;
+    gchar *actname;
     ObAction *act = NULL;
     xmlNodePtr n;
 
     if (parse_attr_string("name", node, &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))) {
-                    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.delta = 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("desktop", node->xmlChildrenNode)))
                     act->data.sendto.desk = parse_int(doc, n);
                 if (act->data.sendto.desk > 0) act->data.sendto.desk--;
                 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); 
             } 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);
-            } 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.sendtodir.inter.any.interactive =
+                        parse_bool(doc, n);
+            INTERACTIVE_LIMIT(act, uact);
         }
         g_free(actname);
     }
     return act;
 }
 
-void action_run_full(ObAction *a, struct _ObClient *c,
-                     guint state, guint button, gint x, gint y,
+void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
+                     guint state, guint button, gint x, gint y, Time time,
                      gboolean cancel, gboolean done)
 {
+    GSList *it;
+    ObAction *a;
+
+    if (!acts)
+        return;
+
     if (x < 0 && y < 0)
         screen_pointer_pos(&x, &y);
 
-    a->data.any.c = c;
-    a->data.any.x = x;
-    a->data.any.y = y;
+    for (it = acts; it; it = g_slist_next(it)) {
+        a = it->data;
 
-    a->data.any.button = button;
+        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;
 
-    if (a->data.any.interactive) {
-        a->data.inter.cancel = cancel;
-        a->data.inter.final = done;
-        if (!(cancel || done))
-            keyboard_interactive_grab(state, c, a);
-    }
+            a->data.any.button = button;
 
-    a->func(&a->data);
-}
+            a->data.any.time = time;
 
-void action_execute(union ActionData *data)
-{
-    GError *e = NULL;
-    char *cmd;
-    if (data->execute.path) {
-        cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
-        if (cmd) {
-            if (!g_spawn_command_line_async(cmd, &e)) {
-                g_warning("failed to execute '%s': %s",
-                          cmd, e->message);
+            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;
             }
-            g_free(cmd);
-        } else {
-            g_warning("failed to convert '%s' from utf8", data->execute.path);
+
+            /* 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
+
+               XXX ALSO don't queue showmenu events, because on button press
+               events we need to know if a mouse grab is going to take place,
+               and set the button to 0, so that later motion events don't think
+               that a drag is going on. since showmenu grabs the pointer..
+            */
+            if (a->data.any.interactive || a->func == action_move ||
+                a->func == action_resize || a->func == action_showmenu)
+            {
+                /* interactive actions are not queued */
+                a->func(&a->data);
+            } else if (a->func == action_focus ||
+                       a->func == action_activate ||
+                       a->func == action_showmenu)
+            {
+                /* XXX MORE UGLY HACK
+                   actions from clicks on client windows are NOT queued.
+                   this solves the mysterious click-and-drag-doesnt-work
+                   problem. it was because the window gets focused and stuff
+                   after the button event has already been passed through. i
+                   dont really know why it should care but it does and it makes
+                   a difference.
+
+                   however this very bogus ! !
+                   we want to send the button press to the window BEFORE
+                   we do the action because the action might move the windows
+                   (eg change desktops) and then the button press ends up on
+                   the completely wrong window !
+                   so, this is just for that bug, and it will only NOT queue it
+                   if it is a focusing action that can be used with the mouse
+                   pointer. ugh.
+
+                   also with the menus, there is a race going on. if the
+                   desktop wants to pop up a menu, and we do too, we send them
+                   the button before we pop up the menu, so they pop up their
+                   menu first. but not always. if we pop up our menu before
+                   sending them the button press, then the result is
+                   deterministic. yay.
+
+                   XXX further more. focus actions are not queued at all,
+                   because if you bind focus->showmenu, the menu will get
+                   hidden to do the focusing
+                */
+                a->func(&a->data);
+            } else
+                ob_main_loop_queue_action(ob_main_loop, a);
         }
     }
 }
 
-void action_activate(union ActionData *data)
+void action_run_string(const gchar *name, struct _ObClient *c, Time time)
 {
-    if (data->activate.any.c)
-        client_activate(data->activate.any.c, data->activate.here);
-}
+    ObAction *a;
+    GSList *l;
 
-void action_focus(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_focus(data->client.any.c);
-}
+    a = action_from_string(name, OB_USER_ACTION_NONE);
+    g_assert(a);
 
-void action_unfocus (union ActionData *data)
-{
-    if (data->client.any.c)
-        client_unfocus(data->client.any.c);
-}
+    l = g_slist_append(NULL, a);
 
-void action_iconify(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_iconify(data->client.any.c, TRUE, TRUE);
-}
-
-void action_raiselower(union ActionData *data)
-{
-    ObClient *c = data->client.any.c;
-    GList *it;
-    gboolean raise = FALSE;
-
-    if (!c) return;
-
-    for (it = stacking_list; it; it = g_list_next(it)) {
-        ObClient *cit = it->data;
-
-        if (cit == c) break;
-        if (client_normal(cit) == client_normal(c) &&
-            cit->layer == c->layer &&
-            cit->frame->visible)
-        {
-            if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
-                raise = TRUE;
-                break;
-            }
-        }
-    }
-
-    if (raise)
-        stacking_raise(CLIENT_AS_WINDOW(c));
-    else
-        stacking_lower(CLIENT_AS_WINDOW(c));
-}
-
-void action_raise(union ActionData *data)
-{
-    if (data->client.any.c)
-        stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+    action_run(l, c, 0, time);
 }
 
 void action_unshaderaise(union ActionData *data)
 {
-    if (data->client.any.c) {
-        if (data->client.any.c->shaded) {
-            grab_pointer(TRUE, OB_CURSOR_NONE);
-            client_shade(data->client.any.c, FALSE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
-        } else
-            stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
-    }
+    if (data->client.any.c->shaded)
+        action_unshade(data);
+    else
+        action_raise(data);
 }
 
 void action_shadelower(union ActionData *data)
 {
-    if (data->client.any.c) {
-        if (data->client.any.c->shaded)
-            stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
-        else {
-            grab_pointer(TRUE, OB_CURSOR_NONE);
-            client_shade(data->client.any.c, TRUE);
-            grab_pointer(FALSE, OB_CURSOR_NONE);
-        }
-    }
-}
-
-void action_lower(union ActionData *data)
-{
-    if (data->client.any.c)
-        stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
-}
-
-void action_close(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_close(data->client.any.c);
-}
-
-void action_kill(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_kill(data->client.any.c);
-}
-
-void action_shade(union ActionData *data)
-{
-    if (data->client.any.c) { 
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_shade(data->client.any.c, TRUE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_unshade(union ActionData *data)
-{
-    if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_shade(data->client.any.c, FALSE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_toggle_shade(union ActionData *data)
-{
-    if (data->client.any.c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_shade(data->client.any.c, !data->client.any.c->shaded);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_toggle_omnipresent(union ActionData *data)
-{ 
-    if (data->client.any.c)
-        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.any.c;
-    if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_move(c, c->area.x + data->relative.delta, c->area.y);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_move_relative_vert(union ActionData *data)
-{
-    ObClient *c = data->relative.any.c;
-    if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_move(c, c->area.x, c->area.y + data->relative.delta);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_resize_relative_horz(union ActionData *data)
-{
-    ObClient *c = data->relative.any.c;
-    if (c) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_resize(c,
-                      c->area.width + data->relative.delta * c->size_inc.width,
-                      c->area.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_resize_relative_vert(union ActionData *data)
-{
-    ObClient *c = data->relative.any.c;
-    if (c && !c->shaded) {
-        grab_pointer(TRUE, OB_CURSOR_NONE);
-        client_resize(c, c->area.width, c->area.height +
-                      data->relative.delta * c->size_inc.height);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
-    }
-}
-
-void action_maximize_full(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, TRUE, 0, TRUE);
-}
-
-void action_unmaximize_full(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, FALSE, 0, TRUE);
-}
-
-void action_toggle_maximize_full(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c,
-                        !(data->client.any.c->max_horz ||
-                          data->client.any.c->max_vert),
-                        0, TRUE);
-}
-
-void action_maximize_horz(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, TRUE, 1, TRUE);
-}
-
-void action_unmaximize_horz(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, FALSE, 1, TRUE);
-}
-
-void action_toggle_maximize_horz(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c,
-                        !data->client.any.c->max_horz, 1, TRUE);
-}
-
-void action_maximize_vert(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, TRUE, 2, TRUE);
-}
-
-void action_unmaximize_vert(union ActionData *data)
-{
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, FALSE, 2, TRUE);
+    if (data->client.any.c->shaded)
+        action_lower(data);
+    else
+        action_shade(data);
 }
 
-void action_toggle_maximize_vert(union ActionData *data)
+void action_resize_relative(union ActionData *data)
 {
-    if (data->client.any.c)
-        client_maximize(data->client.any.c, !data->client.any.c->max_vert, 2, TRUE);
 }
 
 void action_send_to_desktop(union ActionData *data)
 {
     ObClient *c = data->sendto.any.c;
 
-    if (!c || !client_normal(c)) return;
+    if (!client_normal(c)) return;
 
     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);
+        client_set_desktop(c, data->sendto.desk, data->sendto.follow, FALSE);
+        if (data->sendto.follow && data->sendto.desk != screen_desktop)
+            screen_set_desktop(data->sendto.desk, TRUE);
     }
 }
 
-void action_desktop(union ActionData *data)
-{
-    if (data->desktop.desk < screen_num_desktops ||
-        data->desktop.desk == DESKTOP_ALL)
-        screen_set_desktop(data->desktop.desk);
-}
-
-void action_desktop_dir(union ActionData *data)
-{
-    guint d;
-
-    d = screen_cycle_desktop(data->desktopdir.dir,
-                             data->desktopdir.wrap,
-                             data->sendtodir.linear,
-                             data->desktopdir.inter.any.interactive,
-                             data->desktopdir.inter.final,
-                             data->desktopdir.inter.cancel);
-    screen_set_desktop(d);
-}
-
 void action_send_to_desktop_dir(union ActionData *data)
 {
     ObClient *c = data->sendtodir.inter.any.c;
     guint d;
 
-    if (!c || !client_normal(c)) return;
+    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);
-    client_set_desktop(c, d, data->sendtodir.follow);
-    if (data->sendtodir.follow)
-        screen_set_desktop(d);
-}
-
-void action_desktop_last(union ActionData *data)
-{
-    screen_set_desktop(screen_last_desktop);
-}
-
-void action_toggle_decorations(union ActionData *data)
-{
-    ObClient *c = data->client.any.c;
-
-    if (!c) return;
-
-    c->decorate = !c->decorate;
-    client_setup_decor_and_functions(c);
-}
-
-static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
-{
-    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;
+    /* 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_moveresize(union ActionData *data)
-{
-    ObClient *c = data->moveresize.any.c;
-    guint32 corner;
-
-    if (!c || !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));
-    }
-
-    moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
-}
-
-void action_reconfigure(union ActionData *data)
-{
-    ob_reconfigure();
-}
-
-void action_restart(union ActionData *data)
-{
-    ob_restart_other(data->execute.path);
-}
-
-void action_exit(union ActionData *data)
-{
-    ob_exit(0);
-}
-
-void action_showmenu(union ActionData *data)
-{
-    if (data->showmenu.name) {
-        menu_show(data->showmenu.name, data->any.x, data->any.y,
-                  data->showmenu.any.c);
-    }
-}
-
-void action_cycle_windows(union ActionData *data)
-{
-    focus_cycle(data->cycle.forward, data->cycle.linear,
-                data->cycle.inter.any.interactive,
-                data->cycle.inter.final, data->cycle.inter.cancel);
-}
-
 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.inter.any.interactive,
+                            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)
 {
-    int x, y;
+    gint x, y;
     ObClient *c = data->diraction.any.c;
 
-    if (!c)
-        return;
     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);
+        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);
+        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) -
-            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 = client_directional_edge_search(c, OB_DIRECTION_EAST) -
-            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);
-    grab_pointer(TRUE, OB_CURSOR_NONE);
+    frame_frame_gravity(c->frame, &x, &y, c->area.width, c->area.height);
+    client_action_start(data);
     client_move(c, x, y);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
-
+    client_action_end(data, FALSE);
 }
 
 void action_growtoedge(union ActionData *data)
 {
-    int x, y, width, height, dest;
+    gint x, y, width, height, dest;
     ObClient *c = data->diraction.any.c;
     Rect *a;
 
-    if (!c)
-        return;
-    
-    a = screen_area(c->desktop);
+    a = screen_area(c->desktop, SCREEN_AREA_ALL_MONITORS, &c->frame->area);
     x = c->frame->area.x;
     y = c->frame->area.y;
-    width = c->frame->area.width;
-    height = c->frame->area.height;
+    /* 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:
-        dest = client_directional_edge_search(c, 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 = c->frame->area.height / 2;
+            height = height / 2;
         else {
-            height = c->frame->area.y + c->frame->area.height - dest;
+            height = c->frame->area.y + height - dest;
             y = dest;
         }
         break;
     case OB_DIRECTION_WEST:
-        dest = client_directional_edge_search(c, OB_DIRECTION_WEST);
+        dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE);
         if (a->x == x)
-            width = c->frame->area.width / 2;
+            width = width / 2;
         else {
-            width = c->frame->area.x + c->frame->area.width - dest;
+            width = c->frame->area.x + width - dest;
             x = dest;
         }
         break;
     case OB_DIRECTION_SOUTH:
-        dest = client_directional_edge_search(c, 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;
@@ -1291,7 +818,7 @@ void action_growtoedge(union ActionData *data)
         height -= (height - c->frame->area.height) % c->size_inc.height;
         break;
     case OB_DIRECTION_EAST:
-        dest = client_directional_edge_search(c, 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;
@@ -1303,43 +830,107 @@ void action_growtoedge(union ActionData *data)
     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;
-    grab_pointer(TRUE, OB_CURSOR_NONE);
+    frame_frame_gravity(c->frame, &x, &y, width, height);
+    client_action_start(data);
     client_move_resize(c, x, y, width, height);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    client_action_end(data, FALSE);
+    g_free(a);
 }
 
 void action_send_to_layer(union ActionData *data)
 {
-    if (data->layer.any.c)
-        client_set_layer(data->layer.any.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.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, config_focus_under_mouse);
 }
 
-void action_toggle_show_desktop(union ActionData *data)
+void action_toggle_dockautohide(union ActionData *data)
 {
-    screen_show_desktop(!screen_showing_desktop);
+    config_dock_hide = !config_dock_hide;
+    dock_configure();
 }
 
-void action_show_desktop(union ActionData *data)
+void action_add_desktop(union ActionData *data)
 {
-    screen_show_desktop(TRUE);
+    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_unshow_desktop(union ActionData *data)
+void action_remove_desktop(union ActionData *data)
 {
-    screen_show_desktop(FALSE);
+    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);
 }
This page took 0.054795 seconds and 4 git commands to generate.