add the activate action. it will replace the focus action, as it can just focus without raising now (or without unshading)

3 files changed, 81 insertions, 0 deletions

diff --git a/openbox/actions/activate.c b/openbox/actions/activate.c
new file mode 100644
index 00000000..66923622
--- /dev/null
+++ b/openbox/actions/activate.c
@@ -0,0 +1,79 @@
+#include "openbox/actions.h"
+#include "openbox/event.h"
+#include "openbox/client.h"
+#include "openbox/focus.h"
+
+typedef struct {
+    gboolean here;
+    gboolean raise;
+    gboolean unshade;
+} 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_activate_startup()
+{
+    actions_register("Activate",
+                     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);
+    o->raise = TRUE;
+    o->unshade = TRUE;
+
+    if ((n = parse_find_node("here", node)))
+        o->here = parse_bool(doc, n);
+    if ((n = parse_find_node("raise", node)))
+        o->raise = parse_bool(doc, n);
+    if ((n = parse_find_node("unshade", node)))
+        o->unshade = parse_bool(doc, n);
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (data->client) {
+        gboolean mouse = (data->uact == OB_USER_ACTION_MOUSE_PRESS ||
+                          data->uact == OB_USER_ACTION_MOUSE_RELEASE ||
+                          data->uact == OB_USER_ACTION_MOUSE_CLICK ||
+                          data->uact == OB_USER_ACTION_MOUSE_DOUBLE_CLICK ||
+                          data->uact == OB_USER_ACTION_MOUSE_MOTION);
+        if (!mouse || client_mouse_focusable(data->client) ||
+            data->context != OB_FRAME_CONTEXT_CLIENT ||
+            data->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_activate(data->client, o->here, o->raise, o->unshade, TRUE);
+        }
+    } 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();
+    }
+
+    return FALSE;
+}
diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index d60693b4..a8cf305f 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -10,4 +10,5 @@ void action_all_startup()
     action_exit_startup();
     action_restart_startup();
     action_cyclewindows_startup();
+    action_activate_startup();
 }
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index c3ab3a87..1f9a7f38 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -11,5 +11,6 @@ void action_reconfigure_startup();
 void action_exit_startup();
 void action_restart_startup();
 void action_cyclewindows_startup();
+void action_activate_startup();
 
 #endif