add breakchroot action

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index de2bcdcc24f8f663d9808bce7597ea662a37e28b..2288dcb9886762ffcbbb3436093e0b98ada7ec62 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -446,11 +446,6 @@ void setup_action_addremove_desktop_last(ObAction **a, ObUserAction uact)
     (*a)->data.addremovedesktop.current = FALSE;
 }
 
-void setup_action_focus(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.any.client_action = OB_CLIENT_ACTION_OPTIONAL;
-}
-
 void setup_client_action(ObAction **a, ObUserAction uact)
 {
     (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS;
@@ -498,11 +493,6 @@ ActionString actionstrings[] =
         action_directional_focus,
         setup_action_directional_focus_northwest
     },
-    {
-        "focus",
-        action_focus,
-        setup_action_focus
-    },
     {
         "unfocus",
         action_unfocus,
@@ -838,11 +828,6 @@ ActionString actionstrings[] =
         action_growtoedge,
         setup_action_growtoedge_east
     },
-    {
-        "breakchroot",
-        action_break_chroot,
-        NULL
-    },
     {
         "adddesktoplast",
         action_add_desktop,
@@ -1110,27 +1095,6 @@ void action_run_string(const gchar *name, struct _ObClient *c, Time time)
     action_run(l, c, 0, time);
 }
 
-void action_focus(union ActionData *data)
-{
-    if (data->client.any.c) {
-        if (!data->any.button || client_mouse_focusable(data->client.any.c) ||
-            (data->any.context != OB_FRAME_CONTEXT_CLIENT &&
-             data->any.context != OB_FRAME_CONTEXT_FRAME))
-        {
-            /* if using focus_delay, stop the timer now so that focus doesn't
-               go moving on us */
-            event_halt_focus_delay();
-
-            client_focus(data->client.any.c);
-        }
-    } else {
-        /* focus action on something other than a client, make keybindings
-           work for this openbox instance, but don't focus any specific client
-        */
-        focus_nothing();
-    }
-}
-
 void action_unfocus (union ActionData *data)
 {
     if (data->client.any.c == focus_client)
@@ -1762,12 +1726,6 @@ void action_toggle_dockautohide(union ActionData *data)
     dock_configure();
 }
 
-void action_break_chroot(union ActionData *data)
-{
-    /* break out of one chroot */
-    keyboard_reset_chains(1);
-}
-
 void action_add_desktop(union ActionData *data)
 {
     client_action_start(data);