X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Ffocus.c;h=1b544910220f8143dedd588ceda914b620c0058d;hb=9cf5903e16c68ce1877d8d04ca6ee1c28e04a5ce;hp=afa5f8ff14d9ac4bf4ea361ee75becc5cdb58148;hpb=85c7635b9b163face21b460de7fd3877baea321b;p=chaz%2Fopenbox

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index afa5f8ff..1b544910 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -2,16 +2,18 @@
 #include "openbox/event.h"
 #include "openbox/client.h"
 #include "openbox/focus.h"
+#include "openbox/screen.h"
 
 typedef struct {
     gboolean here;
+    gboolean stop_int;
 } 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_focus_startup()
+void action_focus_startup(void)
 {
     actions_register("Focus",
                      setup_func,
@@ -26,9 +28,12 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
+    o->stop_int = TRUE;
 
     if ((n = parse_find_node("here", node)))
         o->here = parse_bool(doc, n);
+    if ((n = parse_find_node("stopInteractive", node)))
+        o->stop_int = parse_bool(doc, n);
     return o;
 }
 
@@ -45,17 +50,27 @@ 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, 
+                 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))
         {
-            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+            if (o->stop_int)
+                actions_interactive_cancel_act();
+
+            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) {
+        if (o->stop_int)
+            actions_interactive_cancel_act();
+
         /* focus action on the root window. make keybindings work for this
            openbox instance, but don't focus any specific client */
         focus_nothing();