yet more improvements to focus handling

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 6548d83e993b4c983f5ee4e26667ccb0ce6e08c2..d3426109626e43bbdf0fc3963e6a5bb12c9c51d4 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -238,7 +238,11 @@ void event_process(XEvent *e)
                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:
@@ -251,7 +255,6 @@ void event_process(XEvent *e)
     }
 
     client = g_hash_table_lookup(client_map, (gpointer)window);
-    g_message("EVENT: 0x%lx -> 0x%lx", window, client);
 
     /* deal with it in the kernel */
     if (client)
@@ -324,10 +327,22 @@ static void event_handle_client(Client *client, XEvent *e)
      
     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);