X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Ffocus.c;h=0ef9d2688217fcb2ad3854528c1bd441aea23719;hb=527ecafab95e66a6f0cedd6967fe2c61dfe85101;hp=afa5f8ff14d9ac4bf4ea361ee75becc5cdb58148;hpb=a6af2fc0b953894f80f37fec90ead9277a07b314;p=chaz%2Fopenbox

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index afa5f8ff..0ef9d268 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -11,7 +11,7 @@ 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,
@@ -45,15 +45,19 @@ 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))
         {
+            actions_client_move(data, TRUE);
             client_activate(data->client, 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