X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Ffocus.c;h=4d0f220d1320dcc9ada4b8546d26c2aee35ec498;hb=4bf6b1b551be744be4fbe4d1faab5be12d051378;hp=9be6741cd38bf9810ab5472267f0633165e6030d;hpb=6c5f6ed1f5d501c79977a55c0f2430ebdd32ef6c;p=chaz%2Fopenbox

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 9be6741c..4d0f220d 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -7,54 +7,49 @@ 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, NULL, NULL);
 }
 
-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_parse_find_node(node, "here")))
+        o->here = obt_parse_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)
 {
     Options *o = options;
 
     if (data->client) {
+/*
+        ob_debug("button %d focusable %d context %d %d %d\n",
+                 data->button, client_mouse_focusable(data->client),
+                 data->context,
+                 OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_FRAME);
+*/
         if (data->button == 0 || client_mouse_focusable(data->client) ||
-            data->context != OB_FRAME_CONTEXT_CLIENT ||
-            data->context != OB_FRAME_CONTEXT_FRAME)
+            (data->context != OB_FRAME_CONTEXT_CLIENT &&
+             data->context != OB_FRAME_CONTEXT_FRAME))
         {
+            actions_client_move(data, TRUE);
             client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+            actions_client_move(data, FALSE);
         }
-    } else {
-        /* focus action on something other than a client, make keybindings
-           work for this openbox instance, but don't focus any specific client
-        */
+    } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
+        /* focus action on the root window. make keybindings work for this
+           openbox instance, but don't focus any specific client */
         focus_nothing();
     }