all repos — openbox @ 9a4ccc919c0e877f2c6e66b540f86169fac18dc1

openbox fork - make it a bit more like ryudo 

add the client_set_focused function.
make focus state be changed internally immediately after calling the X functions to make it so, basically, assume their success. this elimiates races all over the place with our state vs the server's state.
Dana Jansens danakj@orodu.net
commit

9a4ccc919c0e877f2c6e66b540f86169fac18dc1

parent

5034073da7013210ef80f93eaa2cfefdd471f127

2 files changed, 32 insertions(+), 1 deletions(-)

jump to
M openbox/client.c → openbox/client.c 
@@ -245,6 +245,7 @@ client_toggle_border(client, TRUE);
 
     /* reparent the window out of the frame, and free the frame */
     engine_frame_release_client(client->frame, client);
+    client->frame = NULL;
      
     client_list = g_slist_remove(client_list, client);
     stacking_list = g_list_remove(stacking_list, client);

@@ -1919,6 +1920,8 @@ 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;
 }

@@ -1926,7 +1929,30 @@ 
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-    focus_set_client(NULL);
+    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,6 +320,11 @@ 
 /* 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.