M openbox/client.c → openbox/client.c

@@ -1923,8 +1923,6 @@ ce.xclient.data.l[4] = 0l;
 	XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
     }
 
-    client_set_focused(self, TRUE);
-
     /* XSync(ob_display, FALSE); XXX Why sync? */
     return TRUE;
 }
@@ -1932,30 +1930,6 @@ 
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-    client_set_focused(self, FALSE);
-}
-
-void client_set_focused(Client *self, gboolean focused)
-{
-    if (focused) {
-        if (focus_client != self) {
-            focus_set_client(self);
-
-            /* focus state can affect the stacking layer */
-            client_calc_layer(self);
-
-            engine_frame_adjust_focus(self->frame);
-        }
-    } else {
-	if (focus_client == self)
-	    focus_set_client(NULL);
-
-        /* focus state can affect the stacking layer */
-        client_calc_layer(self);
-
-        if (self->frame != NULL) /* unfocus can happen while being unmanaged */
-            engine_frame_adjust_focus(self->frame);
-    }
 }
 
 gboolean client_focused(Client *self)

M openbox/client.h → openbox/client.h

@@ -320,11 +320,6 @@ 
 /* Returns if the window is focused */
 gboolean client_focused(Client *self);
 
-/*! Sets the client to a focused or unfocused state. This does not actually
-  change the input focus, but rather is used once focus has been moved to tell
-  the client that it is so. */
-void client_set_focused(Client *self, gboolean focused);
-
 /*! Move and/or resize the window.
   This also maintains things like the client's minsize, and size increments.
   @param anchor The corner to keep in the same position when resizing.

M openbox/event.c → openbox/event.c

@@ -238,7 +238,11 @@ /* dont unfocus the window we just focused! */
 		if (fi.xfocus.window == e->xfocus.window)
 		    return;
 	    }
-	}
+	} else if (window == focus_backup && focus_client != NULL)
+            /* Something's focused but we got a focus event for the backup
+               window. this means that something unfocused before we received
+               the new FocusIn. Just ignore it. */
+               return;
 	break;
     case EnterNotify:
     case LeaveNotify:
@@ -323,10 +327,22 @@ Atom msgtype;
      
     switch (e->type) {
     case FocusIn:
-        client_set_focused(client, TRUE);
+        if (focus_client != client)
+            focus_set_client(client);
+
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
+
+        engine_frame_adjust_focus(client->frame);
 	break;
     case FocusOut:
-        client_set_focused(client, FALSE);
+	if (focus_client == client)
+	    focus_set_client(NULL);
+
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
+
+        engine_frame_adjust_focus(client->frame);
 	break;
     case ConfigureRequest:
 	g_message("ConfigureRequest for window %lx", client->window);