X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Ffocus.c;h=40c2c80d5c68506a0170769edf84e11e98ee3bf1;hb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;hp=ea7a6a2c83bf59efa8bc011ea43282e927601872;hpb=77baf26a7f2f64ddf1274035fd4991ab17345904;p=chaz%2Fopenbox

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index ea7a6a2c..40c2c80d 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -2,43 +2,32 @@
 #include "openbox/event.h"
 #include "openbox/client.h"
 #include "openbox/focus.h"
+#include "openbox/screen.h"
 
 typedef struct {
     gboolean here;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void     free_func(gpointer options);
+static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_focus_startup()
+void action_focus_startup(void)
 {
-    actions_register("Focus",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
+    actions_register("Focus", setup_func, g_free, run_func);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("here", node)))
-        o->here = parse_bool(doc, n);
+    if ((n = obt_xml_find_node(node, "here")))
+        o->here = obt_xml_node_bool(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)
 {
@@ -55,7 +44,9 @@ 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);
+            actions_client_move(data, TRUE);
+            client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
+            actions_client_move(data, FALSE);
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         /* focus action on the root window. make keybindings work for this