From d7fd783130db9426b287d5e41370d6a616df0766 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 12 Jul 2007 03:08:40 -0400
Subject: [PATCH] changes for the 3.4 branch from master (svn trunk)

Signed-off-by: Dana Jansens <danakj@orodu.net>
---
 Makefile.am                               |   3 +-
 data/rc.xsd                               |   7 +-
 openbox/actions/addremovedesktop.c        |  60 +++++++
 openbox/actions/all.c                     |   3 +-
 openbox/actions/all.h                     |   3 +-
 openbox/actions/cyclewindows.c            |  38 ++++-
 openbox/actions/decorations.c             |  15 ++
 openbox/actions/desktop.c                 |  26 +++
 openbox/actions/directionalcyclewindows.c | 132 ++++++++++++++-
 openbox/actions/directionaldesktop.c      | 186 ++++++++++++++++++++++
 openbox/actions/directionaltargetwindow.c |  11 +-
 openbox/actions/dockautohide.c            |   2 +-
 openbox/actions/execute.c                 |   4 +-
 openbox/actions/focus.c                   |  19 ++-
 openbox/actions/fullscreen.c              |   4 +
 openbox/actions/growtoedge.c              |  60 +++++++
 openbox/actions/layer.c                   |  80 ++++++++++
 openbox/actions/maximize.c                |  41 +++++
 openbox/actions/maximizehorizontal.c      |  41 +++++
 openbox/actions/maximizevertical.c        |  41 +++++
 openbox/actions/menu.c                    |  57 -------
 openbox/actions/omnipresent.c             |  17 +-
 openbox/actions/resizerelative.c          |   6 +-
 openbox/actions/shade.c                   |  47 ++++--
 openbox/actions/showdesktop.c             |   2 +-
 openbox/actions/unfocus.c                 |   2 +-
 openbox/config.c                          |  24 ++-
 openbox/frame.c                           |   2 +
 28 files changed, 834 insertions(+), 99 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 27114f80..03b3c15f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,6 +164,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/execute.c \
 	openbox/actions/exit.c \
 	openbox/actions/focus.c \
+	openbox/actions/focustobottom.c \
 	openbox/actions/fullscreen.c \
 	openbox/actions/growtoedge.c \
 	openbox/actions/iconify.c \
@@ -174,7 +175,6 @@ openbox_openbox_SOURCES = \
 	openbox/actions/maximize.c \
 	openbox/actions/maximizehorizontal.c \
 	openbox/actions/maximizevertical.c \
-	openbox/actions/menu.c \
 	openbox/actions/move.c \
 	openbox/actions/moverelative.c \
 	openbox/actions/moveresizeto.c \
@@ -188,6 +188,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/restart.c \
 	openbox/actions/shade.c \
 	openbox/actions/showdesktop.c \
+	openbox/actions/showmenu.c \
 	openbox/actions/unfocus.c \
 	openbox/actions.c \
 	openbox/actions.h \
diff --git a/data/rc.xsd b/data/rc.xsd
index debac5bb..aa1c45a9 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -3,8 +3,8 @@
 <!-- XML Schema for the Openbox window manager configuration file -->
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/4.0/rc"
-    xmlns:ob="http://openbox.org/4.0/rc"
+    targetNamespace="http://openbox.org/3.4/rc"
+    xmlns:ob="http://openbox.org/3.4/rc"
     elementFormDefault="qualified">
     <!--
          root node
@@ -245,8 +245,6 @@
             <xsd:enumeration value="Reconfigure"/>
             <xsd:enumeration value="Resize"/>
             <xsd:enumeration value="ResizeRelative"/>
-            <xsd:enumeration value="ResizeRelativeHorz"/>
-            <xsd:enumeration value="ResizeRelativeVert"/>
             <xsd:enumeration value="Restart"/>
             <xsd:enumeration value="SendToBottomLayer"/>
             <xsd:enumeration value="SendToDesktop"/>
@@ -364,6 +362,7 @@
             <xsd:enumeration value="Left"/>
             <xsd:enumeration value="Right"/>
             <xsd:enumeration value="Bottom"/>
+            <xsd:enumeration value="Handle"/>
             <xsd:enumeration value="Maximize"/>
             <xsd:enumeration value="AllDesktops"/>
             <xsd:enumeration value="Shade"/>
diff --git a/openbox/actions/addremovedesktop.c b/openbox/actions/addremovedesktop.c
index c8904d3c..91ccc911 100644
--- a/openbox/actions/addremovedesktop.c
+++ b/openbox/actions/addremovedesktop.c
@@ -11,6 +11,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static gpointer setup_add_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static gpointer setup_remove_func(ObParseInst *i,
                                   xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_addcurrent_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_addlast_func(ObParseInst *i,
+                                   xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_removecurrent_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_removelast_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -26,6 +34,26 @@ void action_addremovedesktop_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("AddDesktopLast",
+                     setup_addlast_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("RemoveDesktopLast",
+                     setup_removelast_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("AddDesktopCurrent",
+                     setup_addcurrent_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("RemoveDesktopCurrent",
+                     setup_removecurrent_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -62,6 +90,38 @@ static gpointer setup_remove_func(ObParseInst *i,
     return o;
 }
 
+static gpointer setup_addcurrent_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_add_func(i, doc, node);
+    o->current = TRUE;
+    return o;
+}
+
+static gpointer setup_addlast_func(ObParseInst *i,
+                                   xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_add_func(i, doc, node);
+    o->current = FALSE;
+    return o;
+}
+
+static gpointer setup_removecurrent_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_remove_func(i, doc, node);
+    o->current = TRUE;
+    return o;
+}
+
+static gpointer setup_removelast_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_remove_func(i, doc, node);
+    o->current = FALSE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 1bf963ac..6f2f0772 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -4,7 +4,7 @@ void action_all_startup()
 {
     action_execute_startup();
     action_debug_startup();
-    action_menu_startup();
+    action_showmenu_startup();
     action_showdesktop_startup();
     action_reconfigure_startup();
     action_exit_startup();
@@ -41,4 +41,5 @@ void action_all_startup()
     action_movetoedge_startup();
     action_growtoedge_startup();
     action_if_startup();
+    action_focustobottom_startup();
 }
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index acb54dcd..ebc2c7c9 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -5,7 +5,7 @@ void action_all_startup();
 
 void action_execute_startup();
 void action_debug_startup();
-void action_menu_startup();
+void action_showmenu_startup();
 void action_showdesktop_startup();
 void action_reconfigure_startup();
 void action_exit_startup();
@@ -42,5 +42,6 @@ void action_layer_startup();
 void action_movetoedge_startup();
 void action_growtoedge_startup();
 void action_if_startup();
+void action_focustobottom_startup();
 
 #endif
diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 23b2c516..21cab19a 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -2,6 +2,7 @@
 #include "openbox/event.h"
 #include "openbox/focus_cycle.h"
 #include "openbox/openbox.h"
+#include "openbox/client.h"
 #include "gettext.h"
 
 typedef struct {
@@ -17,6 +18,8 @@ typedef struct {
 static gboolean cycling = FALSE;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_next_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node);
+static gpointer setup_prev_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_input_func(guint initial_state,
@@ -35,6 +38,18 @@ void action_cyclewindows_startup()
                      run_func,
                      i_input_func,
                      i_cancel_func);
+    actions_register("NextWindow",
+                     setup_next_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("PreviousWindow",
+                     setup_prev_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -72,6 +87,20 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_next_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->forward = TRUE;
+    return o;
+}
+
+static gpointer setup_prev_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->forward = FALSE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
@@ -151,10 +180,13 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
                      TRUE,
                      o->dialog,
                      TRUE, cancel);
+    cycling = FALSE;
 
     if (ft) {
-        actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
-                         state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+        if (o->actions)
+            actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
+                             state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+        else
+            client_activate(ft, FALSE, TRUE, TRUE, TRUE);
     }
-    cycling = FALSE;
 }
diff --git a/openbox/actions/decorations.c b/openbox/actions/decorations.c
index a8f0929c..4c661801 100644
--- a/openbox/actions/decorations.c
+++ b/openbox/actions/decorations.c
@@ -7,6 +7,8 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -17,6 +19,11 @@ void action_decorations_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("ToggleDecorations",
+                     setup_toggle_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -39,6 +46,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 4489f812..abe48b74 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -11,6 +11,8 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node);
+static gpointer setup_last_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -21,6 +23,16 @@ void action_desktop_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("DesktopLast",
+                     setup_last_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktop",
+                     setup_send_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -47,6 +59,20 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_last_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->last = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/directionalcyclewindows.c b/openbox/actions/directionalcyclewindows.c
index 3eea00d1..b3c2104c 100644
--- a/openbox/actions/directionalcyclewindows.c
+++ b/openbox/actions/directionalcyclewindows.c
@@ -2,6 +2,7 @@
 #include "openbox/event.h"
 #include "openbox/focus_cycle.h"
 #include "openbox/openbox.h"
+#include "openbox/client.h"
 #include "openbox/misc.h"
 #include "gettext.h"
 
@@ -14,6 +15,22 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_north_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_south_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_east_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_west_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_northwest_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_northeast_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_southwest_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_southeast_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 static gboolean i_input_func(guint initial_state,
@@ -32,6 +49,54 @@ void action_directionalcyclewindows_startup()
                      run_func,
                      i_input_func,
                      i_cancel_func);
+    actions_register("DirectionalFocusNorth",
+                     setup_north_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusSouth",
+                     setup_south_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusWest",
+                     setup_west_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusEast",
+                     setup_east_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusNorthWest",
+                     setup_northwest_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusNorthEast",
+                     setup_northeast_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusSouthWest",
+                     setup_southwest_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+    actions_register("DirectionalFocusSouthEast",
+                     setup_southeast_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -86,6 +151,66 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_north_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_NORTH;
+    return o;
+}
+
+static gpointer setup_south_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_SOUTH;
+    return o;
+}
+
+static gpointer setup_west_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_WEST;
+    return o;
+}
+
+static gpointer setup_east_func(ObParseInst *i, xmlDocPtr doc,xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_EAST;
+    return o;
+}
+
+static gpointer setup_northwest_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_NORTHWEST;
+    return o;
+}
+
+static gpointer setup_northeast_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_NORTHEAST;
+    return o;
+}
+
+static gpointer setup_southwest_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_SOUTHWEST;
+    return o;
+}
+
+static gpointer setup_southeast_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->direction = OB_DIRECTION_SOUTHEAST;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
@@ -159,7 +284,10 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
                                  TRUE, cancel);
 
     if (ft) {
-        actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
-                         state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+        if (o->actions)
+            actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
+                             state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+        else
+            client_activate(ft, FALSE, TRUE, TRUE, TRUE);
     }
 }
diff --git a/openbox/actions/directionaldesktop.c b/openbox/actions/directionaldesktop.c
index d9aacdd8..52c7cb5c 100644
--- a/openbox/actions/directionaldesktop.c
+++ b/openbox/actions/directionaldesktop.c
@@ -12,6 +12,30 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_next_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_prev_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_left_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_right_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_up_func(ObParseInst *i,
+                              xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_down_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendnext_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendprev_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendleft_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendright_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendup_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_senddown_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -22,6 +46,66 @@ void action_directionaldesktop_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("DesktopNext",
+                     setup_next_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("DesktopPrevious",
+                     setup_prev_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("DesktopLeft",
+                     setup_left_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("DesktopRight",
+                     setup_right_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("DesktopUp",
+                     setup_up_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("DesktopDown",
+                     setup_down_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopNext",
+                     setup_sendnext_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopPrevious",
+                     setup_sendprev_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopLeft",
+                     setup_sendleft_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopRight",
+                     setup_sendright_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopUp",
+                     setup_sendup_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopDown",
+                     setup_senddown_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -68,6 +152,108 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_next_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = TRUE;
+    o->dir = OB_DIRECTION_EAST;
+    return o;
+}
+
+static gpointer setup_prev_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = TRUE;
+    o->dir = OB_DIRECTION_WEST;
+    return o;
+}
+
+static gpointer setup_right_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = FALSE;
+    o->dir = OB_DIRECTION_EAST;
+    return o;
+}
+
+static gpointer setup_left_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = FALSE;
+    o->dir = OB_DIRECTION_WEST;
+    return o;
+}
+
+static gpointer setup_up_func(ObParseInst *i,
+                              xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = FALSE;
+    o->dir = OB_DIRECTION_NORTH;
+    return o;
+}
+
+static gpointer setup_down_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->linear = FALSE;
+    o->dir = OB_DIRECTION_SOUTH;
+    return o;
+}
+
+static gpointer setup_sendnext_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_next_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_sendprev_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_prev_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_sendright_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_right_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_sendleft_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_left_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_sendup_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_up_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
+static gpointer setup_senddown_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_down_func(i, doc, node);
+    o->send = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/directionaltargetwindow.c b/openbox/actions/directionaltargetwindow.c
index 9cebda27..82f3abf5 100644
--- a/openbox/actions/directionaltargetwindow.c
+++ b/openbox/actions/directionaltargetwindow.c
@@ -101,9 +101,14 @@ static gboolean run_func(ObActionsData *data, gpointer options)
                                  o->dialog,
                                  TRUE, FALSE);
 
-    if (ft)
-        actions_run_acts(o->actions, data->uact, data->state,
-                         data->x, data->y, data->button, data->context, ft);
+    if (ft) {
+        if (o->actions)
+            actions_run_acts(o->actions, data->uact, data->state,
+                             data->x, data->y, data->button, data->context,
+                             ft);
+        else
+            client_activate(ft, FALSE, TRUE, TRUE, TRUE);
+    }
 
     return FALSE;
 }
diff --git a/openbox/actions/dockautohide.c b/openbox/actions/dockautohide.c
index e7f65055..9e035b81 100644
--- a/openbox/actions/dockautohide.c
+++ b/openbox/actions/dockautohide.c
@@ -6,7 +6,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_dockautohide_startup()
 {
-    actions_register("DockAutoHide",
+    actions_register("ToggleDockAutoHide",
                      NULL, NULL,
                      run_func,
                      NULL, NULL);
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 7e58fe7c..caf1347b 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -39,7 +39,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("command", node))) {
+    if ((n = parse_find_node("command", node)) ||
+        (n = parse_find_node("execute", node)))
+    {
         gchar *s = parse_string(doc, n);
         o->cmd = parse_expand_tilde(s);
         g_free(s);
diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index d0acfbd9..5e356141 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -5,9 +5,12 @@
 
 typedef struct {
     gboolean here;
+    gboolean activate;
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_activate_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -18,6 +21,11 @@ void action_focus_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("Activate",
+                     setup_activate_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -32,6 +40,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_activate_func(ObParseInst *i,
+                                    xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->activate = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
@@ -55,7 +71,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
-            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+            client_activate(data->client, o->here,
+                            o->activate, o->activate, TRUE);
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         /* focus action on the root window. make keybindings work for this
diff --git a/openbox/actions/fullscreen.c b/openbox/actions/fullscreen.c
index c791191e..00820854 100644
--- a/openbox/actions/fullscreen.c
+++ b/openbox/actions/fullscreen.c
@@ -9,6 +9,10 @@ void action_fullscreen_startup()
                      NULL, NULL,
                      run_func,
                      NULL, NULL);
+    actions_register("ToggleFullscreen",
+                     NULL, NULL,
+                     run_func,
+                     NULL, NULL);
 }
 
 /* Always return FALSE because its not interactive */
diff --git a/openbox/actions/growtoedge.c b/openbox/actions/growtoedge.c
index fffcc4e0..2551df0b 100644
--- a/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@ -10,6 +10,14 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_north_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_south_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_east_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_west_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -20,6 +28,26 @@ void action_growtoedge_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("GrowToEdgeNorth",
+                     setup_north_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("GrowToEdgeSouth",
+                     setup_south_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("GrowToEdgeEast",
+                     setup_east_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("GrowToEdgeWest",
+                     setup_west_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -50,6 +78,38 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_north_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = OB_DIRECTION_NORTH;
+    return o;
+}
+
+static gpointer setup_south_func(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = OB_DIRECTION_SOUTH;
+    return o;
+}
+
+static gpointer setup_east_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = OB_DIRECTION_EAST;
+    return o;
+}
+
+static gpointer setup_west_func(ObParseInst *i,
+                                xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->dir = OB_DIRECTION_WEST;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index 6f83983d..87df6200 100644
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -8,6 +8,16 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggletop_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_togglebottom_func(ObParseInst *i,
+                                        xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendtop_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendbottom_func(ObParseInst *i,
+                                        xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_sendnormal_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -18,6 +28,31 @@ void action_layer_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("ToggleAlwaysOnTop",
+                     setup_toggletop_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("ToggleAlwaysOnBottom",
+                     setup_togglebottom_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToTopLayer",
+                     setup_sendtop_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToBottomLayer",
+                     setup_sendbottom_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("SendToNormalLayer",
+                     setup_sendnormal_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -53,6 +88,51 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_toggletop_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    o->layer = 1;
+    return o;
+}
+
+static gpointer setup_togglebottom_func(ObParseInst *i,
+                                        xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    o->layer = -1;
+    return o;
+}
+
+static gpointer setup_sendtop_func(ObParseInst *i,
+                                     xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    o->layer = 1;
+    return o;
+}
+
+static gpointer setup_sendbottom_func(ObParseInst *i,
+                                        xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    o->layer = -1;
+    return o;
+}
+
+static gpointer setup_sendnormal_func(ObParseInst *i,
+                                      xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    o->layer = 0;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 443ff7e7..3af1eb02 100644
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -7,6 +7,10 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -17,6 +21,21 @@ void action_maximize_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("MaximizeFull",
+                     setup_on_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("UnmaximizeFull",
+                     setup_off_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("ToggleMaximizeFull",
+                     setup_toggle_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -39,6 +58,28 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    return o;
+}
+
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = FALSE;
+    return o;
+}
+
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/maximizehorizontal.c b/openbox/actions/maximizehorizontal.c
index abb8a8e1..525f1017 100644
--- a/openbox/actions/maximizehorizontal.c
+++ b/openbox/actions/maximizehorizontal.c
@@ -7,6 +7,10 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -17,6 +21,21 @@ void action_maximizehorizontal_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("MaximizeHorz",
+                     setup_on_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("UnmaximizeHorz",
+                     setup_off_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("ToggleMaximizeHorz",
+                     setup_toggle_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -39,6 +58,28 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    return o;
+}
+
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = FALSE;
+    return o;
+}
+
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/maximizevertical.c b/openbox/actions/maximizevertical.c
index 516463c7..cb2316e3 100644
--- a/openbox/actions/maximizevertical.c
+++ b/openbox/actions/maximizevertical.c
@@ -7,6 +7,10 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
@@ -17,6 +21,21 @@ void action_maximizevertical_startup()
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("MaximizeVert",
+                     setup_on_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("UnmaximizeVert",
+                     setup_off_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("ToggleMaximizeVert",
+                     setup_toggle_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -39,6 +58,28 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    return o;
+}
+
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = FALSE;
+    return o;
+}
+
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/menu.c b/openbox/actions/menu.c
index 64a4d279..e69de29b 100644
--- a/openbox/actions/menu.c
+++ b/openbox/actions/menu.c
@@ -1,57 +0,0 @@
-#include "openbox/actions.h"
-#include "openbox/menu.h"
-#include <glib.h>
-
-typedef struct {
-    gchar   *name;
-} Options;
-
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void     free_func(gpointer options);
-static gboolean run_func(ObActionsData *data, gpointer options);
-
-void action_menu_startup()
-{
-    actions_register("Menu",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
-}
-
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
-{
-    xmlNodePtr n;
-    Options *o;
-
-    o = g_new0(Options, 1);
-
-    if ((n = parse_find_node("menu", node)))
-        o->name = parse_string(doc, n);
-    return o;
-}
-
-static void free_func(gpointer options)
-{
-    Options *o = options;
-
-    if (o) {
-        g_free(o->name);
-        g_free(o);
-    }
-}
-
-/* Always return FALSE because its not interactive */
-static gboolean run_func(ObActionsData *data, gpointer options)
-{
-    Options *o = options;
-
-    /* you cannot call ShowMenu from inside a menu */
-    if (data->uact == OB_USER_ACTION_MENU_SELECTION) return FALSE;
-
-    if (o->name) {
-        menu_show(o->name, data->x, data->y, data->button != 0, data->client);
-    }
-
-    return FALSE;
-}
diff --git a/openbox/actions/omnipresent.c b/openbox/actions/omnipresent.c
index 92cdfb32..0f29f9ff 100644
--- a/openbox/actions/omnipresent.c
+++ b/openbox/actions/omnipresent.c
@@ -8,16 +8,23 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_omnipresent_startup()
 {
-    actions_register("omnipresent",
+    actions_register("Omnipresent",
                      setup_func,
                      free_func,
                      run_func,
                      NULL, NULL);
+    actions_register("ToggleOmnipresent",
+                     setup_toggle_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -40,6 +47,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
+    return o;
+}
+
 static void free_func(gpointer options)
 {
     Options *o = options;
diff --git a/openbox/actions/resizerelative.c b/openbox/actions/resizerelative.c
index 075c9e73..668a063f 100644
--- a/openbox/actions/resizerelative.c
+++ b/openbox/actions/resizerelative.c
@@ -35,9 +35,11 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
         o->left = parse_int(doc, n);
     if ((n = parse_find_node("right", node)))
         o->right = parse_int(doc, n);
-    if ((n = parse_find_node("top", node)))
+    if ((n = parse_find_node("top", node)) ||
+        (n = parse_find_node("up", node)))
         o->top = parse_int(doc, n);
-    if ((n = parse_find_node("bottom", node)))
+    if ((n = parse_find_node("bottom", node)) ||
+        (n = parse_find_node("down", node)))
         o->bottom = parse_int(doc, n);
 
     return o;
diff --git a/openbox/actions/shade.c b/openbox/actions/shade.c
index d28f91ed..29f28cdb 100644
--- a/openbox/actions/shade.c
+++ b/openbox/actions/shade.c
@@ -6,36 +6,51 @@ typedef struct {
     gboolean on;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_shade_startup()
 {
     actions_register("Shade",
-                     setup_func,
+                     setup_on_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("Unshade",
+                     setup_off_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+    actions_register("ToggleShade",
+                     setup_toggle_func,
                      free_func,
                      run_func,
                      NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_on_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 {
-    xmlNodePtr n;
-    Options *o;
-
-    o = g_new0(Options, 1);
-    o->toggle = TRUE;
+    Options *o = g_new0(Options, 1);
+    o->on = TRUE;
+    return o;
+}
 
-    if ((n = parse_find_node("state", node))) {
-        gchar *s = parse_string(doc, n);
-        if (g_ascii_strcasecmp(s, "toggle")) {
-            o->toggle = FALSE;
-            o->on = parse_bool(doc, n);
-        }
-        g_free(s);
-    }
+static gpointer setup_off_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->on = FALSE;
+    return o;
+}
 
+static gpointer setup_toggle_func(ObParseInst *i,
+                                  xmlDocPtr doc, xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->toggle = TRUE;
     return o;
 }
 
diff --git a/openbox/actions/showdesktop.c b/openbox/actions/showdesktop.c
index 8781f95d..03528362 100644
--- a/openbox/actions/showdesktop.c
+++ b/openbox/actions/showdesktop.c
@@ -5,7 +5,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_showdesktop_startup()
 {
-    actions_register("ShowDesktop",
+    actions_register("ToggleShowDesktop",
                      NULL, NULL,
                      run_func,
                      NULL, NULL);
diff --git a/openbox/actions/unfocus.c b/openbox/actions/unfocus.c
index d581864e..8fda5bf0 100644
--- a/openbox/actions/unfocus.c
+++ b/openbox/actions/unfocus.c
@@ -24,7 +24,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
-    o->tobottom = TRUE;
+    o->tobottom = FALSE;
 
     if ((n = parse_find_node("tobottom", node)))
         o->tobottom = parse_bool(doc, n);
diff --git a/openbox/config.c b/openbox/config.c
index 72ac4108..c8dfac60 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -782,6 +782,22 @@ typedef struct
     const gchar *actname;
 } ObDefKeyBind;
 
+static void bind_default_keyboard()
+{
+    ObDefKeyBind *it;
+    ObDefKeyBind binds[] = {
+        { "A-Tab", "NextWindow" },
+        { "S-A-Tab", "PreviousWindow" },
+        { "A-F4", "Close" },
+        { NULL, NULL }
+    };
+
+    for (it = binds; it->key; ++it) {
+        GList *l = g_list_append(NULL, g_strdup(it->key));
+        keyboard_bind(l, actions_parse_string(it->actname));
+    }
+}
+
 typedef struct
 {
     const gchar *button;
@@ -826,10 +842,10 @@ static void bind_default_mouse()
         { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
-        { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "Maximize" },
+        { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximizeFull" },
         { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
-        { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Omnipresent" },
-        { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Shade" },
+        { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" },
+        { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" },
         { "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
@@ -913,6 +929,8 @@ void config_startup(ObParseInst *i)
     translate_key("C-g", &config_keyboard_reset_state,
                   &config_keyboard_reset_keycode);
 
+    bind_default_keyboard();
+
     parse_register(i, "keyboard", parse_keyboard, NULL);
 
     config_mouse_threshold = 8;
diff --git a/openbox/frame.c b/openbox/frame.c
index a4843d6f..e7192587 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1252,6 +1252,8 @@ ObFrameContext frame_context_from_string(const gchar *name)
         return OB_FRAME_CONTEXT_TOP;
     else if (!g_ascii_strcasecmp("Bottom", name))
         return OB_FRAME_CONTEXT_BOTTOM;
+    else if (!g_ascii_strcasecmp("Handle", name))
+        return OB_FRAME_CONTEXT_BOTTOM;
     else if (!g_ascii_strcasecmp("Left", name))
         return OB_FRAME_CONTEXT_LEFT;
     else if (!g_ascii_strcasecmp("Right", name))
-- 
2.34.1