add focus options

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 757b118d5f9dd298521469e1c2b24e609435797b..0dd1696730c6a26c53842c0625d6f569728eb907 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -130,6 +130,7 @@ void client_manage_all()
 
         w = client_startup_stack_order[i-1];
         c = g_hash_table_lookup(client_map, &w);
+        g_message("0x%lx %d", c->window, c->iconic);
         if (c) stacking_lower(c);
     }
     g_free(client_startup_stack_order);
@@ -234,7 +235,7 @@ void client_manage(Window window)
     /* update the list hints */
     client_set_list();
 
-    g_message("Managed window 0x%lx", window);
+/*    g_message("Managed window 0x%lx", window);*/
 }
 
 void client_unmanage_all()
@@ -249,7 +250,7 @@ void client_unmanage(Client *client)
     int j;
     GSList *it;
 
-    g_message("Unmanaging window: %lx", client->window);
+/*    g_message("Unmanaging window: %lx", client->window);*/
 
     dispatch_client(Event_Client_Destroy, client, 0, 0);
     g_assert(client != NULL);
@@ -1934,7 +1935,7 @@ gboolean client_focus(Client *self)
 
     if (self->can_focus)
        XSetInputFocus(ob_display, self->window, RevertToNone,
-                       CurrentTime);
+                       event_lasttime);
 
     if (self->focus_notify) {
        XEvent ce;
@@ -1944,7 +1945,7 @@ gboolean client_focus(Client *self)
        ce.xclient.window = self->window;
        ce.xclient.format = 32;
        ce.xclient.data.l[0] = prop_atoms.wm_take_focus;
-       ce.xclient.data.l[1] = CurrentTime;
+       ce.xclient.data.l[1] = event_lasttime;
        ce.xclient.data.l[2] = 0l;
        ce.xclient.data.l[3] = 0l;
        ce.xclient.data.l[4] = 0l;
@@ -1972,6 +1973,7 @@ void client_set_focused(Client *self, gboolean focused)
         if (focus_client != self)
             focus_set_client(self);
     } else {
+        event_unfocustime = event_lasttime;
        if (focus_client == self)
            focus_set_client(NULL);
     }