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

@@ -344,15 +344,18 @@ focus_set_client(focus_in);
             frame_adjust_focus(focus_in->frame, TRUE);
             client_calc_layer(focus_in);
         }
+
+        focus_hilite = focus_in;
     } 
     if (focus_out) {
         if (focus_out == focus_client)
             focus_set_client(NULL);
         frame_adjust_focus(focus_out->frame, FALSE);
         client_calc_layer(focus_out);
+
+        if (!focus_in)
+            focus_hilite = NULL;
     }
-
-    focus_hilite = focus_in;
 
     if (focus_client != last) {
         if (!focus_client) {
@@ -615,7 +618,9 @@ ob_debug("FocusOut on client for %lx (client %lx) mode %d detail %d\n",
                  e->xfocus.window, client->window,
                  e->xfocus.mode, e->xfocus.detail);
 #endif
-        focus_out = client;
+        g_message("hilite %x client %x", focus_hilite, client);
+        if (focus_hilite == client)
+            focus_out = client;
         if (focus_in == client)
             focus_in = NULL;
         break;